virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Implement the avfilter_default_draw_slice() handler and use it in

Browse Source 
avfilter_draw_slice() when the draw_slice callback is not defined in
the input pad.

Originally committed as revision 16554 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2009-01-11 22:05:48 +00:00
parent b507ebd179
commit b9609848f3
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/avfilter.c
View File

@ -250,6 +250,7 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h)
{ {
uint8_t *src[4], *dst[4]; uint8_t *src[4], *dst[4];
int i, j, hsub, vsub; int i, j, hsub, vsub;
void (*draw_slice)(AVFilterLink *, int, int);
/* copy the slice if needed for permission reasons */ /* copy the slice if needed for permission reasons */
if(link->srcpic) { if(link->srcpic) {
@ -279,8 +280,9 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h)
} }
} }
if(link_dpad(link).draw_slice) if(!(draw_slice = link_dpad(link).draw_slice))
link_dpad(link).draw_slice(link, y, h); draw_slice = avfilter_default_draw_slice;
draw_slice(link, y, h);
} }
AVFilter *avfilter_get_by_name(const char *name) AVFilter *avfilter_get_by_name(const char *name)

4
libavfilter/avfilter.h
View File

@ -23,7 +23,7 @@
#define AVFILTER_AVFILTER_H #define AVFILTER_AVFILTER_H
#define LIBAVFILTER_VERSION_MAJOR 0 #define LIBAVFILTER_VERSION_MAJOR 0
#define LIBAVFILTER_VERSION_MINOR 1 #define LIBAVFILTER_VERSION_MINOR 2
#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@ -349,6 +349,8 @@ struct AVFilterPad
/** default handler for start_frame() for video inputs */ /** default handler for start_frame() for video inputs */
void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref); void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref);
/** default handler for draw_slice() for video inputs */
void avfilter_default_draw_slice(AVFilterLink *link, int y, int h);
/** default handler for end_frame() for video inputs */ /** default handler for end_frame() for video inputs */
void avfilter_default_end_frame(AVFilterLink *link); void avfilter_default_end_frame(AVFilterLink *link);
/** default handler for config_props() for video outputs */ /** default handler for config_props() for video outputs */

11
libavfilter/defaults.c
View File

@ -82,6 +82,17 @@ void avfilter_default_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
} }
} }
void avfilter_default_draw_slice(AVFilterLink *link, int y, int h)
{
AVFilterLink *out = NULL;
if(link->dst->output_count)
out = link->dst->outputs[0];
if(out)
avfilter_draw_slice(out, y, h);
}
void avfilter_default_end_frame(AVFilterLink *link) void avfilter_default_end_frame(AVFilterLink *link)
{ {
AVFilterLink *out = NULL; AVFilterLink *out = NULL;