mirror of https://git.ffmpeg.org/ffmpeg.git
lavfi/vf_premultiply: move to "activate" design.
This commit is contained in:
parent
dbf7a67094
commit
b894415a70
|
@ -256,7 +256,7 @@ OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
|
|||
OBJS-$(CONFIG_PIXSCOPE_FILTER) += vf_datascope.o
|
||||
OBJS-$(CONFIG_PP_FILTER) += vf_pp.o
|
||||
OBJS-$(CONFIG_PP7_FILTER) += vf_pp7.o
|
||||
OBJS-$(CONFIG_PREMULTIPLY_FILTER) += vf_premultiply.o framesync.o
|
||||
OBJS-$(CONFIG_PREMULTIPLY_FILTER) += vf_premultiply.o framesync2.o
|
||||
OBJS-$(CONFIG_PREWITT_FILTER) += vf_convolution.o
|
||||
OBJS-$(CONFIG_PSNR_FILTER) += vf_psnr.o dualinput.o framesync.o
|
||||
OBJS-$(CONFIG_PULLUP_FILTER) += vf_pullup.o
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "libavutil/opt.h"
|
||||
#include "avfilter.h"
|
||||
#include "formats.h"
|
||||
#include "framesync.h"
|
||||
#include "framesync2.h"
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
|
@ -207,8 +207,8 @@ static int process_frame(FFFrameSync *fs)
|
|||
AVFrame *out, *base, *alpha;
|
||||
int ret;
|
||||
|
||||
if ((ret = ff_framesync_get_frame(&s->fs, 0, &base, 0)) < 0 ||
|
||||
(ret = ff_framesync_get_frame(&s->fs, 1, &alpha, 0)) < 0)
|
||||
if ((ret = ff_framesync2_get_frame(&s->fs, 0, &base, 0)) < 0 ||
|
||||
(ret = ff_framesync2_get_frame(&s->fs, 1, &alpha, 0)) < 0)
|
||||
return ret;
|
||||
|
||||
if (ctx->is_disabled) {
|
||||
|
@ -345,7 +345,7 @@ static int config_output(AVFilterLink *outlink)
|
|||
outlink->sample_aspect_ratio = base->sample_aspect_ratio;
|
||||
outlink->frame_rate = base->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;
|
||||
|
@ -360,39 +360,31 @@ 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)
|
||||
{
|
||||
PreMultiplyContext *s = inlink->dst->priv;
|
||||
return ff_framesync_filter_frame(&s->fs, inlink, buf);
|
||||
}
|
||||
|
||||
static int request_frame(AVFilterLink *outlink)
|
||||
{
|
||||
PreMultiplyContext *s = outlink->src->priv;
|
||||
return ff_framesync_request_frame(&s->fs, outlink);
|
||||
PreMultiplyContext *s = ctx->priv;
|
||||
return ff_framesync2_activate(&s->fs);
|
||||
}
|
||||
|
||||
static av_cold void uninit(AVFilterContext *ctx)
|
||||
{
|
||||
PreMultiplyContext *s = ctx->priv;
|
||||
|
||||
ff_framesync_uninit(&s->fs);
|
||||
ff_framesync2_uninit(&s->fs);
|
||||
}
|
||||
|
||||
static const AVFilterPad premultiply_inputs[] = {
|
||||
{
|
||||
.name = "main",
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.filter_frame = filter_frame,
|
||||
.config_props = config_input,
|
||||
},
|
||||
{
|
||||
.name = "alpha",
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.filter_frame = filter_frame,
|
||||
},
|
||||
{ NULL }
|
||||
};
|
||||
|
@ -402,7 +394,6 @@ static const AVFilterPad premultiply_outputs[] = {
|
|||
.name = "default",
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.config_props = config_output,
|
||||
.request_frame = request_frame,
|
||||
},
|
||||
{ NULL }
|
||||
};
|
||||
|
@ -413,6 +404,7 @@ AVFilter ff_vf_premultiply = {
|
|||
.priv_size = sizeof(PreMultiplyContext),
|
||||
.uninit = uninit,
|
||||
.query_formats = query_formats,
|
||||
.activate = activate,
|
||||
.inputs = premultiply_inputs,
|
||||
.outputs = premultiply_outputs,
|
||||
.priv_class = &premultiply_class,
|
||||
|
|
Loading…
Reference in New Issue