From patchwork Wed Nov 1 08:35:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp288121pzb; Wed, 1 Nov 2023 01:34:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEM7HCe0/oxNfPUpXdgrkUUJLc5R+f7yhD4T0WLWUcKBpp/oXR0bFT6GQUS3EVpF7PNaJEM X-Received: by 2002:a50:9f82:0:b0:53d:e139:64a5 with SMTP id c2-20020a509f82000000b0053de13964a5mr14487965edf.27.1698827650358; Wed, 01 Nov 2023 01:34:10 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b33-20020a509f24000000b0053e308abea4si537551edf.640.2023.11.01.01.34.09; Wed, 01 Nov 2023 01:34:10 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=ojd3QZw1; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9777F68CD34; Wed, 1 Nov 2023 10:34:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2028.outbound.protection.outlook.com [40.92.89.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F92168C85E for ; Wed, 1 Nov 2023 10:34:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=agUVpyjPbkvSMEICqp0z1plLA9hwAKshHlKJ9+wqqfpXnhwveNQMleR73EDEHxFtE0EiHWg5EAgPCuNqw4gePx4FPdej9fwLTmQ8JK9VoFFTygfrJ6qCXht/9ht2ChWXeDuL5rFxE1uxEWX+V5AqvMPsln+G3/GzyCurxZg9rwB0yev0/Vx6b2jai2QsCaJRneJFJzmiZY9c5uEWiD95vLCGHaHpuiepzv0KeMapCbob52tSUir2Db+82IV5H047/SHa7hs04vVxdODYwAg2uh/jR3C0/H/6KS5ymjKcdg4GBpIqp9YRUS8jhGattCAoUxvyegKZ7JwhzsjC/aviyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/G4VrCSeplVKnm2sPnvwryXugrLw3RtP0bCz0QiJdow=; b=nWGoMAgUSa20X/iFJE1iWih9afa1wY5fr4ylsHHpxjdy4l5HG/H/Ak/mI7L7xyfEI2eIg0hMUgVIAVlvlAkqP4JUUqX6ufOpb4Zx1J7LLY8nYsIC0ASklVnl/SHfg3ml+YCxogf3uFasz22zb0A1yIY9JwEVVGl5/aNBm/6pW7MYf0MvZEp0cR43uDg7VqqSn2CnYuMOvuY7c7BCG31Gj9MpW14WsZpXLI4+fbsiGkDSDdEo+qzsDqDVGQ3byfeyUIPNlGMsVkou56o/vo+TVTZAIAMy22nzNGyitxN0+qokDsziew8KK5twxzov3wVRYDj5eIdkdOPjLufeoTCceg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/G4VrCSeplVKnm2sPnvwryXugrLw3RtP0bCz0QiJdow=; b=ojd3QZw1U9TD2wsbzu0jaFd/sTnYBNJR984m/uZWsjVdRxXw2G6RwAJe6n49I1Fk71tn3NK6xDjC2WAOcZZCf/KAWNnTVZ6yr1yNAC3L4bhL7XAFZJ2TF092TeLOfjDnoBNhhac/oHo2qywugIH91QrcNUIXynWjce5GfQL9ieG0/rJyXrU20j/Dp5cRyr+bmSbUphvCQ6CX5ODct9miktJWaZyjpJEG02HtudJWfpxaTYvq8hcgqkn+enb17h/IrOGmM/LsoQBRuwoFTXjkLurvFmr8rU3lXTeoXptV9Hlq45813vQNR6bQX7Z7joLTBtTPXpHIBc3KH4TMab/yXg== Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) by AM8P250MB0215.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.19; Wed, 1 Nov 2023 08:33:59 +0000 Received: from GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768]) by GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM ([fe80::54a8:bde1:da41:a768%3]) with mapi id 15.20.6933.029; Wed, 1 Nov 2023 08:33:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2023 09:35:03 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nOPmDRXSP6d3kp/E2F9gSnuxW4WvK2XBzVhpLLounXQ=] X-ClientProxiedBy: ZR0P278CA0193.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::23) To GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8b::7) X-Microsoft-Original-Message-ID: <20231101083512.3398680-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0033:EE_|AM8P250MB0215:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b5a85c5-3c50-4b33-6986-08dbdab54b63 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PWzAKLW0p9MyIuTlrKvB/JPxFihTDhe4ftTCvqikQPCwAUrwP1jVxcrCg0Oaknq3nH3LPbNi2ZuRwz0kNX13bxhSCN1vsV/BdD/CEGGKVjOp4jkTJV/w36T1PJm7c/4ElxxRMtmSPq4no2je3En+kXXj9HDHGioYVCc+eFg8W9YDbbohg6V8tU1jkrYWtpd5m4mez0RIkyMnnWhc+Vve0g/lPGK03nby8h4hlgb0hDC9aZJUjLMkmAhuQsmo1r2CMkyhDE9tlHtB2MSHK7Znv+fXgaNWfmtV/omTSElHX3NDoHqYZFq3Lep3epMbelrWOrvvLFZibPs34v4p2T2ByxrajfjiZsUUarkK5dQXvP6/PADXLkZgrAATeCGF4PXO0o9kTuEm9zoYBTYcZk+Qt3EmDSBhwJrUbawLDZqfl/Z9y9paLTfyPUQQysM8RgnViVUyg7EXXFckk9bf/wAI+hcrSPhgOGuBZrv0mTpRqzQip0P7isEYJsSxL+5PTj1hVpnOz+QaMDIgcnNZDiFnR+Mb0jWd5Shz/u1gHJsZYtVSrRiXlQUpBatNd2nBcE8BElGLfCndj/c8QaO7fZKfikeUJvpHhSkhyEfrx3KMsAWTOaix5VatH4C/XYR9B+lu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rLzJUItxLA33bQGeh04+BLIGjbn51pTr44V/4+HQsO37O6xPtYkg+BGY5VR5HdtNh3mqfoU4fMKIauXZe5+5CyJReFTxy4PF4p20W3E2Fgtejvxg0BHbzMM/k+lh9awhen9dHyY6WvnlPeCq6Ctt07Prm5UxEhMDJhFWshdgyK9ljI8I6vSxG0ZVuQi82GwU0sL23NOv1J5D3QkK9Rpk0TulWFIMGH0gOKHTOED+dfelyjJsN+/BH0aJrpl7LDxhaCA9lv2WFJNO24iCGcNyBhZX+Ecw7Tt33HI9AiJHWDFyXDk4DlSJDCpjsj08HY0k+2i+t1jmphsjQUzWcjdsLsMrX7YWTklViQtHS3OHTbkfUvtPWpDeM9Ry05k4SPQMJM9H0zuvFk+h2fMLcJJU+l/d/gjxRRbCQ/CyGbidSg+dTMuuPtkivABvLKRuyZv06wldgPsfk6/Kv2ZIXTuXpPEpz9B9dLqSYtYw/5/x/rHc7XsYI3gC4qTOz47KIlTnNAxwghfWrvcBU2CyYdVoUNqPgQ+d7yODBatv1A6g7nG0YYcGGXx1eysebu1XvMdLRCCtBTJsFKfNZGLnYPHgKzdUw+g58k5ckVF+vZucEO3z+16mvwpjZQ8MAVCs96ceo9vEjpUGNtNUAzgGgf5I3ozuymKiTthUeV66j8IKmav9MR/9fKwITdZh+lSbyb+CDQKT88GOUloKNFedkBwbjpztH5XOs2YyG6pHa7AP3SoOIJuXAeOj7GZHrVQ3yPWJkocPs3jdN2EaQ4UmXixu95eWUdWfjGOFW1uiHZztz3FielhBNNEzQMC3uOOwJX0EqKqYNTaqEZKm/I+G2gB2KvpCweLFlSQa786gdqZQSFMGP39o3+e7QIAT7Hr5/p8FlmaUcrYXYtfHB2ZzoErJUYoiSCWPGXBuycHGsBonTd8BC4BXS1TzepQ6MXTKb6/xq9ynyY4rTjOt9ByFfWMm8LBEgcPjvYR4twF7ICmCX0+YkUSC0Jm8blsHwK3SYorpM1b91wachtWGw2uQfbAMbZnX94NGRyRPrLv1S9/WleIEAmhetswmW6JymPpCYgvzAF1oey476brlZG7KgJ1ajf7SC3E+QNS16uDg44UUPh5eAMUP4nsFgavlSyPFaBVDH+ZoRp9ss4MiKFabPP6ZU00+umTQPdy20IyBs6HUkqllUWC+XHOUxrl6ywP5SnHrRb7xGY5y04jXqHzFkkdG4fsOlU3rBD8dh2d7QpTDuvO5XQnkA586BCx4DPQV2BjH X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b5a85c5-3c50-4b33-6986-08dbdab54b63 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2023 08:33:59.5251 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0215 Subject: [FFmpeg-devel] [PATCH 02/11] avfilter/f_drawgraph: Deduplicate outputs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ndkk0mWayXiZ Signed-off-by: Andreas Rheinhardt --- libavfilter/f_drawgraph.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index d29a7fb60a..d53598ee15 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -454,22 +454,22 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->values[3]); } -#if CONFIG_DRAWGRAPH_FILTER - -static const AVFilterPad drawgraph_inputs[] = { +static const AVFilterPad drawgraph_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, + .config_props = config_output, + .request_frame = request_frame, }, }; -static const AVFilterPad drawgraph_outputs[] = { +#if CONFIG_DRAWGRAPH_FILTER + +static const AVFilterPad drawgraph_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - .request_frame = request_frame, + .filter_frame = filter_frame, }, }; @@ -497,15 +497,6 @@ static const AVFilterPad adrawgraph_inputs[] = { }, }; -static const AVFilterPad adrawgraph_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - .request_frame = request_frame, - }, -}; - const AVFilter ff_avf_adrawgraph = { .name = "adrawgraph", .description = NULL_IF_CONFIG_SMALL("Draw a graph using input audio metadata."), @@ -514,7 +505,7 @@ const AVFilter ff_avf_adrawgraph = { .init = init, .uninit = uninit, FILTER_INPUTS(adrawgraph_inputs), - FILTER_OUTPUTS(adrawgraph_outputs), + FILTER_OUTPUTS(drawgraph_outputs), FILTER_QUERY_FUNC(query_formats), }; #endif // CONFIG_ADRAWGRAPH_FILTER