From patchwork Sun Nov 11 11:30:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 10978 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 94D4B44D326 for ; Sun, 11 Nov 2018 13:30:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0AE6B68990C; Sun, 11 Nov 2018 13:29:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAA5968827F for ; Sun, 11 Nov 2018 13:29:43 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id v18-v6so6315554wrt.8 for ; Sun, 11 Nov 2018 03:30:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=nb+lzwUAgl06ZGSBt6olm4vsJFjL3n+yv6gGaCOPbNE=; b=ieyZP4kBgc+qlxmb5lsW3Uf1E6dJoB+RCA4LGEhPQ7ouKpRw5e5/sa2kgqfzur38Dc 7Z7uSZ9NEwBCsz6xG2GLoEdxvHJVjxaAn3u56MrrMLn1GREAyXvn6SmYKyS0AfIpCJcR RSxRt3px/FDzaqlbdfWpIemtkKuIIYyYrCGjzMmarpADKBJq0mWhCp49ODfBPxCJJapg DODpv0FwUcYxTfbV8gkD7YdbsT2DWtU6cwxrg5un5bK05QrV1rtAOGQtYub9bd/cwl6H fOYuz5q4dz4RlQw5L7Q9Zhso67g6VccYakEFpml0X3WyE5uxB1DiLGOwc2QaIG0hKWLP w8jQ== 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=nb+lzwUAgl06ZGSBt6olm4vsJFjL3n+yv6gGaCOPbNE=; b=rXrgCSz+mNWKcsc9nxakrvNnqEbKTP6v38M0QYP3uvdbGm7mIK2CYQAirbt02QAHPT lT5331SaG0p62X5hxwxP6YKvf6I1Xyn19OEiywnA5z8Y5tobD/ujU8NI8XfLcrv0CffY x6vbdTQp0QulDeLMP9pMofozvUFnG5g7dsVZORrwD1DnDCL59kZIkJXAjXXZZaBsByUk ByrMrDy/fu3WqQNUuSzlf3vGaSbDLp45QY248nuBgCpDeP+FZfMQybG0dGPxauvkrC0/ yHTsoZSVQVnlliwv8mISUo04yZl1HPjbGsaQg2r2GL+vMxHst1uzX5FKc3NrPlk4DyO6 oNvQ== X-Gm-Message-State: AGRZ1gKj2X6YYBMDrztOB1NKFOzS/GRka+mZUWa/BpU8ClvrlJfVzeUr TZX+i+0nCBdGDaxAo6CMkhpW3GaZcUc= X-Google-Smtp-Source: AJdET5f87HT9MVHmW5yaZII9Kx7oP2EqD4KsMcuXCLHSnRFOW+EPfscmjSOtlEzoYeaAaDqOz1yVqw== X-Received: by 2002:a5d:660c:: with SMTP id n12-v6mr15485512wru.19.1541935819762; Sun, 11 Nov 2018 03:30:19 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id e10-v6sm8494372wmg.23.2018.11.11.03.30.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Nov 2018 03:30:19 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Nov 2018 12:30:11 +0100 Message-Id: <20181111113011.13476-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_alphamerge: 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/vf_alphamerge.c | 88 ++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index 45fa340fcc..b0a590adb3 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -28,9 +28,9 @@ #include "libavutil/imgutils.h" #include "libavutil/pixfmt.h" #include "avfilter.h" -#include "bufferqueue.h" #include "drawutils.h" #include "formats.h" +#include "filters.h" #include "internal.h" #include "video.h" @@ -39,17 +39,10 @@ enum { Y, U, V, A }; typedef struct AlphaMergeContext { int is_packed_rgb; uint8_t rgba_map[4]; - struct FFBufQueue queue_main; - struct FFBufQueue queue_alpha; + AVFrame *main_frame; + AVFrame *alpha_frame; } AlphaMergeContext; -static av_cold void uninit(AVFilterContext *ctx) -{ - AlphaMergeContext *merge = ctx->priv; - ff_bufqueue_discard_all(&merge->queue_main); - ff_bufqueue_discard_all(&merge->queue_alpha); -} - static int query_formats(AVFilterContext *ctx) { static const enum AVPixelFormat main_fmts[] = { @@ -140,44 +133,54 @@ static void draw_frame(AVFilterContext *ctx, } } -static int filter_frame(AVFilterLink *inlink, AVFrame *buf) +static int activate(AVFilterContext *ctx) { - AVFilterContext *ctx = inlink->dst; - AlphaMergeContext *merge = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + AlphaMergeContext *s = ctx->priv; + int ret; - int ret = 0; - int is_alpha = (inlink == ctx->inputs[1]); - struct FFBufQueue *queue = - (is_alpha ? &merge->queue_alpha : &merge->queue_main); - ff_bufqueue_add(ctx, queue, buf); + FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx); - do { - AVFrame *main_buf, *alpha_buf; + if (!s->main_frame) { + ret = ff_inlink_consume_frame(ctx->inputs[0], &s->main_frame); + if (ret < 0) + return ret; + } - if (!ff_bufqueue_peek(&merge->queue_main, 0) || - !ff_bufqueue_peek(&merge->queue_alpha, 0)) break; + if (!s->alpha_frame) { + ret = ff_inlink_consume_frame(ctx->inputs[1], &s->alpha_frame); + if (ret < 0) + return ret; + } - main_buf = ff_bufqueue_get(&merge->queue_main); - alpha_buf = ff_bufqueue_get(&merge->queue_alpha); + if (s->main_frame && s->alpha_frame) { + if (ret > 0) { + draw_frame(ctx, s->main_frame, s->alpha_frame); + ret = ff_filter_frame(outlink, s->main_frame); + s->main_frame = NULL; + s->alpha_frame = NULL; + return ret; + } + } - draw_frame(ctx, main_buf, alpha_buf); - ret = ff_filter_frame(ctx->outputs[0], main_buf); - av_frame_free(&alpha_buf); - } while (ret >= 0); - return ret; -} + FF_FILTER_FORWARD_STATUS(ctx->inputs[0], outlink); + FF_FILTER_FORWARD_STATUS(ctx->inputs[1], outlink); -static int request_frame(AVFilterLink *outlink) -{ - AVFilterContext *ctx = outlink->src; - AlphaMergeContext *merge = ctx->priv; - int in, ret; + if (ff_outlink_frame_wanted(ctx->outputs[0]) && + !ff_outlink_get_status(ctx->inputs[0]) && + !s->main_frame) { + ff_inlink_request_frame(ctx->inputs[0]); + return 0; + } - in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0; - ret = ff_request_frame(ctx->inputs[in]); - if (ret < 0) - return ret; - return 0; + if (ff_outlink_frame_wanted(ctx->outputs[0]) && + !ff_outlink_get_status(ctx->inputs[1]) && + !s->alpha_frame) { + ff_inlink_request_frame(ctx->inputs[1]); + return 0; + } + + return FFERROR_NOT_READY; } static const AVFilterPad alphamerge_inputs[] = { @@ -185,12 +188,10 @@ static const AVFilterPad alphamerge_inputs[] = { .name = "main", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input_main, - .filter_frame = filter_frame, .needs_writable = 1, },{ .name = "alpha", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, }, { NULL } }; @@ -200,7 +201,6 @@ static const AVFilterPad alphamerge_outputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, - .request_frame = request_frame, }, { NULL } }; @@ -209,9 +209,9 @@ AVFilter ff_vf_alphamerge = { .name = "alphamerge", .description = NULL_IF_CONFIG_SMALL("Copy the luma value of the second " "input into the alpha channel of the first input."), - .uninit = uninit, .priv_size = sizeof(AlphaMergeContext), .query_formats = query_formats, .inputs = alphamerge_inputs, .outputs = alphamerge_outputs, + .activate = activate, };