virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Use the new null callbacks to simplify filters and reduce duplicated code.

Browse Source 
Originally committed as revision 22595 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Bobby Bingham
2010-03-18 23:13:02 +00:00
parent 91d1c741bf
commit d313e17ab1
5 changed files with 18 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavfilter/vf_aspect.c
View File

@@ -56,13 +56,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
return 0; return 0;
} }
static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms,
int w, int h)
{
return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h);
}
static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
{ {
AspectContext *aspect = link->dst->priv; AspectContext *aspect = link->dst->priv;
@@ -71,11 +64,6 @@ static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
avfilter_start_frame(link->dst->outputs[0], picref); avfilter_start_frame(link->dst->outputs[0], picref);
} }
static void end_frame(AVFilterLink *link)
{
avfilter_end_frame(link->dst->outputs[0]);
}
#if CONFIG_ASPECT_FILTER #if CONFIG_ASPECT_FILTER
/* for aspect filter, convert from frame aspect ratio to pixel aspect ratio */ /* for aspect filter, convert from frame aspect ratio to pixel aspect ratio */
static int frameaspect_config_props(AVFilterLink *inlink) static int frameaspect_config_props(AVFilterLink *inlink)
@@ -100,9 +88,9 @@ AVFilter avfilter_vf_aspect = {
.inputs = (AVFilterPad[]) {{ .name = "default", .inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, .type = CODEC_TYPE_VIDEO,
.config_props = frameaspect_config_props, .config_props = frameaspect_config_props,
.get_video_buffer = get_video_buffer, .get_video_buffer = avfilter_null_get_video_buffer,
.start_frame = start_frame, .start_frame = start_frame,
.end_frame = end_frame }, .end_frame = avfilter_null_end_frame },
{ .name = NULL}}, { .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default", .outputs = (AVFilterPad[]) {{ .name = "default",
@@ -122,9 +110,9 @@ AVFilter avfilter_vf_pixelaspect = {
.inputs = (AVFilterPad[]) {{ .name = "default", .inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, .type = CODEC_TYPE_VIDEO,
.get_video_buffer = get_video_buffer, .get_video_buffer = avfilter_null_get_video_buffer,
.start_frame = start_frame, .start_frame = start_frame,
.end_frame = end_frame }, .end_frame = avfilter_null_end_frame },
{ .name = NULL}}, { .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default", .outputs = (AVFilterPad[]) {{ .name = "default",

8
libavfilter/vf_crop.c
View File

@@ -156,12 +156,6 @@ static int config_output(AVFilterLink *link)
return 0; return 0;
} }
static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms,
int w, int h)
{
return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h);
}
static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
{ {
CropContext *crop = link->dst->priv; CropContext *crop = link->dst->priv;
@@ -223,7 +217,7 @@ AVFilter avfilter_vf_crop = {
.type = CODEC_TYPE_VIDEO, .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame, .start_frame = start_frame,
.draw_slice = draw_slice, .draw_slice = draw_slice,
.get_video_buffer = get_video_buffer, .get_video_buffer = avfilter_null_get_video_buffer,
.config_props = config_input, }, .config_props = config_input, },
{ .name = NULL}}, { .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default", .outputs = (AVFilterPad[]) {{ .name = "default",

37
libavfilter/vf_format.c
View File

@@ -85,27 +85,6 @@ static AVFilterFormats *make_format_list(FormatContext *format, int flag)
return formats; return formats;
} }
static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms,
int w, int h)
{
return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h);
}
static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
{
avfilter_start_frame(link->dst->outputs[0], picref);
}
static void end_frame(AVFilterLink *link)
{
avfilter_end_frame(link->dst->outputs[0]);
}
static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
}
#if CONFIG_FORMAT_FILTER #if CONFIG_FORMAT_FILTER
static int query_formats_format(AVFilterContext *ctx) static int query_formats_format(AVFilterContext *ctx)
{ {
@@ -125,10 +104,10 @@ AVFilter avfilter_vf_format = {
.inputs = (AVFilterPad[]) {{ .name = "default", .inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, .type = CODEC_TYPE_VIDEO,
.get_video_buffer= get_video_buffer, .get_video_buffer= avfilter_null_get_video_buffer,
.start_frame = start_frame, .start_frame = avfilter_null_start_frame,
.draw_slice = draw_slice, .draw_slice = avfilter_null_draw_slice,
.end_frame = end_frame, }, .end_frame = avfilter_null_end_frame, },
{ .name = NULL}}, { .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default", .outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO }, .type = CODEC_TYPE_VIDEO },
@@ -155,10 +134,10 @@ AVFilter avfilter_vf_noformat = {
.inputs = (AVFilterPad[]) {{ .name = "default", .inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, .type = CODEC_TYPE_VIDEO,
.get_video_buffer= get_video_buffer, .get_video_buffer= avfilter_null_get_video_buffer,
.start_frame = start_frame, .start_frame = avfilter_null_start_frame,
.draw_slice = draw_slice, .draw_slice = avfilter_null_draw_slice,
.end_frame = end_frame, }, .end_frame = avfilter_null_end_frame, },
{ .name = NULL}}, { .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default", .outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO }, .type = CODEC_TYPE_VIDEO },

22
libavfilter/vf_null.c
View File

@@ -23,22 +23,6 @@
#include "avfilter.h" #include "avfilter.h"
static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms,
int w, int h)
{
return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h);
}
static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
{
avfilter_start_frame(link->dst->outputs[0], picref);
}
static void end_frame(AVFilterLink *link)
{
avfilter_end_frame(link->dst->outputs[0]);
}
AVFilter avfilter_vf_null = { AVFilter avfilter_vf_null = {
.name = "null", .name = "null",
.description = NULL_IF_CONFIG_SMALL("Pass the source unchanged to the output."), .description = NULL_IF_CONFIG_SMALL("Pass the source unchanged to the output."),
@@ -47,9 +31,9 @@ AVFilter avfilter_vf_null = {
.inputs = (AVFilterPad[]) {{ .name = "default", .inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, .type = CODEC_TYPE_VIDEO,
.get_video_buffer = get_video_buffer, .get_video_buffer = avfilter_null_get_video_buffer,
.start_frame = start_frame, .start_frame = avfilter_null_start_frame,
.end_frame = end_frame }, .end_frame = avfilter_null_end_frame },
{ .name = NULL}}, { .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default", .outputs = (AVFilterPad[]) {{ .name = "default",

15
libavfilter/vf_slicify.c
View File

@@ -57,12 +57,6 @@ static int config_props(AVFilterLink *link)
return 0; return 0;
} }
static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms,
int w, int h)
{
return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h);
}
static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
{ {
SliceContext *slice = link->dst->priv; SliceContext *slice = link->dst->priv;
@@ -81,11 +75,6 @@ static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
avfilter_start_frame(link->dst->outputs[0], picref); avfilter_start_frame(link->dst->outputs[0], picref);
} }
static void end_frame(AVFilterLink *link)
{
avfilter_end_frame(link->dst->outputs[0]);
}
static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{ {
SliceContext *slice = link->dst->priv; SliceContext *slice = link->dst->priv;
@@ -116,11 +105,11 @@ AVFilter avfilter_vf_slicify = {
.inputs = (AVFilterPad[]) {{ .name = "default", .inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, .type = CODEC_TYPE_VIDEO,
.get_video_buffer = get_video_buffer, .get_video_buffer = avfilter_null_get_video_buffer,
.start_frame = start_frame, .start_frame = start_frame,
.draw_slice = draw_slice, .draw_slice = draw_slice,
.config_props = config_props, .config_props = config_props,
.end_frame = end_frame, }, .end_frame = avfilter_null_end_frame, },
{ .name = NULL}}, { .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default", .outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, }, .type = CODEC_TYPE_VIDEO, },