diff options
author | Nicolas George <nicolas.george@normalesup.org> | 2013-08-28 00:07:22 +0200 |
---|---|---|
committer | Nicolas George <nicolas.george@normalesup.org> | 2013-09-23 09:50:09 +0200 |
commit | 231e50157cc9a7a8b08ba3d0e566279fc6cbb800 (patch) | |
tree | ec04d590c371575edfa6635f2f41d0112cc7e296 /libavfilter/dualinput.c | |
parent | 53319d5c932867bcc84798622dd171b5c19165f0 (diff) |
lavfi/dualinput: reimplement on top of framesync.
Diffstat (limited to 'libavfilter/dualinput.c')
-rw-r--r-- | libavfilter/dualinput.c | 149 |
1 files changed, 40 insertions, 109 deletions
diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c index 10e365267b..179c3efab6 100644 --- a/libavfilter/dualinput.c +++ b/libavfilter/dualinput.c @@ -16,144 +16,75 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define MAIN 0 -#define SECOND 1 - #include "dualinput.h" #include "libavutil/timestamp.h" -static int try_filter_frame(FFDualInputContext *s, - AVFilterContext *ctx, AVFrame *mainpic) +static int process_frame(FFFrameSync *fs) { - int ret; - - /* Discard obsolete second frames: if there is a next second frame with pts - * before the main frame, we can drop the current second. */ - while (1) { - AVFrame *next_overpic = ff_bufqueue_peek(&s->queue[SECOND], 0); - if (!next_overpic && s->second_eof && !s->repeatlast) { - av_frame_free(&s->second_frame); - break; - } - if (!next_overpic || av_compare_ts(next_overpic->pts, ctx->inputs[SECOND]->time_base, - mainpic->pts, ctx->inputs[MAIN]->time_base) > 0) - break; - ff_bufqueue_get(&s->queue[SECOND]); - av_frame_free(&s->second_frame); - s->second_frame = next_overpic; + AVFilterContext *ctx = fs->parent; + FFDualInputContext *s = fs->opaque; + AVFrame *mainpic = NULL, *secondpic = NULL; + int ret = 0; + + if ((ret = ff_framesync_get_frame(&s->fs, 0, &mainpic, 1)) < 0 || + (ret = ff_framesync_get_frame(&s->fs, 1, &secondpic, 0)) < 0) { + av_frame_free(&mainpic); + return ret; } - - /* If there is no next frame and no EOF and the second frame is before - * the main frame, we can not know yet if it will be superseded. */ - if (!s->queue[SECOND].available && !s->second_eof && - (!s->second_frame || av_compare_ts(s->second_frame->pts, ctx->inputs[SECOND]->time_base, - mainpic->pts, ctx->inputs[MAIN]->time_base) < 0)) - return AVERROR(EAGAIN); - - /* At this point, we know that the current second frame extends to the - * time of the main frame. */ - av_dlog(ctx, "main_pts:%s main_pts_time:%s", - av_ts2str(mainpic->pts), av_ts2timestr(mainpic->pts, &ctx->inputs[MAIN]->time_base)); - if (s->second_frame) - av_dlog(ctx, " second_pts:%s second_pts_time:%s", - av_ts2str(s->second_frame->pts), av_ts2timestr(s->second_frame->pts, &ctx->inputs[SECOND]->time_base)); - av_dlog(ctx, "\n"); - - if (s->second_frame && !ctx->is_disabled) - mainpic = s->process(ctx, mainpic, s->second_frame); + av_assert0(mainpic); + mainpic->pts = av_rescale_q(mainpic->pts, s->fs.time_base, ctx->outputs[0]->time_base); + if (secondpic && !ctx->is_disabled) + mainpic = s->process(ctx, mainpic, secondpic); ret = ff_filter_frame(ctx->outputs[0], mainpic); av_assert1(ret != AVERROR(EAGAIN)); s->frame_requested = 0; return ret; } -static int try_filter_next_frame(FFDualInputContext *s, AVFilterContext *ctx) -{ - AVFrame *next_mainpic = ff_bufqueue_peek(&s->queue[MAIN], 0); - int ret; - - if (!next_mainpic) - return AVERROR(EAGAIN); - if ((ret = try_filter_frame(s, ctx, next_mainpic)) == AVERROR(EAGAIN)) - return ret; - ff_bufqueue_get(&s->queue[MAIN]); - return ret; -} - -static int flush_frames(FFDualInputContext *s, AVFilterContext *ctx) +int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s) { - int ret; + FFFrameSyncIn *in = s->fs.in; + + ff_framesync_init(&s->fs, ctx, 2); + s->fs.opaque = s; + s->fs.on_event = process_frame; + in[0].time_base = ctx->inputs[0]->time_base; + in[1].time_base = ctx->inputs[1]->time_base; + in[0].sync = 2; + in[0].before = EXT_STOP; + in[0].after = EXT_INFINITY; + in[1].sync = 1; + in[1].before = EXT_NULL; + in[1].after = EXT_INFINITY; + + if (s->shortest) + in[1].after = EXT_STOP; + if (!s->repeatlast) { + in[0].after = EXT_STOP; + in[1].sync = 0; + } - while (!(ret = try_filter_next_frame(s, ctx))); - return ret == AVERROR(EAGAIN) ? 0 : ret; + return ff_framesync_configure(&s->fs); } int ff_dualinput_filter_frame_main(FFDualInputContext *s, AVFilterLink *inlink, AVFrame *in) { - AVFilterContext *ctx = inlink->dst; - int ret; - - if ((ret = flush_frames(s, ctx)) < 0) - return ret; - if ((ret = try_filter_frame(s, ctx, in)) < 0) { - if (ret != AVERROR(EAGAIN)) - return ret; - ff_bufqueue_add(ctx, &s->queue[MAIN], in); - } - - if (!s->second_frame) - return 0; - flush_frames(s, ctx); - - return 0; + return ff_framesync_filter_frame(&s->fs, inlink, in); } int ff_dualinput_filter_frame_second(FFDualInputContext *s, AVFilterLink *inlink, AVFrame *in) { - AVFilterContext *ctx = inlink->dst; - int ret; - - if ((ret = flush_frames(s, ctx)) < 0) - return ret; - ff_bufqueue_add(ctx, &s->queue[SECOND], in); - ret = try_filter_next_frame(s, ctx); - return ret == AVERROR(EAGAIN) ? 0 : ret; + return ff_framesync_filter_frame(&s->fs, inlink, in); } int ff_dualinput_request_frame(FFDualInputContext *s, AVFilterLink *outlink) { - AVFilterContext *ctx = outlink->src; - int input, ret; - - if (!try_filter_next_frame(s, ctx)) - return 0; - s->frame_requested = 1; - while (s->frame_requested) { - /* TODO if we had a frame duration, we could guess more accurately */ - input = !s->second_eof && (s->queue[MAIN].available || - s->queue[SECOND].available < 2) ? - SECOND : MAIN; - ret = ff_request_frame(ctx->inputs[input]); - /* EOF on main is reported immediately */ - if (ret == AVERROR_EOF && input == SECOND) { - s->second_eof = 1; - if (s->shortest) - return ret; - if ((ret = try_filter_next_frame(s, ctx)) != AVERROR(EAGAIN)) - return ret; - ret = 0; /* continue requesting frames on main */ - } - if (ret < 0) - return ret; - } - return 0; + return ff_framesync_request_frame(&s->fs, outlink); } void ff_dualinput_uninit(FFDualInputContext *s) { - av_frame_free(&s->second_frame); - ff_bufqueue_discard_all(&s->queue[MAIN]); - ff_bufqueue_discard_all(&s->queue[SECOND]); + ff_framesync_uninit(&s->fs); } |