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);