From b29b934e4fd3de69dc45a23bb779a22b2fecd194 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 25 Apr 2020 12:35:22 +0200 Subject: avfilter/f_interleave: add duration option --- libavfilter/f_interleave.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index 06f4cda798..368ce6e678 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -37,15 +37,25 @@ typedef struct InterleaveContext { const AVClass *class; int nb_inputs; + int duration_mode; int64_t pts; } InterleaveContext; +#define DURATION_LONGEST 0 +#define DURATION_SHORTEST 1 +#define DURATION_FIRST 2 + #define OFFSET(x) offsetof(InterleaveContext, x) #define DEFINE_OPTIONS(filt_name, flags_) \ static const AVOption filt_name##_options[] = { \ { "nb_inputs", "set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64 = 2}, 1, INT_MAX, .flags = flags_ }, \ { "n", "set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64 = 2}, 1, INT_MAX, .flags = flags_ }, \ + { "duration", "how to determine the end-of-stream", \ + OFFSET(duration_mode), AV_OPT_TYPE_INT, { .i64 = DURATION_LONGEST }, 0, 2, flags_, "duration" }, \ + { "longest", "Duration of longest input", 0, AV_OPT_TYPE_CONST, { .i64 = DURATION_LONGEST }, 0, 0, flags_, "duration" }, \ + { "shortest", "Duration of shortest input", 0, AV_OPT_TYPE_CONST, { .i64 = DURATION_SHORTEST }, 0, 0, flags_, "duration" }, \ + { "first", "Duration of first input", 0, AV_OPT_TYPE_CONST, { .i64 = DURATION_FIRST }, 0, 0, flags_, "duration" }, \ { NULL } \ } @@ -54,21 +64,26 @@ static int activate(AVFilterContext *ctx) AVFilterLink *outlink = ctx->outputs[0]; InterleaveContext *s = ctx->priv; int64_t q_pts, pts = INT64_MAX; - int i, nb_eofs = 0, input_idx = -1; + int i, nb_eofs = 0, input_idx = -1, nb_active_inputs = 0; + int nb_inputs_with_frames = 0; FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx); for (i = 0; i < ctx->nb_inputs; i++) { - if (!ff_outlink_get_status(ctx->inputs[i]) && - !ff_inlink_queued_frames(ctx->inputs[i])) - break; + if (!ff_outlink_get_status(ctx->inputs[i])) { + nb_active_inputs++; + if (!ff_inlink_queued_frames(ctx->inputs[i])) + break; + nb_inputs_with_frames++; + } } - if (i == ctx->nb_inputs) { + if (nb_active_inputs > 0 && nb_active_inputs == nb_inputs_with_frames) { for (i = 0; i < ctx->nb_inputs; i++) { AVFrame *frame; - if (ff_outlink_get_status(ctx->inputs[i])) + if (ff_outlink_get_status(ctx->inputs[i]) || + ff_inlink_queued_frames(ctx->inputs[i]) == 0) continue; frame = ff_inlink_peek_frame(ctx->inputs[i], 0); @@ -104,6 +119,16 @@ static int activate(AVFilterContext *ctx) } } + for (i = 0; i < ctx->nb_inputs; i++) + nb_eofs += !!ff_outlink_get_status(ctx->inputs[i]); + + if ((nb_eofs > 0 && s->duration_mode == DURATION_SHORTEST) || + (nb_eofs == ctx->nb_inputs && s->duration_mode == DURATION_LONGEST) || + (ff_outlink_get_status(ctx->inputs[0]) && s->duration_mode == DURATION_FIRST)) { + ff_outlink_set_status(outlink, AVERROR_EOF, s->pts); + return 0; + } + for (i = 0; i < ctx->nb_inputs; i++) { if (ff_inlink_queued_frames(ctx->inputs[i])) continue; @@ -112,12 +137,6 @@ static int activate(AVFilterContext *ctx) ff_inlink_request_frame(ctx->inputs[i]); return 0; } - nb_eofs++; - } - - if (nb_eofs == ctx->nb_inputs) { - ff_outlink_set_status(outlink, AVERROR_EOF, s->pts); - return 0; } return FFERROR_NOT_READY; -- cgit v1.2.3