From patchwork Fri May 3 18:43:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 12976 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E70E6447D3E for ; Fri, 3 May 2019 21:43:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6ED868ABF8; Fri, 3 May 2019 21:43:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 670A468ABF8 for ; Fri, 3 May 2019 21:43:39 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id a9so9043790wrp.6 for ; Fri, 03 May 2019 11:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=mFDz6dTY7C2c2/HoE3kGvrOBw4Z8GkfN9xMzMpnefC4=; b=nGD7JtJ7uCtDXX/Gsfba+TTlAbLjmVYJfRedpfP4WVKdnElPqPf1be56EFDLUwqt/Q 6SIKZNLuu/zfPbSjfnkzKNA+rVBEtgrQD4xakXiONa5h2KAmRiMw9kZGYn1z4R17ypAU WhiCxn/RBCOUqful2A5aQvtnIVFaCae/voXFaYFRnQv7Nd92zQmHDJTMqrH08mLveufD j5Tk/+qiM3hRu+ToVpIIZIgXCoqPaxSuh9BSxh/dUAcY55O33UsCfIElpvWGLEunJSz1 OxKz19OCKqK6PdKnjV/0bhUH3H/9KqMJLs+vmh93YUQ1FQt9xQ9Z7zuZtDAMsj3RUgm7 akzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=mFDz6dTY7C2c2/HoE3kGvrOBw4Z8GkfN9xMzMpnefC4=; b=r3G2Rc0xG6yyckNZITqzhtX4bikxqZc/2sF8Q2YXNYSg65frhHfqyVZhApP+hgXBia j+Mn6QSHgju63ZMvNj64MIIHxQzBVCeUXXRaa7zbXiwuud0woQHaIikKU+cpNXpTkVWX Z8yobTLMrQP74KOdx5QnwGwR5IHp9JOKKliwz2lhITKEPGgfEHLG8jwcJvzHRND1W4Rx Ao/yxJYgReK01xVxQfWT0xy7/ImOBSP73is9PaYMBOwQN2Ba5Hvk8rg3RebkRxlVu3mZ klYOTgnMw4ZGbaPjtiZUEUGq3ESS02/gB613vDc6S2DTXhgG02E5Yg3x8r/r6zYmcAUA U5gQ== X-Gm-Message-State: APjAAAXfQ7zgA7ggIxyEH20qAw5oK5jR3a5rvemGW5yoA1XtijaIS0r9 FjMjtexlJJdSYBMRajVqmfLo2ML8 X-Google-Smtp-Source: APXvYqwwv8ZoJuGENAyYUMafuGlApZ67T22HM+wHU8BWbpU7QrNzk4HBiJ0EfEYxpmORe0dIhiK8Nw== X-Received: by 2002:adf:f0ce:: with SMTP id x14mr2138135wro.121.1556909018343; Fri, 03 May 2019 11:43:38 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.103]) by smtp.gmail.com with ESMTPSA id h123sm3323146wme.6.2019.05.03.11.43.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 May 2019 11:43:37 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 May 2019 20:43:27 +0200 Message-Id: <20190503184327.32246-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/f_interleave: switch to activate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavfilter/f_interleave.c | 125 +++++++++++++++---------------------- 1 file changed, 51 insertions(+), 74 deletions(-) diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index d8a73b52e5..0966c4a0d8 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -27,12 +27,9 @@ #include "libavutil/avstring.h" #include "libavutil/opt.h" -#define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" - #include "avfilter.h" -#include "bufferqueue.h" #include "formats.h" +#include "filters.h" #include "internal.h" #include "audio.h" #include "video.h" @@ -40,7 +37,7 @@ typedef struct InterleaveContext { const AVClass *class; int nb_inputs; - struct FFBufQueue *queues; + int64_t pts; } InterleaveContext; #define OFFSET(x) offsetof(InterleaveContext, x) @@ -52,58 +49,66 @@ static const AVOption filt_name##_options[] = { \ { NULL } \ } -inline static int push_frame(AVFilterContext *ctx) +static int activate(AVFilterContext *ctx) { + AVFilterLink *outlink = ctx->outputs[0]; InterleaveContext *s = ctx->priv; - AVFrame *frame; - int i, queue_idx = -1; - int64_t pts_min = INT64_MAX; + int64_t q_pts, pts = INT64_MAX; + int i, nb_eofs = 0, input_idx = -1; + + FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx); - /* look for oldest frame */ for (i = 0; i < ctx->nb_inputs; i++) { - struct FFBufQueue *q = &s->queues[i]; + if (!ff_outlink_get_status(ctx->inputs[i]) && + !ff_inlink_queued_frames(ctx->inputs[i])) + break; + } - if (!q->available && !ctx->inputs[i]->status_out) - return 0; - if (q->available) { - frame = ff_bufqueue_peek(q, 0); - if (frame->pts < pts_min) { - pts_min = frame->pts; - queue_idx = i; + if (i == ctx->nb_inputs) { + for (i = 0; i < ctx->nb_inputs; i++) { + AVFrame *frame; + + if (ff_outlink_get_status(ctx->inputs[i])) + continue; + + frame = ff_inlink_peek_frame(ctx->inputs[i], 0); + q_pts = av_rescale_q(frame->pts, ctx->inputs[i]->time_base, AV_TIME_BASE_Q); + if (q_pts < pts) { + pts = q_pts; + input_idx = i; } } - } - /* all inputs are closed */ - if (queue_idx < 0) - return AVERROR_EOF; + if (input_idx >= 0) { + AVFrame *frame; + int ret; - frame = ff_bufqueue_get(&s->queues[queue_idx]); - av_log(ctx, AV_LOG_DEBUG, "queue:%d -> frame time:%f\n", - queue_idx, frame->pts * av_q2d(AV_TIME_BASE_Q)); - return ff_filter_frame(ctx->outputs[0], frame); -} + ret = ff_inlink_consume_frame(ctx->inputs[input_idx], &frame); + if (ret < 0) + return ret; -static int filter_frame(AVFilterLink *inlink, AVFrame *frame) -{ - AVFilterContext *ctx = inlink->dst; - InterleaveContext *s = ctx->priv; - unsigned in_no = FF_INLINK_IDX(inlink); + frame->pts = s->pts = q_pts; + return ff_filter_frame(outlink, frame); + } + } - if (frame->pts == AV_NOPTS_VALUE) { - av_log(ctx, AV_LOG_WARNING, - "NOPTS value for input frame cannot be accepted, frame discarded\n"); - av_frame_free(&frame); - return AVERROR_INVALIDDATA; + for (i = 0; i < ctx->nb_inputs; i++) { + if (ff_inlink_queued_frames(ctx->inputs[i])) + continue; + if (ff_outlink_frame_wanted(outlink) && + !ff_outlink_get_status(ctx->inputs[i])) { + ff_inlink_request_frame(ctx->inputs[i]); + return 0; + } + nb_eofs++; } - /* queue frame */ - frame->pts = av_rescale_q(frame->pts, inlink->time_base, AV_TIME_BASE_Q); - av_log(ctx, AV_LOG_DEBUG, "frame pts:%f -> queue idx:%d available:%d\n", - frame->pts * av_q2d(AV_TIME_BASE_Q), in_no, s->queues[in_no].available); - ff_bufqueue_add(ctx, &s->queues[in_no], frame); + if (nb_eofs == ctx->nb_inputs) { + ff_outlink_set_status(outlink, AVERROR_EOF, s->pts); + return 0; + } - return push_frame(ctx); + return FFERROR_NOT_READY; } static av_cold int init(AVFilterContext *ctx) @@ -112,10 +117,6 @@ static av_cold int init(AVFilterContext *ctx) const AVFilterPad *outpad = &ctx->filter->outputs[0]; int i, ret; - s->queues = av_calloc(s->nb_inputs, sizeof(s->queues[0])); - if (!s->queues) - return AVERROR(ENOMEM); - for (i = 0; i < s->nb_inputs; i++) { AVFilterPad inpad = { 0 }; @@ -123,7 +124,6 @@ static av_cold int init(AVFilterContext *ctx) if (!inpad.name) return AVERROR(ENOMEM); inpad.type = outpad->type; - inpad.filter_frame = filter_frame; switch (outpad->type) { case AVMEDIA_TYPE_VIDEO: @@ -144,14 +144,8 @@ static av_cold int init(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx) { - InterleaveContext *s = ctx->priv; - int i; - - for (i = 0; i < ctx->nb_inputs; i++) { - ff_bufqueue_discard_all(&s->queues[i]); - av_freep(&s->queues[i]); + for (int i = 0; i < ctx->nb_inputs; i++) av_freep(&ctx->input_pads[i].name); - } } static int config_output(AVFilterLink *outlink) @@ -190,23 +184,6 @@ static int config_output(AVFilterLink *outlink) return 0; } -static int request_frame(AVFilterLink *outlink) -{ - AVFilterContext *ctx = outlink->src; - InterleaveContext *s = ctx->priv; - int i, ret; - - for (i = 0; i < ctx->nb_inputs; i++) { - if (!s->queues[i].available && !ctx->inputs[i]->status_out) { - ret = ff_request_frame(ctx->inputs[i]); - if (ret != AVERROR_EOF) - return ret; - } - } - - return push_frame(ctx); -} - #if CONFIG_INTERLEAVE_FILTER DEFINE_OPTIONS(interleave, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM); @@ -217,7 +194,6 @@ static const AVFilterPad interleave_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, - .request_frame = request_frame, }, { NULL } }; @@ -228,6 +204,7 @@ AVFilter ff_vf_interleave = { .priv_size = sizeof(InterleaveContext), .init = init, .uninit = uninit, + .activate = activate, .outputs = interleave_outputs, .priv_class = &interleave_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, @@ -245,7 +222,6 @@ static const AVFilterPad ainterleave_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, .config_props = config_output, - .request_frame = request_frame, }, { NULL } }; @@ -256,6 +232,7 @@ AVFilter ff_af_ainterleave = { .priv_size = sizeof(InterleaveContext), .init = init, .uninit = uninit, + .activate = activate, .outputs = ainterleave_outputs, .priv_class = &ainterleave_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS,