summaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/dualinput.c8
-rw-r--r--libavfilter/dualinput.h3
-rw-r--r--libavfilter/vf_blend.c14
-rw-r--r--libavfilter/vf_lut3d.c14
-rw-r--r--libavfilter/vf_overlay.c14
-rw-r--r--libavfilter/vf_psnr.c14
6 files changed, 18 insertions, 49 deletions
diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c
index 4dc1708..97e15cb 100644
--- a/libavfilter/dualinput.c
+++ b/libavfilter/dualinput.c
@@ -66,18 +66,12 @@ int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s)
return ff_framesync_configure(&s->fs);
}
-int ff_dualinput_filter_frame_main(FFDualInputContext *s,
+int ff_dualinput_filter_frame(FFDualInputContext *s,
AVFilterLink *inlink, AVFrame *in)
{
return ff_framesync_filter_frame(&s->fs, inlink, in);
}
-int ff_dualinput_filter_frame_second(FFDualInputContext *s,
- AVFilterLink *inlink, AVFrame *in)
-{
- return ff_framesync_filter_frame(&s->fs, inlink, in);
-}
-
int ff_dualinput_request_frame(FFDualInputContext *s, AVFilterLink *outlink)
{
return ff_framesync_request_frame(&s->fs, outlink);
diff --git a/libavfilter/dualinput.h b/libavfilter/dualinput.h
index c22066f..0ec0ea7 100644
--- a/libavfilter/dualinput.h
+++ b/libavfilter/dualinput.h
@@ -39,8 +39,7 @@ typedef struct {
} FFDualInputContext;
int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s);
-int ff_dualinput_filter_frame_main(FFDualInputContext *s, AVFilterLink *inlink, AVFrame *in);
-int ff_dualinput_filter_frame_second(FFDualInputContext *s, AVFilterLink *inlink, AVFrame *in);
+int ff_dualinput_filter_frame(FFDualInputContext *s, AVFilterLink *inlink, AVFrame *in);
int ff_dualinput_request_frame(FFDualInputContext *s, AVFilterLink *outlink);
void ff_dualinput_uninit(FFDualInputContext *s);
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index 3bc8eec..a5c8e9f 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -422,27 +422,21 @@ static int request_frame(AVFilterLink *outlink)
return ff_dualinput_request_frame(&b->dinput, outlink);
}
-static int filter_frame_top(AVFilterLink *inlink, AVFrame *buf)
+static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
{
BlendContext *b = inlink->dst->priv;
- return ff_dualinput_filter_frame_main(&b->dinput, inlink, buf);
-}
-
-static int filter_frame_bottom(AVFilterLink *inlink, AVFrame *buf)
-{
- BlendContext *b = inlink->dst->priv;
- return ff_dualinput_filter_frame_second(&b->dinput, inlink, buf);
+ return ff_dualinput_filter_frame(&b->dinput, inlink, buf);
}
static const AVFilterPad blend_inputs[] = {
{
.name = "top",
.type = AVMEDIA_TYPE_VIDEO,
- .filter_frame = filter_frame_top,
+ .filter_frame = filter_frame,
},{
.name = "bottom",
.type = AVMEDIA_TYPE_VIDEO,
- .filter_frame = filter_frame_bottom,
+ .filter_frame = filter_frame,
},
{ NULL }
};
diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c
index 3c1b482..cc15f20 100644
--- a/libavfilter/vf_lut3d.c
+++ b/libavfilter/vf_lut3d.c
@@ -667,16 +667,10 @@ static int config_output(AVFilterLink *outlink)
return 0;
}
-static int filter_frame_main(AVFilterLink *inlink, AVFrame *inpicref)
+static int filter_frame_hald(AVFilterLink *inlink, AVFrame *inpicref)
{
LUT3DContext *s = inlink->dst->priv;
- return ff_dualinput_filter_frame_main(&s->dinput, inlink, inpicref);
-}
-
-static int filter_frame_clut(AVFilterLink *inlink, AVFrame *inpicref)
-{
- LUT3DContext *s = inlink->dst->priv;
- return ff_dualinput_filter_frame_second(&s->dinput, inlink, inpicref);
+ return ff_dualinput_filter_frame(&s->dinput, inlink, inpicref);
}
static int request_frame(AVFilterLink *outlink)
@@ -766,12 +760,12 @@ static const AVFilterPad haldclut_inputs[] = {
{
.name = "main",
.type = AVMEDIA_TYPE_VIDEO,
- .filter_frame = filter_frame_main,
+ .filter_frame = filter_frame_hald,
.config_props = config_input,
},{
.name = "clut",
.type = AVMEDIA_TYPE_VIDEO,
- .filter_frame = filter_frame_clut,
+ .filter_frame = filter_frame_hald,
.config_props = config_clut,
},
{ NULL }
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index c3f1c2e..b5ade85 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -549,16 +549,10 @@ static AVFrame *do_blend(AVFilterContext *ctx, AVFrame *mainpic,
return mainpic;
}
-static int filter_frame_main(AVFilterLink *inlink, AVFrame *inpicref)
+static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref)
{
OverlayContext *s = inlink->dst->priv;
- return ff_dualinput_filter_frame_main(&s->dinput, inlink, inpicref);
-}
-
-static int filter_frame_over(AVFilterLink *inlink, AVFrame *inpicref)
-{
- OverlayContext *s = inlink->dst->priv;
- return ff_dualinput_filter_frame_second(&s->dinput, inlink, inpicref);
+ return ff_dualinput_filter_frame(&s->dinput, inlink, inpicref);
}
static int request_frame(AVFilterLink *outlink)
@@ -606,14 +600,14 @@ static const AVFilterPad avfilter_vf_overlay_inputs[] = {
.name = "main",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_input_main,
- .filter_frame = filter_frame_main,
+ .filter_frame = filter_frame,
.needs_writable = 1,
},
{
.name = "overlay",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_input_overlay,
- .filter_frame = filter_frame_over,
+ .filter_frame = filter_frame,
},
{ NULL }
};
diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c
index c4af4ac..353f535 100644
--- a/libavfilter/vf_psnr.c
+++ b/libavfilter/vf_psnr.c
@@ -320,16 +320,10 @@ static int config_output(AVFilterLink *outlink)
return 0;
}
-static int filter_frame_main(AVFilterLink *inlink, AVFrame *inpicref)
+static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref)
{
PSNRContext *s = inlink->dst->priv;
- return ff_dualinput_filter_frame_main(&s->dinput, inlink, inpicref);
-}
-
-static int filter_frame_ref(AVFilterLink *inlink, AVFrame *inpicref)
-{
- PSNRContext *s = inlink->dst->priv;
- return ff_dualinput_filter_frame_second(&s->dinput, inlink, inpicref);
+ return ff_dualinput_filter_frame(&s->dinput, inlink, inpicref);
}
static int request_frame(AVFilterLink *outlink)
@@ -359,11 +353,11 @@ static const AVFilterPad psnr_inputs[] = {
{
.name = "main",
.type = AVMEDIA_TYPE_VIDEO,
- .filter_frame = filter_frame_main,
+ .filter_frame = filter_frame,
},{
.name = "reference",
.type = AVMEDIA_TYPE_VIDEO,
- .filter_frame = filter_frame_ref,
+ .filter_frame = filter_frame,
.config_props = config_input_ref,
},
{ NULL }
OpenPOWER on IntegriCloud