From patchwork Mon Sep 12 16:07:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37876 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp172404pzh; Mon, 12 Sep 2022 09:07:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR7uajSvwbYPuyOnw57fKH+Kmg68Itvfw2HkV+nNd5G1y3CPttvoIzwI3g3vAHBUXB1hyYRe X-Received: by 2002:a17:907:7f9e:b0:77f:c4c7:915e with SMTP id qk30-20020a1709077f9e00b0077fc4c7915emr255139ejc.485.1662998846544; Mon, 12 Sep 2022 09:07:26 -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 g24-20020a50ee18000000b0044eb919cd29si6492503eds.161.2022.09.12.09.07.26; Mon, 12 Sep 2022 09:07:26 -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=J9twQ4r3; 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 37EA768BA31; Mon, 12 Sep 2022 19:07:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2101.outbound.protection.outlook.com [40.92.91.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD75D68BA31 for ; Mon, 12 Sep 2022 19:07:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ihIKEQA4xRy1Si8H6548yQEJsbm3K4TsfQ6L/aWY8ZhNOBEXAMzzCPiD7V7bY1Hyh9Gh+bDvBVsBM8QFSErykRUg/lTr2XMt75QaxfUUZasEW5JTuTQeTNqGKNJ/MoLNUMI/VNfqhRs0KEKhg2jNGeCMMk1Kp1QjVmso7MTvZN8DxFJSC18pyWtaxDqFUv9kte2s03qDF3NXJOkO2L0dChhzTCNG8AhhPTRQYXSLf81d5UM+cKWSkooOVTxitYlQ0xsSi7KUK4BqyKYRUnnuWGYn06aVQtzVbRGbhQvxrZ6+lXZP/JckLg7mKo1VANSp7TsTnfE+sT61ZqKdirhWCw== 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=PXaRPLDeqIRnERcELgXzDG3BBzE24CGzltGuzAbT0Bo=; b=R/yPDrXDEOw34pqDB3eoFGKfrePk+99v79ceE+/fxUjntBRTymMsfV+zFst58LDj5yMdlrb0BhxrQ0GT0nE9fY4ZtTra7CfRJ5CdjSVI/WT9xYC2z7RhfgqnPyNqesv9obyTLCiegl+vHsPIOhOO3KWvmqHh0gaC2/qome2NTMNxTBakgt71b4ZEJDcRjqpBFAVl9gz3Blg3TpnLNtRvADqqyNgr0YtFVy6AlSpKd3hpN0xu9vAqRzNkmkyHDv84nV8JbmDGT+6Vs+eKYuA2RtxPsm/yC2Eszd1WVYzTcEI1oERqi1JtMp3KNQJ0jowCRYiWsX/ESycwDu99uYN9qw== 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=PXaRPLDeqIRnERcELgXzDG3BBzE24CGzltGuzAbT0Bo=; b=J9twQ4r3X9t8vwMnjZnfzicKCQ6N1gneQU7xgZXTbpaapHtyyuy5k++OV1LWCduSq++e7Yt9RxOCOZTNk1ou9WCtW3ZIar5UNeTxGvhnoFfRXnhiSYh1UNLmnotn9IShvzgMk9t/VZTlo7ISsYY7okZelXVtMasLlxnfGRk5WtEPU3iiyRPG+E/M8jjBp0CQ5afvy7oCj0+NympeCp179OWcfno/W2tskpI0tdBnrr4qsffrgWZcEiAkhd/oTm4Q8xq82KJh5AKbrXQzdcrx8lidixsbEyKJoo8wbnOvZFJIdgfTCCzE6qQDraLRxD79XkBHWXru2E/StU+7zqqc5g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0241.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Mon, 12 Sep 2022 16:07:16 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a%4]) with mapi id 15.20.5612.019; Mon, 12 Sep 2022 16:07:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Sep 2022 18:07:12 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [s/6AkSOCpSTDFmPJ+cJvo55VTeCOTE4tNibADXRFMo0=] X-ClientProxiedBy: ZR0P278CA0086.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220912160713.253974-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0241:EE_ X-MS-Office365-Filtering-Correlation-Id: b0bd821c-c492-4153-5543-08da94d8dca1 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyy4kLjx+6603QexPiU1Rq6+T1r1KsGtOrs/yi5bspzKuiagAm/09cLbRDhMw5K+bpruvLFtEw63bXPrMoRuoOL7WTLXzFqVkjS4n0QZrPGNsEMWPd5s8sR8/cm7Hw4nBtI3+PyUx6x32DYx1nYFKMddgrXso1qsesZ/B1uuLCy29pCs62Z3sPNbSetfpw2jZLM1hsZJsVKtoE3bF2Ad8oOGK1ZyVq6qNIw8Y8UEACBb+EA2xXB+PbBVFNBrDQQIHvOf5c4/lUq+I28QKeY+vfgZUosPiEgILrHH1ht9JjQKZ9Ifq+MNrGFP6IKD5H1irpfTbAGfzA5dZ5Jc0nH2fuSJhgkPFdYdGsaRqMN1tGb0xNYs/zAXUc0W0Mtq4k185JVLh9LBkz7pRRYo4v3L6AJfjP5NHnWcLwZCM8zlXEEHkj45fZKodrJVlRMNkBaBq/fD22KuRF/0mzRa+hfX1prvAtxDC3wIHrctKCDDeuFs0iyUWA9UbW4JtimWkNSIY3mDPH8L1JF63s6Y8SxY6fu8JG2E7IzezuFo6T6O1zoXIlBk4JrqFOC3efErdH42OXIJewWkLRcIbDnkybAQzquNLf6BRNkAwg8a0/HY+ok/P4ISu75kZso1oJLpedHXaops6Z72Lc2qcSwVX8y8vxO19nVtrTkL/HPj3i4yDTj2c1rq2bJSrbD9ycNc/YVuFZEkGHM4SNz6L86knAOKNcHGaEnxqINSOw= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QO4bpfTq5xFS8fWP4Fs85k39uwbnyYHs2aaKw1nj9GgREr7F7gdY9/IfSQgyy+/QeluzM+7AY8Fo4TOtzpbOyugeUOLMDKRC6t9E009pKsA2lGDkVncTVG8wth61hM7EPSmR8BWSlAVsuiAPnYXBwGKAxDeRK4iWCGMKjomGLDcgjnAh6t2rnl4wrPuBVkp7IoOa9tIvouMj8D+yu/miJIUt76fknwe9Eo11w7HoqgGrLs95Loihx8CXm9Me5HAgt8k1iBNODmKNBUVctrbK8giBVe1UYKQ1OVGR5GG3jwPtUJ0/nNquU6D2mD/9RZ64Xi26cIj5J9T6MEcxWQaPeDbiW6rstXGNdQfeEiZJROPaqZfGJVhisKifP7RY052DyQp7XG7DzZz4dmsbJtiN3b1T/yh11dC9/fmG8enGmnKRUmOwyxF9TL8s8e/6L3FQ+3CUTlFNmIS3BiJMhOWQrAYCuBcvbEK6UcZf00KrGa90XztCwUBr9Xzr3ft0iq2SMltzb6i7GKUYJ5VvOhsNvrwEdPVjB9wpuuDc+eqRiOIZuOVsAlZh6iiFtPFB1vLFzzEknhPFJlEMkEH1LMr2vROFt5VlxX58dAcesoLrS7ZjBv2kafoA/yqtisYR48FUW2Pro8Y2PFkFXDwhEmaWDA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1puaV2Xg8gOHIqzFCqooZWyiKokeM++youKp62GeHRU+g6ij2OAX8Kyh3iq33ze4z3o1BK20EzOzsQKLysi4wy6o/2ctAXa3kSvJIeJekWLQbMAC3IpfAlOucBPGx7UO3ipXFwcjjyIWm4c3DL0y5J/YkmqRmnxVm1ia3u/tfNE6AHz6YyAn7eMWdHrUFYabuQACbNSUfVgQe0FQ0JMZD7fX/c9gXXyED/PVtH/DU3BrD5A5scpXyTNYl/a/QJ4vP4TcxTmVA8U6rVENczHhBG9zXjsLqpHUfuf36wugga4q5Y5jb7/5xuDCatKWqcbqAqlCp7mocYlqFwDJjV3lD9STmYdhVkIU2+ev8lgO3F3TxwsBQcqL1x5LWZgTknWOTJbFwOL5/XPUXhu+MCX7p3jshtB/4zGP8k7JV/H8KchQUu+oLWfYlysWUC9nNQdvU3chVa5rFQj3hp3DkltR1CLJaXphjqZf/VEx3pEMUUtBJf9Syshprm+7OORTFKXJb18Ir1csqoOF1LXy21uqOIytYdQswb1UaEME7TvqEQ7iF1PmVeV0xkUCVuUbJSSUJcb2vSXBv/xN0BZuUf48fit1igUaGaVX65PAEHor7ww6wU3pWiqIfiwMpeHWDyPx6TcwGoWOnAb/YKPdaVlrS1B5VEWFR7L+GNiOHuKGwFNELQJi/2pXuCeUvL138mKeXJmZYebUO/rM4azKmg2C7HS7Zn/QUuC8e9Psqsznl49m4Q6h6I+dAZkpzd0PGqiCeIc5qTxA98zCHIh7q9eump5HYY9bChdT18YIY/xSLlsGwsrWJeJ1VHSk1/6Kex6YAi4i5ApDxSrDDN/XYvruwmv5MclEk/zKtycwpYFLKl/2LGMNuNwDjPmchKjJicrsljue++bbzJ3LtHzctgPssbyCj0hWeaNbO54TwLiG795BgTNkVHi91Q6N+oZUThBrSAYkZuDGNuGYlnWQisWorBdptqFtijdyOTwmbajBJsm7raZiLsi6IgtVbA/nC4VowU1ys1n7qPisDsEO7m7mgQlA08IzAQCQQShSLdbLpax+zVVMzEj1/d/cNtp6ErWsN60iYlyqITixFhF9YrBIa49RIwog8q4p0EPPuWnVeZW2cTr6NNPLs+zKyZc3KccFe62vL/17ShiA8eNtMirkeQKy6cPSd8grVAC39IpVerGdvTKSHzfFpnvrVx5cldtLeYui5U1mwkHxfznetzHRYAsW50sehzxsNJfcVHv4cbSDZ2xyNASQoogrhRVP0OedR5CxZf8nRuw2KNDGmL884YQmBFwx/SvnepCXMvyGaG5PBM2ComJcDWM+Wiu6qgRz X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0bd821c-c492-4153-5543-08da94d8dca1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2022 16:07:16.3784 (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: PR3P250MB0241 Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/avfilter: #if ff_tlog_link() away when empty 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: 44vp+7RFyu8B It is currently calling av_channel_layout_describe() unnecessarily. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 2 ++ libavfilter/internal.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index bde41637dd..f34204e650 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -381,6 +381,7 @@ int avfilter_config_links(AVFilterContext *filter) return 0; } +#ifdef TRACE void ff_tlog_link(void *ctx, AVFilterLink *link, int end) { if (link->type == AVMEDIA_TYPE_VIDEO) { @@ -404,6 +405,7 @@ void ff_tlog_link(void *ctx, AVFilterLink *link, int end) end ? "\n" : ""); } } +#endif int ff_request_frame(AVFilterLink *link) { diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 0f8da367d0..0128820be0 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -268,7 +268,11 @@ void ff_command_queue_pop(AVFilterContext *filter); char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms); +#ifdef TRACE void ff_tlog_link(void *ctx, AVFilterLink *link, int end); +#else +#define ff_tlog_link(ctx, link, end) do { } while(0) +#endif /** * Append a new input/output pad to the filter's list of such pads.