From patchwork Tue Aug 17 04:49:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29586 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2645419iov; Mon, 16 Aug 2021 21:49:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9i/KJ6xS/ORYPb41Us4E/lZaByqUeYiiAx4Yz8SYC3zIHkaLesGj9Wt9pWF858JYlVp+I X-Received: by 2002:a17:906:c182:: with SMTP id g2mr1723346ejz.507.1629175775719; Mon, 16 Aug 2021 21:49:35 -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 e26si1314505edr.515.2021.08.16.21.49.35; Mon, 16 Aug 2021 21:49:35 -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=M0KSgOy9; 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 4AF6968A59F; Tue, 17 Aug 2021 07:49:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067025.outbound.protection.outlook.com [40.92.67.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E1CA68A4D1 for ; Tue, 17 Aug 2021 07:49:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QGSZHZtVdFI2WBYOiDVUG1BNHZtnIPw8aDYbnOErdnsB3mdLNYLQd5Dc0GeXTQNI23xs7Ra+EBfjZgyVJPRBHyPGY1XAk5nq+9gZCnhqIOh2V6FKuNuo7pUEQg1qAWpnZnVjOiaETQQXAf0AkaXehBDSxAEDilX+CbAqqgt3PdXLAhy6dcdBrJb0Vy7ChE0QXmh4EHMtr2NIZ4h16ST52Kpr+wtn5ALEEIuaKhw6Y1AgmLj5MW14yiz3GCukARg4vbGTgaksrGXsGxQLD3jMVc5BbM9W8o3nZF99SnaAl/yCQdWebtySSvYGg/l44g/66PrRz0yl3+ShSrAzyHiMSg== 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-SenderADCheck; bh=kBqG9APrGg/vgM9Cgv2MVUgitcV3Toj3ai3hCT1SQzQ=; b=HHKVr9rRwUvXK1aK+GJx/9pqwRS00dZnQPeHr/xILWWLGDgTnc5l/2+OCYqz44CyGbRfH3tJme83bbMQ2b0YxGZtxHKXANloYYTRpysL7Jf8wYUjKvTh3QHgbjFFKYh+AwN0y4IwSUIIJ8s7X1F3HXDjCz1znPZeGnf4sVvWBmr91wcQj6FnVKEOKLB7uwRn7bT1y8d1dfgcnIrDwWFWHfuU56MsSa6wY0I6WS/njy121SuOu5fPOjHbiklTfeiyHEs0TBR7US8DCWoGgX0hPb/knx1cbDktF1y8t9mwX2H5mAcvku2GoFE8GELsGDUAXiaha5k3l3WQbA+1RdaCUg== 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=kBqG9APrGg/vgM9Cgv2MVUgitcV3Toj3ai3hCT1SQzQ=; b=M0KSgOy9baMpK+axHcDBUgfRilfRLXg02Tt6wLZDeP9dBpkoVL1obnGXeftguN1ae+mo9oDKAFiZeVXMp971DxgMKxgy0Oyuhfd/iLH6D6c9Rd4ocOcDtxq9T+9LbeVH9Kbm9EnWS6hGddz9UP/V8SHmP7qNE0UQUZMCZhqk4jIJlxzYiapu4bgLLNk2ZtEYB7ln+Uw4Syr4Ci54ZN1XMqehvQ9gAm+3yY0IX1Eb+05PkCPD9Gbg07RNp7zf8MaR90bAhrnblNUjT2xRfftt1MSdjYqdKSmBioFw5z829diEVcIjQQd5zx1FkisM+zNSgtBjdb+2Ki+wiQca8oJuxg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5542.eurprd03.prod.outlook.com (2603:10a6:20b:f8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Tue, 17 Aug 2021 04:49:19 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4415.024; Tue, 17 Aug 2021 04:49:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Aug 2021 06:49:06 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [xTpvhO3clJvNj+IACdkeGIXp33GGb2Vd] X-ClientProxiedBy: AM3PR07CA0104.eurprd07.prod.outlook.com (2603:10a6:207:7::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210817044906.3154476-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR07CA0104.eurprd07.prod.outlook.com (2603:10a6:207:7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.9 via Frontend Transport; Tue, 17 Aug 2021 04:49:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 371dcbd6-9e18-47ca-0140-08d9613a5fab X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSp1XYbE3vnwSazxHNSRmcCtOyqVgMpLfDjCKPOQbYfzuf9uHldcugzYHIOPooaB8Xc3wOnSsJWPpG04u3u4jfcQS15RcSO/4HQmQw1cgGHKMYH/yuXBp6sKH2J+9ZL/HEdJn8Qe/hlk3GekoCbCUU0racqpgab7HFJLkytbjVwPr51zCy35DeamHU3lpWlnUsVbdYYwm6PU6pdnj9JKmZ4dHc71xWjzRj1QXh6C1uYmsXoTIk7vyF7FDg1vfIiVovxfEE4koX+ivP2nqHYOSaVdBKL/CDXcEcocBabhcL8bwqkdlL6r7Pvmn0VxZSUMaV8nzXh5LlUrCK1RshqxfAHSRzPV63SduGYR8XcexnJGwA2zLejr8OIrg6b69yVXXvb8Z9uSC9JReUlvdJzFT9QMFaFg7+/8O+KN/AadDzxDSpjR5ad8Q1IV0znpdtKflWTs4OjAhNRC0tsy4RHXedy8gvJlqpmZ3oCFREv+lRwGf9yrz+Bw+2jtjdEX2N23FeWLyqI1XbaPM8WnwJp8asPgLGBayw1XDOHk/iWsqYHCDPxnDQI5gCDh8hreIr+3Hm4QIw74uW9CHSzf4kcczoIfFejPqsEcHnqxFizEpmt1spqqcUKDa8VrysqhhAkRE23Gec2T5W8z13FGKrof2LGdGT+d86tBaWZFHgsedjWYNQr9W0awupT94GlN/x7Kk1DEhNePQvjx8obQPGhoJnFwwd4MYMiWGjJHxC2ReRXBHtJUgl+8FC4Blt7VJjG7/w= X-MS-TrafficTypeDiagnostic: AM6PR03MB5542: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: spaMHmsoCyNLqbj1lAeDrx7S3h3MIWzCJcb118DrX6soakxqp0lP6xx44vG4GKK6PELQ6JdddNcRHdYBXy2hUQQdeoRgIHHl30J57RdDbpS6IEA/ZuIaJe3RBAzN4zhzLbdjRhC5e8XAYE2v+VUDHF1fG8xzD0BQsoTqHKHkRnPyFVE+9V5RQxZgdASUd3N++Ij6ihGS1teEwZk7KN8LRWQdi7mKDG9k0lUK1OZY1JnKMD+Cp/1dm/UWkhC39ZxeIfuuKhV5D0WbgBtsg5N8l5K/MFIT5dhphtfj2mpnSp4PavUSyf8Z7wlz8Yj4WUD7A408ZktQEeyRRrZsR5d8K0rqb7SECgt8VTuFQthIWNPHlZ7vVynbrfPR/tvvp1gAw15UOujOdemIOIFDpjgp+juWMFjs+J/nKmWHWemEZULWpB0/CoYgVe124GF73DHE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HqN1OlfbUhqhgq5b0VUa+2YfsJIhkvB4ZHmyMDsI1Dz/KHB7a2b6XQTcpbj0h87+gtLXg8af5+5uim9rCiAVdhrzCs8TVdDuWvTitHptLlufGB7Eyp/pIyRdi+fqd78Hk093ESG6AUeb1ILOlznBCw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 371dcbd6-9e18-47ca-0140-08d9613a5fab X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2021 04:49:19.2438 (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: AM6PR03MB5542 Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/audio: Don't call av_get_channel_layout_nb_channels twice 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: NyxO8ytBZN4X Also makes the assert-string shorter. Signed-off-by: Andreas Rheinhardt --- libavfilter/audio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 5289b94067..cebc9709dd 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -40,8 +40,9 @@ AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples) { AVFrame *frame = NULL; int channels = link->channels; + int channel_layout_nb_channels = av_get_channel_layout_nb_channels(link->channel_layout); - av_assert0(channels == av_get_channel_layout_nb_channels(link->channel_layout) || !av_get_channel_layout_nb_channels(link->channel_layout)); + av_assert0(channels == channel_layout_nb_channels || !channel_layout_nb_channels); if (!link->frame_pool) { link->frame_pool = ff_frame_pool_audio_init(av_buffer_allocz, channels,