From patchwork Sun Sep 18 20:27:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858591pzh; Sun, 18 Sep 2022 13:28:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zrgbSMXxcHgQC+7Lfd7JJgJo6o0Yj1Cv2KTtvMY6y2KDCaTqOmP076BY7uxnggu6WKXKd X-Received: by 2002:a17:907:3e89:b0:779:4869:b799 with SMTP id hs9-20020a1709073e8900b007794869b799mr9931004ejc.91.1663532911587; Sun, 18 Sep 2022 13:28:31 -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 u17-20020a50d511000000b00448b88378f8si8014678edi.359.2022.09.18.13.28.31; Sun, 18 Sep 2022 13:28:31 -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=U+szwiET; 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 07F6D68BBDC; Sun, 18 Sep 2022 23:28:21 +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-am6eur05olkn2078.outbound.protection.outlook.com [40.92.91.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 388CE68BBC0 for ; Sun, 18 Sep 2022 23:28:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aUHO9hxBGUtQ2mn634+DBqQJTGa2WyQJ1oJDQltrJZcqXpiWuk7qgPYU+MlCH6DrFVfWC/igKo2XmXQV57ck4IDwOtjszese3xqk4Ako3q3MlWgL6X1UtF5pHV3e2RLJ7W/PoN3m4N/u/G/okNuhgw9kuAyiheXK2MiD89nQ/t3XVBMHCNCXFZmbj26xIRLVrIMj9QcXesvSMGB8nd7hfmsxFpVKSM8jU7/6DWoDen/zBnOnxa6PNylJPcD5v1XWXDgzatTwzquWzoIw58JACbDtHdFxX7i4peVGaSos2uCGjz/yHnY5uxO2f/gpeDNfX2K1y8DTIZr8Ze1qHv6EfQ== 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=ffpzeqeZHkDQNx5qnfXxbkUrS8yCWGnPufNBmCsaWsU=; b=BRTwKbqqz5BG3UgRGwQM2aWuTkn8jVRQ0iPRNp0a6Cx43svqNFJcP+Ji0ZfAT9xVIlbhcDuJwJyIy2s3bqnOvFlqqUOTbxcEHknlI5vMh0+LNAz/z72wgZYwFy3nRsDUiyYV3QXCYms3RSjgPhyh8AWJZcmAPc4n5rvqQ2sUTGaEn69v422lzX/u+zeOtCxrTbaYwLkTQOfd/N9spubJVkTuqMXqTh/HLiXlfVaDc/3Im2Nuqi089D/fjwb0RJPIEdHL2F3PY6pzpbhl13FgANmA/iO9DzFCt5RBu3hel7Bhjd5EBAiiZRMHgQzNVUfwdNv3JRrU+CulULFn1Alxrw== 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=ffpzeqeZHkDQNx5qnfXxbkUrS8yCWGnPufNBmCsaWsU=; b=U+szwiETBA7t1KGCw6h4Aef4fOBDhRy0J5WoMzJL7EACq+Z90UZf+g/krn4ilKMX/tOr+ttZUIXH14R0SyZKDX3IeK/7NndnKmxN491D+JY2LBa5O7MVggVCRzhY7/f7TMS+n5Tzw3YP8xQ9ZJp8XmPJts8O3WbQYt5gdCFvDyNEjg00tCsCwxEgET2b/F+flPTQQgSxBqn5Tc/0P2RywijtOCkZNXhgWjW3FdmPu11Wrqas9yLm5EzTRQyejL/4x92F33YUGNrsnhqny5iPOy0qMwRS1CXgNGsMgjbgn9ODx0duDeReh/crKk8+M9PX28wOVpZc2T0sag2Z0M5EDg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0484.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.19; Sun, 18 Sep 2022 20:28:07 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%7]) with mapi id 15.20.5632.019; Sun, 18 Sep 2022 20:28:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cMHPfeETA/TP0httQ6Xl4FIR/iGCkwMUW1pBDpdh9Pk=] X-ClientProxiedBy: ZR0P278CA0109.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220918202757.2345415-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0484:EE_ X-MS-Office365-Filtering-Correlation-Id: eaff55bc-3680-4b31-1129-08da99b44bec X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN510+Jql8OwQORGPNUAgSCFEpkkJ3Rv3xDFGvHP2RQ1ATp3on2/5HGrHufQp1U9tUNHD32hVb1BhSnnwUP2J5P/HebkMz1K19kh8lszKwUwW3FlWAfpmZhX5yj6xSHNdzdKPoAGPShmiOtWwgbZqo5sWs3zYA84goSL5txZFYXtNZCv+DLTvPaMz7yNMhJWCskRgG8wpM+NoIEN2foxBaLC4LGFgQgLUgI4M+sotgVzlhYw1gx6bF8X3lwYOAiFTUVZ5FsyG/A7rSj2iCVLb0UB+UyniZI9XjhmlF+H4UqlmM92EZOgvupg5Prwu5FpAKMF1GNgOeHn5zbmGpUoPREUNS5TcwZFyOBd8CaZzlC6FBsQ4cHHqvHEb8JhkHuKyqgiKn2OlLFeVEH55U8ufwAEHG/QPeuECk+on6JIt4RMlz4RKq18LJ+WIU6o46zDuDEIZQVCDsV8IbWjDg9zkoQt6cypx18bwoySQewKuEM8pS9AmFB3fD9ocoJXk1nQmQM/0PGik3C7hJ+tJPCZ5rNAdptkxCagoxocR5krm7Q8iFqAaYnkbNehscD177KLKqgSGLTrudFaisMrozELXIKQ3wcXYZn8MINCA/tbmKTmsnNEv+CIl8jadQdbwMJEiA7PYYLKVbde5Vv5BCDcF7b+Pa0TdQoI2oTlFLsgFhONmzydbV5O3uSlawk5IfUOyTy54R3Qmj6ESrQsyhtuvmh3RM7W3nHEyJMAcLnfCk+tXME= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tk0B31tedLydxeFTVyrpvNdSl4K8kB+MUdFlDQNbbTw3OtFSt/W40OinRRbqS8eiq+3eNBCsrlZI9nPQeuF6L25Yh5n76zUHWXfhl9o7rN7jYZqRNvjqnuNNZjzABKdY+c2P9rqY+en6/+F2ye9O72RClUFfozfKbZhl7bvvPiqtKSj0Qj5GWZz96ar3Qha0tiOGdOjfIEBEMQ/HoCWY4+T0I2PAHBZI8cmwDfIwd1Bt8Pf7YVkbo3cVLoqtUm/Q4k1XlscAPJBN77AQuUexC8daITjj2Oi20ksriRxi9Z6IVu0r8yVPxidcSGzsrmGyT1+xqWf/XBe0hXml6E908kXAnUkBjRpSFv2FFxKyRkRBX9V/0j5ylMGhC8PQYDXV8apAJYz/7QFmDUqEIswaxZURfP2RrYPIvKc68oIcYjbsq8UJvvVag0i8ToVi11Ay+Kik8VpUZxA4pbHRIBc9dZ1K+ci9aPZDLce33fzTM2ZXH7mrvtPKj5I5/1Rcxr4R234lih4+y0KRnYJQcUAijJN7u+dD92FV+z+QH0J/y0tfJlWSZF7gWfoFX2uTSXMgsRL1+MqZ7a7l8foSxLEJW4JWhqxtr1HUCTErZ7Vt62OEOl9x/TT+FvKWNpvHJREe5wzc5D4Sw9ptuF9Xy2LfjA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hLvz1RpT/34CVNvQv/phr1du6PMcJf2B0lOdVpeTOXY/gOE2MwebQcg29kJS5tyEigjdFog8GhXf82meW6N2c36kJiYAWObeRyrODhaeGE6NtxY3EU339pyycWCVI3zoZm5k6WfWUcFTYYY8TQkoV54RhAEQjqjWWn0ZYuWmK1X6uvGHaNPw/DkFftDmXI6Ck+PVKPLiTWbIw0eiUm05PU1G4qGBVxYW0VlM1G5ezyAbS2i/Y01CF33MIdhRmfZiwP6OqPOZhFUqj9/3pERuF7CVGiLVhD/tSR8gJE6md99o18CkPaakYbbeOkWXum3/RTnsym8pyKUaeZsFDfgac2wpOpHkIpJ/xFC4ivqzc1IzTcnngF5GUy70MhLom0U7fyNHo/xvjARGdc5N36SkZ92IvWXqxBn3LlJts7iRFbQyq6vNtWA8mfDphDDHGnnF8VcGDS8jyxW6Rv3b40w4wYKYP6trXEA1PW/aQ5tqYt8kalIMbNn40FJZ5TpWMFOE0kay5gId2SyP2Ck3kYJidc44SNo1A3oa06nuHrvfcEJBcfhWt6RsMC5zc/z+bM4lh1BxndO3LiexaioVb2mwvJzd/Dkv60LL+dr5P9LGYNQ1wuhaSO8uMHvssAKovjeRptpcPxmBdCaz+0EKeeqy/uHgCjbl/GIE2tTwjO5bAsbxV/F2NHbvNFlumQ2L7+oUFRgkeYwrlQgroL55tx9FQpQbo/AidaKDXyN5eWHi4SkU1OThiYovfrVmNQJ96H4DjzXrOmoSxUDZvXucP+LJL67bq8jBm8N3drxMFV6eN3fbAMQUAQ0eiyHCAzWzPIqFQcNooVrJIZU8FVSUFulPPUeQl/q/FRhq8HVkPUeFRAlAQkQS3rT1oRgBL73cWEDsMqWsQ/6J1JzRpFdNqj3tGpfn3Ee+DAX5nLLCeaD5pYTY9Nd2HYLEi+FH6HLjbfgOPceU0vQTXvptJN1f9LcaXiDeSiEmrz6I12Lwsfe567iAH8W0We0mRIn5EM9RwpgIV7+9sNh9qw/78B4slPrsANuQ7O6xKhCOKAva6zKmIKZvlBayqH+JGfQFoRnft8D2qQTa8tVlTN99EP1mrDSZzkDq53eoLQzFqjIhm+1VqKzOTa1aOu0V8L0QDZzMEs2Srn4vRyweJH3uV2VnWKAFMtcCB7kdlOjTOLeXJTur8S+g0GV6lwv5tEVOlRqS8pCVFCgu1pwu1gD81JgoSNQc9tegtulHQ4yFCQdnGyc/Yj3udh9zbagZG5Gg8TyxQRkcZcx9Hs0umd3Xs4COWg2+PremP84uAof9/20wR2XK9so= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaff55bc-3680-4b31-1129-08da99b44bec X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2022 20:28:07.5002 (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: DU0P250MB0484 Subject: [FFmpeg-devel] [PATCH 04/17] avcodec/avcodec: Always use old channel count/layout if set 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: Q6ISEaH3AR/+ This ensures that if AVCodecContext.channels or AVCodecContext.channel_layout are set, AVCodecContext.ch_layout has the equivalent values after this block. (In case these values are set inconsistently, the consistency check for ch_layout below will error out.) Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 96b69e0a17..754c21c97a 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -232,7 +232,7 @@ FF_DISABLE_DEPRECATION_WARNINGS if (avctx->channel_layout && !avctx->channels) avctx->channels = av_popcount64(avctx->channel_layout); - if ((avctx->channels > 0 && avctx->ch_layout.nb_channels != avctx->channels) || + if ((avctx->channels && avctx->ch_layout.nb_channels != avctx->channels) || (avctx->channel_layout && (avctx->ch_layout.order != AV_CHANNEL_ORDER_NATIVE || avctx->ch_layout.u.mask != avctx->channel_layout))) { av_channel_layout_uninit(&avctx->ch_layout); @@ -240,8 +240,8 @@ FF_DISABLE_DEPRECATION_WARNINGS av_channel_layout_from_mask(&avctx->ch_layout, avctx->channel_layout); } else { avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; - avctx->ch_layout.nb_channels = avctx->channels; } + avctx->ch_layout.nb_channels = avctx->channels; } FF_ENABLE_DEPRECATION_WARNINGS #endif