jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix improper structure dependency

Browse Source 
I actually did compile that last commit and misread the failed projects
as 0.  I'm just going to put the conversion stuff in video-io.h stuff
because it requires it anyway, and video-scaler.h already depends on
video-io.h for the video_format enum anyway.
This commit is contained in:
jp9000 2014-02-18 13:50:09 -07:00
parent b5bcb1973b
commit c2f5a88c01
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libobs/media-io/video-io.h
View File

@ -23,8 +23,6 @@
extern "C" {
#endif
struct video_scale_info;
/* Base video output component. Use this to create a video output track. */
struct video_output;
@ -83,6 +81,28 @@ static inline bool format_is_yuv(enum video_format format)
return false;
}
enum video_scale_type {
VIDEO_SCALE_POINT = 0,
VIDEO_SCALE_FAST_BILINEAR = 1,
VIDEO_SCALE_DEFAULT = VIDEO_SCALE_FAST_BILINEAR,
VIDEO_SCALE_BILINEAR = 2,
VIDEO_SCALE_BICUBIC = 3,
};
enum video_colorspace {
VIDEO_CS_601 = 0,
VIDEO_CS_DEFAULT = VIDEO_CS_601,
VIDEO_CS_709 = 1,
};
struct video_scale_info {
enum video_format format;
uint32_t width;
uint32_t height;
bool full_range;
enum video_colorspace colorspace;
};
#define VIDEO_OUTPUT_SUCCESS 0
#define VIDEO_OUTPUT_INVALIDPARAM -1
#define VIDEO_OUTPUT_FAIL -2

22
libobs/media-io/video-scaler.h
View File

@ -27,28 +27,6 @@ extern "C" {
struct video_scaler;
typedef struct video_scaler *video_scaler_t;
enum video_scale_type {
VIDEO_SCALE_POINT = 0,
VIDEO_SCALE_FAST_BILINEAR = 1,
VIDEO_SCALE_DEFAULT = VIDEO_SCALE_FAST_BILINEAR,
VIDEO_SCALE_BILINEAR = 2,
VIDEO_SCALE_BICUBIC = 3,
};
enum video_colorspace {
VIDEO_CS_601 = 0,
VIDEO_CS_DEFAULT = VIDEO_CS_601,
VIDEO_CS_709 = 1,
};
struct video_scale_info {
enum video_format format;
uint32_t width;
uint32_t height;
bool full_range;
enum video_colorspace colorspace;
};
#define VIDEO_SCALER_SUCCESS 0
#define VIDEO_SCALER_BAD_CONVERSION -1
#define VIDEO_SCALER_FAILED -2