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

Add preliminary ffmpeg plugin (still testing)

Browse Source 
- Added some code for FFmpeg output that I'm still playing around with.
  Right now I'm just trying to get it to output to file and try to
  understand the FFmpeg/libav APIs.  Hopefully in the future this plugin
  can be used for any sort of output to FFmpeg.

- Fixed a cast warning in audio-io.c with size_t -> uint32_t

- Renamed the 'video_info' and 'audio_info' structures to
  'video_conver_info' and 'audio_convert_info' to better represent their
  actual purpose, and to avoid confusion with 'audio_output_info' and
  'video_output_info' structures.

- Removed a few macros from obs-def.h that were at one point going to be
  used but no longer going to be used (at least for now)
This commit is contained in:
jp9000
2014-01-19 03:16:41 -07:00
parent 8d63845dd4
commit fc8851e9f4
20 changed files with 743 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ struct video_output;
typedef struct video_output *video_t;
enum video_format {
VIDEO_FORMAT_UNKNOWN,
VIDEO_FORMAT_NONE,
/* planar 420 format */
VIDEO_FORMAT_I420, /* three-plane */
@@ -57,18 +57,18 @@ struct video_frame {
struct video_output_info {
const char *name;
enum video_format type;
enum video_format format;
uint32_t fps_num;
uint32_t fps_den;
uint32_t width;
uint32_t height;
};
struct video_info {
enum video_format type;
struct video_convert_info {
enum video_format format;
uint32_t width;
uint32_t height;
uint32_t row_size; /* if any */
uint32_t row_align;
};
#define VIDEO_OUTPUT_SUCCESS 0
@@ -78,11 +78,12 @@ struct video_info {
EXPORT int video_output_open(video_t *video, struct video_output_info *info);
EXPORT void video_output_close(video_t video);
EXPORT void video_output_connect(video_t video, struct video_info *format,
void (*callback)(void *param, struct video_frame *frame),
EXPORT void video_output_connect(video_t video,
struct video_convert_info *conversion,
void (*callback)(void *param, const struct video_frame *frame),
void *param);
EXPORT void video_output_disconnect(video_t video,
void (*callback)(void *param, struct video_frame *frame),
void (*callback)(void *param, const struct video_frame *frame),
void *param);
EXPORT const struct video_output_info *video_output_getinfo(video_t video);