diff options
author | Nicolas George <george@nsup.org> | 2017-07-17 16:31:44 +0200 |
---|---|---|
committer | Nicolas George <george@nsup.org> | 2017-07-30 12:26:50 +0200 |
commit | dbf7a670942d078c12aa7944b1fd469e188e6da2 (patch) | |
tree | fa58178a24a70c14253d807c8e496e24fcaf1c17 /libavfilter/vf_remap.c | |
parent | d07e25de763ef7c991bac99e9c05eb290869ed79 (diff) | |
download | ffmpeg-dbf7a670942d078c12aa7944b1fd469e188e6da2.tar.gz |
lavfi/vf_remap: move to "activate" design.
Diffstat (limited to 'libavfilter/vf_remap.c')
-rw-r--r-- | libavfilter/vf_remap.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/libavfilter/vf_remap.c b/libavfilter/vf_remap.c index b7182e9556..d549912fcf 100644 --- a/libavfilter/vf_remap.c +++ b/libavfilter/vf_remap.c @@ -41,7 +41,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "formats.h" -#include "framesync.h" +#include "framesync2.h" #include "internal.h" #include "video.h" @@ -283,9 +283,9 @@ static int process_frame(FFFrameSync *fs) AVFrame *out, *in, *xpic, *ypic; int ret; - if ((ret = ff_framesync_get_frame(&s->fs, 0, &in, 0)) < 0 || - (ret = ff_framesync_get_frame(&s->fs, 1, &xpic, 0)) < 0 || - (ret = ff_framesync_get_frame(&s->fs, 2, &ypic, 0)) < 0) + if ((ret = ff_framesync2_get_frame(&s->fs, 0, &in, 0)) < 0 || + (ret = ff_framesync2_get_frame(&s->fs, 1, &xpic, 0)) < 0 || + (ret = ff_framesync2_get_frame(&s->fs, 2, &ypic, 0)) < 0) return ret; if (ctx->is_disabled) { @@ -330,7 +330,7 @@ static int config_output(AVFilterLink *outlink) outlink->sample_aspect_ratio = srclink->sample_aspect_ratio; outlink->frame_rate = srclink->frame_rate; - ret = ff_framesync_init(&s->fs, ctx, 3); + ret = ff_framesync2_init(&s->fs, ctx, 3); if (ret < 0) return ret; @@ -350,44 +350,36 @@ 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) { - RemapContext *s = inlink->dst->priv; - return ff_framesync_filter_frame(&s->fs, inlink, buf); + RemapContext *s = ctx->priv; + return ff_framesync2_activate(&s->fs); } -static int request_frame(AVFilterLink *outlink) -{ - RemapContext *s = outlink->src->priv; - return ff_framesync_request_frame(&s->fs, outlink); -} static av_cold void uninit(AVFilterContext *ctx) { RemapContext *s = ctx->priv; - ff_framesync_uninit(&s->fs); + ff_framesync2_uninit(&s->fs); } static const AVFilterPad remap_inputs[] = { { .name = "source", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, .config_props = config_input, }, { .name = "xmap", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, }, { .name = "ymap", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, }, { NULL } }; @@ -397,7 +389,6 @@ static const AVFilterPad remap_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, - .request_frame = request_frame, }, { NULL } }; @@ -408,6 +399,7 @@ AVFilter ff_vf_remap = { .priv_size = sizeof(RemapContext), .uninit = uninit, .query_formats = query_formats, + .activate = activate, .inputs = remap_inputs, .outputs = remap_outputs, .priv_class = &remap_class, |