MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/vf_midequalizer: move to "activate" design.

Browse Source
This commit is contained in:
Nicolas George 2017-07-17 16:36:20 +02:00
parent b894415a70
commit 620608467f
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/Makefile
View File

@ -231,7 +231,7 @@ OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o
OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o
OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o
OBJS-$(CONFIG_METADATA_FILTER) += f_metadata.o
OBJS-$(CONFIG_MIDEQUALIZER_FILTER) += vf_midequalizer.o framesync.o
OBJS-$(CONFIG_MIDEQUALIZER_FILTER) += vf_midequalizer.o framesync2.o
OBJS-$(CONFIG_MINTERPOLATE_FILTER) += vf_minterpolate.o motion_estimation.o
OBJS-$(CONFIG_MPDECIMATE_FILTER) += vf_mpdecimate.o
OBJS-$(CONFIG_NEGATE_FILTER) += vf_lut.o

28
libavfilter/vf_midequalizer.c
View File

@ -25,7 +25,7 @@
#include "formats.h"
#include "internal.h"
#include "video.h"
#include "framesync.h"
#include "framesync2.h"
typedef struct MidEqualizerContext {
const AVClass *class;
@ -89,8 +89,8 @@ static int process_frame(FFFrameSync *fs)
AVFrame *out, *in0, *in1;
int ret;
if ((ret = ff_framesync_get_frame(&s->fs, 0, &in0, 0)) < 0 ||
(ret = ff_framesync_get_frame(&s->fs, 1, &in1, 0)) < 0)
if ((ret = ff_framesync2_get_frame(&s->fs, 0, &in0, 0)) < 0 ||
(ret = ff_framesync2_get_frame(&s->fs, 1, &in1, 0)) < 0)
return ret;
if (ctx->is_disabled) {
@ -311,7 +311,7 @@ static int config_output(AVFilterLink *outlink)
outlink->sample_aspect_ratio = in0->sample_aspect_ratio;
outlink->frame_rate = in0->frame_rate;
if ((ret = ff_framesync_init(&s->fs, ctx, 2)) < 0)
if ((ret = ff_framesync2_init(&s->fs, ctx, 2)) < 0)
return ret;
in = s->fs.in;
@ -326,26 +326,20 @@ static int config_output(AVFilterLink *outlink)
s->fs.opaque = s;
s->fs.on_event = process_frame;
return ff_framesync_configure(&s->fs);
return ff_framesync2_configure(&s->fs);
}
static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
static int activate(AVFilterContext *ctx)
{
MidEqualizerContext *s = inlink->dst->priv;
return ff_framesync_filter_frame(&s->fs, inlink, buf);
}
static int request_frame(AVFilterLink *outlink)
{
MidEqualizerContext *s = outlink->src->priv;
return ff_framesync_request_frame(&s->fs, outlink);
MidEqualizerContext *s = ctx->priv;
return ff_framesync2_activate(&s->fs);
}
static av_cold void uninit(AVFilterContext *ctx)
{
MidEqualizerContext *s = ctx->priv;
ff_framesync_uninit(&s->fs);
ff_framesync2_uninit(&s->fs);
av_freep(&s->histogram[0]);
av_freep(&s->histogram[1]);
av_freep(&s->cchange);
@ -355,13 +349,11 @@ static const AVFilterPad midequalizer_inputs[] = {
{
.name = "in0",
.type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
.config_props = config_input0,
},
{
.name = "in1",
.type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
.config_props = config_input1,
},
{ NULL }
@ -372,7 +364,6 @@ static const AVFilterPad midequalizer_outputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output,
.request_frame = request_frame,
},
{ NULL }
};
@ -383,6 +374,7 @@ AVFilter ff_vf_midequalizer = {
.priv_size = sizeof(MidEqualizerContext),
.uninit = uninit,
.query_formats = query_formats,
.activate = activate,
.inputs = midequalizer_inputs,
.outputs = midequalizer_outputs,
.priv_class = &midequalizer_class,