RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/vf_premultiply: move to "activate" design.

This commit is contained in:
Nicolas George 2017-07-17 16:33:20 +02:00
parent dbf7a67094
commit b894415a70
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

@ -256,7 +256,7 @@ OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
OBJS-$(CONFIG_PIXSCOPE_FILTER) += vf_datascope.o OBJS-$(CONFIG_PIXSCOPE_FILTER) += vf_datascope.o
OBJS-$(CONFIG_PP_FILTER) += vf_pp.o OBJS-$(CONFIG_PP_FILTER) += vf_pp.o
OBJS-$(CONFIG_PP7_FILTER) += vf_pp7.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_PREWITT_FILTER) += vf_convolution.o
OBJS-$(CONFIG_PSNR_FILTER) += vf_psnr.o dualinput.o framesync.o OBJS-$(CONFIG_PSNR_FILTER) += vf_psnr.o dualinput.o framesync.o
OBJS-$(CONFIG_PULLUP_FILTER) += vf_pullup.o OBJS-$(CONFIG_PULLUP_FILTER) += vf_pullup.o

28
libavfilter/vf_premultiply.c
View File

@ -23,7 +23,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avfilter.h" #include "avfilter.h"
#include "formats.h" #include "formats.h"
#include "framesync.h" #include "framesync2.h"
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"
@ -207,8 +207,8 @@ static int process_frame(FFFrameSync *fs)
AVFrame *out, *base, *alpha; AVFrame *out, *base, *alpha;
int ret; int ret;
if ((ret = ff_framesync_get_frame(&s->fs, 0, &base, 0)) < 0 || if ((ret = ff_framesync2_get_frame(&s->fs, 0, &base, 0)) < 0 ||
(ret = ff_framesync_get_frame(&s->fs, 1, &alpha, 0)) < 0) (ret = ff_framesync2_get_frame(&s->fs, 1, &alpha, 0)) < 0)
return ret; return ret;
if (ctx->is_disabled) { if (ctx->is_disabled) {
@ -345,7 +345,7 @@ static int config_output(AVFilterLink *outlink)
outlink->sample_aspect_ratio = base->sample_aspect_ratio; outlink->sample_aspect_ratio = base->sample_aspect_ratio;
outlink->frame_rate = base->frame_rate; 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; return ret;
in = s->fs.in; in = s->fs.in;
@ -360,39 +360,31 @@ static int config_output(AVFilterLink *outlink)
s->fs.opaque = s; s->fs.opaque = s;
s->fs.on_event = process_frame; 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; PreMultiplyContext *s = ctx->priv;
return ff_framesync_filter_frame(&s->fs, inlink, buf); return ff_framesync2_activate(&s->fs);
}
static int request_frame(AVFilterLink *outlink)
{
PreMultiplyContext *s = outlink->src->priv;
return ff_framesync_request_frame(&s->fs, outlink);
} }
static av_cold void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
{ {
PreMultiplyContext *s = ctx->priv; PreMultiplyContext *s = ctx->priv;
ff_framesync_uninit(&s->fs); ff_framesync2_uninit(&s->fs);
} }
static const AVFilterPad premultiply_inputs[] = { static const AVFilterPad premultiply_inputs[] = {
{ {
.name = "main", .name = "main",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
.config_props = config_input, .config_props = config_input,
}, },
{ {
.name = "alpha", .name = "alpha",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
}, },
{ NULL } { NULL }
}; };
@ -402,7 +394,6 @@ static const AVFilterPad premultiply_outputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output, .config_props = config_output,
.request_frame = request_frame,
}, },
{ NULL } { NULL }
}; };
@ -413,6 +404,7 @@ AVFilter ff_vf_premultiply = {
.priv_size = sizeof(PreMultiplyContext), .priv_size = sizeof(PreMultiplyContext),
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.activate = activate,
.inputs = premultiply_inputs, .inputs = premultiply_inputs,
.outputs = premultiply_outputs, .outputs = premultiply_outputs,
.priv_class = &premultiply_class, .priv_class = &premultiply_class,