From patchwork Sun Sep 18 20:15:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp855084pzh; Sun, 18 Sep 2022 13:15:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6UI+Qqlsp/1p9LE4FUrxS7cZsaSoBqD7PZ0pHVU6IK13VHa1EQdmtWVzwMXnhEJQkU9zj0 X-Received: by 2002:a17:907:a06a:b0:77b:9167:b226 with SMTP id ia10-20020a170907a06a00b0077b9167b226mr10913232ejc.421.1663532158228; Sun, 18 Sep 2022 13:15:58 -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 ds20-20020a170907725400b007313314bb73si17766185ejc.806.2022.09.18.13.15.56; Sun, 18 Sep 2022 13:15:58 -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=qhaoBBMH; 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 BBC7168BB9F; Sun, 18 Sep 2022 23:15:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064043.outbound.protection.outlook.com [40.92.64.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7632A68B825 for ; Sun, 18 Sep 2022 23:15:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dPjbSBk33bTFEnjPtrVxGBZ5bpw4f/tiqV2cz77rBuLx+RxHwJUd2cwpkwcwbRHMN/Gcovv6EhunuLXogcc2Bv8YpEl5GZK/TcY6Nj6br2VvoQ0jqrkIN+pC0QVdkZNQn6/WLpJxkab35t+DXkiErb4LlmPYfoASYIXYuUfkeaBQP1A4FOH4rRpKZ3qrznxje14loH3rkPvI31fjiKDQnbSg4ypq7yO2rkwOIz71sfL8EvGsNH3F9dN8X687ead4dA4dG7yX3M3ykvlAvnyEuKpn0008Tseu64Js7lnLTD6cSMIeXdUibeqdgEfiIreMm0C4BwPTXJtU4cWftRGshg== 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=MXfjJDz7q61/0RZyXFQzQAMla3So3r0Q8xmC4eR/lbE=; b=lkwx7eVIEE7C11d11xBXKjFAsJvlyBbOlSPwi3tJk2gW8cSfkeXI33dkYtkwNcNxJ0OKiYEJL7wib9xXOHOAASQYlGSsBHP3zN04lDZ4vLefAAG73rdUXZgyUk9cMXRkvRe4ijRZUyictt9GrO0kKybX4lTEGMBl4TPCcFHP0e5UXRVPVLRi6/JsfeaiJJyVZy61UsdmgSpupHr6CJ0h2SpYuaf2FimzuTUoQRxO+PhUomVoVevc/7efc0kplidjhMA51k2eAtM2U7KuZ7yjQRG7Xznz1ye/42598qJvdz9HX+DrBSOaciCnIBPEfOlYashA/y8EoYmzIrak7N8hig== 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=MXfjJDz7q61/0RZyXFQzQAMla3So3r0Q8xmC4eR/lbE=; b=qhaoBBMHHGIqAiWLFkeHpzNP9C75jXs/mClLBTsHbRF6DxtUKRAuZkn/3uS64mdhmu9xXMLt4K9LBdc6iMyOlXu6SuUJ/LviyJ94jkZVFw5CtD/We3QahkvWAIVzn1tGWWx5esPLF/uMQI5sL43Jtzw6ayaQmMrJhT2JuoU27LRbF1YLumZg6dwHfb4g0cm6rTUKK4I2T2DIOoMWehBVuMqZbm4+6yGgNYUQv6XDrKQNRJfbnTraAsrx74ZqcQLaMBKDn5htTtq4PKfTvcvDixXYTOhel9zU+YCF7QAUe2cC0WpEFULKxyOc/O3bRSYz4WqQgVwsx/9iiCTcUYH4Ag== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0439.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b2::8) 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:15:44 +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:15:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:15:23 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [3e3i2ga8S72jZwxV5FWSilC9nrhBYeCz3vPZqNIhmnE=] X-ClientProxiedBy: AS8P250CA0004.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220918201539.2345217-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0439:EE_ X-MS-Office365-Filtering-Correlation-Id: 87d7f22d-92d2-42ed-a8d0-08da99b290aa X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nf+gHZRpQ9KUHXFvRxTwG0LjyUE/XD4dw8QEcRIvQrAS7scCJr0F/4HrimuIsRkpC1+uoHT6xLKQ60Mg89vwfxMNemIiN3uaEPUOBLq1KX3VjaxTqxmQhY65y6m94fVvGNayr7T7G1XxFuZ7we3lfSW1SyUCnoqmGCPICzACtZc2tkIKzkYrpOq/va9EaU373AL108zBwWOoZaI7ozjNAl8MYHeMA+pKbpGrg6C46we6BEqWc7goiRCQroErpvGJyH6ttgcxt9IbeinKVw9bdgUdvE6U8RNx24hlxsDseIFpM4Y+6jD32bvTEzgkY2vvPjZ8N98YOGaIdcw+p6SxtRuzmSgLHDtWiQK69sgNHYx6dajD8WqZYxXcupT4zqVTZaKXW1pCcel4LK3Ne3a+HksLpp8shLxNadrnCvYaYgpDw/CTXTDBH2xzUicsYTYhn9okMKrK0bUict6FUrrHEC7OA5xgihzKEVX2GSaUUKeUSRpGiTSGSQkxFvdM59R57oqQlqrneRGMoLPHwlGeCR+QRw6zP/WaV4lAJ5jhm6rxGH9OIA8qwo7BW1d5Co3DBqq0Fk/0tX32ynKbAjsD9z1vZ9wedGFfvF4H8T3kd3rJp6AKunMc3RPcjzWyNTbYabKjfUSwXLMiLgOaOzGGWPRcc8F9JmUAMm0Ijtrnm3e/pPPYXdPw0qzaWjZV3k/4g+eltG+3/Xa5IORX5dq3bnhVFPz2piNFssn4/+FInIEqxilCgiZ1+Fp57jUlWG2Qh+N2BadsfFieYw3w8+ngGC X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wl+e88xYcWgeuHnmInv2Lq0bh4gfvjmWIgYsr0XoFv7gkXkjCSYNbO9Agmk349baJola85A+0t2mZkqHZ2dt91Sr8L/XYvZlMlV0H9x4ILtpBoUNQiiIMP7nr7PS0M4r8GeWbsaLqrZ6bCzbWb4WKlogTHCp6dyNWcBHWHwLatwtCjHgsdQ90eMiqZ9xNaovH03/hqPElzIm8FHVHJZ8+bgC4/OaT+ykzuIXWMqaf9teNI9iE368jDoYSgcLR0X4lJwRbKwROTwW3EkJNh9sElRcyK4WtiNQjYPmX003adPRjZacYPCHxSOADegurF/Txj2EFAJtrabU6Y9cIyXzeUtmf5DWiwcLVujnyecFuN4Ouv7oXiNGDLBSDkRa+CrXUF0NI4uHVJAtQEhVIgpy2SePBZU/9dJwjQOxlm12FMsaEkHxsEdbBdlsMSZlWXMJFFwyC6A6RV7UYqD6IqUkJ1ExiiR2qZkqYgTSsPAAC7FwjSEIbnGD4x769xl66LA+oy5m/7Q5VUONB2XW6VQiSSO/hdQOGu4u5IBYkGkeDoibs8nqEf7Ouh0Q7PCAFDLKYN45XLWf/1WY+4xK5Fl0RFYfw4hrE35nP/f15zUo1sVdnOnIMwpTCTDfihPggUCijLeQM6sNawtMz9DDzk3AcQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o9WPHZmlOPzCnNxxD0IDI+AYWAcIQZMzYodYIiw+M8xcwSj/gZLRk5zI0xCxJE1JbcY9TG9M71PhK5ZwDxP+0mRQAvad70O4lm4q3XgX6jCSoQqj8au8M6Bqz0Qcvc19Q5STQ9KteGAzhPQUZfRBNCZOOMCEkT9tC6puVcN7TIFiIRrixkmvFVeoaf2lo30cXoIZHtHCd4WS4pbyEyEo6Zlr2XSLsvhktYui9NzLoC7uflwwf7Q0aCT+DPyhPnDkypsDc34sMQh6nyoFG5yurrXGpOzQpXO+m91qmHrCMgTdlxAT6HgSPtb/PeqjcFexy0FsNC1Xg8K4nA8xvH0cXQWAIXk5G4bzwwJDQmXQW9WDHlpnhEOTgXBMWTiuLhfHai32/TQawlFhbVf4/6Ur+Dww0prLdeX3dcREycqyzH4N0Zaxcn6QgHzYRtUTU9R7E1Ayphp7NZnxCcuMuNHExzpD/Fx+iJsrOoEuJyN8gu2iVaEkgKp1pjwwqgoLdQjoIjLu1omtkS05sWuB64sBarEYsK9MsRpbts/vclWAmPx18AFE1XdEFdg/sgEel9xa1U24W+gmtRdlwPWB6hNXzW7WXvk/Aj2K1ivRcTgCb9MUjZ2aq9916KIHvD9mAAanNWGgpWFrhve+RHU9+3jJW786v6JdCIZW9OarC1wBkvInAomlmywSaq+8m4QWK8Kvhv7o9G9n3e5ey83fNfIgRknrN6dPnqFWuqzYt/iuoBj8UN/ADzND2dxA+7DHPjzxyUszvDaJnQua4s45HGLnAET4uL8antDJZaOamnhNBqMzzK5Ci9bk0gwxbjZlUIo91s39HBPcHARSIt/1slIztyRB2KrVk964CKmElvg4hCGZ0YxSdBVR74UMpKSHivyDtecr2+KDRgcNm9BbNrCYfixjNw8QyFm1sBQIhHRe9lJiehJ4xxZsjcS4MbH28LUp4cAQDAFmE+n99mlAZfnEgS12h24nAivfgR+qASmxjEFEpr8CzpLdVcdn9azNoyRSxFHyfqN50bLWsF+vnsyJGFk9Q8zOcPsRh13kBLJJqz/zvX6LlxlNk1n4gxUJFE20Q5HKp+0qFQFJPpfsiD/UpQExXP3tTzRzYIB7/8DSMBIVBdHP9+NC38yOO33IgRSybQKEG38+myoO8M/epthj2nEcdQwenPDaAqy/l+Zz4FAqgers+LOAtzNBId7WrTZi/6GoRWwaFm8yILm+kqY0lkrGwQEDYJY0EDTdKlB7EyM0sQqcSCgCABJI1KXprlIxE+J5VEaCxoW8GCLTBiZrlPJGWIfE/nU2dV4M0Y3gmviGXeHKItdwps7DnerKYbX4 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87d7f22d-92d2-42ed-a8d0-08da99b290aa 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:15:43.9190 (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: AS4P250MB0439 Subject: [FFmpeg-devel] [PATCH 01/17] avcodec/avcodec: Uninitialize AVChannelLayout before overwriting it 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: fu+oMXX+PCs7 Otherwise, there might be leaks. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 29643199be..a165cdea95 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -235,6 +235,7 @@ FF_DISABLE_DEPRECATION_WARNINGS if ((avctx->channels > 0 && 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); if (avctx->channel_layout) { av_channel_layout_from_mask(&avctx->ch_layout, avctx->channel_layout); } else { From patchwork Sun Sep 18 20:27:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38021 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858531pzh; Sun, 18 Sep 2022 13:28:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Akqo5Fn3/bgoF/7zzkY/dsMpSigE3f3BZ27HAc6z4LS3vH4ajRWQVPjTcfux7tBot9NZd X-Received: by 2002:a17:907:628f:b0:72f:57da:c33d with SMTP id nd15-20020a170907628f00b0072f57dac33dmr10741092ejc.374.1663532895168; Sun, 18 Sep 2022 13:28:15 -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 y1-20020a056402440100b0044e9151d561si9147751eda.542.2022.09.18.13.28.13; Sun, 18 Sep 2022 13:28:15 -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=oEkuxOCA; 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 F098E68BBB4; Sun, 18 Sep 2022 23:28:10 +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 F1AA968BB01 for ; Sun, 18 Sep 2022 23:28:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oEczjhVk30eKaNrOFoUbTIlKgSbAyvl3LyhQs/MeBFOmYUEhWbSQdt4tlht9sW/BnIoZ+HBgeo13mUHgbvhqE3fG7NzBjF41BRWO/7aFQhgwC9KDrGQbqqmilmuvoat+8qa/fw3hKX+7cg2N0zzKh2uEokVcC0pFtdMEjDoUclQindEyHQV9r3schIUWbuJRZOtTXDCbX6xI7RPEue9YA/NpOEtlTZ+jKp/U+5kLTMyakj6WtKRkV9BycPCkKduDStVgu8ssqDfz5ZZBdmh7zchBKKWiY3T8ir/UQ61gyzo/GlzhzFDLjd5TRmsSMhOEffBtavlr03GATOWWXIu/jQ== 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=wHrqiiCuPDvVdhbpXZLHxgcsJPa1LMnVrvQtSSDOocI=; b=QG1NWxTu+os/LAT+qT2Gcxho2Ntb77/GAycMuDjotKW6DPaT/NVQPtlgdGwmcvdewOoD+O94en8fVUjZZjlqixeeMfcO6nqiH9vqa3tQbBwJokvAIV9t11ZwMDq7kPepBHPDnw/Kxy6OLX4De2FKcxFRUhrKt6BRkN9RHyq9RvgV9Hnwh1QHKE+sZK0WiOvrXmSLt7bS0deteGWaHR02pmYKmu+plhUh1qSiL3YqS0gzLD676+ik1YadPflQIlOlzCqGhxJKjZVWzf6xOVCYCtAPos+0CWoPA0XiMpqGXDVHJX1rq2Igu2xlkqC9WjYfOoNAWcGKyr+e165uaXgb3A== 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=wHrqiiCuPDvVdhbpXZLHxgcsJPa1LMnVrvQtSSDOocI=; b=oEkuxOCASN1kIsUOtT6vllSUsD3PMwPJAE7PuzOqQaoRNhBh6gFJztxDEzZK0MXBwwn07ffF3BYJzuAlHWUSvnE9+iqy7XpXXBrKk4Ds39IGwwYIcZ6mGuq3MRXZKVfrbxvmK7yrYqpFrKXorOVKCxAhJgCgBVqcYyO7wfMVNx5+xUUk89t1hrXhjRAM+avzWGl/YdQ9tPZDHgPFaHEMYAIROh2c/Fbytjvt5JgqKYr8bXBw+HPmt2Mxjfe13uf38SUTyqHOXXhZZLT4boivVdIGu3RgzmCw0oOCagzooSEfrdFCmBpe/F/3fXSk7IkS98N+dGkc1s6Ow8FWeaCEzA== 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:03 +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:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:42 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [IhEa76RblWinN59plS0fydIkgjqKvbdEP8tCOZn2jlk=] 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-1-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: 69d19434-c398-49c3-743c-08da99b44944 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN51lXNz0Ne3XKx1/3P68o0/Qn6LyshoLu3r+ZFNYYS6wBFyy1a/rawwEQfvv7pIv2LKpEILnHMXaIn2v9x6l98zMcUVIzz4zVmSEylrfwbcAeP2Lzge96S2g17laUsuBxk3i8CaEuLLgnbInpdUCgag+3lBRO1SHvhdRebeAPV2tH+EpBTQlvCil6qqFFgBu4+DYOmq5DI5tYH/I7RAdzTGQD3L6KUUEIRRTYp75t/DSJndP0mkqigL2M/H3F8gInMuMMhVvVnbjDOQTcBAXACB9ytyHttaLBRIk4JPvmtm1hzxQAlcCF9V6GFOJgZOE1wLvvS38T5nVZRKxX4LRnP2siVomcFjNyoZ3AX7cVppbiEQ8zqH1wiWJ1FnXPBlNgK2b9S4YHSqlL/9DasIm3eT1Mt9EGGRrDqxmlhQdMQuJBHnv0jP+mo/0Fd8ormK2pm2y688Dbn8+aSooruw+nD4zO7KNnVJO3C7aHIHf/fbMI2NcXB2L9bShYVOlOCgZimrm4o61o23Yc8m4pvarM1crDVkIRUiVLFnPyCy9CgQ42poUKKDA0LoBFcFotuKWi8NZ/vksIO0VXUefo5JsFB4Qc4DrscEDVF/N0RwoJ1ir8XIZEDrqkALSIs/Q5URgxqmxORyPqCtyxh4wnJHOwRcKXcuY6C6UrqR1rxRBXxXFvSf/gGYRRvjudMa+UC9H4XbZJd3Ycgl1ByHWpzOukWdrjJ7hgHSAN7DmIH7ulJkc6A= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wfsfVCu59kcv4zNkikHp+uo4+0+lLDP9WYkbNnrGJwrksXM5xnl99S6aqxHhWXyguw3Qyd7VgdnLcJrjN3/bow4hnupPRj9u1HI1UJbtjFCokc2OW6OvD3ycfnAqyRR52cYjxGVcNJUn89GpwGEZwIShf8DMrxuflbJn7PSZkX1OMDqQKbArsgnWsjR2uD9jPnAxGAizVDulrMQCCE5y0BNp2091CichNUWoloeZgiuZWIf16j260eM+4Y6a8N4Kqq3UE7VVtBNgUNRKyhInoMrmgL9Lw/M8N2CRcyiarTKHgGdzYTUPYNJ9rgf6sqICK/9YlHWqOUA5zAQwVgCvfTPnQ/PKnQnzSSQo0+q2KRQUJNQ2dRhsvDiBzyeRidS1gy9g8XVMFJLaG1cya+Y6iuTMfBcj9fCMGE4mO25WRCQvkcxs8nf+m79HQBZD3MQBXLZQxfqg0b8SwfvyGPnMCx3srhwaRYfvs/EOAAyFVBVgF3P0MoA/7EFX4c37e89HHmnGzQYSoe60iavmgKZ6PFdTY34hN2jZqs5QzYkKbo9/hB2naDaSNja8CBXsaVjsZSCNhhNB1stuEx5OnPWaN8QKS8usap17eDcDxb7B32CLKb9FPHXaJ0A+pbCFOY7LDXhDo75y4u8vU21TaV+B7A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yDIYKzMCoArH+8b/lz3G+JqrjyKe2EATjqhDVcb11KHKirdy8mFxqSPsG+up2jsqodry+Rmvz40/P+aJY8ftOgHvGoAkq8az4U9vvOIoI7rIzKQlFkDhEZXB8w4auKX2sXY7BelrqPr+VZfu5JbsPcZ/HfqTmXpK7TABCsxEgMkTHgVuJ0N0Hflicg6H1Ki4HfDykNosyLufxgmqjS7VUlga+IdpUsTLKYOi81j9U51njkAgZTpqCrT4xdlBQ1HsKob5YyaG9fouBSF6rl0nu2e1D4CsNgBoFWK2ljtskSUHxm6sSWKTnNTsjT93c9xSI+ulVKaVjgw1FCUCCvo+OHky39jt9MFlNPffmERGHAP4j4P4agAxwFwsqn/B64WAnxYQGthNYf4KrkGU5DVt84pJstSAIDV3PKeOQvZCUqIN4cHYFeawLC3HpeFa2v05tNg0nyxVT6sr7yi2Ys4vOv4G7t/S/ZXCtJFPQIEth+yam0w0YaoGOjxSKp8Yc11MpWNJPT2+wxAVLbTFbtBzW+IQYLEwQDXqsF/CChqNIn6gSERROXPpwAFUgNx62Klq42Amo+iySa0JlM2owBqoBiopfASqfmxFFIinSS4YeYrY9L2FhtmRkmm7RMX+QbS80WdKWllc/V41kn9CCRqmoGAbTzySwOE79r0KEs5kvS2dze3L+L8aBWlZ7ycWMGAnXkerXjAou38V3KuW6zJAfkk8gDuFPlXScjOqmbjUPFWg5FnwdJmyqK0QJYskxXBF3hdCbOZcEZSaJWmGd2NGFNcm2548lY6X1MU6sbcHPuknIypPqvEZN8APSzRzODSgHBi4CtuJCGiyymyLvVfbJsT3c89huDCYyMk3DHtaAy+kSl3LMw1IANjgYz9+NQA6WyIRDbWLe3jnZwogoahJAAojaui8MUgapAXFmUw8+Dx/DCp1BmMvt+zNtCFjbdlQoiP9CKzGtt2Sp+b0zjV/rYQy2917oIfAQB+JzW0Cj4b+Kv0jZJ/CI4IeAx4SnrdiMFUPMAFnZi5I1CffX6j+0ORMrMT0pAJ8ZehLFDm86YZXeWMW7bcJh7T/+O2eGkpsZ6QMoAqQ94QaPzebOsqYNs6LlsuK/fHJFMbWgbihfBM6YmPmLfGTr6+yBD8uq+kj9kuVby6XcD+9e5lzf2c6hOXYuhPl0cPbHNGDWYtnN7dMBUCzM6J36UQhKpQA2TMZ6tw6QqK0/IQoHRa9SqrXmeYYn4XxHQ7oy0jSrp7PaBdJMfTatDSFeo8AIAYFeVXNdr3TCzElPcOn3RihOyAJZJ5+yWkHhr69q5CzFqEHFTA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69d19434-c398-49c3-743c-08da99b44944 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:03.1075 (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 02/17] avcodec/encode: Remove dead deprecated check 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: etfxdRtVp1H7 The wrapper for the legacy channel layout API already sets AVCodecContext.channels based upon AVCodecContext.channel_layout if the latter is set while the former is unset. Signed-off-by: Andreas Rheinhardt --- libavcodec/encode.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index ade4d458e7..2168b88ea8 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -629,8 +629,6 @@ FF_DISABLE_DEPRECATION_WARNINGS buf, channels, avctx->channels); return AVERROR(EINVAL); } - } else if (avctx->channel_layout) { - avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout); } if (avctx->channels < 0) { av_log(avctx, AV_LOG_ERROR, "Specified number of channels %d is not supported\n", From patchwork Sun Sep 18 20:27:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38022 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858555pzh; Sun, 18 Sep 2022 13:28:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Q0Lb5s9kvI0Uf6Mr0kSxPujRtVpJeeSuZOFpzzEyiduUgzBz/jnfw2aNtnZ+hDgSdh0iZ X-Received: by 2002:a17:907:8a15:b0:781:5bfd:2c40 with SMTP id sc21-20020a1709078a1500b007815bfd2c40mr1165199ejc.189.1663532903292; Sun, 18 Sep 2022 13:28:23 -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 wy8-20020a170906fe0800b0077ea290986fsi21342722ejb.584.2022.09.18.13.28.22; Sun, 18 Sep 2022 13:28:23 -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=ZgUZZB1l; 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 F308168BBC7; Sun, 18 Sep 2022 23:28:15 +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 1AEE068BB01 for ; Sun, 18 Sep 2022 23:28:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VvQwrmiBm+jPak0zf8fBegcMMgrz8T+bGly8CoxbrYWKGPHHCJBNuGoqixyxAp2/CQVNRPHQ9kFz6WTHurZ/FE0FBA/KzP4iKy4Dqyu9l8NVn/pq/hv+2J2fvdNL6bzR91WwmLZtEtUskS/hNDUIv2wcyCGwzhAbwyj2M21+VSCi0IialCYwlPYyiVzUhSV38l4rHc5iMXULKDbl2EY8j+tYOsqDD+Bl4G1qZsZGceD3X0TTVKUgRU81uDzlqC+V+ZyF2/pDX1+OxHj81Q+KeISnGOtGZ0rNqoFocUfkpjOOpnV3N7LWwMXJscvfuD8UTvw9yfsKpXIEtdWx+iuefw== 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=DAizWXXibcluE03ybnF5jzHSihK+DnGn4jc08HSD0lM=; b=AlqH9O54juiFxxDhjXwMzmSn9cw1pGrvs3kcpwWxz4EybVJGFLZ8m5jHWXVbhXOqiMT01VclmVIn9z9KnXt164k7Mo1ZiSFKuAxPclid0v2++0gmFgE3iu4MptSCwfRabjLCOdWw6CgdzJYcxs5kyD2yq1NpjKz/fek6pd22tDQdQTJOpgbFxoQRUIsFVy5cID2213FY7K5NVgtY/AHZ5avLcOLKUZ4oKMMsMt5hayW0PGoNihVsF7nrSi0eso1gk0+u1fgv7g4ESPub97rl8q1gJWKGAAaGI9dIEkLBaL1aZaFnO0BNVwVh+zlKAyxSRZ/6roA0YxJgluZ3y83j7g== 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=DAizWXXibcluE03ybnF5jzHSihK+DnGn4jc08HSD0lM=; b=ZgUZZB1lk6L4WN8MiASXhth4s4xd0xeW5cbnczWghR+s8kipuW7uM/8Yvn6sXJ2jwAuvYI2syHBhmus0hSA/IhzAMe1/6dFAGfV4iCwYHTdJVDzinENggL74+oRRck15bUs3exF//KthpT2WwfDjHgYjtjt8JelCdqC/v0Wr5MQTMHfMjlaKx1hu5ewa+o2kA0gXTnIucbHaxGqHAc6EFmKSni/TqiujFDKbPYt9aztLizPz5oQniaCDz93h0bV8nxxY/ib5Xl6dSZHl7qWf4ssEkVz9UEDgbufPBh/ETLHfAKC4VK0l6TazpMWqdXJ7F1xvPpxDCDjsutu+zh/dew== 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:05 +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:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:43 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [4gxarH+OtygIVpcmCeSxAz6lSoP3ncOPYpEYUr76eL0=] 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-2-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: b1a71edc-78fb-4d14-b48e-08da99b44ad0 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxCM1OeU4RWKrdQhmMVsaYvtPduTZrmDYjGznXiNWxUE6W3i/LkHXskHp7yxYgFo+o23cjG8LPVoMPHQdViTdbX9q2Y/yXMS65yqQuSfDnejUPB7XzWOKARJEwMS2cn7dZr8P/PrAx+jAXXh4/i+ULGOltw32jk8fNgDBLtxfiNDkgCb9QMLZJDOliqnwK22WiJ8Nscj/9vE9lq2Ae+wc8TeaDeyvpLtXTjsJkZo9DZ+bDKuYCq8lkc/KksW6J2BrXBmwMkbvlxlYMZU2Bryvb67sAsfQetrbwtMApwI+hqezGBQ5JiT5M9rO891tcMDiIzHpZcLLcFMIlnRZ+P2hd9rNUfNsT/txN4n1etkFknXG2yIDd8JKIoUFXZ2DIal0CjoBjNdmfuiBVUaUSWNxMIkqMsE9tAcPPQTB/PjJiKh570E97g1qBxlgbAGj7pBqK956BLzJXh6mKJqzxNzzw6HCRz8/o5b3f/oVIHjFGVVb1Yo3u/MB3ulmiIFyET3ti8MlVYUMhAKYiCBOejnhcRynhPnWZKYceY8JCuNoHGbfgC5RiV3caPDYnIt1egeb62rPU5rdYI65ilI7oRjFcjN8qq2O7tCSAamD+3w85GlZXeDxmB9mA6w6z0B9qn3c0IaTF19r5Utp1oie3uD2+5qWTjVVsWfHbuTy6hudeExniXeszGqeWgT3H1tN0p7W/f3RjjrMj61RouZJkmQy99ekH3Kszc6V0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T2WURHdmEmMoiMkfDPKQCu3HKYEFztc/QjMbKd1YGyntpRHNAbkM4tLI7Dam1KlnWus3CtpfOL1z4axdSCmbxXjaovXVg5U+V/FgA+1Td98M1wsObBwyY8AzWhuZLxxPFWc46B6xT6HFEgnt3uW/M7hdTG0zYTC85PWIhUP0BEa5psDq9Be05IuEt7pwM714WuuHBrPb/s8gIYzygBRpuCXSBtG8cc/WkWqIiwYWS3NmPJMy8MKdlp+SnsMTsWenXosCoQFEBLw0596llGfrWTbr96Q6kZsqcryHqoMphzn4eU2pnnLc8EV5xgiSc7pjUSm2EeE3VBPqr+rIBa/i10b/2RzPTkt/nWZH+jdjy9lbhKJZ3o1GZGKciisCgww612NgcnWRuKLS4GMVgVXWk2sOZqJWmw1exktWRL+9QpZnzSLdBcZQ+snEHkJkwhV9lvQKsWzuB2U8i8n4NAtaSfJPd91CHoXokm3fdPD8beUwRE+ywa3219mAo1hUjTnwLHUTpBq8pDMSKWS1YSWhGohmMF07l8x9luc/ra4DJ4oITaSnapT46/otPn7tyZMHBcLcv6WwPoy3DRHj41gIYc6JkKhumeeYvGpKmCsaQho/STIL5MUsxKyVaXZCgvjmIHneUBxvI+7N9gKbxNfZNQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JFqspK2eIdAkAb9ZJ6n5e5EMBNWBbJKxiHER7aqJjyQFDeE/l8aeCBg3uzMVY6QFps+eWlhOowsbLvFWSgXoMdxazCphrF4yCA9zMZSfHsYxQMJQM+/wymDaT2V5HLvlGpEDZ5t+CZ0FEn7ypGzQeMn84dqyvObGFZ27qO7/odROdrafOn3QJyetul/wsbeEYpCO+KukWbnRIwruTvEvXteYMjaEv/+q34/BJ1MMb8S3GxaXYXGVOZzDA+6SAHGMQuKFokWzB+Yja9jvvvLbhttIFvCpLvoVKlPlOm4OrztXJ7DGNZ6EGA0GpeKe00mnoJ+ZGJrYzgpWrrgsmmEn5HDvQ+RY5NkZfCPaqR2GOZOfI2y6Djo7qHjObmxR2pc40G0kfzsdb6e+eudioMZj9z1QvR+uDGeG4scnBi8zUhjzapbEwOpnUzQStLnladz6sGBpZnpd0S/JnyunvjAKArUtm/jB1XX8exMMCBBYUXX70k/34I1J4cK1Xk7fxycaJ0DoNI4AjhFEKm59tphwtIKdtmcHSJivWlv4l09rGXoADsktjt8yDs2jyQXo/wGRi/SNc2Ej0CzTde7hHO8oTZlnuFTyCjkK+CyAm5FOZVjaM8jAmohmJ/+bxCrCZnKLoR3uSHzbX7DNvPlRl/Y9wYUjiiGTrZWv2awWucR2oym0tOf/U0uFsnhXDEQWvTx/5NU6etpyyXJimCIBqSABSR+9Hmmlzw72Rp2xdzuAIUbqB8t9ubKzJj005lzKX8fK8PbyKD3xbUgRT076J2VXiGRKLUDbhbPDWNoNVaFfCYOJr1cBBYy8StodicsYjvzk6RTEDCY/CE09yVrId46/IqfZrhAWrzz3TfAezOBmYzdwtox3iU605DiXvyhg/Z3sVPvE5qNrQHq05pUER3qJcYsBdMsmLdIvBIIfzWtnzzN+1bYQ3VP3NWASUv6bm0aPYaaO50FpgA1YJEI7egco3HLVF/MWvg6YtUjKlvFe6INcPoZFalwz17r+53yXTwLDk5Gxnh6U2vVSzR3DOLgsXofs+o2vRfGXn8H3oVVraOi2xj7YeyJZgsktHypQuw07jd2rG7uHF+k3xL4fUS8a25yavJLhoHZeEFFm0DuVHe9Yq+/oBfEK1iR/cgjnkZN/VnVOx9x4rt3dGfzzBIETA4YuEdW2mCB7JUsDn5QnoJx7xAeBiQZ0VPFLezjrY8WHoOxbO0lcTAPDFUbYE11txF3vt5pXFquHTpO//YzCmMpQ7WGIgUMR0eiafjihW8Z6GCQs+eybO6soT7E3QOi5fTWbULmWMYOAiCqnrDCM7jA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1a71edc-78fb-4d14-b48e-08da99b44ad0 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:05.6419 (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 03/17] avcodec/avcodec: Check for more invalid channel layouts 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: H4w2AkjeuMW3 In particular, check the provided channel layout for encoders without AVCodec.ch_layouts set. This fixes an infinite loop in the WavPack encoder (and maybe other issues in other encoders as well) in case the channel count is zero. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 11 +++++++++++ libavcodec/decode.c | 5 ----- libavcodec/encode.c | 5 ----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index a165cdea95..96b69e0a17 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -246,6 +246,17 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && !avctx->ch_layout.nb_channels + && !(codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)) { + av_log(avctx, AV_LOG_ERROR, "Codec requires channel layout to be set\n"); + ret = AVERROR(EINVAL); + goto free_and_end; + } + if (avctx->ch_layout.nb_channels && !av_channel_layout_check(&avctx->ch_layout)) { + av_log(avctx, AV_LOG_ERROR, "Invalid channel layout\n"); + ret = AVERROR(EINVAL); + goto free_and_end; + } if (avctx->ch_layout.nb_channels > FF_SANE_NB_CHANNELS) { av_log(avctx, AV_LOG_ERROR, "Too many channels: %d\n", avctx->ch_layout.nb_channels); ret = AVERROR(EINVAL); diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 2961705c9d..6be2d3d6ed 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1595,11 +1595,6 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels == 0 && - !(avctx->codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)) { - av_log(avctx, AV_LOG_ERROR, "Decoder requires channel count but channels not set\n"); - return AVERROR(EINVAL); - } if (avctx->codec->max_lowres < avctx->lowres || avctx->lowres < 0) { av_log(avctx, AV_LOG_WARNING, "The maximum value for lowres supported by the decoder is %d\n", avctx->codec->max_lowres); diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 2168b88ea8..92e8337227 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -600,11 +600,6 @@ static int encode_preinit_audio(AVCodecContext *avctx) return AVERROR(EINVAL); } if (avctx->codec->ch_layouts) { - if (!av_channel_layout_check(&avctx->ch_layout)) { - av_log(avctx, AV_LOG_WARNING, "Channel layout not specified correctly\n"); - return AVERROR(EINVAL); - } - for (i = 0; avctx->codec->ch_layouts[i].nb_channels; i++) { if (!av_channel_layout_compare(&avctx->ch_layout, &avctx->codec->ch_layouts[i])) break; 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 From patchwork Sun Sep 18 20:27:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858625pzh; Sun, 18 Sep 2022 13:28:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4fyrEGcdyJn8Ehgi7kwggm9vyki2eb2JAOQaj4xMJpHryyguvxbNJnNzr7g8maIrf3FA4v X-Received: by 2002:aa7:c585:0:b0:453:e1c6:7dc6 with SMTP id g5-20020aa7c585000000b00453e1c67dc6mr3302555edq.245.1663532920822; Sun, 18 Sep 2022 13:28:40 -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 p10-20020a056402044a00b00448ec02447csi7098552edw.144.2022.09.18.13.28.40; Sun, 18 Sep 2022 13:28:40 -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=olAchxXL; 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 1108E68BBED; Sun, 18 Sep 2022 23:28: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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55E6D68BBC2 for ; Sun, 18 Sep 2022 23:28:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ad+AUD9HGi0EFiqGr9R9yE1THo5SYkxQEEZe42XF/+OUsxpBrljtQfKe0XCykUCoefZk30jU0AbtqxUVYCMwBIWd0qiNVaytAG8V82IiAMEreEJPsCAvmLDNuBn9Zqkhjt20ZICoBtu1F3D74fyeGRdUDn1ywWKy5Isl6bjvc6XewPSDaf4lQT/lcUurgDuLCuu30j/xmKTUJi5Sqh4i+HyhWO0Q4f2XkTXixf1BABrqEZ4sp63RsG6iXB/K1p4qKgT5uD0tQBawjetAOAGImbd8stzmWii05BTv825n83pHLbka2luZf/OyKK0pN+pp7C3xYQKOg82qD13AwN118A== 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=dK6BD2Io6oN1Bwwy5eu8rTd1eA/SsmVBcuqsQOdFGlU=; b=BRP7Ax1NCduMjRczDG/QnaE49tNoxu9kEw1jCI0UlRbf4PU9kpfWK9z244AUe63fK6nU4kfAvB29PDPl/f/4O7j/UaVMgB3g39+Y4a1JKug3tVSckt8IBm1j1ZMNca9bTITh1hKfLpVzZ+b+i7fEXOWMAREScXtMM14qfZgiqmsCclqeBILaL18AONZm7tY6Wq6abxQaAc4rkpJWrxTBJkohsyP6WSDTwfLjCofjg31ydzUz955Ldnc6nGKTCsMNrjKiWezuZax8p2CrQu/G9kHdwaKh00ARPIdZLiPH9sd1Kk2aVOToEczPUgXloMhBOuptf97u5PhCBUgVBo1eMg== 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=dK6BD2Io6oN1Bwwy5eu8rTd1eA/SsmVBcuqsQOdFGlU=; b=olAchxXLo6SBsFbeIvrvHfW2OrHdBHdKKShtbzGlDsBf22xak39Htabj8TFZ9DezoztqBj+Pd1jfWSR2t2ddYlJd4A5yhxOUwtktoeOcwCElSdPdp+CtsT7KlszWbB8fX3Bf23gQpitUC7e23sxCA6PS28jQusKzXQJHRy75n6bIP7vyW8XdisxIkjosJ2+l7wulL9nv1cxrz441h7SJI+QOVVG4xREWCToVZQ1nZCL3EGJTq+LiCYDu0EVv6kWG4IgdkYi1KmgGOKPbU7sMH69N0xYKDUg223IfGDwda0oJ0aIF3Wdmnztsa4K0VNSE2NkIBncaJgoYfPFeQNvvHg== 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:09 +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:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [xzkEbsIJR1QFbc+L/l4sy6hRbPkU71E2XoJdDZ7oN9M=] 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-4-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: 1d8a1908-1d49-4054-fd48-08da99b44d1a X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN51cYTarY5z2KzfQDpVmkC6WMU1HoY40L+iOoaCM/DuauFLsjT6N9K1l9a0YsMRXFPAqgXilYwFEX3px7iCGX5aPwTWls1dd19TbuUcNdcJDDTJttifp7h3KQsx4UhGJIeizWeCxO1cqknlTgrkEAXHZSZa75/6AZ/Ff32Km0j9x4zhndFGLcFCqecAWb0m4eo0vRF84ken9Ezew/1PyQxfnL19ZAMC4tAQtkItnJ12EwYGWTECCDGcCO1A/jS1LFePdvdGNeAW5TwIoyVRpnw9flWFdRvab9TQf6PvzNvAFS12/3Iav+6o8D1vdqgbcvPba4DRB3ik7CGCGJqsU9QmbY2UUZAqbHc+kmuv6OUf53LYuSQS38rJBeOYfBbKDL+NaoER6Hxv4jGWnlUUS2DEze8sP73BZusbGAWJnuWI5ANuSHL8GJTRDOivphRXENkCt8xCFQzGeP73ceY4RKV4IpdtSTZQe33ra7I5dnkqhI9V5E03BQszU/YlJGJ61Fi8sZnhJN9vLBJcfxRyYZjqMWEsklbp145LaUjbQALadx86wv8GF/41xr+vRYfKBHIbaAiu5/uVnh9IH5BESlXk227b3uNnVPNgDLE+u2m/2BTtgH2TPfhvgCpoK797jodIw8Xvp60YQwlqwhb/1cKGw9ze9xOnbgQkHVYXykyJfj1OF7p5omSlbpBGVnRxTjOoghK6XjR6aKiqDwTnw8sMh27F9mRhO3ouLQzZuEbxVWI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 29ePKX2CQKew0tqLQkc0TacnoB97ziFdxXBPRACxGnVyfkqfZUGr6TlMuJDQ9fQBh//k4cJaH542ceZpiiaYPkEw86mTKqQN9DrjcvNU25qgy7HDlj7nNGSlNDB2NSOqmi/AyB9/oUr0klN7NILvi/s+a2pLNz0v/qvHF6cz3e2PJ6GCN/IOHDWosEgDhVq7eZfXzg+OnBhzCjg7wJzq3y44ogs1imxCmVCNvDP6drCHBa3NpY5YGxMNpakdEC5RizqYXPT524AOQhpF+nVE7rHfcMbMrE1ED41txyLQbiLMqjG4WpoI7aMon8hl8H0Qcis2YwY0PyJFKyqmmINfHRBDu4x8R//MN/ErtJHATDofqOg6xzEeI0QGvjim27OSUCyDzvbtIGAmGf7xoeJ7a6fe5x5X3WXw+81eXl1Js9x80XYGoLemj71IfLO6gWwACB+DZoFESZSpI2fhAl5T9idFFgy7+vFEEApdnrfV7S7WP7uvEiQk0kFwWPXdDOnbiI77rf0qLMvK0Aljw/55NbOg/aaJK1lxeg2/VPSpBwpi0A6I//XuqEd/SECnTWrs+Py9XchVELgsQR8p09P2ML7HbNA4GBW02j3eyBVidosGMO1uLCJr6zRhl6W44DBRb6rxZnaRCibIm+4GMD5g1A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VzPqnPmo4l/L7JuiH0WeJ1YnfOpPXqDYB1sDtAPI9HknWUX78Ah/fRCKtRScgRjK3Q38rtFsjsXGvHk5rysnS7ULV8JZl87PMfPSYIfD1m1TP827lBF1k+5Y8hQcHiWjS7HwruylhaACQywhUBmTaV2g25JmJuTa2FlACWy2MeDISdGMjXSjTpJQEyDTaNBZZuv0B/gvSNZnIU+xjrP/RragSa+ETluCYsWZcXcDKttTJaQ3eF0CRZFyViUtEZrM1M9pufd27UjVcXW2jN1sYzZUZxDuD4932+m0FJpltyiH95JBbg9v7MMkxa2PgQtttMqt5KMOnmQUEcEO+MyTznx5vfvlWIGxZA/Qn5cnWGOZXDjPZQmLXTueMZ8oKe+Cobl6SMFKPwqheSxmRCCoyBjohKp9v9HsN0eOk9Zue2ZCgn032rVjNm7iU1LV+0B2Gk71fFrdnCq3AmeeFG8/J+1DW/ELVm1adS3Ihr3e38FeXhEbxPAUzbKGEawR48I6jm2yP6aDswSqBUb8zpPy7S/998uFQYd/BkWqDh8SQepjIbebYzrS05lxHcYY3LsJKDIuZub1DgrEUOqFnK0WCgvqyVx7EZfvBQXwTZ1nh1WvfTThYqUHVb1SG/ElZlIxcpd0WcxSQ/zLnCnom+msjHeYJ4p/CCdrf/L+EGOFMFE3BX9/zJ2Am7AoXQjE7Lw4tl7Jxe2YLyjGyMbkVfnlE4H2ohvTlpetx27zPRdeXxZpS+welY143FZ6TYO7VLLt8ZgPQsOwYsTmILfIX9XsN4DpsTj596sinU7Cr1X9BlaCTkRoLBOt1q3an5dvLd9ZsMMb0gh+Ps5GwZ90IxlV5xDFoiJ2LAsiGl2RWTnG7Zw3D7ELSl+nAHuDEUIfZa8navsjXrlqF9nrowIe3JAory6xYxCmB7gRySnWZoU8TEVFg+sMOF8Ff0VzNO92vxRDypbhQrF4h0WIg4m31o/L4sqX2WjWll8G8hzLRTdX4135shPrmIZWs/GBEyA8s6jFrPV2jI+VSNnPT4642mBZ3z5G1ydSAMbFI+6TmYtDQ9r9+e9QsDidsENSFI5LpMiKeiU8ygczMENm65tVBZu44V5il81mn5Ht3IN18QnghvE440cdO1ULRzVQv2/SktmcCd4tN2ZWXBIK1+4gRjhWzCbmzrJLTqNNSqnoos0gastzQ3E4pzBaLHESdk6X4XmN6NZEqc40X4MljjEdnaBg6nnIx0letgMsvt+3iwaaxRXJ4NeX2nVCVrmxzBbH6h2eLKLf1q3QyVpeZqv8Ss9T9jQdvP2xIcwU/IhJI4XbcS8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d8a1908-1d49-4054-fd48-08da99b44d1a 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:09.4854 (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 05/17] avcodec/encode: Remove deprecated always-false checks 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: oEOdknRNvcId Now that it is ensured that the old and new channel count/layout values coincide if the old ones are set, the consistency of the AVChannelLayout (which is checked before we reach this point) implies the consistency of the old values, making these checks here dead code. So remove them. Signed-off-by: Andreas Rheinhardt --- libavcodec/encode.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 92e8337227..d1edce9edc 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -612,26 +612,6 @@ static int encode_preinit_audio(AVCodecContext *avctx) return AVERROR(EINVAL); } } -#if FF_API_OLD_CHANNEL_LAYOUT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->channel_layout && avctx->channels) { - int channels = av_get_channel_layout_nb_channels(avctx->channel_layout); - if (channels != avctx->channels) { - char buf[512]; - av_get_channel_layout_string(buf, sizeof(buf), -1, avctx->channel_layout); - av_log(avctx, AV_LOG_ERROR, - "Channel layout '%s' with %d channels does not match number of specified channels %d\n", - buf, channels, avctx->channels); - return AVERROR(EINVAL); - } - } - if (avctx->channels < 0) { - av_log(avctx, AV_LOG_ERROR, "Specified number of channels %d is not supported\n", - avctx->channels); - return AVERROR(EINVAL); - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif if (!avctx->bits_per_raw_sample) avctx->bits_per_raw_sample = 8 * av_get_bytes_per_sample(avctx->sample_fmt); From patchwork Sun Sep 18 20:27:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp859024pzh; Sun, 18 Sep 2022 13:30:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6HF28kDDksWMU5M9hG723DWq/8bYDUrsRTqnNe3/EOoxo+34VOQsjHFg1tUZBsdGV+R3A8 X-Received: by 2002:a17:907:783:b0:76e:f290:8b5 with SMTP id xd3-20020a170907078300b0076ef29008b5mr10966270ejb.395.1663533008550; Sun, 18 Sep 2022 13:30:08 -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 ne18-20020a1709077b9200b0076f23cf9c76si24321078ejc.195.2022.09.18.13.30.07; Sun, 18 Sep 2022 13:30:08 -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=sBK4kTJp; 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 1716568BC57; Sun, 18 Sep 2022 23:28:35 +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 552C568BBE4 for ; Sun, 18 Sep 2022 23:28:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=anIPAmAuc6qe2nuIgLcwKfxOHM1vnu71v7ZjjIZ3mGqT+YSUpBNOUo0JLggC8nqzXwhqUcROD9KMMzL/rwGAjFOKM/NpW/6fGR9rmi2lu/cIVMsdnIrC/Do/UsLmTNtQPPgDk5CR3IY7RfIn5xfulmKe9zJYppk953aRm5ldLDwFS+C0oaqfgA71mb9u5s1kqANBhc3Y8HWHYB+M9BcuAb/sC2xdtewP2vjzs4ukde2Fzb346/YgMZREFXrlDYZOQF1tHbrRnLAdSpiAaTe8MqIsc+FaqRRMzBQy4r8V8fRsd1VadA/pa07EE9rW1vdl6NWKQ5IEPpDQ1K//0q1xYA== 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=9p5lwyMPwYFMPplXdtLMj3U8cjzsQhf+vd+GFs0wZlE=; b=LJPgv4UaM/b/521JE26eFcK8I4j/Lf/Dwg/Zuo0jynhdYEs0Nw8Jh22G7sNPiPLjyg7la8eF6WMicTge5u7U+kungY08d8JWRFN2xHbmq0aGrHE7wnmgyCoR50yAedMfb/d3x7vWKRk0a11bwtOat9tf2SH/slEB7/HkK0v9NFWkouWOQMyIcFKNE45Qb6CSYLBkUe6Vi/ocwFEEbpGjxckJpFFhtpQhiIuuSkdHrRqJpyVxvCtKURGXl6FGS/yD3UCcQHwpgP6xaYgCY/HlKzwWhQilTmkQfqTSbtVsRJmAjmPnHLRr0KjOlSEljaJpEAMPEKRWj4alqnz5w9SuTw== 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=9p5lwyMPwYFMPplXdtLMj3U8cjzsQhf+vd+GFs0wZlE=; b=sBK4kTJpAuQDnz7kAjV3aO16IbsM8L8gTmi+Iv1GsIeYUrKGbEKE6hPoBD3fwJU5LdU7L9S9nbSPYaye7w5vWHiOOlUpOcDfw0A0JcwLmwEFkoqHdR8WRoUgAqEMej3cdDwOjVKY2+jTfh/XW8ge/5+uDs5s3y3fS6yFC6KdECyz08IU7sk63wSbFb8nQKVfYP16X4tMxgkjZaLT3dbIe0ph5ze37B6swDpbg/jDvG+32nCYx4XFqLurs2C28x2d2G8T+40IVoh5vC0UJ1KhcS9K0f/H2SMhlCVpMkXchqZzntLHu2Wk+TUPSdIVME40Pq+FM6SMI5TITVFhjI64gg== 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:11 +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:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [FOTTaHqD2dqsZWVAnlxpoIQE/+lSwG0eCMcVA/tAOk0=] 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-5-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: c2c4d91e-4288-4830-2499-08da99b44e2d X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN515oHc04P6P5bLoduW2EgL4O85DpTnhrA8CX8L82E2y7rjC1BK2gah3euGT3j+QDurhytB5HWDi1oZCTWfpeOTFeF/eiR0RoQxbIV8PKT/2VWYiRgHYhdjG4PhljLKzHEdyfHG12WaAlxVBYjah6h7rPGIspd2bFwJV0T6bZoj5hz5K3is4KzI7gZFnEUGPfcXhk3NkN0rvfPtrE1V3Fv5L1jPaZcRDV6fX1jYhKbKEHlpUrKmcwvmfBkC+xp4YS+J7c1pD/Vrcolt6qgT1Vp635n6sRWWz5IrNk1UUIMrJVMrw+Y4w13jzB8IzwcEJc1bYlxsopeK/sSbGPfVYqKHG0K+NrizDsNq3oIsnI6OgXKzg0+8r+LxAnowrO/dTRT6t/rjPjj8TW1bKWLjI87GgcjcYD2+j2al09OLz11vDqH2xvzrDKq/kriN28WHi1SBnbbzHbi/ybomkMlVddvAyg3m0/8d54Pp+TozYZa/g0W8IdDbJwBg5B6+Sm7osGPM9kbkMf1CkNKJH9ye99L4i252x3GaqCUq92xlhTk46Z33uxDT4coU1MO7LUFWFC3mODEW3FlZcde7uEsh5a/wvhe2Fp5DfzC8IKAPpk5RiDO8sg8hSorqyJq7OYUq7xEMm5T66vHSl2838ZjWGmdp6+qDbOlJkWD3WnpFmQB7RBnxyq/KcJY7V2+AxUaaoyRG6jkNbySV0x88O/VqvFoWUBeHvh3qmKywAD427hI4V6A= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wZ4SCGc/VtTU3RhsIdLfKatHfOueFc2UoVLWxw5i9PT6B9pVbVzwmKb0kSfjMnIMW0uCvIFyQxLOqEaeR2U6N8bfe/voLiKCq462Bwz6HhYl6oAU1tvgJ6ieUeOWEN5mhqeSj3dL3pwgoWPfjfjOesIPkxQ/ISCN52g1CsEyQcEBDIfFsEurlX4B/qASzvGJRJ6D7ZmjuQ+j6Wc4zsWzR0NJ65WvlStObEvOdGPdldj530UyX4ooQJIaYMzzvnWMbDN/FlQQ5jZCZciLUV297Co03/IfmInY5bYUl5kt7yFnYLTz1/hG5LGmb5gI8sP7vnCIcHcm1og2NKc0Pgkx1CoNb8Q4kpg4XQZPblYY4AknkiuGqtcBFhXSzOF4LJM5wZgXZ3OUE0TEvjlzJIYWve+vQJO2v4dzTicYRVkqTPnxWLjCltPZ+y0DBrgCKQqBtUh5zjhfzBPESwGTu54+0p6GJPw2+Q3CztfzvLX2IyUO2GbSPlZUObIihZ4gjI0fGtv/kpIBfvY9sIuNPYLHZk+1k/mHrNr9NAKNK6Rqf/FxdR8wNX17GRg4fKgPWkdo8UnO1/+WZw41yuWrLVclN2bUZEgIaCb9TpNcp9K+LVNm+8Rox6svrlx0IAqvrLndgKhXM/S2OqhPf6jpWMm2yQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HUT8GRRf6JH7/PU9wNTSMDySoOqmfK7EMDZn+grK4bhpmrbvld5DfFpoVNQwP2e/GEZ3v+zOjOrEJFAngwVvgaApTsLF9qzxpWtIxgLd3sRkXkIiadDjRCBdvEk5e1DkIRVG0ECKk1XUFPjHki0Yslb1Mg5CTSk5mfu3o1OdZwCbUjZ5T0tFa1CufgPVZLao8FYxgq+amjy9Zju64b2ehDuHqgkqJly6vqoEjRNDpWMbix7jzSVc/Lofs1d9rH01Ku2IG/Jvz2ZRoZZodr02Y9SPRAOAOPJAJtwwexKaHhrX/EGY5Ac4yV06eV7eY+evBzgQEw35RFqv9aB97mj/Nce5blIzqvaE/S8xYutBH9YpgDoYrAeWH6D8rAJER0OP00ZVqnH5syRnt506ohzQRTBJvExlWQuiQETwhaPBowiLs19aAt3v8bzKIriLs/yODJRnTR6Cv9Q2sJ10qWzNGcKvulWKgnh4Yu7RHRrqofObUDhNvkpVfmX1HA+oKEo3go673fbdYs8Y62HtEauX1X1OOPi0g8wyxoQQZ5rmvhASV8JVCA5Dbd3vJovt0v+I2Izj2m7LKR78ETLg/9DYKjtsPFotVnpuCt4YJEOSdXBTDX/xkqLHv1CmXEcyP5W0WK/girXvUIyLgcr6rixW6nfhKj9l4psS0S/z9znnwqkqnziJywbvXtbL3TsndkGsc3VrVXTboc4ojsp2+3meWOmRB39uywyFwyQsiLMdLYpOa7JlXHYYMiYMLg9A+eEnOsDaTDBN9pFx4LDtq5EUPxj6kc4DHo/zTHyyMFFGc4VlkJKv1PMUrANCkVufW5VkUx5F4n0dDR1fuMNfqbUlfGA9icGk+aoTXibmj4h5f9C3/y7229PMnA6z/CYMGR7Z/JdtEDBmqe0/tAVG2er4PeG3gIQsPAbAHlwWGmbJqC8GWKkmYtUd8s/Li588t9P7c47VqqgouoqzbfatcYoeSiqTpyp5XxBb5vHenQOl8EDh5wyFkfQd60+fErCnt2vPm73l+3aB0tjHy90hXrWPaSzD/zLBEUgNogUrRiTeHM1bkiX72lQS88uOcsybmS0CzFTljCaWysDhCUIDM31mwS9Pd4nfaayfqkFAN+DSNFLbfy6K9hLwdcWvZ1XiDOmWpUvLOPbjGG6GeuoLI3rNQWOcep7DfBE1EVy06W/t6sCKGFfHYZQYwBo5nOqnPTKr7+AjeNcFkzdaSs67IKBD4TYyrwrZEfNzV052vLsTZwM9IwvRTwTVWRAY5KWxiqsbS5D9H85xWb4E4xyAC10f2Ns2/mDznEGb52vQi9GeWoM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2c4d91e-4288-4830-2499-08da99b44e2d 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:11.3282 (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 06/17] avcodec/dfpwmdec: Remove always-false check 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: tI7Xo73Qqn8X This decoder does not have the AV_CODEC_CAP_CHANNEL_CONF set, so that number of channels has to be set by the user before avcodec_open2(). Signed-off-by: Andreas Rheinhardt --- libavcodec/dfpwmdec.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/dfpwmdec.c b/libavcodec/dfpwmdec.c index 532a955b4c..4ddb806561 100644 --- a/libavcodec/dfpwmdec.c +++ b/libavcodec/dfpwmdec.c @@ -85,11 +85,6 @@ static av_cold int dfpwm_dec_init(struct AVCodecContext *ctx) { DFPWMState *state = ctx->priv_data; - if (ctx->ch_layout.nb_channels <= 0) { - av_log(ctx, AV_LOG_ERROR, "Invalid number of channels\n"); - return AVERROR(EINVAL); - } - state->fq = 0; state->q = 0; state->s = 0; From patchwork Sun Sep 18 20:27:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38025 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858667pzh; Sun, 18 Sep 2022 13:28:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4TlaRWIkY2oHIsNX1apoVtymPyQmWw4OQ450uqtui8TnWuey2SrT9M5VIbIKIm8pRRG5It X-Received: by 2002:a17:906:8477:b0:77d:185a:b443 with SMTP id hx23-20020a170906847700b0077d185ab443mr10448827ejc.311.1663532929491; Sun, 18 Sep 2022 13:28:49 -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 dy8-20020a05640231e800b0044efcaeec2asi7352712edb.167.2022.09.18.13.28.49; Sun, 18 Sep 2022 13:28:49 -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=XymBBPm6; 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 2124A68BC13; Sun, 18 Sep 2022 23:28:26 +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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8827468BBE7 for ; Sun, 18 Sep 2022 23:28:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MTkL19Tb4HaEsZ5SxlBr4zFT3aaXD+d6idr2/mYDtXpnmgJRe2LVPSE3K2/GjlaMrhK8fngaLzzcPFVGpO2oKoi1ZzZ4Azpb8PnGk6U5bgZiY4330RJDe2sdzuzXLCP9DBxAg1IvDLMDGiMIlumqkpvjBvGhPhzk7KNyM2FmtA8aPB9uequx/tu3VK26tkU4siO9RYFGMpLqt62YudjQPnuUxUbFVIADbgLhPe/5prRKdQa0jP25zRuICUcWgM6lyz+UeGG1ub3EJlKpcIXraVTYM/H4AZaxeUik/tADC9VhUkvIt0SLKyEHs3GrbyeBRXx5R1UQvlCJRXcXZdSeLw== 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=WOhoRJqQ4bwB7/EF3r/61v5Z/ckp2Mfd/QiKCaJIzFw=; b=aYKuMjpm+wVIh8cf5hy2+SgTUu/WqkvKGU9/GDgZ3e0gvLLyHcruJHYi5csL5g64UYY7uiDcgNU1jOnouybGpeoPUPTbETc3x9IuRtMWHQoKdFvYYWMr3RYg+ZanNuYtMl68+PV1+bfzdxLaexU1OiZ3lq5G/V3o1I4RGxXtljAyFLuqoS3DcFnWFV3Ykl7SZjyYo3Hlh8Jj6s6G/gvW/aU9iCe9daEEJKhqgaM//KBuWF1TsfqJe1ga91lWD4L+xb4FkjswaasXME1lm4gPRrxh1KxCy4m96qYt+kFKeTQayNnIlKml6hKPyKZ1pWofpXf4JZ7h73xj6RJNprTRxg== 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=WOhoRJqQ4bwB7/EF3r/61v5Z/ckp2Mfd/QiKCaJIzFw=; b=XymBBPm6p9f0zUtxuyvEYWWGAKiENovwG3vcczQNQ/v65P6Txiaq7JiOay8uBpUYPFqkteDBHUfN+unp5phTK0Tf9tGrhR75Ixque5NfSOuF3zfMRAnlSSuLn51Xj8ep1bmOO7siIfSKy0OJWhYxJ+p25nrblKYIwg6U225cUeLBHWzz2/nU52WrZ6j0hmO4coiQZgoy3dF1xXq5ZFvy8MfNe6sNwSJVRtfUMmsT2LdqAUxkxiOFdJAaSQ9DWXlnrEvSCG8d8OLQhv1bhilUKxkzg3Fsf2xNIXHRyzkWmYaaUX64pdRN3WYfpHpKOFPAPL5Urtn0fHLbUUKYyw4yng== 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [laj04nEXHxufQD6z0Ryu5lOYFWw+Y0LAXox3Eyz4dnM=] 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-6-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: d39fc9b1-604f-4b20-16a5-08da99b44f0b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN51Hv4pIqAxB5EfRGPEU+x3swCBC7LexFnG2WvC8gwYqqySgH+RCPhXkVmgGm7v4eCNlF6J1ENA0L5dSEAn1DKQgliXJjAcED8/5m4/newX+E7/jAWGFGWUMLr8TnnTu2F9KZH0O8MGuX0vUiFjpnsQu2XFgp78RI9atiGxXPJVkUCgqVBMi9KmPtEv7AwxOG7Z0YRb8aEc6CFeUWJHulV1u5Yd3ux/YfQ+dKfiBhXngvg57PwxUcwGYrhCzP0fMAfSEaagZHGrV801PClrn3a3tCTB032qqK84+uE81JcRkxv9m21by2DjBryE0deSolQrrUpNLHLedGnbr+XG4GUu0EYXLoafjAJMnAgiWxxvggklt4Exg1vp5ryPPBcXxWqZhVrygzdJDOSeMdv9spH9uUkSl0cg8dGqhXMAyOnk+OzuqJU8XIKV1/l/SmS/ICukPpGhjDmRmK9YcVteL9mCNaWRwI5BlhE1kv/CnWRrR5l3kpS0RPI+ZlSrOot4IXk6+qEGdQY/P5/VblErbS2TAkipG53XB5hkb1R5P5wQsKUKSjoW5zbQ1yVpb/4QVtxpEBE/qnQfbtHaZR3Zqf93IADhI74lcHVKazwejHedhWUgX0x0ZZ0Jl+l30bmJr5qmMet/DRAUjDKknxeb7syKoGqgvVQg+LY7lde9ueHrqmPQNZoc9EQClZEsCUytoqq6hDXIieGVk8Y4wWcjmsI2XQuzQDy/61W710+CgtyjHEY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hsm7Hg4gx+qx41teTBvukyeqVLzq/9jTpk/mUqX2NGqEZZUiFaVb4tAh3yiP2/p9ox/uSJNWqPZFTjqHpH1Rz1sJ3jf8etcKffi1nnFOSJUODNUP8782ScQZnQ4BRZJLM5BDng3meuZ1z7BHgveX9DGdpSKGeBksn/pL19/Rjxjxn1vmZ+MijeWPCr70ANPbF4vEscsQzaiCKVYJjjg9yDR4RXG84uCwFuD8cNKx59mjiFQ/zwu3RUqzeFGa0E1l5AaBjJ+meB2n801rFJLvoTpJ0hsXPrYVSwHp3vaT9noA34jAYBm1Jsa9+HbE7TK6yja7djvPw5hJAwbjCjOaM5qi1BiY2d6CeojA4f+zO73/Mu6guDhD/SWNZbUBHzoorePLlGvKHVfInWIL1/VvT6u14z0SDemE4u/EAFuWWiTSbx2O56qubi8i8NvPFP5cK92fMr9rW98JvXUoYzXITp3w70T1a9YlmahhvcxIqkxoD6zIdk289kYbw3MxkXPurC8oHARuAVzm2kxMBWI9EirZuAo4wx4dV1OCIc8f7IpCmzQNZSIvopaX9wDGcgjyW4EhYDtpTBydr5hiDOxZI701Jw7c2hWsT1WtV4nQdSf0zdpY7KAW2wiZJ0bia/CisD9KIsEW0Hyqy6LC4OjDpA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h5pwBJFXOWqP8q2M8Cn35Y/pxd2d2CBTDj5w0DzZ+L7dSDCuXV6pwr97xFQSy7KSOB6ZTPTnrbjG4A0/kh+dl1TnPkeNGhnitE3q1N4/duFaogh+WWpaW7a7nXHBlz0k78OmLXylLfTONK2yjmPmTvAOyt0kitoVo+x1czyJX9j7CiGaZ+tIfXBTM8wwl7BTlhqM2MswshvKnXjvOWdixZDsLXwlx07LutFfHwO3LpPKtDyFnlV8hrEi5/7tsKZuOelFhSHP3w2NtC6IagCgpBh1Cn8gZ63SagIxqFhSOmWvxCaDCPspR7mCGAo0PFeWel9t6e8n1+r+cirSmmRJcER6LNX24bDYAfc6r1hrAhIhUtQgDqYCPDHE5PCkp9gXRb0iBruusv3G1DGz6StSgFANz1XfvjleYYF9tvGl2/6NAJ9dG5hMla1QfbrBwo1I4xq3Z11MZou5Dldewm1kgBPz2qTHVtVaYesakt5O1hDUGczLpT1Vyu8UokhhvJL2CG24FZAjGS2hq/VBDi0schuX7SXVEMUJTRHY2fBkY/l/IhY7WOQ9VpRvB4828y+2Dx34qwd6bvY+oUNBRppRXTWXgAQlPnfawLl+CZJwRrLmsCp8eF26cyYC3vm5h/WyOCnnrgjhtuDHnb/ASLYc0I83k9Ko312+ZPWjHrvHChmxaKWpyFyWSHbBe6k1QociUCPTioVjk5TNTPDEDbukmXkiTIMKBxVple1+XbJVrMUpO71EIwmho/VfGFrCh2iXE0CXG+iY37i9XoFf1GsQsn4d/jmlnbiKAAm+sluTNGSERALsedy+OjiWjfxOzG0OxX+WknOdPZDQ+I8ICFX+7oc4C71Eo1r3fD+78l60drQUJexgRvOJ5zLjBP3j0FbcR9BZ3x+Jl2KUkgiN38rFi10FnUkp+N/QcxOIXaznXC0zyxlHmGko5ojDy7r2mY1Olp2ocoOhS0I7/XTgSyPG5yX/sDlfpI9mb0ElnUICQ0MNZhebGqGDk2IjtjuInTzrRQYrsoMqBt8OYaFU8unSk2M+zQbgfVRREqt3CYGD1sJVWBP/haQUmXn3WgwGVla6cgz6Rxp2suvQPPVVLOlHnAIERZTRdbJpXSYTZ/n8alOLBq6E/WXAfwaAH/GxkdIcAJWB+DUF+3l4XqtcIpptGtZsJxOG1c2kW0tMnquszX53K3JyK+ie5TMQ6MPZob06CICrIocdOCg1RZOnSaQE/ni4hm4Pl7Jm4cB7HDuKvv0xQSmtA+4UdsaJ8FFxFGnva/98oD/WCO1zO+ohI6XIwcJOAWwuRj4g6IXMbetrzXQ= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d39fc9b1-604f-4b20-16a5-08da99b44f0b 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:12.7823 (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 07/17] avcodec/pcm-blurayenc: Don't presume every channel layout to be native 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: PTB1JuPZ94vf The pcm_bluray encoder has AVCodec.ch_layouts set, so that ff_encode_preinit() checks that the channel layout in use is equivalent to one of the layouts from AVCodec.ch_layouts. Yet equivalent is not the same as identical; in particular, custom layouts equivalent to native layouts are possible (and necessary if one wants to use the name/opaque fields with an ordinary channel layout), so one must not simply use AVChannelLayout.u.mask. Use av_channel_layout_subset() instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/pcm-blurayenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pcm-blurayenc.c b/libavcodec/pcm-blurayenc.c index 1f1a3a27d8..03ed88b8ae 100644 --- a/libavcodec/pcm-blurayenc.c +++ b/libavcodec/pcm-blurayenc.c @@ -63,7 +63,7 @@ static av_cold int pcm_bluray_encode_init(AVCodecContext *avctx) return AVERROR_BUG; } - switch (avctx->ch_layout.u.mask) { + switch (av_channel_layout_subset(&avctx->ch_layout, ~(uint64_t)0)) { case AV_CH_LAYOUT_MONO: ch_layout = 1; break; From patchwork Sun Sep 18 20:27:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858709pzh; Sun, 18 Sep 2022 13:28:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+COFOXNwunNVmIgy17UyJ2tArIvFFGnxlgF4+8R2RCVbv/OvW0pKWx0Qk9ajsqOsqrxpY X-Received: by 2002:a05:6402:4305:b0:451:7b78:f2e0 with SMTP id m5-20020a056402430500b004517b78f2e0mr13263898edc.342.1663532938479; Sun, 18 Sep 2022 13:28:58 -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 l27-20020a50d6db000000b00446f6e9c6cesi7605411edj.351.2022.09.18.13.28.57; Sun, 18 Sep 2022 13:28:58 -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=LrSJDtME; 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 29D2468BBEE; Sun, 18 Sep 2022 23:28:27 +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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7FB368BBD5 for ; Sun, 18 Sep 2022 23:28:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dlaZMF90EkcIaoI2uBuIPa70pRI0lZ2iL8r/1zzXlC6yRNVrk06BeK4erB5Vpjn57Da/2EVHSZWZlD6EHgiViC0NQ8PZDimYmyorVT8kHUdJRWdeNZM0KakJHSbNRDFZ/IburzXaPLtwHHlzPKqQCAWiWH+9mMFXHou2dbGdY+/cjV0MJdsIwiAK3PQIHFGjzp6nzQjBdrb0p7zMLh+pqZcHF2/XB8u44GUj51zW+mQ+wv3vO592LiqVV3RbjmEC0aR9iMY3R1gSPY+5rXPGZWLxvn0ORHK2qJoxCDc5+eOP3TqiwlpJQ1EIlW61Mv+utyZ2cQXQIOMbkrjQN+aEHA== 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=XqeBBGl9hkjPnY63TA9OrdtFmh8w3PEcryZ6Pw4w/V8=; b=WOcxhSdqJoCPyR8sHEEl+/zcrTO7/vsDZPERl3BPjdLjFDXb7DpdMcCN+KjlkhUvyen1BTo3STvIMIjmzk5SyevLF0eaLPK+TVSvyRMuMSnLP52Ts0X0NZ0poxqU9xly0qE5OTzzi9GDbCA0IzcwBVnzpoddg7uGG+o+2tfjQ8YsmKf71vvKK7R/7n17M8PAvhVUvpGDrUJ5QnxffhuE82W79lW/9D7HCbGWPjlCqY3ijpVYzMvJzQwQxvXlwIXMeoebAr+VEooYeCg8hr5Knvx0jwhoL1KljAEs8HeG/LeH095Tmvk4z6iJKN4QczeliSU9xzDs9YQ5tz5HN9ViwQ== 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=XqeBBGl9hkjPnY63TA9OrdtFmh8w3PEcryZ6Pw4w/V8=; b=LrSJDtME7ElyAxW29Xd+bCmKisELrMpsZ4WUKzdHKpWIXLkKHIxgTzokkb33KTauhKog4Iro5ffCRaMKlr3SMREV5wAmpZupfeR1GU6XEt9nSltqrqHJVF+wbu+wDSrC6KQslahdtAvQL2NZ1kjGtv+8bmLAhZTF58SP+GvJhMPq3qfu8FX/377oGcA111dfbuDcXdGCBOxpqijE5reJqUfh4yjOvvzDA/OCAHAdP1KdkfG9+xr6giDNQB4U21z7lW/K7B1VTpPfy4OsVLIUzqk9kuoPx2OlF/G2fVifz/scvychOWv2+1RrZfIML9jpKw8Hwbccymv2WYeFIifQFA== 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:14 +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:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [RmnSncfw+ig+/izN/SqwUtjpVsE+bcm6sIUqEQaQCio=] 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-7-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: 14b9de1c-658e-4056-8421-08da99b44fd3 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxCM1OeU4RWKrdQhmMVsaYvdF/ozw2UQMeWp0drotB2snYp47qoNOX0MFzzzM6lx8++uGrj4kZAeoh56s/2WJHSTTRs3PSA2v6X64mEOrXMDLy3cP6ehK1eRIWO7oG/ly/Ug/e6unDWuLp9dYTf0MIrYNUG7WaXtMIpOOutYjoC0KvCuogbADW8IoQ1rU/N/An+GLgZX8oCmKrXlkZkV+YgKnO1jgzkOzekbWbcEUwslnP+LbkreWomdvlC6y0aHfeeLbRcbGemQIr5z2pvbFxdETiHC0WY1NKf8mi0lt2DB/698dNZRZXZSlyeD3o4mwTsKpJe/Q8ti/BYGksszYIyVD6fUOi/YaVmZujhbW29AN9ll1hi/p2kC3ef8PnigISGriFrFIwlhaxYqlzPGc7/dp+qcf8yHCX8ms09A8eDKEm6G4/uAXZ6RfGd9/E6yPR2uq94sJB88r1f+35YGiKcbuO9Zgzop9C5nqV3MJl9px3Npi8jFjvGz5JpHKtNrvaX7zHsW79uGM3rcUKu2EvopF8g/sL10LbWecGFHJYY/X6JTmcPbglbuRZWNPfeUKEK4iIzw7oZrGED+/NClFEQxv2lQzm5sqYqW5pbYxxYaXb3tR6Pplty1HswpYG7sPsIUnFWOXEUKH+dTfg8XV/aW8KSC3Tb6Vxeq+4Uy5el79M1hd8DV9ZPxm2zuYr0la3ZGNzhNcM0TYBdvq3TSpVBYAS0SReprdI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rp2r4/Vy8P/lUwWf/AfG7k/jfYEZg6UFqbnZObXnaj4LQ7KgEtsp5+eOExpmOFnbej/65hqC5Gn6qRB5VQnEeJYzgZqdlxzrW0aJbbeFAHPe2R0Z6s7Fx4PC4GSNmnvIK0NdecwNg8t4qUQ4R18GntPrMAcASOit+viRJy2PvD2WsqNNfagQ8VKcVsInZM5V7ku8KXXNLvKP/WjM+q4GDyCnBg/vxE33wQqtgi6jFV9KaHaAdPXbwK8H7rjyp6cUvsagyHqJ1m5r3AGixLbjbR7vYdzrx7hQALp5BZCBnL6EryngRXhe6qt2dB5m6eKAXzPgv1uFjujSn3aZaX4g2+5sJL+BmeDcUoCutw/7f7Sxajh4B+3jKd/r0IJcmhZw6ve9x6Mk++d4CbRA7l9bbUOYD3YHmSXcU+Qh2+3LS82UjSpODsxunwY1/TTRRbZ2SpiuMi+xTGzlUDYkDgKfTtEtlOrZ/4Y/0YbF9l2O/EUVc2RyYAxsCKHHqjvXvtWU4jVC9RFWKwVcckp14EOJH1QyzgLeBtU/7w31JPJZqdRGR7BRxzSbJilJE86UxnIrOp4O9LEacDy07tdgzXvNVyjl51u51ZTMSza55jNSkrcf3cZyN5Mo5wc0rAqkOyP3ISXRETvF4DdT0tLlDW3Y4g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: T8wDX9dr3S3zQ/AUm/IaXEyWrwZ74SCk67jQaSKSONF0iar58TXB6vXPSJiB2ijkFpj486uCc+2Xjn8kYLnhxDQvWYDKNebtBN2R4DRDi1zBuv5ilHLwK+X00JSaP5XLVYgA0zpeBhc+42quyOPtDC2YbeBSGdW9o8CFjzbcPQjJ7T1U6Wdadsn5umcOD/hW4h4hJC72W/PfLrB0Ztf4Ap8u+bcs1k7wtFYlE6ac4sdO4AZ4ejiHMByMBhp03VADdkG+cWkSam2BHLtKLNeex3RH7oq2ZWGJAd89R4CRAxiE6pmKsuGDGSUGUsWiBg6df8QJlcJCiAGakphqKk69QTe0AodH5yEHin5GM6Slp9R0mNthS03g2iCykUXQ7WJQv1NH69eaP19gB0PuiS5rydKGIrKiDjVAQDzNDqgcAGOjaEYCreczRG9alzDylMqahmU0yS4y62Z7C0Mdj5+Sj9ZBuVsnB3A9tAOpqXL1e9n6710zETu5dzczMy+9JNJr61YLGPYh5ZPa59ZB/oCmsmTiaFCPvm/tntJ3bQgIEYyKVxfpnjm4jG4I74h39dDZtipu2iEi9JZ/MIUG4mLcpxup7lut5NQuxp9ZfE4WY2xeTSXelw4EFwYU4hzX5lOBdKFCGsgVd+4yN7UJSM+KgsbaWZr3Eb5owniXWePaDbNlYMJjKnvGXlT7JqV2PwB0ea39Lk0Mp3UzH/ncYPq4qy6lPkzwxxuxAxymPf/wHxuFnpHGMLL+FCqUcbWPt2Jg9ThNi/Eh8+RLZbvu5r9FF2Xft7+sIKwiO3x6rxGPrH3QGch8klXYG4END9qy8LhNB4G50OIhZPOLKRoOxN+xUzmfXpb+SVZIgJ9cIpAhxHVcqkyEy+CPxFYj9CYv47xVJ6SD9uBMIr9+tEB1S4TS3JMPlg2qnvkrAYN9Qvu+ASo6kjQZeFo0w130QGZY6GPube1ih65grH30kO2UGp9Sfk0LBm5uGkR+8rkppApdjYLJTZTeU0YyFR5RFXukw2qf+ZH/HnRXqcdAaJtD17P05NqHdyhLiapPGHBKH3KvzjA+ajbVMlB225ayVOtsEm8Wjw+xPFdOduhO4z5+LWV2drOteXWK4+3ZvovX1C/ATSkslJj0w5CQEUIU2Nih49mOwZqy3FuIr1A1MgxAl+pfVwOTUlB0i47jflg7u0qZOeFecnoAEKoK0N/pu0FZN2IUnS25cEI+0ENQklP60nO74Iq2XyOoAf+niQrCzzHcT1szctNzODG1f0BsiWWbeDJ4g+3RqIxyAP2xtYolsYqIldP0S5xObMB41JvOsxtGkR4= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14b9de1c-658e-4056-8421-08da99b44fd3 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:14.1114 (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 08/17] avcodec/pcm: Remove always-false check 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: mTf0WByy4lQQ None of the decoders here have the AV_CODEC_CAP_CHANNEL_CONF set, so that it is already checked generically that the number of channels is positive. Signed-off-by: Andreas Rheinhardt --- libavcodec/pcm.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index fcb8ae1c2c..ee36a364c8 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -254,11 +254,6 @@ static av_cold int pcm_decode_init(AVCodecContext *avctx) AVFloatDSPContext *fdsp; int i; - if (avctx->ch_layout.nb_channels <= 0) { - av_log(avctx, AV_LOG_ERROR, "PCM channels out of bounds\n"); - return AVERROR(EINVAL); - } - switch (avctx->codec_id) { case AV_CODEC_ID_PCM_ALAW: for (i = 0; i < 256; i++) From patchwork Sun Sep 18 20:27:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38027 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858740pzh; Sun, 18 Sep 2022 13:29:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6SP9awUIc0ll9ZE84I0s14MONCoNsAaYD10gc/ctPrYpOUP7PHyKWo69degdX97Npo6aD9 X-Received: by 2002:a17:906:9b8a:b0:780:da07:9df5 with SMTP id dd10-20020a1709069b8a00b00780da079df5mr6345741ejc.273.1663532946953; Sun, 18 Sep 2022 13:29:06 -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 v6-20020a056402348600b00450c1de6234si9296475edc.587.2022.09.18.13.29.06; Sun, 18 Sep 2022 13:29:06 -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=mxo3tBdg; 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 56C6668BC2C; Sun, 18 Sep 2022 23:28:28 +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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C942B68BBED for ; Sun, 18 Sep 2022 23:28:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mMOyzU+Sz/CsHYULNJ/Snk8uFJco61k7NPys5aIc25Rg/My6p8GVKiDhs22hPjpHFU94iJQbXS3rwkHGiqLkaiY09Y5J6DgjsqktNJ+Ad3VBid8VbfoAD6/J6S2jOxutd6gq5FQmbnc1P2ssA2zB7YX4STou2kGF2h9ByLNko4/8AH0pV8qwvIQ55g2dTko/vVZHbRGJv1JcbT9DmmALYt2VuChBBDkKwnXMp7jF8rJ3gvK3pX6ZYIq3eDK4XppvfNZdN4mFDIQtvkZNIqawMXgEPIg8St/g23WlGcqCYWRaiHuknlqXDtttJz6/Mqm25oWBmRVC2xP3yO9WzdZuhg== 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=2JcNwSYulWoCkaP+Gr/8ywVVs7bm3tX/jMkyXkuad+o=; b=iR2SOIU3UaCRFEbePFXn1YGWHfSXDTy7nsOPP4c2BBquZTggul0SUp9HEpWDE5DB3rcbmR7DUBS1BOmB4zBXoAbVzWgzPliYbm55wlGdCN8EAN6tBtyZ32ZVz+o1fZWii28SA/sLuVDgmhPz6555c9AiBIGIV8adb7eD238OJSm6Nd1dB0zB2Lm+YYRD37rC0aisMfIwaZc6JPecYHWIrlBWGaVw4/5AuSgX349OnF1HOsFf05/5QQIHdHfF78EkEJVIv3zxTAj7qoGFETuEZ7oypr/SnCsqDOVObTIm8jjelR5R7TAX6JuQLSIppnFYCfLluDgKCaICXa1gDgMBWg== 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=2JcNwSYulWoCkaP+Gr/8ywVVs7bm3tX/jMkyXkuad+o=; b=mxo3tBdgdUxlOmoU7XlrfQ2AJZJJYoL3znWXCq7Tt7IeJ7Z73IA0kHGPZJLdYTY76t83Sv34qgArZB/DL0jYxRE0NMzjM4SKmErSlrTSPDSweeXS/OaszvOLRJz3j5yJEtOsvhenxHzn238swTx71E622qrZn4gPfbGOY4YR83W7//SmI3TnKYfpmhp0JIiZjJLisiBG8Ni3JeSO2s5db1iR6r28ti8jYCgREr7fGGoy28uZA0xfQWiCuMXBJVTPMR/LplitlwyuyFMf2fJXKuQ+OrAUrkLBlwa8EX5pdhF3RqzqJmKXmgxf5OCTgHZYrcOxo4AHopLKJ5teZ79E1A== 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:15 +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:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:49 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [x1LFfBkLcgeKMBHWTonjR9plNvitxei0XmTug+4VDCE=] 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-8-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: f9454a86-f962-48c3-a2f9-08da99b4508d X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxCM1OeU4RWKrdQhmMVsaYv1NInnUVkNOkDwUfkH7Es9EifyyI16wznzLDzBMLGIFO9apXf9jHFMxTLrysIc2+sY2AVUwbyZzi4t/6X41PbAzUDPyVrmEsmXdVD+OyY8jBxpz2vpLxycrKRUQn1uZsFaxDlQA6/xsRnZOwDpjwdxmEsuQOAD3ZTNB8oDd0ygiS6+mRwIWRgqJ3/pYgJ69bkhnPqyqLsQk4UzuvGOiCWu5k9DoifUqYzIxyo5e1Z4trUoA85ucm8YO2blvuUrwG6UBrxtit1diAxGIluTsVJgaoHQ2epIGg4o6f8TqBwDxNmPRSJbodsltyKjj3D5xcZ16Z8pYvpk7mYuzZ5u9HMSduSOzLEUS55wgV9ZrRgXkJBrONuKRVPHgGQoCv14ydq2U/Sk5CqzHVZ/RI3iEqq5FMCEjlewOpsWaOb1iNeEmSeVOa+YXTJkjxbknCNUiAASesCRHxPO/4wNKSXfFoGKgbeJZriDXxFOcjTU4zPwcwmYwn4yIOjLJ8RCsNku6pxDnuUjNyRPod4W4klwrtgSgjZg5x2KO1X16xHpfcaOQUksGPIng8U5o8LJemZyPUnC9qCTFinC+IlTsl3MJ1+LO44gCDUPFppNPlTRiMlIMC7VotjF+5GStW5f19fhoGV90LVc+GymGK9g1txXrkKOBl/Z1/+NViCBFRPEO2zx2+8SfVjiAHTfHpeCDkUwdPD8yTFZ5k8M50= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hsTq+IgZV6Z/kBSBXaPoVi4zr9uQEtcM/lbHNPgLftnmo1a7P5CJwhPQruPAf37tlxuVWcZsykw44KA42auLDvClqxuKhPwKPhGA1YfSLLDEV9V3UhwiXJWKM023xHi7zaeOsooKC51xUBZCFeeq4AJb697aaNW8uPARcQuTQpqBzEMH7peuKjP9//X3MxLwp39vUa/+G5tqb9Oh6m5wAbtiFZY+CzSEXT0hisJfLKkkoBknGDoC6ruaJajxF2NC0N0HWDan9iNgbLqcpbP+SDYhl8iZ73W1PqEQjHypEZruN5ZHoRKhz0JyNhVILJHh2F2Cr3RiRxdkgC3xa+kN34dgWTtsAPerkt7+FICbyWWZZzc7fzVU7NEH0NgBOJ8clUtN7Gj3VKTh1xYGCxcD94ZSnU2fqGX1bofTmUaYKV6qZz9wKHarAqbdbmbbH9jGvuLwRaPh5pdixP56UeWBGrfcTtdN5EoTyt6Id+zl6w8paBpxsMxHtGVHii0QK9RyLaFIhIa+mNi/jtII5a2+phe3WC8f5wwOnpEYtbRmDz+eGuYGyk4bbU3me7fkf8llRsdV+e498nacvoCGreb2F+EWXmcg1LVnyExsNO0pnlSQmNPDAW5SdfA6WIt5Y7IYbn5SsflXjpWIpfXltYpV9Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: poYc6mFYXeinTr5m9pgo0w7ROiakSuB2mQJoLWARoknVfZP4MLiaZepsC4jgTyfyZ29UhhrIEXOTwoTigIXb31qqS2ilI2rBddSRXKUvLcKnHiSexq8kOsb3KFqiefrKVotvfnLClQxU9upeeQkklDQJBVBQOv4TQFAYvqGbK5fWo6/4TrpAXH3n5XurEkrIzr9mahnvKAgrvSHkBOdypGzYoq35Fah+7gqpX3tYl+lUw47z/bOyLoEkWWWIHPgBjpEHP9SZatuKJrBv1XyDysKqEjOq3dieIgE5vAlLXe5ZOE8rh2+NQaYHWOldMNRFDcFeOQDn8wUsgPSbWHGNfGNK7AOnDAfHvQRocMbOy9fkLuCcC+A3CtX/8Rn8VYCJnV/wg4+8rITQOoS+iDf4u9QgCaGPT3UtPfH+3D3XA+8CJdg6oHum8vNpw8NFR3oe+70T76smhKCLWeGf7YA06tWNEM+OiFbmO0gt8B2urlrbqsxDjtVCU2E0IOOZlsQY7E4Bz94fexTTaQ5drEjq3wUCFH7qQSHKp3u2l4kU2OW66DLbQwo7NPzkfem+5b/uVjHJm1oYuseXroaYMiCgEVBDuFme/mYaScKU9Q5h+bu0hKUrSsZSKssDFDE4+oGXejQmpMMo3TXGE2YRSWNFJU3/DqVaPq120DouNsu5nKZ01VEbwoMygRtqXvqMQ9OFQN/sjV1DLP6VtmH2auAUfhlHtuyI8DobLlpgcHB9RkiiKt1sTKExrfZEiqPNoDwtda+OLK+F7haGhlhU3bYmrPUps9lPlnIqFWRrJ9ufS5wdVKZ7CIufSyfUsIw47FNnvgsYkDJjI3AjjPC7AmkeB3R/zSdC5Rl0MmFa+Xh5gJWdP/Wdo4leVldGFdy0CnFcmo6upWM/0w+S6EhAhH9drh/4eaw/IGZc8uRKpEUW/SS3ksEiRDO+XPAA6ps0r8buAZemE2/u9q+gaZz0wAPES6EJxsw4PwM8IoLVx5dRKDvId34IMP4DE1Jnlze5CWTiAlXE4I+z0YE61EpKv+/p+ie3hdK1mFmiuHeA5D9Zeae0kb+lx/fxIdtARrnGHliEZfIXHp8WQ7yit2npn/dcGPcAdOEn17nMNetcYb74QWp3ysyaFtbQaqzF+t+cVH5J4lPFcVRsTMi9n3uDPlVkz+gwE1JJaPl2CpeElhiCq31Hfh83NB2fYfha8D48tmGG3xityMCvPUYilcXJgbMKtVO4WtR8jZ48pzpwZoqRJwY5cun+AQN8Lx2nPe5GDZaxlMrTK1U/YOy6n6phHpPC+RLzxViKFvNE2KYthWKDD7wK81mJByi85m0d2DRfJgsd X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9454a86-f962-48c3-a2f9-08da99b4508d 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:15.2999 (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 09/17] avcodec/libcodec2: Remove dead channel count check 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: bUf035gJjxwH This encoder has AVCodec.ch_layouts set, so that this is checked generically. Signed-off-by: Andreas Rheinhardt --- libavcodec/libcodec2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/libcodec2.c b/libavcodec/libcodec2.c index be9677ddeb..581ef04ce2 100644 --- a/libavcodec/libcodec2.c +++ b/libavcodec/libcodec2.c @@ -105,7 +105,6 @@ static av_cold int libcodec2_init_encoder(AVCodecContext *avctx) //will need to be smarter once we get wideband support if (avctx->sample_rate != 8000 || - avctx->ch_layout.nb_channels != 1 || avctx->sample_fmt != AV_SAMPLE_FMT_S16) { av_log(avctx, AV_LOG_ERROR, "only 8 kHz 16-bit mono allowed\n"); return AVERROR(EINVAL); From patchwork Sun Sep 18 20:27:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858787pzh; Sun, 18 Sep 2022 13:29:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7lQUZrevTFIM5SwrwUlJq3IzpkAlOJmtpmlA2TTP9QI3UXZrVPAzG+uFkWhZELvyRssFCN X-Received: by 2002:a05:6402:5106:b0:451:787c:9fcc with SMTP id m6-20020a056402510600b00451787c9fccmr12510806edd.164.1663532955735; Sun, 18 Sep 2022 13:29:15 -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 co3-20020a0564020c0300b0044e81c4dacasi6850200edb.474.2022.09.18.13.29.15; Sun, 18 Sep 2022 13:29:15 -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=Sykk5s4C; 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 75B3A68BBEF; Sun, 18 Sep 2022 23:28:29 +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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E508A68BBEF for ; Sun, 18 Sep 2022 23:28:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SzSTgKtm886grJ9riwGcaCrXS2KawzaDkDNZf3Wg/ZvFJSnsSw6JOInn1n+B/5YR0P7Fjp65GgeCLIuDiRBGx+21aVJc3a4gTz74h+5GQ530yU581klJ+iXkbjbuI053LNPjjcNVkANaUSvejQVkSIDGBNS6lmnkZuszIV8xy31zw8VYEIvAxFiTonMsNQ3UzHwbOEA1g3cakCkbRl3mUBekBbE9ABJ+seqeEKEw33E4O12gjO1hm1lIrd4/ErQJpJKMVUOfxSxufDv6vP2kSTJ3ozqJ465752JXOCR5A0ueC4IrSnWz7v6qHDzapUx/HKcd+zJisM5VpZKr4YeZlA== 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=FckgzHXuCkXPZINpDVhVQtnvdMtXnLlaxLgjrSI8ATY=; b=Dqx2JEXfipEMS1g1sePXr/adUA6LaS7kLBuXNP+czZ5UVbJfiOOh31vHsT4W6xkEuIhG0pUsQ7HsEoGUMfztm64xXWjVPVPg+hneSIxy+AKMdusGgQuTcEPimX0a4kPDNoGLWa4tGsO+DVW/EJG7sR+l8OWL5ny5YqqbVSmyEVg4/MeZK5RDURPu5JIs13s3qXdJ9ArNd8v3WJ5beOvdTX345nSv5Tb75xgsvVOzyYa7QjiYinSSn8pXatL1Dp6qG4tUh7R4BvD87kZuPw2UjVTnpDkTJuDNBqzTKQb6HD4ziGYgmVab6ZWAr+bKxy+P1KqgszgzOiDOd7Jaw+iUSA== 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=FckgzHXuCkXPZINpDVhVQtnvdMtXnLlaxLgjrSI8ATY=; b=Sykk5s4CIFmQhIII1lm13+BC2bbfQQmCbTVNhWD3sWJJas8MzuoRUOD8ORiDysjL3ESmf+6VV0XO4wDf5QN18JyCKopPwZZR/jnnDJFI5S4+freHgqD4COmOGemfuyX0LhtspC7dq2hRpIxtxVGBDZXSuutzTnxncEudAPEIf3fJMxKcihjuade4NjBYXckU0yXXue36K2+W6Bz+YOiizRGJRYpuRMJajiqBla17SqH7J9j2cETkE8p+n5GhfEHsuiVblbzarpXapT2Cp4Qa3GKS9YnUW/PSJxYnUKIBFC2E9apMcgQ9fs/rdbrz+x3JIIvD+3gvfEU1OYMaqOTAMw== 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:16 +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:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rQJRkB4EQWSDCklnlVFki+bHH+raIvC3Ib3mX9pTzI0=] 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-9-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: 827fafa2-6849-47b6-8b93-08da99b4514c X-MS-Exchange-SLBlob-MailProps: 4VtScROZs20lU4OelGykrtjemWOE3/91fYXiGgn6jVNqZuX/cbz5nEIThDIko+gRCwKep+tUxUEf2pWhQevoS/kk/2CfP2lvC61UT3Ol/h+y6CpaRChhoM/mm5sfVV3TcpOPC+rYRNGXZBuqluqoGKzidMZh1mSUfXbSv68ImF7YbyaRCXPXgb9glRpJiwvD2eDgg+o+euqak5wv0ym1YLTF1wBA9gfa5jdT5zg5v7nVhpi45DXw6m+xUXYk1bitV/ORMigBFGOYtYTbk0zDHV6tsGgbCc0yeOlJ46a5RmK2d3vtwwlApgwuFbXGJSwxhGqEkFsQLBmd6dZmYb/16Wa1DWelT1iv5NOCXk/Hy0qLHQ9hjJbpBpnBHfso/2VvcehDC4k2XWU25wapfgtqDf8kFYLzKdPZxQ+IX2A3ZoOoGJ3z9SIxm9V+BR9HgWSCnaEqIW6cjavoEXmxdgMOY4AY4NjNubrAitns3QOAkaJ3Y9LAb/jSbkr7KpGp0IpATRWHXx9/z6uilTWEL5yjo0W4w4JowSQ1FmLijN2gpJaDL6INlyKUA9m+44aky39eJwU5DPTwzewesrQSHP+kJM1QuGrZ8hcA/0OfsUDUodkfugmrNAjq0tH+Lrg+p42mjJ751sUi1CxpFX2FNCoBJr375aCKamQ6+IOPGFtPDQLATz59EOHhNQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lPwK4YlP945DCnzwFS2XB2Y18iM2BVziRMdgAKl8IJZ5E3FuVoTmeb2LmRqr4uUnFUrp0jrOtcSurBmbunSYcwJwiE9nOOwRfXnHBtwEmE6GHbaP85gmEUsjein6zHkJn8ylXU2e4ZTUscwqvF/Jf8tMreXaqd1L+/zjWDgELgs47MfHuE/iyTPqHOIiTjtNmHwzKcahDMThGafDDOCA0Dq/VJZTd/tZRFA4EZnf17lLeR+9+ftrJRI1VNMN684CsAf9VqUtEOvgSuK/LGLqpEVOGWwXiTE8MtTr8OOMvHqsFS2ELzAh1Ag4J73T5Ep0xitcaTlaQx1sqeVBd8uiPG/93g5DtMsOJwyB+39AT4V5sIf/A2E7hakw0atMKuG2h4oR1oGS1MqotHOaf/d7tzxxOi4qnO8I/bBmpQ+WEOBBmbMMKQjAGdPSS0ibTyFY2WQuJaqf1S4AOX1hQXomeug9uTW6RL3QUUIt5rFM2L/l3quzHEi03+s/9ghGG+dC8ljGf0Fu3+OIKS6Pn4Bu4TtO6RFmp659kNkAnzTD6aGwaG4PRmWclYxZraLoGzUTw72Awq0h0mstIPmgKa70tV8c632r7msGxI+e3ySYy+GslKrxv6bEjGm28OcwzOCIlGbPyojBYIqSNRfWmRYoig== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BgR9Q3Xb06n1t+SU+pTTWan5mqM1SbRTxxoWwXjCW4cyGobeV3IRmu5AjYf90CUoGu7mD7H6pK4/tatUmTVSiWyTQDctmTc7sY7Uq7Zt5ItYTB1fxBuUmCq8bgCSvwx89l/Ugz9LOssSFh9KRBEK8i4CjBwtQvIgCTW/sbz4v/SkqS+9+3cIgklQmbbrOhwfaZc+NBWXVCPg6wUGVSiikTSERsFkrSVeXumYrnGUolKSMRaABzXjGnabe+7V9+zZ8Iu8nuB3WhPJ+dBNBaG/3HtTb/hMc2ze4QYSpTiQH0WTIlL3FieOZ9ro/ynRaWkOR9o0fuomJAsLgA8LqpItwYAf6nd6fDBjvMB3G3FvIs3P8IRApm/b7Cf47MVGJ736ws+DqxSAe4WNSIgRQbXJIIy9ES86B7kuzttmwNZpklpqm4A4dvhww+wvMibbeaJ1vK6L7qbZjJOuO0vW7F6Y2yw6sdpHjf5x9Q7u1EmawSk0X+e0nb6ORBZgEcLJLiMNdf6//0zg1JnHBHScX4bGpiCHeuLNFSYiIJNDE1/jCOLbcssm85MfW6aQnBtGqae/91pUfq7bJxdCnZo6sTY7n3V8u1KbxnP4SenwX0IofuCPXZ/xCW70IY3eHep+w83QAfg5Ntr8kcYDnnmtQytN5XwdFOB+bisj2T70c6uFXGhiI1bh/sR0NNBHHuf6hG0l9NisND2c0FKqSxOk3tbZsXVNGlH+Prxdk6tPGq3dL2kmApvoBJHGekVUZ7PWXNso/O3fXZoVJrVY8bPQAwoB11BDKtlbaeyh5KecdcE+fGB5MQECSCGvOP6J9JbCxaQEixg5ZGlefdsU9YbpC0p075colheA7yL+0bJQi17gK23lpxn8W4yovepixgvC6oW1dCuKn8ib//X7DbfKvueF11hVc1xO5tkohqdZvGhsI2ai0jmWZZrHEulOHOC19o6/zsyHfiPvlVy2Pietx30SVM9YuKXJmUxNK8m5YtYylTg7VETL6HIPhZkJEioMx0ZibIE2OklduAigAqb13vdd58nXnr2PVl9CppceLCL6GZlVfzkSaqwCr0MfDYSH5bQOV5tCUgb6Rrm3wPuoHkiY5SDs6CLfBzx68lcmxaEdPDZDnnFFwctGdYN3YsGPI3nrbtgkVxhoBp6gTN5kxCYIhnRIIXo4BF2c3MkiWpcplPRQbR/hF1foD/MnPfYT0f0KnC9Ekptqsl/oPW+vspJVkDKoALFelNMmyZG4u+ohSPluM0ZHh5bb/dHL0u536tOmV1gixU83n0QBTbaKItlZq5tLDidsfZD2xcHkRSrGS47pdfoodEbiqsrndJchXyjA X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 827fafa2-6849-47b6-8b93-08da99b4514c 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:16.5511 (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 10/17] avcodec/libshine: Remove dead channel count check 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: +6znMIMtjLIe This encoder has AVCodec.ch_layouts set, so that this is checked generically. Signed-off-by: Andreas Rheinhardt --- libavcodec/libshine.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index 621c57816a..e266229f03 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -44,11 +44,6 @@ static av_cold int libshine_encode_init(AVCodecContext *avctx) { SHINEContext *s = avctx->priv_data; - if (avctx->ch_layout.nb_channels <= 0 || avctx->ch_layout.nb_channels > 2){ - av_log(avctx, AV_LOG_ERROR, "only mono or stereo is supported\n"); - return AVERROR(EINVAL); - } - shine_set_config_mpeg_defaults(&s->config.mpeg); if (avctx->bit_rate) s->config.mpeg.bitr = avctx->bit_rate / 1000; From patchwork Sun Sep 18 20:27:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858826pzh; Sun, 18 Sep 2022 13:29:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5LPrDW5ayTbb/TEIb0dDi5eM3gdXZq/EEl2nl4DE7camJT9JbmS1evCDJ7z0felqHbiCAe X-Received: by 2002:a17:907:7290:b0:77a:27ef:18d3 with SMTP id dt16-20020a170907729000b0077a27ef18d3mr10624448ejc.42.1663532964250; Sun, 18 Sep 2022 13:29:24 -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 d24-20020a50fb18000000b004513a465ec6si6966477edq.94.2022.09.18.13.29.24; Sun, 18 Sep 2022 13:29:24 -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=WqqZYsuF; 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 73F2C68BC3F; Sun, 18 Sep 2022 23:28:30 +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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E90768BBEF for ; Sun, 18 Sep 2022 23:28:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GQ7buTQKcJhNXm56QIcGLe4KmxUpPAWJvx/QELxomUv6Qyr72CFjkaBjnvtk/zzJHo/snwGliihNj1lvA3K8PLmCDgxUvR0x5Be6Cmo5vwwSD86wIul/jdeL4XBbTCuqRTyL4kAGHeoB+P/2/C2T5L3hc6gS2fdxlHuzSJcQGDilQu8HOtdW2S8EtuabFlmX0RANg0b5rKxmD29x9o6+jmiYpI/vqFA3B/PnSZed0lVO+QLTFnUcDTWLU25wTRcDoqmpY0FfKTcLsbpeWVNPnUFFIlLNUaWqjsOVCXy19qZVGMrcc1fRfM3KOxQWff8Ef7Od3iKwBJO3ha1F8ibhvQ== 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=Uf1hqmzdzC8C/kp9JoLpgHC69mpIDwZZwmlUtNs2748=; b=VFo9P4lCNXCsw3lvlJQgdJ/UyU7d8QQ8BprzarAHyetlmkpjoWEdBWKA8a5KsI5Nmhlz46ugW9zQTzZf317ahlgk7L+yc8nu/yk0KILax7TKB9x7d3sFS0FQlzuXS/0KuWCOL4MJ4m18YRpTzEcoZxg6e777XhrZ2PswRGlx+Ezg3TBhjPeCBK4ue9Qia/yxnJ4LMAcVn1+8S9RFORk6MP4GEBxf84/yuJFEoWc7RvfHfNknU5I7UwPuiCcBinq9zl7sBIWmYWl18yPRw8RLNPAQJnWx8W/5RZslaJAaHr9U+7jNEejqRBuQPB4quFX8fFFNxKfm7j2Qb441epf6XQ== 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=Uf1hqmzdzC8C/kp9JoLpgHC69mpIDwZZwmlUtNs2748=; b=WqqZYsuFcFruFEvtD+rOyAfSkMBABxa+RWeC3gn7sQE1kuNgFCT8arXYMKunliwmg9SmTtMEvjRW0GX814mCHkrZr00+1mAeUhqC7jVBWHJgvlGY18IW9cRt+Uh1pVY4OJZh/PJKouIwCGnQMakJ4flnTBA2Z3oPeIekJuO7wbs6ZXQKOmqjB+4xGqkrW5/UKilbids1gB51Z8b7XlWdFaS3/Zs0gjg9MDXxHzZPVupUkSImm5ti7NeY3XRgiHSOuGfaVIZPsOVElNRLfwDPEjM4xX9uueOKCLexSFsTybwej915SketSC1IT9TYldVr5U4nvDfpBdQGKuy/AhQo8g== 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:17 +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:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:51 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [z2QSWCobjZWQvG1o+wQLEbjUzrR+fr2fVPDdgGLT+H8=] 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-10-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: d6a6cd31-9c61-4608-fe82-08da99b4520d X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN51WtqHdXi8z0Hv9REyTU2avzB+e3YxZPchFGqUi2aCOnS14TdqJ6oWRIMXSIjoFleiKfrr3umKe2oZMjKzydo9U/O1xWGyKblIufxlBq7oaMGK6qL3VwGxaUbxF6fzCWFxrYc+poTmRnU9Ug5eJiD7MC0f/LvmHaGULzuY2tk6b0dODgczV79l8g285c5jtYU5TqBaBvxgAI+Ua7R0pTsC+fQpzC/DU+CXBvJhGbeSKOmWZou5/KvwBrP0h9zAOUd4ZKJU+jBPfuctVtaW6SNCJPkApYM8C5C+0U117hszlZxs0E4LUF9nQcBZ5wsL2EHJEosKjR/kLUsGzsAmEe6n6q6hROhGts0AL8i2Hut457jq67+GuSt8cVyUHBmOop3NLDirmWoZtyYqbdqLSPpyVSQbuGTRA2ofGqr6DvwsVedvkPue55Uu+aNW50xmfNUlE0K8hgXW8QGRp987/sv+w+BNRU1JWXmHXYeCTyiOaJDEsmSAVPqJAASRhTfWStyMj4h+yFnayAEAJkX31ZeTKyxR/NCyoD4nkbWixClCGJYtNU07ud0n9pKaqOPvJGqATZ2tI5+DYe/1JiyLdCtd5wMTOqz2lyT/bqTTEleGD1ql7Y8AFDea+4zKg0OH81Gos2RqjZCpjrqaXtkpaQ9gOSS1R21qphwsyBdnO80OaG7i5VVzOq0/VkMpXNu0BLfqw6KxQw22j/lqwLqZ8g+BuArk3X3V/1/tfXXWoa4bq0E= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jQJLBkxpDVl/BJtbmBzgpPw0cEuYH99nMOc9vST/NrSJe/2aJVIISSUjymLiX+2LNka8J8NAdI/p9X+sNsQO5zDbeDxgAlXnM9s+3rm97O8PFtCVVCiTkC6a6acoTkfH5QmU548FOWWYzoxXJXr+GtgGRWTy052SEDZLX7aMPXZA7aQYxpJVfqi6zDyme3Q4I/9iLAxYGCzxLbRsVaFhnQfOQz/wY35a4V92twy7Wt6/Jxy9i3CE8ocOjgEzgmebWIVmvy5qBAEPxPh1zYLr/ekdAeVOQISOLIbY9p7/GfBUU2XLvPDSxqt2cpTpvpjfJifIBTFs0E7eAeB1G9i2OW2BMvleXJ1D6waIVfV6m6lPv1L1Pe2rd45P/ASRJPbSMBXNvqjjdw7eUAgob4GS8GjnETUsfn0i5hH0/0/+cpu+DoZBBfgy9tfcUUZuviKEo3OfSMZco2aDQb5XLXpRFB1GogS6vs0PMjE1DiDp7zlDB/OKgv9BupAA7171kb7WRNWn4OyHC4oqaelba8DQAaXDOdNJd2Ddy5QnuzNb6bphzPKJE9zU56pbcwzG6jtCjmGpjeunJy1gmQgCFdkpp/5SEz6TMGrO+uBhuBoxMxLvrEZfdQ8j1Hu7jJoGoH3e6TRd2UqY3vYAyB36OioMUw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d3dC6UA9yoxg3SKXX0TgdQgsi7afzfOPhou737b9+Mc0crD/8SwVQdvTKA8erP9uaggAj/SH3w/zj9ekkkOp/EWTenWvfT0JooaWoiDuEbuQko0JMsmjf4MsIZdA3aBZ4bd+N5Mfn2M2tKeOOzGlF7u88qd00m+THd+0/alaTLdJe+6F4MlhX5hFUPOG8kEE+IZ0MU76gDWBBo4M9zlbMQRIlgcjI4iz1F6du2Pa3PWxEZEaXdwJlUNmBargTdxSBTyAnHTL/d+5gka6u1QDp2Vewl365dXl6nQ5axouQ/EI8Kwt+wK3wmeS+1GMXvR9+wzQWWNjGyxaREP/fs3QvDXTfvU0kKHXQkyu1hoHtcBZRwMcSTOg2VT7Zb09Inc7nsTHq/teaaJHLYyuC5zkGbBcwZ3TbspQoB2XcntiWlga0O1HXRFi6e1Quf9blM7jBiHaQCpbJOwG++CuE4fN6s/BHruzG7I7a40SPeygixOOZmz5uAz40JeFQ1FUFtCfMW24B3Iczar37Cc/UUDa2BOiZWDo5kMWUCNA0Ht5jUAeXOMQM14cFD72mGhRk8pis3aC9xqZTW1P5dDVmhavimW/4nwjKVj3szwGiVPsLo9sM3BJzPWEB4x6ggeo1HmhChgCMTxnFcuvXrT8NcOTsUu4S9DlWGCYnW6Nc9+PI5IBJCDwewsM3XjSO49pfGbRx1xxlXbPjh/OLRz4qrfaz28+GTnQgeug0wbcjxTraePZQVXPdGNT9Mula/xekze254q8jOZeoMd4pJoWiVGnsfRQQ2ByFZ+WeH57X5/aWLKZCs8W66YtIouHGX//WGDB9vqE/I1cwTr9ah+aum85LG+dZr0NIqmPTlbyP9srIT1eLLI5gNfEhknz5q42SkCvBc3PxfAxinYeXvMgznbp6oBrFHOyMediy3bqEQnRJoC8v9dwBOH8AqxWyaiiU2kEMJwh7so//LX4I/3IhRo2r0WStiJzZ0lrVz2nvISLq1wTxjen8bnnoQKKk851wdaYLNHB0FIaBa1hBuOAvXk84wHREy7yJMSsiqcdQ5iABk8/xRbhAUDTC92lQnaDrkWnOKhFzKnc3YCZpCxXH2XR6UfwbuEoAMywjqOeEttamnlWrbTQn6r0hk4aQk+oMqhQsABvbjZ++GQFVT+W7HW6OW3lutD1vueqS10e7J5PmS3Jq85FL3htDvR9Npa1WI9blasBsITn5GlbB7Fcmpxrcx6qTPFD7kPtHKlT/ZRmN8SB4HfcONufppin1KeCCpomA+O85+/6eBW9dLCGVwQumS+MGszsUgOgyHG7ENQcVYfUBVtaSn8WeYhsyz+lZafi X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6a6cd31-9c61-4608-fe82-08da99b4520d 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:17.8345 (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 11/17] avcodec/libspeexenc: Remove dead channel count check 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: X+le2e89INt+ This encoder has AVCodec.ch_layouts set, so that this is checked generically. Signed-off-by: Andreas Rheinhardt --- libavcodec/libspeexenc.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index 8d2c6347fa..2191e7dac7 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -152,13 +152,6 @@ static av_cold int encode_init(AVCodecContext *avctx) int header_size; int32_t complexity; - /* channels */ - if (channels < 1 || channels > 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid channels (%d). Only stereo and " - "mono are supported\n", channels); - return AVERROR(EINVAL); - } - /* sample rate and encoding mode */ switch (avctx->sample_rate) { case 8000: mode = speex_lib_get_mode(SPEEX_MODEID_NB); break; From patchwork Sun Sep 18 20:27:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858874pzh; Sun, 18 Sep 2022 13:29:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM52YKRHo1WuaUZLwoKKnbMB5uXXdA4CcgnOPIWxiBM894Mf48lPtdPSQptF8azJGuLXR5CR X-Received: by 2002:a05:6402:a43:b0:44e:cf0a:5e82 with SMTP id bt3-20020a0564020a4300b0044ecf0a5e82mr12423281edb.118.1663532973260; Sun, 18 Sep 2022 13:29:33 -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 jv1-20020a170907768100b007417040d1c5si18143078ejc.823.2022.09.18.13.29.32; Sun, 18 Sep 2022 13:29:33 -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=iLzcPFUK; 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 6F64468BC4B; Sun, 18 Sep 2022 23:28:31 +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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A44168BBD3 for ; Sun, 18 Sep 2022 23:28:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f8tzHKpnJK5h1ZkiaJLFYYHCVpu5TbNXb9hCwlPmO0H7AhBCRfIxT4F4tFRoZ7pJHvCZFxY2Mx3wet7M83sq6cG86e8IVypRjIhRMklg2lHdggfazLdSkXFjQGG929MLa9SI5Qkdtdj2ysP6jj5fRYLdRx8Ni6Vh90iBmWf4UxIeafIfMfXeO5JdQQc4A4n9Z7Cyf5IiCE1c6WVoftET7LUrIMFBoUaT7dqdoME8uk0gDe2q5mcv4Y1OiEs7jxhkidXazSizF3gdWtp/9vMllRWWgoAJBpcxKLefdwzwWf0X1oe1xYNpLscd0k1Kwp5nbsE0KagCVZMOIglKG11zlQ== 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=sxQ82+MZ/TyoNEgufVVnLjjncuyvFgDOetXQ1wMbxDE=; b=S4e1vkcJJkFBSAmPCK6MrCL2JeLnjY6NJCQ9DjqeTSVp5pmX/Lnwy+Admg66CRT51GA9QskpxM69MbLu0y179fs80iuu5kf8lgUC9ym0ecuZEch6YBMvDJYK109hkBE619d6JCHuErhtrEkQaesm3/hP0zsBW9Pi2rWt9R9LatawckWOEPvv7Fgd8QWuE3EjEdg1+w8PDaCEPLon15YW3t9UJmGOM38l6VpdEm26RKa6+TY12e7xDQw7DaIbTqWfbS3lFLJay9NxDl7HH6mJuuyaRBEaZutUdSJdSBEdXJHuh68T9Ud/BYCitYGTQtfAIAkiAV9fWzzvBpr1w/wZDA== 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=sxQ82+MZ/TyoNEgufVVnLjjncuyvFgDOetXQ1wMbxDE=; b=iLzcPFUK7FF0nxuHfk4XNEwwyhu4uOSvZQTnh7goEcHNhCFyG1nRXARiLZLDN2P3eyo8il8sko2TIl99hbmdDyM5IWAPe6qii17CIcsajE5UQlmVwlD57Qvk9/AQOEdGnKtDw0c1wrFGQKNbFWqM/YaQz35qekPdO64/59dNX48dsp5tLbfd7jdClk464KrOlFsXndI+Fu8qWHCRLt5G7vDvCRVKY7v3j3XzDjEwHNlmyjXX0czhWYmch90ti8RNGnmT0S/TD/exUTAKV1Ioxp0k9VjYWcVTVvGdryqVSou+d1KSAtkDXFVB9KWwZ+K7IKav0pE7B0wEzNXRu5z/vQ== 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:19 +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:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:52 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [3/xrpPWxJJNicELGZH9+ShAyOvDJhVw2MEW7tMcCbVg=] 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-11-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: 28eb8018-7808-4d40-eaf1-08da99b452c7 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHUuMaJpkr7jshQhQ+SoZAyRoiKZn4e+iVtOBusgiqcFN5QMomhuEOKvepzyBLr8g7M6vfkiEbhFUbeRbzHf3Byz1cg85XUa0P206B67asMo1eq148RcHkFtrTY404ZouhzEvPzzhkL8A1V5VKuHRBhB+Qf8dQCRvEDJ5Wm5HuLWC34qX4XfN93OplCajtYLCu/DnoYUi6299+Vajbd2z4i2IO36NNrJkcxBKQEm8vrf2q7aTGmzkV5Gc6mGcHvi8GsDzT9F6wRKRLPYnUtGd70cuVnQbJ3AKSXM31Q9eYelIOZ+Mh+M1Z3Sc/CmT35dNYF6/anKxJNnz2ABlckSz7nicAdVaUI3mmneY5GNToPWxhVNBe6baP6DPbNegiOwQiEjZTpN/grFiCSX9fOdBhzs21Us9DNTeMcyKTKZZEfDoseJBjEauFFGJjY6J+jNEhkHp2tf+91ndTqqgVoXhuKis6HHBAR1VSY+hYBk1E2TM3Yy4HL9HbO277v6gfJj7MJhNMFrBgmYVUm3rXdT9j8Ur23vmh1mpaC9Fg5Uf5Tr9xyot9knSkWmBHB6zArt4GuWFqeTvxzoxyqagmYcQlEpVjE+w63ZMRjZuOUh6t7/WqC8nIHsowAAUQ5B0bk2tsaCd6HbuAL6DShlFIwpnMN0JV6LUsukj2a8k0DO9O7+X2qmWoxo4S0A+Va5t1sQhkbzm6fXZefZxQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MOECWO5Z/QCAuN/6aBpmTkqdKLpgS4EY132Br/Ors0xYYxXcvzkLahsJTvT1mi2A+hcfMEH0Yt0VKNVnSsSK0hQ95lVnW5YphMhZns/Wj07YKqx6DNDACpgH762++CAjxa5ELA1eeGNX8pj+PCu1w2CtcoRGxvGXrKdkRs3C8QwjYSSkWEj8L6v0V6D9FD+WI0kEFgSHeiOt8gAnZe4IfIOKuhXabGIN6fqcAY+EOIahbxDc2wCJYGsE+Wwm0e09qLME5TtB6TeR0+r7oFzyyftvsnzedRbV/3Dg4MinqD6KlLwGUVX3t4Dh3xLxrMQMjFBa3IAPYHZkFLNQvnGDPEsp/KpIm64exiq9n0IBTkw42gjvq0iOZ/uWm7yPayeO8q5qnxYC/kZHrXHPPejr1KcSo14now1e/B/cJs/S2wJeSW20z5SBAyI4n6aobxrDcvPdj3cD8W2a02ok9dg1nH0h7TynSF3LTIAiDu9gKDWA7A2ql0htVIbOXW3NIjYpk+Chbm4zfEzCWif+6NU/a3w3xamDeatKeKuBBMbpKu9Mkpfuy9KArB8t0MVvNOvfLWX3NU36vxgZesxZsr2GJh0Z+WrXKaiapyTa4soPSOeN7+pYNPL/bgRJX1mdKYgQBUZVqviXqRJUu10A4epYxg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HSRXzs7/uqwAUquBM2jxP1u1l+SJVg7Lg7vElJXPAAjQzZ0ZWTT1X3bRprNB6zeNTEPMh1eqlIWCY/mBFd+XpH7ugO+i8mtehT6ETkC4jOyaY70qg6oVTbG11N3q2nKp6OUPJpbJZh8zOUhzvvySjxy+a4ENOOoAvBg9uKu0FhfNyqJWbD2Hb8zm922Sob7MAjATm4JLQeUCYBunpFSq5y0WY26tUx7mpbKV2Br8j0Xw9NE+dJnegDmTADH0tiM659N7LwgW07K7s9498RJBm6x2+4STPmMxE+eDY/+Y+E2ceK65Bp0l5D6cY2v2q5/JsEnTDu304/cLQw7wcRcPMTxQmMEW9MuyFO4fjRXV81Dh4yJJ5o4PFFzLCesuTxTT0x3XJk0YthY3G8sPvK+hrQ2qh8g+aIqhsuRjS9jyyake5fLIUqjUDvKxLUvgDFKLmA7WxX2Ew/iX9rXT/NxGBCHL1WuUQTsWvIRHb1D2J3fdliA/um+VN4irS9d4+LcEimROtgw5ef7sBHsLnBTsaBn5oNz2scLGjnX30RqPpb9MHQ0Cu4LM9w1WEOMtQQLJnt1llB/rpq1eaQEub3XG8+RMbplfe5MfHUVWOruV4VoN7Rd8/I8oQ8lhq36Q1qCab9Bc8/eVApvz6+sX826hMrld+ZzGdZCCRNAKhYg0OEG8qiOGFiRA6mI3g5QHNOr3Bv6UNZ/ABlD4eZLkP3iXoAIIWIC+hVi/5NV6DRi+pqcJViWKXc6rHQcvc5ZxwPuoEIX/9dVT6WW2Sv0tRLBhdPcsw9wMNiK+W+Dk9d1zG1ZhjcSSTRnM4JkLi5zTtyKxt7yLA0l8KEHJN3U4+4EjdAhJ6iRr94hrwNRLCLw/Ze/FtAL1NtkXplbjktP022t3Tp6ezgxgnO2qBH19ndogVlw/yLlDolRXl3b0czWpQKrLllKPAE/OWx1A8ZhnPtItPUE9YgbFtXL4gguGfAdMU7UpW/BlAko+bn/FjSgOBZHz+hkFf/WXcrIfrihYCexI0H9Rhiv3mO00QmFCp22nqucRYlOJ9iCoOZzkOzO6q+eUrOh7auFtlAKIxwcA7RBZqvwYa2AK0RGDpzl99kfQNLBQTjK/RzGTum0Cp2MiVFdi7lKG53qk+S0MVKVMfeCGLX+7N+ttxrfGK6bBTLqM1E3SxToVsnl/HyotasvsAGWliCD0C7AlQvP5bmAqzSLHGgHBRr0c++ZDxuPaUiK6Ha7u0I7a7wvm3EwkpuyWflmdZMUfWAzf6PP36aBLkm4EaBvebAalRpujFGbA6eagUOUK2QZtjSPJKWl4b+tAPi5SfBY25sgmbpXQh/XXK+A9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28eb8018-7808-4d40-eaf1-08da99b452c7 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:19.0686 (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 12/17] avcodec/mpegaudioenc_template: Remove dead channel count check 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: ixQxQDju2ChM The encoders using this have AVCodec.ch_layouts set, so that this is checked generically. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegaudioenc_template.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c index 67b8069102..396e8a4899 100644 --- a/libavcodec/mpegaudioenc_template.c +++ b/libavcodec/mpegaudioenc_template.c @@ -82,10 +82,6 @@ static av_cold int MPA_encode_init(AVCodecContext *avctx) int i, v, table; float a; - if (channels <= 0 || channels > 2){ - av_log(avctx, AV_LOG_ERROR, "encoding %d channel(s) is not allowed in mp2\n", channels); - return AVERROR(EINVAL); - } bitrate = bitrate / 1000; s->nb_channels = channels; avctx->frame_size = MPA_FRAME_SIZE; From patchwork Sun Sep 18 20:27:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858906pzh; Sun, 18 Sep 2022 13:29:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4J+JPPWfw17wZSabwtQ6gADflGRvyQkJrPAvCf1ThQRKctDa50qQ3AP74PrntTaFr2zeEL X-Received: by 2002:a17:906:dac8:b0:741:545b:796a with SMTP id xi8-20020a170906dac800b00741545b796amr10396983ejb.240.1663532982032; Sun, 18 Sep 2022 13:29:42 -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 ay25-20020a056402203900b004479e9c138dsi6688687edb.447.2022.09.18.13.29.41; Sun, 18 Sep 2022 13:29:42 -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=VHUE1806; 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 5C3E068BBF3; Sun, 18 Sep 2022 23:28:32 +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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55D7768BBEF for ; Sun, 18 Sep 2022 23:28:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eiVdW8Qd5tvSQLfHrG1n1WF0PSx264ns6RTkBhKn7jAPbkqdsCy+slNDTSeJetvK9Kxg8EY+FHkEHCO1AIs8QHJUW/x+TYxHKZdNfiIpROsCG/lZ94loYgldxMoR+B4K/FLEqxFsSpck/Rq0rnz9Tc/5d7ByEzMDpIrIDW8Ql8Y8Iq8L9m5G2ZpTnssCJVkvhBZal5mH+sZcRsvqXzwAMPhSM4hcNzNy2Q3rK9qrLnUsDFp8hOjbW0j+spRd0E3BT7khLvbF24d1954wttouSnQH6rJavkAMb+FeKLfaARYD82U7Kj661WnodLPxCpqHgg30P7Tp/iWq4/p03X0G0A== 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=u9Fd/JTMtrQwkO/ZR1J+GfJHyYE9RVm60oseKqQzMnw=; b=Hxt+DtnUbN1GMPN77Sci4m6HO/+XWg8BlilTGg6LrQ4S1pxL46DPRJfiG+E8OvFRcjyEScVAOvaSOr3+oe14kinNNJH9awfxewxxCZTCIQbft+iWHfFPCnwJMK7hBQalkfxn4oTetcgoGPO1UTtBQgxuv/CpiIOlzVPqUaxV9DHPc9Ab4UxzcKkZzdE+sh6teCXVNX+LUZWgZH1xmmVm9notD8/5zKvoPOI4gL6qcLtmiFxv8g6i6Dx/Fh3qiwVbURbtGpOY+q30lyZYs/GRGktzXuQQwYk1UVNsbTtPzfNuFIdJgRtwQj12CowIj1hjJT3ObLnI8motJyOPWTvaPA== 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=u9Fd/JTMtrQwkO/ZR1J+GfJHyYE9RVm60oseKqQzMnw=; b=VHUE18069+NMFiNo6fKZ+yExLhQsSPXCE7vKI66kL4pDDS9O8EEE8M/it8oeeS2M5xPnl+1985Yn5fJvR1RUs/TvmahaTOLAYqT055zVQ3ZAoZoTMDZURQyuZjl1YfbLyyrYtOHqNjFPdHPR8JgmPz0cgaiz/rzrwOA/YhRxfXYJSzo13QL/I2Xg1p4IXRve/wX7nH/bPjlTftG/OPJT+b04szH9T7wgoYe1UetyAixcjSNklBw8wmXagdc7c49/fJpCpN2r6Ofg09ejRORsr1NIUPV2kwEKnDVHT9f14Z23xAYmjMBc/E+d8lLMnbaKylFRa5AgraDE5hazEI+F5A== 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:20 +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:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YyluUPPcSdbWj64kH+A3JN7YXgGI6hNeJH2yfxLIubE=] 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-12-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: 47bd07e3-6a3b-47f1-903e-08da99b4538b X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxCM1OeU4RWKrdQhmMVsaYv/Bf6m4KR2JAbuARYg2DbMektOl6u4FDyQ0rNC6Ro6ruJmqWCgpcXV70In00NRf1uma0I+KFrEKql0EGV3DLyEVyXjeXr+oMD+W9dM8PM29UDe79WOuQ8xpfIwO4aAZFAMu5irQ4F27egDzvoICugmcqRxVJRhgYfxGXVaMrw4i+FFpXHHHJ/Fc+JHF5kTOz/uF0tDlKwbH1ohtOpW56JlKFnfShqxYuIZW3adL8qiHr2famUzRUFDWEPh6BPKim4OCAU9rDWasrQT1+TyRQNGCfGdpZQz3ao5O0O+FZyzyGoKt/g4fBSIRakD+7tWMu252boo+kqsSuUfLWFdy1fbfsGxZCvpM4n6Can7lFlEwsko+a2tbU9NiAP8ny2GBMUZNctaUwEr7XTQnIT9+lnV+tQZ6C/NIqUJGuDTxvdCTp74B6rwj80gDQTijOJize2n7I/u2RKqaB951coX1jodgvUwj0GKrrVRPu85PhXaNnY4ocDvI7vsyF98FgDzT+KQmyTy781ZpG/t4Owt1BQJljc/U+vylHKXcTo3sin2F2PtCCwR8SDj3cocOHEyxQjuv8Wxnq8gYFpUArjaw/dMBF4OP+gbRmXFWZCPFc8XtvyfFvb8U1nNAt5d7vlq+VGP8vGyDAuD5I47aA0d1KCGT2X2FIWDRhs3/N9MI+FRpCpyPTE14yFHq/rK/2mSa3eOhETsgZ92FM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UNvsCLfKZqc0qnCEGVwokYjwzxrM9/oWAMVIl7QzDfWwOIIJ29x8ucrU8NC946J6T79TMIGKGWiu5ayLqjz/PrSpySqpt5yqqhAOaU0ovUnQoVYDJ9w5nTexuPJaH/4PNWFH4S7FAmlqNHElUIPr0PQy23m124VUGJHcIp/JJWjsYHDlqs0h4gi0HQ81vzIrof3R+2XpFJcUZzglLasrL4fvprbUQYznqeFATsOJfx2AgFL6GUgoS7CU4EyviW5SJ8tgXaDVnKyssOtKqpkmf3dw/EWJ770EXZkIPdgwhW67G1O8Zai58W7WH3zpI/9Az94J4Z5Q2qOqiV2M2noZaLiKJUJZ9Z91CzBgYPn8kzkeBE2f4viQGzrPeTY4rY09zu+vMuxXE2c+yZyWqkXzjNdId+qThp2PndcQFGMhH3/1tXQKe3F5dRafwf8lI2fNz/e9wfVjUm0UQ+W1e4iUTM/2b3YUWZse9u+YyrL3efYvKhcQy/HWZEl1S8MLJvILo/Tn6EkCsg17F6ytG69CRcx8EJlYU0fnI4sLWg7RvOKTItrbH/3bagGDaSkGExbLCJ/mNBF0OGvXFcvLCSfiS3yUgbtAd2WCFry+ItGOTpVjNrdSvecbzs2w/aW/8EtEgcfcXvMgpK0J3wdi62v+YQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nBbG0RLGoKu445ps/IRy+zqjv4RL5jDDgbH9MoOg2nkg/SsfxuxG/36OdwKAUj3JnIIgPSpUeLjTH2CpEPLVbLN8+1jHVmWyhN3af2GcsgBGM6VZqZJlTRMKasVNH0I+tl9sF1O3ZVNhQz6mFqFBrDj1g7DUxjqk+le3ozW1u3R70s/rsq30IW5rJR9b43rMDRClZ1u4MQjyRd3byjKE42uSPO9V+OHThJP7sw0xp/+HBd/p+zcaInxTzf1ZomkGH+urSlid/8UlEyH3PMzBDyHrhS0a+cVhFIhyR4/1TDVv0fVuDmEqpxHnF7n48SyTVPyx4ZvvJmcBKIfzzkKd0XpiPJlz/GypEMy1XoyXk7UCSlEa5WGsbe/ZC4TC5D3kldKMMJ8D3oMJC4EZHMKRv/nMh79L44F4GfYNNKOMfVzCYUzrhVUfuTAUxIQ5815srWy5YJSlDl36wmw7ZkqwM3ZABS5uN8EL/wgMPoWP+8L6TUiWyfHVaQjyrpCo993yqpQzn0v2uCRdrS1iZFeuVRbFbQEjnfwaeTdBKJUFD8Hg7osEQS9XLa72ytWWkz+S6SKPLsYuXxcf4v8ax6Mh35FV632UDLJJ2AjCiGWxyDWZoKGCcQ/+tRVf1jLIqiC7FDDaDPRRT9LL1+qDbu78+rZsg52Qc43Ktu1q3tTPgGKsE6T+NICPrXzq517n253+I9YZO8slWiRZaG1MWzSyj5txONlKUG0efyFUt3AjvntGOJE6Z2FrydTEoHkWakF4+XpU5kdAv6enGC7qVZFaNY4ilUCs3TZWlwT1Em9HZ642R+yqsZ7/XEwVENKP8ovfYzIukxGSaQgCPiZrcwQYX1sJP4swiNICd2KQpVAikkhdloYKTme54q5atSDhSikUN06byNgN08qHkonyhaWXwMfq4RqM3K/zd/eC2Lb+ZAgTh0S+sZSWRKF3MSk96aIQmElWPbdtzfLzfXOyaRjqecwAbSMrKMMb9qDDzZjgabpxFgC3A9bUix+8LD/BBvJFHtbq1mpv++2ai1JPE6LSi0PDrWJmSVbWLFCnBXL8TYYzoUIZ5y5JDUkGS3GNJifJImIrf6xU3UxkbUpB5OMDkdNlNea7H+ApqYf0C9IWAMkLkK0NdVMxgaSkPIDOVRnTWUhZh2XOWG4dITXmYr7iEZuGk39kClsZ2baatPnrajWUWsBUOpDfdXIFDCs+X5dn4HLx2vZu2d019Ivshk3CDMcRnuUZ9IB9iMu2FgKtJnVHmeryTT8hhPtYeUNo0mwaKZPJOAtL+uy5+ESXP5xfrdeHi//w+BIXl3vTdpzHfp35VbTFDdv1ggMXjb7fgz7F X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47bd07e3-6a3b-47f1-903e-08da99b4538b 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:20.2727 (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 13/17] avcodec/mlpenc: Fix channel layouts 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: nmkVe89Edutd The encoder actually creates files with side channels, not back channels. See thd_layout in mlp_parse.h. Signed-off-by: Andreas Rheinhardt --- libavcodec/mlpenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index b66f3a3067..463332593f 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -628,14 +628,14 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx) ctx->channel_arrangement = 1; ctx->thd_substream_info = 0x14; } else if (!av_channel_layout_compare(&avctx->ch_layout, - &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0_BACK)) { + &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0)) { ctx->ch_modifier_thd0 = 1; ctx->ch_modifier_thd1 = 1; ctx->ch_modifier_thd2 = 1; ctx->channel_arrangement = 11; ctx->thd_substream_info = 0x104; } else if (!av_channel_layout_compare(&avctx->ch_layout, - &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1_BACK)) { + &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1)) { ctx->ch_modifier_thd0 = 2; ctx->ch_modifier_thd1 = 1; ctx->ch_modifier_thd2 = 2; @@ -2277,13 +2277,13 @@ const FFCodec ff_truehd_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE}, .p.supported_samplerates = (const int[]) {44100, 48000, 88200, 96000, 176400, 192000, 0}, #if FF_API_OLD_CHANNEL_LAYOUT - .p.channel_layouts = (const uint64_t[]) {AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, 0}, + .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_5POINT0, AV_CH_LAYOUT_5POINT1, 0 }, #endif .p.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, AV_CHANNEL_LAYOUT_STEREO, - AV_CHANNEL_LAYOUT_5POINT0_BACK, - AV_CHANNEL_LAYOUT_5POINT1_BACK, + AV_CHANNEL_LAYOUT_5POINT0, + AV_CHANNEL_LAYOUT_5POINT1, { 0 } }, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, From patchwork Sun Sep 18 20:27:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38032 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858935pzh; Sun, 18 Sep 2022 13:29:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5/Fnm0IOEEBMh0d4lO8wd1OvECXRSia0tsvHHGdu90UV+pMg/SIOu35jl8sirl8Z4Yeldy X-Received: by 2002:a05:6402:5cb:b0:452:e416:2bc4 with SMTP id n11-20020a05640205cb00b00452e4162bc4mr12977833edx.114.1663532990695; Sun, 18 Sep 2022 13:29:50 -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 dd18-20020a1709069b9200b007802170e0a0si16213252ejc.32.2022.09.18.13.29.50; Sun, 18 Sep 2022 13:29:50 -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=MLNTOR43; 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 4648268BC5A; Sun, 18 Sep 2022 23:28:33 +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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7197168BBD3 for ; Sun, 18 Sep 2022 23:28:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oock1yp/ddvyjbuJH6Y/Hj5U/y+uyu4EVnD+Yy7M2Xhf2LDDA/G85oxdN0ecUYIB/oGfmQr0xZUr+7eRxt2UVVQdU7YgcEUJJqj6R2ONx90fvl5+hAH0mEZ9I9GT5AjVQ4eWDjY2bx1N+FQICK7CXAATNG6H0l6h9X0jEGQoliurTIFAaHI++uHi0da3VALWwyY0YR/xi6PuzMm4XThuMc/zL0XPVM0E4LBiCa4DGXjhFCEQR1sQLUpXjP7ofkxg7mQ4wiibTnitd/yFm2jb4ooq/etFk6xbYanqvI2oDguc7HHkozk2YkyVzRYsjvogw0y1AGENC+VI/mThpSTivA== 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=+0BfBLUqN8o5yJ5Qfn2+EIMcygDJxUz30KryGWqU48U=; b=Mg9wid23eg7ccNXDGEOf6UfyBsqHIB/Yug5GkxNB1MAyoq/SxnFE3DfiJ7R0+kmulOZC3V5gmcucn8lKRc+Rx3EKmidffNVASI1rY7GXfdTp23AtPCr6NEmW64423p5eDIDYj4v/VTfhexaEosdK/iUKOCD3Y+o+FDVj2tnV7O+b4VirE7qdye2Gsb7/qmxVw5YPBA8KQFAhd1skBketsJoQuGsqVbyDR+lr62DZxUJGjFcmW9AR26oQEniwu5Gl4/Q/bD4VF/yASi7mNQT5RJb/StZnDosL2WtHS63iWRdLCd3Fjysp29jyYx+acwTBV7QCOF8X4krmogyAvaOvdg== 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=+0BfBLUqN8o5yJ5Qfn2+EIMcygDJxUz30KryGWqU48U=; b=MLNTOR43/wouGFOl3kBXC2RBwLs8l2VCFCAMNXKza1yDSaFrGJhaMlYdUR2TSC/NW/YDIM3WtsBjjJGPnTOv2LE16q1bb8rxurZrkS5/6ua36sQVmHqKQrch71YaXI4i7E4/60I+0aKGMv8J3CLcGN3umlFT2a7iyNDxVmR3TUuWko3uBQSFPMMnWyJpwCdGO1S/VqezP2ebGooqfqVTh0HjoaJM/5VF/k+Puo/Cqoqwt6xF1hbKwf9A+CQa/7nevswcL9C+5m7gxS/XZO7F+bfdm5m/tBu6fA55Gp5aKp9Ap5ubNAntHE/r4l/KJrIeWMGucDleAxNnMhHJyfPGrA== 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:21 +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:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [zUgpwqyUer9nd1VdTsP8Idnjwy4wV+/DsdpRFRtlJ+g=] 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-13-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: b2538d39-75c2-4c38-ee48-08da99b45442 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN51GSU0XTfaVJtkPF152wZN7ptw8FgqKBcSkCJ4H+weigbfYt48F62Dy878w0jnLbxzAuHiWwB8DVqzjueakPUxMKgp5bnZqD6NAhdshjLaZTtZ8ugLRb+tOMZSn1Z5nR5/k71A12hdm7ifw/wFOsfBp+/XBPdVY6RehEj/tfIw6BqoWJS5haVUNFKiTCOGQemZWDSSFRjiDZp/toedQevD6Myf7nrby72lKE5+mlhfrbyTnWZWVzL2akQ8LLJpqS9yjmAJaTjrCvXTIrf8oQnNroLi17PKHZQdbMoCMriPvcWAMhCBZZQIMjPaYknJ5qEewOlOGZOZRKPz4xTCCZtueXh5ZlZ75LGMSGrc3eSWdYzYUDX1QA88AY0yw7clyxBHPmCorEH5vULuTkxwY3N+ZIaz+l1623mPBXSDsC+zQ3fw4WiBeABfcnk0feUyjxEg+y/hIz1n0+BYRJAm6Ct/NfROTFsL3lWwiWVN87dovDbQNBZ4etT39zYFpyqQBpJfO5+vFV8CxNe25oRQw7TgMMMRn4anADlbpWshFOzODAJGvS+Thlp3BpHTE0PwFatMFs1iozc1CHYE6r0IhHQlSzW+Oc0IK+csZIff9JfhPziF73ajYUCJVgwN1AaOtD8yW03R5qTQu2mpdEtIthEG5W90CC7KCBGw4oINSyzZ+avU92uMdfbh1WAoiAhyrjw9yVjG2e452oLku/XoFCKpe8gAFrlTDxMlXLpisib1HaU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gkgAxGqZ2VF95SBxy8hOTs6Kx2jH0NYMAXONpZeaM0Z+pdI2IYVzEuNmvNWdaUYC0r2ZWWIMyNiGHEaKpsDlOzlB1DyHoCQbdAWEPWZ1MZBU5Lr2Ps7tlP7msl18UZTY03behqJ+2DojyGjGXdjiY2Ol65E4EC2fMnTwGCcX46SqhM8nzYhP0OCsmS/JBc4ZIAUoklgGYa+rUsc6EDfkiKUcU162p9y01MnCRt3NcO250EEbxNNLt6UWSSDvbhUBScHorgGVYBqR68C89g47e2vKoOdOwXpRg6lpq8qEos/ATf0PGRdOnGXtZf/0QPXo6dLgQdcyECffbkOd/K5/dt/cj/2UicdKE1+k5LosLdOphrLzLrv/dVUhNoJN5p9ifsRzzCOveFfW9mP4qCTYs9NPqx5UbC62j1MTJ1OYeojFkUUSf5wvpukavhRcwe0kSYnLYgK8hWqyVary0ky+FCik7EXazUpIivY5dIePjXPTEwKm58KXOj3rL1E8QZOfoYLN8y0jNAP+oA85SkoxOj80Ee1dib09EeOnwpm+IEVUW6TxC+Smd3QA9JsdtMtK/qqTqV0F1F+eDOiQdRGtUqoeC7mF4l6Gro4jaHYnRaFA7gaOs0+lUF8aJbOS1yt7kvc8Wc0M4HNU5NbwkgDYVg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7wOESDXHGSmzE2TF9QhMOb7x+VCFOJHWrxpAGEqu++U09m0pr0nlriy5Y5swx5r1fZZSz/Ndxt4h9miUdxubIfjtktCo2SdCwG6QKl6vilhErGxpIggscmWNlzJ8NYNFe3SRs+OJ3tcrWwLBw5wJZhrjg0WLKsMwJlsiLOKPzDJz+HGsq+0c2ymbZLpI1lvoVNe6EP/uoA4XuG4/YKQCRBQ0w/f3mPB9lRruxNZuH7RMFZ347UpM5AjM2RhODo7dc07/3IHLn7Rl1jwU8/g1O4LRxC2S1HrWS/Ri09XbD5wFWpJS07UCL2jtiEkm6+qGxsdOctpZw1zEIzQb/SIGJISVcO/rjDWHP6af6weTkhVG+tELHy4jT/frDg8dds0PW5YYd8+GSsfwJKn3hHl3HAiiXghz1M9yhzK36WyiEodeXFUiSxBQWcqpsuL7BwWQflRmmZh+k9VMRebu3dnBRQavdwrMjWQ8Ws6of12Q+ZBg8cUqaplIDKCkoP3iMMYvutkSS7OpTt5AMiU0osMuOw9PpHf8OQHswFQC0fH0hoKZtxBsFuVae1HFV4rCUuiQ3eNQ/FSGHhLICCcdVsrBbJUc8lJG2EC+rs4ZyC7mkAWH4q8IsZQ/gUi0cy43MYqYuzA6Lve6NtRqi4ttn1+uQhCPcQ2QgCvYt+0CzPhBv0Tki+UQmS8IOX7Q3Kh2vNHfVWoo2/H15LKZ44K3ycP67E+93FOYGnW73U7oDVzq7L5RElbQVFgKkMxs2TwCIav5R60e0f3kRQWFa7/BkwX8DxMEgJNRoPM1e+pcPXFa/fXTCl3xAiHarLkzhnZBl9Av1EOh6gWirUT+sSOSROmzvbYMZVbnNnqRY1jjqCylNS37AA8eyXsRJgIr+H/pBEIZZjJVMgdhHl95snPA1JtxnoZTny2Ao8vhgSTYBd1jTlpNpP0bNK9guEHbOxohTUQbSIZR9LYivW3YPhmu2r6Hc6vssrDsW7bEe3FzlD0vS+7dgyUqP1UGJiZZ8tqp4DXvxM9t0JWusHag6a8+sM2wcuiD8HLt/hOTdlgS6FVpTIR7Nf2EqbjbsNqZCtsUXY+XxQIPT35wJjeI7/3pZRsQhSHfHNtBf4VBy33xqPZLK+InO6Fk8T2MlC8iXtRNilfs/gHIZEFUZhEvIFDk/PSoaMFYm4mLWJDZnze+ppz38fsuwYvI9YosSjkObo467bWG3FXQq1Uz7HRQ/1dEIoYXznRnIdfJUbtbaPym/G9lpjv41GYQYAwl3ZZUohPg853Fhb02FhaD78rbrf6J+LtvXFOhgGP5BUJy6AFPOKLdWJNsG8VG66lNkgEWnLDlVnLd X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2538d39-75c2-4c38-ee48-08da99b45442 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:21.5067 (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 14/17] avcodec/mlpenc: Simplify channel layout comparisons 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: lnCuxTuEbYeX These encoders have AVCodec.ch_layouts set, so ff_encode_preinit() has already checked that the used channel layout is equivalent to one of these native layouts. Therefore one can simply compare the channel masks (with the added complication that one has to use av_channel_layout_subset() to get it, because the channel layout is not guaranteed to have AV_CHANNEL_ORDER_NATIVE). Signed-off-by: Andreas Rheinhardt --- libavcodec/mlpenc.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index 463332593f..d2e28888f7 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -480,6 +480,7 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx) static AVOnce init_static_once = AV_ONCE_INIT; MLPEncodeContext *ctx = avctx->priv_data; RestartHeader *const rh = &ctx->restart_header; + uint64_t channels_present; unsigned int sum = 0; size_t size; int ret; @@ -589,19 +590,20 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx) ctx->num_substreams = 1; // TODO: change this after adding multi-channel support for TrueHD + channels_present = av_channel_layout_subset(&avctx->ch_layout, ~(uint64_t)0); if (ctx->avctx->codec_id == AV_CODEC_ID_MLP) { - static const AVChannelLayout layout_arrangement[] = { - AV_CHANNEL_LAYOUT_MONO, AV_CHANNEL_LAYOUT_STEREO, - AV_CHANNEL_LAYOUT_2_1, AV_CHANNEL_LAYOUT_QUAD, - AV_CHANNEL_LAYOUT_2POINT1, { 0 }, { 0 }, - AV_CHANNEL_LAYOUT_SURROUND, AV_CHANNEL_LAYOUT_4POINT0, - AV_CHANNEL_LAYOUT_5POINT0_BACK, AV_CHANNEL_LAYOUT_3POINT1, - AV_CHANNEL_LAYOUT_4POINT1, AV_CHANNEL_LAYOUT_5POINT1_BACK, + static const uint64_t layout_arrangement[] = { + AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_2_1, AV_CH_LAYOUT_QUAD, + AV_CH_LAYOUT_2POINT1, 0, 0, + AV_CH_LAYOUT_SURROUND, AV_CH_LAYOUT_4POINT0, + AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_3POINT1, + AV_CH_LAYOUT_4POINT1, AV_CH_LAYOUT_5POINT1_BACK, }; int i; for (i = 0; i < FF_ARRAY_ELEMS(layout_arrangement); i++) - if (!av_channel_layout_compare(&avctx->ch_layout, &layout_arrangement[i])) + if (channels_present == layout_arrangement[i]) break; if (i == FF_ARRAY_ELEMS(layout_arrangement)) { av_log(avctx, AV_LOG_ERROR, "Unsupported channel arrangement\n"); @@ -613,29 +615,25 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx) ctx->summary_info = ff_mlp_ch_info[ctx->channel_arrangement].summary_info ; } else { /* TrueHD */ - if (!av_channel_layout_compare(&avctx->ch_layout, - &(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO)) { + if (channels_present == AV_CH_LAYOUT_MONO) { ctx->ch_modifier_thd0 = 3; ctx->ch_modifier_thd1 = 3; ctx->ch_modifier_thd2 = 3; ctx->channel_arrangement = 2; ctx->thd_substream_info = 0x14; - } else if (!av_channel_layout_compare(&avctx->ch_layout, - &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO)) { + } else if (channels_present == AV_CH_LAYOUT_STEREO) { ctx->ch_modifier_thd0 = 1; ctx->ch_modifier_thd1 = 1; ctx->ch_modifier_thd2 = 1; ctx->channel_arrangement = 1; ctx->thd_substream_info = 0x14; - } else if (!av_channel_layout_compare(&avctx->ch_layout, - &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0)) { + } else if (channels_present == AV_CH_LAYOUT_5POINT0) { ctx->ch_modifier_thd0 = 1; ctx->ch_modifier_thd1 = 1; ctx->ch_modifier_thd2 = 1; ctx->channel_arrangement = 11; ctx->thd_substream_info = 0x104; - } else if (!av_channel_layout_compare(&avctx->ch_layout, - &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1)) { + } else if (channels_present == AV_CH_LAYOUT_5POINT1) { ctx->ch_modifier_thd0 = 2; ctx->ch_modifier_thd1 = 1; ctx->ch_modifier_thd2 = 2; From patchwork Sun Sep 18 20:27:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858968pzh; Sun, 18 Sep 2022 13:29:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6x7TNNV9C9YqKKwa2VitA2CXIiuuOEBwdMynMw2LGqeW4aiV1CZ9z0+BE9vZ7hLljOVLTk X-Received: by 2002:a17:906:8a66:b0:780:a4d1:5a10 with SMTP id hy6-20020a1709068a6600b00780a4d15a10mr8966135ejc.492.1663532999007; Sun, 18 Sep 2022 13:29:59 -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 p3-20020a50cd83000000b00451b2b6ddeesi7017972edi.506.2022.09.18.13.29.58; Sun, 18 Sep 2022 13:29:58 -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="hRL8dwk/"; 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 2113368BC5B; Sun, 18 Sep 2022 23:28:34 +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-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D37968BBEF for ; Sun, 18 Sep 2022 23:28:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X5ulYhl3YVnW+8vAc7IlanFUy9ECt3UUVvZ3rhE/JMsXUvDjepxLezHZtXWMgz7DykKyp/CRflJTveQifHbWYcRqlnf6KPWj7dgNfvd9vN8pS7y1fiH4E20Y/5kY8fYH35fEj4/CYA7kciSAcqYXXmWZ9viYZCdTBKQClYvUjX1zFcxcHFxHZ1elsTMIBjWsiN/2OQiHklaAm7+Lxe868gNcG015cNb8rgSs5RdoBI9geVrA9Pcip5kXfjGvkLuruigAMpEvUYpbCN+YlhUDa6yDTtXLtvai1Nv0OrcLarXBsSKu+s7m9mcMM5zKQWLSClkk3fUvk2xm7YbKMjtZpg== 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=pbyoo95FhtHmMIJkQXQKbuzhYHplyAK/Fzc5U/stfdc=; b=TpxAlxUAIBTt6FYvHCezv2306M4pE7ALSahfV0EeFyFlcVWMLQOUQ+5ICpclkEZTjz4GpqMUonTBn6+czJkOy3mGZ3PMRNUgVBAfwljtPy27j8y6RRAUyTw+xiLK5y+vC9ujCaGn+UlaT+5T588yWCnn5aQ1XBOvfR1C0MdYDI5NrXRPe36X1XMpCNEhJPkCe1QHnSkH1lLN8o6WKdzWKQNOPS6qYVD128ImyafiHaJB1AfG5ruxMwv//LunZSKJK9SxW+R7P4TQz+AumueP8jWgUftpnmBS6vdUXmI8uh/dPQE1IxtTt66GqEqZm001dA3tlil7UOL6uQVdJU757A== 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=pbyoo95FhtHmMIJkQXQKbuzhYHplyAK/Fzc5U/stfdc=; b=hRL8dwk/nfQyooLITIs7OZkbrHWI33VO9Xv/jo5JQz7jRS9y2toiJcXDKoQpEyWc/G12rvrrCaP3iKhfW+TwgHSXvPiIfTfU8J1zjG3wEjV6YATbE3kk2wFt8CrJMyeavgbGQ7sdzYgOl/xShoRssmdey0qQLT1nsc0hqqFgFG3Cu1E6Adpl4A5mz2281IO+/zZdZ3tyzMi5MHdXsuPpd5k4P6bqLeon20b8H8dPFT+pPr1ToOB8Jug8ZMFuu9CrOfWPVrZrMvRWiWXQtdChI9FBqM87h28Vt2vizZ6qiwdKE9lbGkRvzStzSsu3GYZIyUTrhQniCumOGhrQ8eSxEA== 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:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:55 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [st0C8UKJIcMPTCyKRwxI5ZibZq91W/tU7NdBg64utfA=] 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-14-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: 16fcc432-5dda-43e0-b9f0-08da99b4550d X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxCM1OeU4RWKrdQhmMVsaYvXNiievAkHnFD/eRxXIcQJg46daxrQSAPQKwKfpVVMEnzCU3spYWVoRw8lWcoyKYX3GZExNNLHt4KHrgQz4qF95gX7YR8J1EGs1pcVpLu2Q5E6r1ddgrtlm/7s1ytZ2n1JW3v52XQPbhQun4vjKI2PTvRRUlWzeNTQz1g91neOBvTbGmsgz4Zipja+s9ewZY8V1n8jO1K5O/B5SjcDdgKA+QI62zJp1JGnrKqYCa9KiXJh2g/FPMJ8z57Krw8anUpMVFUa3SlpbK5Vf/MkZOXZxGzDdNmOM8o/GujnBJ/R18k9dGAHJMcGHujmC4NaBqV0BFuofGAVN1NmpoHaODl7cvP7zoCApRM4xNpBjmpgCFx0NxmFSwzx//Q+AxlbrNV5YFG2fNEmQnFxAyWscKGSfomLiLSEiwLrns9Y/QXmI6Tvr/pqGxwi3gfDxIZzSweJNE+V2r9EwRC5Vsy3h0FfWfhU7miyOJH5dOU4EBes4lN9jRSw/JNQoq79J8IU7yDb8oZwJ4fXPYkNIAsFrCzGC/WSOd9mKnioSxoVPKzpLTPsT1zfRWH1MvjTjAqNQdQsErZbT5qvDNiQcVwTKmJ9Jig1SDwzTA4dgk5TWd48ndWOXIxtuniQpOF22TxUgK1xLCgqomv2KILUnjm1gfVjpjfDqbZ1FxB1cPWT+9KwIVxRYOlNTIN/HtK7LA5l1A1ilwYaqm/J5I= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ryaXxMJNxQJZP8XB2Tv6TpYxGYnHo2b3Xojf2us6eFZG9jN4htvF1F9Qs6eOzBHOiKPa/+OYIiW7s/Kr0/4h47t9ZkI8e+pioPlcaA8Ipi1gz0p4AJ13Sf0YRPduERPqz/OZm4I3sY8CgBjJmoCogq66JgprF/7IBOSTvYURDMpaP3/8DMibN1QH91eKOJAbWbkpLUW3/umccgfYwPZ/MWCtjJPlOy3UUok50mqPkVfoRj6KTkgBpAhWkY4E5a5x0fqBi/hyzqs/jvPl7Zpj17PbKNjlY/e7Q89WTBbVoKQ3cVkqjhuvPdowb9nN1K7q3f9xX91vOJn1wHkA//7xUmWAarHy29c03k7p+7bwpZ7D5JVaGwgduvt7A+aE4BAweYsHNhCYEoJ7PNM24/7R27aeKRrmKWPxZRoAkDhffMlRF0bnLOe6BReG6Mlcq7k4zmsAaHQi1lZnSs3M6OXRvIhzvMHu91681skhnFMCRBKOdf2e9ckoGZ0hrtzsMH8D6QzPJSsDYB/78h0Fk5i+gaLPTaDnXfTCXC4GSCJQutq/N8x4WFFcGp1jWYnslrw01xLGzbTn9XlGwZb/eqRhrfKLITZv1bkosONjL24hYqhxkokgz2x5c3ZID1utWNKpqOQZeD2XaEc2a4Cj5wyjXQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0YULRMGaabdFZb3qWo0ozKvmSGpNSLO8IrXL9eNtLjBSo59kpmu5/Y2ikeQSF27B+OunsCGnDgFtSMRkMBYbtsNDuHRhNPPOAhYxeopnXpv9neuT8zeyIr452V3fejn5IIca5U4aKeSxidqOudiTlm6ijqnJt+bGqpZW+8et9BV4Gj9hWLiccLb+BmJRLYwhALqT9gw2zS5DAUGzJ22TQKgiiWa/Hv+MkuWLJglP0VIMh91XzCmLVtSQKzhel8YkV9GwHYU2ZI9vNzvvgSft7fg99dcUzV80XggdfZtZTtM0X0VM/uHqmLF0d4VhnbxtV/tnv6x+dUw+6dq6dzvIqgIk2lLWNZ1Q01YqFVz7uL48jflIH1pDEGdXNKOVK6Wm1lOER/maLGuz4ns9Zt+6a63NHQgx+ehxk0ncFBxl/2qfSOhsCu0sDnJSsRKcxXYbkdaTgd/iLYUQ/0YuAiSH5kzvbjRubeMuReqjJtqx2oIGwKTBhEzQGnQrFdL7iBDkf4WLmVV2aevo0hfAxRyuxXovdppMRyG6nmI62gLaGEX5EoA0CLvtI8EAbmw/qNIKAFQ+9N+hLzwaY1QRv6h+SMsGm/toqqI3x7LFHzw3CU1Udtm32hZKmATwbEX/z6kyY28NRBHNvGkrqfZ+HQiJvItE9AF5C0oAJ9Fy4wq3/A8bOUT2TxR91CnRJ0nfL+v/SptEg/Q4KqoGLRpmmBOFdepbCpvPrEcN7Bd6DZOWbt6wYOe19Tt+CClhI2BIMQhn7NJo7hxwzwu714cIIHaB8o//lUaX11UOkFPIl8uDgVS+wV9DmupCCRgJLHUlFvR1EWzOPlq9lTcQZHI9Rmp9a4zmQ3HtogKiYJfG8ohHAlFHCCI9k/tFx+ftlcjtNCqrLs4GW5TTFlckweAqx2+Gv7oPCn31yeykoSy1OOQmSABZg4dcTZ2tbCOmOpeke7lYrY/MsYQYscD0dl4KeQ8fT4chLA33OV47hDs7Oji1WTIft43m8l56t0h7p1BwPklTeB+A/KnHpbIxFpTLd33QHaPXbAfOEH8ChsoNvapH14gpnatzV8nWpJHxDiczeZYmrXCH7vhWpwc8NqjPoEJ2fyV28e75vOwes/VG1p1Y4X1kaTXXJ719B1lFxqhgrOsfPH0tB5VFQ53KkUzIjm91OeZrUa8FEaJtaF/ZFaujMw5wQjq2c4fjAn9oKfOBYzWqbCeSffWXSjksXOCknnZChcHSGx00c0qcv4XTcBT0Wd9aC4hNWotaGNErDLVCk/bsHwVhwzPev7IyCjwDT4B0YGXRNTIqQuVe6VydOFoJtCeVVLA7rVilrP8qjjBMmGCf X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16fcc432-5dda-43e0-b9f0-08da99b4550d 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:22.8347 (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 15/17] avcodec/mlpenc: Remove dead channel layout checks 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: MQ493SSz1YgW ff_encode_preinit() has already checked that the channel layout is equivalent to one of the layouts in AVCodec.ch_layouts. Signed-off-by: Andreas Rheinhardt --- libavcodec/mlpenc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index d2e28888f7..878c5aedc1 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -27,6 +27,7 @@ #include "encode.h" #include "put_bits.h" #include "audio_frame_queue.h" +#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/avstring.h" @@ -602,12 +603,11 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx) }; int i; - for (i = 0; i < FF_ARRAY_ELEMS(layout_arrangement); i++) + for (i = 0;; i++) { + av_assert1(i < FF_ARRAY_ELEMS(layout_arrangement) || + !"Impossible channel layout"); if (channels_present == layout_arrangement[i]) break; - if (i == FF_ARRAY_ELEMS(layout_arrangement)) { - av_log(avctx, AV_LOG_ERROR, "Unsupported channel arrangement\n"); - return AVERROR(EINVAL); } ctx->channel_arrangement = i; ctx->flags = FLAGS_DVDA; @@ -640,8 +640,7 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx) ctx->channel_arrangement = 15; ctx->thd_substream_info = 0x104; } else { - av_log(avctx, AV_LOG_ERROR, "Unsupported channel arrangement\n"); - return AVERROR(EINVAL); + av_assert1(!"AVCodec.ch_layouts needs to be updated"); } ctx->flags = 0; ctx->channel_occupancy = 0; From patchwork Sun Sep 18 20:27:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp859066pzh; Sun, 18 Sep 2022 13:30:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4bFCIMuABomddV/KTvJlVv5DhPBgJjULICwAKL9cXO9oMkbbhD5yw13ieqMcIaq8LuA39W X-Received: by 2002:a17:907:31c1:b0:742:28a3:5d08 with SMTP id xf1-20020a17090731c100b0074228a35d08mr10493132ejb.112.1663533016762; Sun, 18 Sep 2022 13:30:16 -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 q8-20020a056402518800b00452e7ae21e6si9144472edd.286.2022.09.18.13.30.16; Sun, 18 Sep 2022 13:30:16 -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=FBbogH9N; 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 F1FBC68BC09; Sun, 18 Sep 2022 23:28:35 +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-am6eur05olkn2055.outbound.protection.outlook.com [40.92.91.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFB4168BBF1 for ; Sun, 18 Sep 2022 23:28:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l0SVuDc8KkZA5BpqHiOXa42jI6RbzvSjmlu0WOg3FKm/2MaWdCegOoq2+zVLD0D9M657UtQvflvE1F3VOi4AMXakOcaGT+WOEctWllRzDaTR8Pjmhlfj3Y9OD226d0kIaxNhxdSkhNFdVXhAFtbQLS/r8kcqPIsXqk2vs/TM9E8As2N7wDZNUs9+y25OwV0/wB8Z8oBdc//njsLrikENN01o4I8qrvsfOEcCoI6cTy9Oir2THE//u5qP/lP2F7ZJ7SZfgPksEJoIOEMUCd39LNX4Gpvats/4jHtt5vDCNHbwGjG2osaa/7PKiYS4lAwb+xidX6RlIl5igkeSa4JAWw== 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=svQg0WN/nIJSGHJSXAHNIHsYY4rX25UvGsuDtbI4QO4=; b=BIBgvlVLzaZnkPJJ4i2Hi/iacVPI2eZurCh65bpYnXK9sNI4mQjXQkXrO9UHIUczH5eVRkxmlshE+I92KzmRZWEHsrqFVORQlv9Ob0TaqX0mxG/D6oLXpP+mCgV/nijGEmTYKbakA16KqROvi4w8DQOnPiiQaG05yQIMT06y1wv0HiQLXQM6ohIUtsIUzQDeowI1yu/KK+m3emHw5Yp1gLY3LIoBZ++Q9E1VcAix+FjIpNqGdYvGqf397Z02p0rotwese3zJ9ul5fKIjHAVTQArwUs4fKqGt6Ts2tOsltsSfyJUEVjGddLkVAHX/aa/ExS21MELZQv9bkVT+ksnhcA== 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=svQg0WN/nIJSGHJSXAHNIHsYY4rX25UvGsuDtbI4QO4=; b=FBbogH9NHO8aySolKSAwgGkMTCq72b6+519ziQGNRRiLxYTMAoz24xRtYwVKhdvtlp+Ts5EZMytPGgaulQ4btIUIqUALUMpLTd54LZKDT+8kdGVFQiai9Wr1oUJJnVthdAVjY17t03ALD0nFI5/ARql8UefXtCRV1c6TytWMXyEorY7bHeS7XIT0KDR8OZN70DEWo40L2xOrCqsiIb7mCnsTNdC/Ke31BtpTs3oNpQxgBeaGdbatlvSP6REUrIGrrZy7OsOpSY5s8hgEcnT9s9nkMIOsHnQgGf2zS6U5sa6a5MYVBEHZL3tD6AV6H2V0iBcsLVdMW88tQJFYkJ2zbA== 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:26 +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:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:56 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [QEUmoMqVYdC/cyTT/9JMI+CYGSFUPWfW2Snb7w8eJJU=] 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-15-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: 549e26eb-ec66-4fa7-3f30-08da99b45713 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN51BgQgb52nD6KJJc4buc0q3GT/e9HKS7DtSxOFAIiaZsNnDjm+k/ZxfSEYhEgrmbxjBR6f1E3+PF0Xyn0+l8BP/gG9d64oQYh9ee6rM0PkQlzTc5rVnqP1qLPKLHFJzPiE/Rl758cyIsTnh/yyZaU9I7iZAEKWoPO/6MLJD4Cw5DME5XObB0UjlwzseRfmVLyBV3Ndsf/j000UIL5FuwoxS/3XSyDGY7h8PLc2DtIuqgXUTeKmz1FDZFHBCjcAiKyA5ecBTHLjhcNYElzHwMJZA46aw0j8sd4V4t4y3ydMr3XLY5zrwYm+n9fpGSQOtG038KKXy8o2Slb/94Tru4i39mI3hztueEb5qzIECBBe4csZgccpJ6IldEPvd4H/BwqMeYaEAodb3rqBlAgkjPzzH1jbCz//MM0KSojCxToVlnuyLtJEWw2wPmSe0vA5McmvZMLayXzuH9yhAxoFdItcFSrnJejrEkUMYrn9spphzJpNR2cK6Io7NJ+E4lvUwI4PZcILjWqMJHHydeov2TydIDrPSOhHvRrFRCRlvidqn3OjkHLPbQhyhDi1UVHVN0frYr42aMyi/bokIVl5M1k2kg3KOl0tZa+xYyOv0073fVum5YJsBnWAT7QBlp5VCCCf4N8aL9TdtdVOCGMv8tFPDzzPr6vOpdiops2e5vaeFXUcU5kBrwkxHOLlP+XfKYSBgcFieZ06VAvP9EzcFL6YQr5ZIbtfdIcLki8TNY4XeRE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cGH5xRWfYrfyI5lyw/s3xDiWwnml4Iuw4BoXW5HpoVWLf4r8AGzvBU3gH4n2coA/5i74eK9Covrdl8zs8kKU9s5bshqDkLsIDw5I4ZUvfLIbf0v0xelC9gv2ytXsHLaoDwpLyxKyTmBpLvj3ReRSXAcAaKHdxFtWvmlTaGLqcZd2tQBDTjy+oi0TJr1dLyyZvGiCaiiItEvbgbG0JOXFFyXjjlsUSlaq5a5G1IcxMuo+DAKEsw3oYPbWB22UIClvG5yUgT/7+jm4NxYjwjFUyYt6kxizbK9tvHYiGyo9ee2mLzdGjDJowrlfVT18su3d8ov4wIs7fKLpikFd+U3uG/TBYSirJG+97iGCcBa50QxvkTzklPN2xIqSkYIzjohLGDRheWTfx2aqqfE2r70ZvzOhtZvcuTeDmEVJ9Hiqqe5r+cWTpgk2qE5xR4tF873hAfogTZOovYwdzE2D6bkNeNkbcPbIdu2EFwKhxGPXF6HieFnlFSOp/pOzEN3futXIoltLMZLWf+ABmckG2h8OmIgIhJKQttf0ZkMU1vKmY48jYkOGBrWbDRoewIYwWg6MWEaEgc3YJ7M+J6CPmajDXtpuEqPTSr19/VLvjntQ5ls8iNPNeDe0PfJWjlJpRIgTR4makkiWaM50EH9BkT0daw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bzglOhxCdZex5NplSs6et/pN3HpctCtHk7HFpfuqJiAzo6q0/XhHqlArxvdWZ4TfS9/VY56FtjC79YYhw6vz9clsKJCD1D95qOldqSlkP7hoxU83L0KYkKjeNdbU0kmvOEdKjiquoJwndvszZ5tJyIS1UgU7318KaAqz4m9WDg5/BSE7sNtxr92VVFkRcfUP67AlTJnq1O+TGwMf4J8lHi+Ksd6P1QSgr+UfKhs/+jhP+uwvGhzqk4IMG7Sl7D28cnXmz8zuiy82NO4OIpWPlLM/ILvM2WYXlJS+kHAx9EJX6xx5AfBCN3DArV+nietQyzauR36ulJGdVyhmkqLoYhyYKbmDbUqY26bFuHZggcDQIz00a1H7+TjUIBomS4Emtu6xZRW8GNPGP/BVr/UqrMRs2s+C5uOn/2tKGtzpSeJrQbiCunfyJ2DxrhG50Q3PtHqaoJT+ESz4zmaew+XbGizSxsxbCihsNH7P5uAKFAkaGSfI5ErSjJ8SgghUPcuaFwoknuVyBwijnxdc1s49cHVu05Jcn6shHvyCmS+Bz8BkXDS4fTZ8ZEIvs2c8p/7dKe6Wk5E3AtMuWvbNec7d1vJgrKSoMhru0+t6K7FnaRY4O7AtMNxpNTk8NUoGboKknHR8fxKpM/IIqasJzlleFObrdarRx+fU01Cz8PY5nl23y2uGFyG2BrBy5N+/HkuTFlx02Wzb3bSqgo3U4dQlsQhjzbRTlQWURsVLf73qaJj2bZvqSpaGi+LPVZfEuXHKK4eVI7wSCvA4tUk1rH2j1znjEWjD5YV8xKpCM+hqn+ybe0G1RX98TsKg2AlwLTxv8dg48pjxfLeQPIFrlRnG9E5Twe9V+X7hnilBZQemWHkTT/dlf8blLtGHgnPr5hJS2dDzHvDmVOZ2pWYFjfxvFfNJ4vrv04IfIW8hJTz+WY5JRax/9WAEU3Sl3Ho6hibjJ9kYqDayrT3Qh2HKVqBEDAwygYzOvfI6Xp9EhlvpEoytqpQg/DKxAw2lwh30hK/gs4F2gLwMiqaBj6UXl7Sx4mzJ+3yPyKtEKtgILJ4gcoaUzFFdJ2IR9Lw0AZrR1WVskBdMwgefaTu5/s6FPps5/ANljS0FNFYya88/WXXU4alBS7nhQyADJQnB1cCWc3yQQIQiGNdvJBGSM1Bb0LS74wEcalKXAg57nMeAYj79Nkosdq8wJ5b3RelRsflPDombBQ3j1rcDB9kSWeOryXoIp1DEVusagJS9M5/WiF6c8zBMC1dra6DtXwJ+WOXRmUdHXVF6OZfqfzH4yBTnMttbSG583VSI4+VpkkDLFaRf8jaLvWZxSv3j6uh1TkgbtGMS X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 549e26eb-ec66-4fa7-3f30-08da99b45713 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:26.2107 (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 16/17] avcodec/dcaenc: Remove dead checks for unspec channel layouts 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: sPx+cjQ5uS62 This encoder has AVCodec.ch_layouts set, so ff_encode_preinit() ensures that the used channel layout is equivalent to one of these. Signed-off-by: Andreas Rheinhardt --- The new channel layout API is more stricter wrt these checks than the old one; the old one let you pass if channels was set and channel_layout unset. If this was not intended (or only semi-intended), then setting the channel layout based upon channel count should IMO be done generically in ff_encode_preinit(). libavcodec/dcaenc.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index d0de6d3eee..0996296d8c 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -222,13 +222,6 @@ static int encode_init(AVCodecContext *avctx) if (ff_dcaadpcm_init(&c->adpcm_ctx)) return AVERROR(ENOMEM); - if (layout.order == AV_CHANNEL_ORDER_UNSPEC) { - av_log(avctx, AV_LOG_WARNING, "No channel layout specified. The " - "encoder will guess the layout, but it " - "might be incorrect.\n"); - av_channel_layout_default(&layout, layout.nb_channels); - } - if (!av_channel_layout_compare(&layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO)) c->channel_config = 0; else if (!av_channel_layout_compare(&layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO)) @@ -239,10 +232,6 @@ static int encode_init(AVCodecContext *avctx) c->channel_config = 9; else if (!av_channel_layout_compare(&layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1)) c->channel_config = 9; - else { - av_log(avctx, AV_LOG_ERROR, "Unsupported channel layout!\n"); - return AVERROR_PATCHWELCOME; - } if (c->lfe_channel) { c->fullband_channels--; From patchwork Sun Sep 18 20:27:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp859109pzh; Sun, 18 Sep 2022 13:30:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6FD7DgSdQRuTo2de/lPxVrHvgr4t04OY4qognlp2sSqwubBlioMg9E1PpXmqxtA4+B/lV8 X-Received: by 2002:a05:6402:1e8c:b0:44f:f70:e75e with SMTP id f12-20020a0564021e8c00b0044f0f70e75emr12342350edf.405.1663533025902; Sun, 18 Sep 2022 13:30:25 -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 y8-20020a50eb08000000b0044eedb5a82dsi7597704edp.476.2022.09.18.13.30.25; Sun, 18 Sep 2022 13:30:25 -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=T75s+ngc; 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 B0C1168BC0B; Sun, 18 Sep 2022 23:28:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074102.outbound.protection.outlook.com [40.92.74.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3952568BC3F for ; Sun, 18 Sep 2022 23:28:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VGJXn1Sig2gHV6UEKGDvGp8aR8VbwH+rkGbfDvPV39GPFm7zzmMeq8ObbkcJ7z6L25meK5oCPlz2p9o/CWCJ+qVJToi9ZY9v5CY/3fPSpje4v6hNh0H+fb1iaN+JEU+4NZdOCs6q0ccLbR1RWg+jnQM3FDrrp7fskdNm/b5SDZ0Xx0tmp+S/h0XkndFXEA/pUg/RX3K85pnWgEgxXWPNHlqWbrry1n3sp4QDiBzLGnHu4gE3M3TGU1aRZ22+MkdFcMrL8Svrpc1YSS9/WGEtzrMgiW6jgwaSUZJll8wUz7t9objjfdVpHOK5zxLaB8FgKP5rxTF2QoXms/gFma9hkA== 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=+XpNyoDzaFyFkXXGmfiXe+C1rtZh6fxfigXpucB5u6o=; b=iYPNaY1hPkTJBtX3HWkTSOd/CO5nAQV23ogx3RuEbMQ2ZGCFi5aWkMdgkTYReDxw0wMTr4Q5vOnd7J6TlZB1GxR6qN4gwoLkJ9OAJqs3mabmU0V7Cf1ndOntxslI3ETwYfK6S0yWtyItCGkapin+XfEtDIEP3DLXQCalIXvksXD8HIs7W6zsduHMd+zkPnJZdkzI6dTQB9JhBAe+9Xi1+R8IIN8nOJQOOeDjWPMdG1x+xpv4NhSWJESlCjT8oqDnBkYi1PXG12WdoRiLOGqYdVxAAnDWkGJ3N3Yd760B21Qq3XHYfYPcq4HVP8pU2wpr8tL6r6t+mpEbvoWW13Rp3Q== 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=+XpNyoDzaFyFkXXGmfiXe+C1rtZh6fxfigXpucB5u6o=; b=T75s+ngc1ZC6FkWiXzPSUHjsba7s5/aoEY8Ci+X3/SXzNw0E6eIhbMwLMK8bpVsWmUKZd+xXD842vMDSRMOmuna2zKBBdfsaIred/MV8/V98UqU0R7cI/ne4KD7Bq2Jlnhpg4A//wovXMoLRSB5oYlzVldQIurzYGRY37/3L8u5smam7oxiQDcYOSQoetSTUjQOQHk+SrmmeSVMBKYBNp87PZnabSGAnqprvrMT3oRwuDyHNfbtO5AIJruHeosiEMzMxWwszeLrrDCbNpOScxTEHp3OBhyB2LDqZWHLNVuoMwTofzzKuwUKq7IHNzyzZfwOc/BkbWJakW6K9LtIwLA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PRAP250MB0442.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:278::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.15; Sun, 18 Sep 2022 20:28:28 +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:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:57 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [QwCJ4iZ2VUXyN49C9shaD2S+HXmcROLjNoqDCwfSvMk=] 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-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PRAP250MB0442:EE_ X-MS-Office365-Filtering-Correlation-Id: 0853aaf9-9e1c-4870-df49-08da99b45814 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxCM1OeU4RWKrdQhmMVsaYvaayl+l1Ll105SdyNn3b5f1aoRTpZ1pGbc+6isKNWl6egskaW32gw3ZcEa+dGXnjWNnEAfGXjQkZdnN8PA56MmwpG0D+xLh+M/bdEbvyprTL3HihyI0VQdFCOQj/ma3ntmz5EqJYOT1E2k+YcylgOH5hQHY0t7btDiS/XkphOKZEhC4W/T53TLolRwN4k45FZfnqxT39oJIv0LYelGgCGt2/25J+O7jNaxFnoSPx9y8NZDGmQaayzRrCKCwyG4bjzvMzKMn80bpPY6L+NUmpdmdRgNV4AxcN4ngtTHNGXCkN3K9DLHn1U1twzWu0IKWM7w0/3KThKDCk1u0/mvmCN3DoiTEW7vSpf3uYtd/8vRgUuFJIMffnqf0aF3/SrCGkgz+xZs4GSbakXQpVFH61Na0SPF2DZNUgQmphAXzp3pgQBbsGr2czmCBdeLbEdY5f0RtzE48T+cBizWHYQOorOJeLQxIoPiJe+pg6hMh6ZxvP3XIA+La0erPqcZqiEAwMYRqXaU5o7M7Gl/YU9Q2IXYw55CJtYKVeRIJYKdOHNcZOOQRwo3VGzfiRdi/ZtOJrsKNbVpVUJi2c1uDYzfWru9sIYo+52oP+ImfEu7v5MppY97eJ3QU6Z6sY/7oe5wxu++l3ZTRNWQkkRgWM0a8FvdZ3EcPT+pKHgT3ZK9EDbWd2SQydpJwcHMj+ebB7jvO7oVtu5BkzZxEA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7qq1OoI9ppTktufNBr0oXsm1ISmtvu/Ln+G3/kXQ3ED/D5uineYgcYQ+adc/n8fHi/+XVzsj6+CWMZb/EC6QJcre/131Zr4lJxMzwbB/fe6Z3RWxx0BiPjqB9DsgXl/UnGwdOdwD4fJ1DDcIk8ncPuBx4VOdTvOrxNgsIz4Z53cTULOGPLidkw+uqtc9Ezktf14YpwM6aJOX5yuYWn7Q1KZY2qHYshqqWF1YBrzfcMeKs4cFSCdK43GAAhXokTvrVrRlrGIzm08DLqsD13glEPFMNbSxta0QuzdnNbAxXYSK0r+wpKhKdSttZDg0mw8XnQqx2C4AkZBsidXli7jEPEkv3t8YZdxi62oZUKNfiuZvo0aFpsICRYxeFiaLc+wyry1sETaivRzLo9R8ZiZKlZbq+4BCiIUkT/zwbcHOnXR6rODPD4yCjYdt1RWFlhqXk6tI2AXczRYJLFC+qMVYS7RAeHTWEQLZwCfdqVSEaBlDdEyndeVXfA6YLBuZ1nDKrTVY/giLRzYM/Vk5lR5npuCI6RlLwvFv/dX4PqqcgRGu2tUdbd/0vxBrtrkOGFkOgkRgfU+0/zDZGizpSI30gQEdDqj/8OsN5bn00VBYTEmg8SR6FIDIo2Y2lMquLFBH1HumtOMXmBx6QXW2Sf+mZA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UR2B1EHHIfDT/xulELr3DDB9xqyxvsUSzu5QNeRiHhSm1+7UY5GB0Cq/DrLvurormuPTmEG/7nq1mQtqIMfZnGgYMBiP6gtLRfmrC4CVgNPlhSU72RXmKb8sAN/Wjxm/N3cnxNLmPWFlohpftzVxi88xD35N22x76g40ZZv5oK0V8+SO7h4mus4VIIZVAgA4rVmGopYoke0n+OH7aHTGxk5xm4MdmxpUTavV9FhMpiqgo4r7vSJjVFkwr/NjDctIzKxllWVqRKtN33gluHchmppnWUv1E8nDAKCMDWEeAsdBmfbDtYRsFOVefktvgR4hGSPWdUNRBr3qIZKVPpmPt5L9b38i8CZQLpJd3yT52fjLwtg/L3tH+1/xbz98KHfos5pQKApLyDhdHtkCmLiEHkli8ZaHLE7tlBWR9p+z5phQ8JtoEwZzupH+ZDg7ZSvE/Zg9pvg+nQKFijla575SY8JueK2OA70doahSBvoQzRrCqI3YwmURyQOocLubA9Xhwc0rWLZ5ZX6hrfhe2vht2rNmmvxydnBFThuEvRERlE6eZYFRdJpGHWiIXaLC6EWEecOCQ4rnDVCjxzfsRAKHqPnMVQKpnW55+9VKOKwfeKD2wjDrE+3BSv204d/XuqerxxpRtDHOhDkw6d/g/9VDGk9hf//ecX6l4RYEXEPIehJ2dTVBgwxS0tHuCiLdtLfaNus8WsjoHZB4weFdj0W8/Lt6AZHa+550ss88TPHG3w29vREOEuWh4V8dXnaia5qioBiMBgYq8cqgFM4gYMBYdZU0ttEvy5qubFGIphq0nckVHwqt9p9U4A+gM6nY/TkuMfANTSk+s8CIS9huwGe+AXHKxbEk4QgROZQYfGyKv4mi09cTAe5+A2Khv1ESxDdAma2Lj935W8fJgssTFC7bvuioHEV28TbigoIGUZJ1+K0zlYL+qt9bwLp6KRtkM/AAVjlj6TlrUwczOvyMUiNhG+q8BZnhXRj5RTbsD1//RUelzI4C6LyZ1l+aJkwOQsRgkq3oSrlbvlEgS6c3LM8Qnwjxp1vEds6BZ3Is5UKfTq8piPkwVd2YlRYjR8t17QgwfR4Y8qAbHGhqY2vBhYjAoYmrsUm18XDDsB5L1d31u16AQjXv9BcD1ryMbVXRmv+g7HH1bwceb4L0zftOlGoK9rkiWrIZ3UsSsVs8YOt1YRrQ/UaUc/9zyNdAtTfvy3uctO33M5tH9vP6k+dydzOgyxF5Z6PYlLxAOi5bhJP1lusp7oBCmiu3pQPo4R74g2yB4uEJQRj1ZJlWbKbhWy0xKAfZ8TJ09hh/S+JXnPhY5LQ3lbm11R1ftATMkQBTqRIW X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0853aaf9-9e1c-4870-df49-08da99b45814 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:27.9146 (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: PRAP250MB0442 Subject: [FFmpeg-devel] [PATCH 17/17] avcodec/dcaenc: Simplify channel layout check 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: yDQVTOOZI6ay ff_encode_preinit() ensures that the channel layout is equivalent to one of the channel layouts in AVCodec.ch_layout; given that all of these channel layouts have distinct numbers of channels, one can therefore uniquely determine the channel layout by the number of channels. Signed-off-by: Andreas Rheinhardt --- libavcodec/dcaenc.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index 0996296d8c..46618c13f9 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -222,16 +222,25 @@ static int encode_init(AVCodecContext *avctx) if (ff_dcaadpcm_init(&c->adpcm_ctx)) return AVERROR(ENOMEM); - if (!av_channel_layout_compare(&layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO)) + switch (layout.nb_channels) { + case 1: /* mono */ c->channel_config = 0; - else if (!av_channel_layout_compare(&layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO)) + break; + case 2: /* stereo */ c->channel_config = 2; - else if (!av_channel_layout_compare(&layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_2_2)) + break; + case 4: /* 2.2 */ c->channel_config = 8; - else if (!av_channel_layout_compare(&layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0)) + break; + case 5: /* 5.0 */ c->channel_config = 9; - else if (!av_channel_layout_compare(&layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1)) + break; + case 6: /* 5.1 */ c->channel_config = 9; + break; + default: + av_assert1(!"impossible channel layout"); + } if (c->lfe_channel) { c->fullband_channels--;