From patchwork Sun Apr 7 21:09:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47902 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp2147203pzd; Sun, 7 Apr 2024 14:10:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWt6jSFXu9n3/59k115QMO7jENjxkG3xiNmwT28KlplNM3WE/F9MAUvb9ryYz6c7pPIo87dX6U3Af6LupLeYAGYactcFfdtpDq2TA== X-Google-Smtp-Source: AGHT+IFJvhEmbakPbukxsE7nNGlHS/NLqtj05zL0lQHCiTZuxz9PFagkseL9rbJ0oqYfMXyB/+pk X-Received: by 2002:a50:d59c:0:b0:56e:297b:ad61 with SMTP id v28-20020a50d59c000000b0056e297bad61mr5274027edi.35.1712524248384; Sun, 07 Apr 2024 14:10:48 -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 f6-20020a056402354600b0056e5bc5fc9bsi444982edd.370.2024.04.07.14.10.48; Sun, 07 Apr 2024 14:10:48 -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=bE6NFDWZ; 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 9E47268D26C; Mon, 8 Apr 2024 00:09:56 +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-db5eur01olkn2043.outbound.protection.outlook.com [40.92.64.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56ECC68D1FC for ; Mon, 8 Apr 2024 00:09:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GiOSLjbnqLi4dsLE16TKbRDqi3Z/O1qrtP0edgNJ0cLwOwnZj7QD3EqiM/4f1Mut/bNuwLhnnShyztCAbNhRdKcuZ8Fhpm6qQZCU0+d2d/WgunoexKHyl7vug4hSmIF8OOLZU03SdLvaxEEW3zh9bSY1Zc/1IpxknqwGWI4CTaSxo1Bu7BHelBCgMaukny3GBvWkqtLhMBcItEWW4gzoJYeQXsvpARBvbnh1b4gk1dcKlBEn6NpynpK4GVBJipGRlEIJyDpJLc6W+8x0Yt3bXir9V2Ir8XiGRb5pfgZfcdo19XQJBCSziN/G2kGuQNRr7Taks0g1dp1nVbxCpZ875g== 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=gIMh+fEyHBE7oyDUJpK/5wNtpOyIKdBMzElnhDBgp6o=; b=doBS4mg+7xN7eam63BFrQyQKE7QhgR/0twN5lmklzChETTN4Rys1gH5/SOTJ0xj6jwI8p+eUiA7SgQWi80D8auCUg9gNippZ9NrNbNvZHxUUpoBXB6JXamqw1+hpmBmpjIneg1NjPuARIRCodSG4Gvy9t4GNjPfk4YEyI8zBXKob3wdsSpQz7V55QSWWBwduISxayC+acU4XlqdWzR8Xvx4beVj15lW+pO/VHJyp1GQGpn6shFpaQY3nTbHPMb3XcEJKY/Ha1k3eqUPXEbJF240J5yF8FxzAIbhDMN9LS5lYKBpwyDjYLP9gWLXKerFKlDPcN2t+kTRFZr31agXQpA== 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=gIMh+fEyHBE7oyDUJpK/5wNtpOyIKdBMzElnhDBgp6o=; b=bE6NFDWZvIpqve48X39/XYS6yqCOh9bDUuvoUpgwKAH3P8tlL3qNX6S6CtxlNT//Dn51yhvb3R1KwzOiGuNNFZyB7iFWqhoC9ap0NS94rOcAUI+V2huxHymE4R2Gc7vplbYL6fbiPPU9nHa/r2VQg9DGGpGFEUOhvAMR8+tQIlVVuCr1En9+RzF1cu/OP+sA3RxgehIof3S0FCMPkUua+NlJpJ6pcgDRq9JZeabNsMYqwoHZqgfPLg9uKItB8IAObVZbr/QsFY9WT7eB3mhS7mzyrJK+dLYLJyE6u5W+ohDEaQnrz5hBPPwSQgDyGvMfR+6oAzscMSliXzRVCaoS5g== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0234.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:379::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sun, 7 Apr 2024 21:09:36 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sun, 7 Apr 2024 21:09:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Apr 2024 23:09:04 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [/63Ddt2EnwleobBVi8kl05sX1HVzZRDy2zkZGamV5Po=] X-ClientProxiedBy: ZR0P278CA0038.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240407210915.895619-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0234:EE_ X-MS-Office365-Filtering-Correlation-Id: e72d09a5-224a-422e-f7a2-08dc57470778 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnpOxDCcKCE3ew6GouC7ydNhVMs6zbTOyCRaZDQ3mc5g1xwy2uSr09F21VqoZ3MgvAwYeXTSSw2uzhWomH6cpcaAV2GGGtquTpVbFueuDY9utX2+SmwK0uZlTqHjZIcCed2ez+TT1LTsA8eXwhvbMjj7zYqVdVlif57QVg1Ci01cx0BF5w7nPaURAGuyAkmBh8wRVnmyVxXHNKSOGUAWYfP7waxuehbDh8Ahhk28/NRVfU84uJeRSOhWxo498PpZTFbnMrRONVUgVOxeW4bOkd5s6tSRsWo4LEjsBNyWaSEeuTm2LGO743lLc6AmHs2gyDLzmn0giWbfoZfggW3fRFG37uEj0AvfQTMTmRP5XJuUNpdpjWCcA9Xv7qByrCEcVUxjeds2Bmmlblz9M25L1hGTwXl9OELH4KPPJEPnUkacTZWfE30pR17z8wdQ06OLPwlShcSCIH8qkiEXmSQP2C5sS1GO79kp1UmPKMhlYWsTUMrXhD3HXSBibAUYHB07wc2awAETGDX+pe6oRO0L1TFhx2IGH6NmOjCYPWXzVtyLk5DRTFkhH36+H/UrdDZZJs3JlotaB8nIWJspXCV78SM4DhrpXAIt/DIp23jVADPJtCrhufyw2aXb0xeSWrFe0eFNNU56x7cXw3lCyqvP+5gYm4dsCCv97RwgbyLsjY/D9Tdj3Wp5iN0clP7nky5ick9KFKjOFFYlIo/Ejb6rPQiSavNGQCJLJ7lWkX5kvviESChD+pcRHYbF4Yyr7y4FdQE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jJqN0f9EMAby8ILKZlKp5GJ1svl9JbS4y3pJ7gdAil7wiCKQHU0TnbGA7SBr4PwfJSRusrOsMiaOHDVBRDnAf3u6aBUR4Bs7CThT+LFYlDyo7c2OOuCZi8+xzgitwn6pOpWD5jFosCNyIduO0WR/77784WbIFRR51ha3kNYeo5Y3i8ijB5jsr/fRXMa2VIHKDlyXG0E8yi740Tq+VD1JvA2GYL6mDaF5dBlPCmyU4rwPNePmzeaAhntQBtTbrt4qz5lVKMtbjnLS7DFPX5BFBilUMmux6Fl4QJNDhAQs8T8kzyLHyGLePvRdQ61BPkkZK7/D7XS3WFsJp9G0LayCMXlYWB6V+nKAJ8wiTSH+somS7w5Xsy+Unamjr6Uy4lV4Ta3CrpNTXB9TZC3PeK4m/5dHvYaPpUJR2XRh4tOe9nRGZy/nlQ7IW9D752Irwfs/QNk835jIpQvFvoA/OCLWS8kQsPHL3DOMFfarT/db/1SKQ8io6teUQp3Ife69bOAET2XgFG+0uyIIxa05Hw8qI5ppWlo1JRYLD7WyWycfF6v2l5ZeuQflGaWjgNIdyZ2AT7iieBa/mEsafOtt+zf95dl3tJoGmPLr8TtQ7qUg0qFyTUFC58Kr2HeZDS8TERVd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1EXw490HJQ+Obuw88DFfEJVtezl7YyMobsajWcU7LfBt6HADo5i8qOsJiaA/IKeT5tb6Ucxqz7Gn1ws6yse4Ruzah44/FmuVp8NhD/ek0Tok5AbSV386br1HA3NjyQ8Cj9vj0jNKAhZ8HW90ZBA4SXwxInLnTIPdBPulnmdHG1E42CYCfXsGECb44IL0RwIxYrj8QkR9CI+hJRTLwqVf17yrtmMTwNAhvnlXCTUy1wJZmf9VQMPaLizz0T9CaMMCWFq0n5hONmqfGx/EWMp7M4qQfi42ylwlfrRokNNg7TTz8CF65C/ochEXi+ZMiJqJK4dU7kmfSIwdxBknV9XUj47q+zeoR7W5X9MF9SgJzy4klxxGj66S78TnoMx1R2b6VMUlltFO0JSHPAvEafGJ39EluImDAJ5/o1bLyy0AaPGHSUkkO3zRh50GEyiWvDNGHc+nm2bZkDQYqScfNfGeDeFYaC8GdiARrPZWIEtQepOyYHgl4ez0nCgi2YaiZSY9G0JQTUv0U2TbqrhC0ogkA2eVJLKIRkMn3phUq96cmJL6kMwBeJaTpZROUI6ZEzpPSJSuzNZpUo9X/m8/KWZz1T30VRz5ybLAfZnrcdMWbX/tphtOXNSL5z0OxieITi8lyTubuf1vJGKHIl/GGFvTHqYktrFgcMirXsW6eFOcvQgnv22PWn532JQP6qdburPY+PDo2RTS3H0l1R5eHwPELmHXtpmX9dy63NKTnrFkxk8TgHSQCghJPhc/JL1nko1Mz5N6lL35Clr32ivmZEWx5l7qcFCV6sOvRfGWKVpXULEKx0Qt98pJxBNoznt18jMtc1WDioCG+aQUJ+5yhYeBZUfu4l5SYJIWJ89upfe51oAeaWPeVrVUEi79EJwmSc4ZiZQmpOfeqdCd7rI3wofmb/IkTMKdaKllJNPDLiYpTeocjVLsY79GtY2SRg6kXe05bnCnt6ZtQftqLY4SFuPToJa7ao+WDuIMYuM/Ofmkw3LFv4QaWsGIpTgquuUpoymiX+CJJ7w8Gy0gxHllXYSioW4zaQIbcikHawzaQWQj7OkGWjYwwI0sSQZOVY0PNuoHP4BCLrAWCpS8wBMOOdbZ6/rANsF3nOqP2ZH8pw+5dkCmFT5TpT64HHy5HENYd57xK3kErPUYG122a6jI3+XmIzN+g2NHB6L95jSmrUyaO89xuir1Pq4cT41rHBKER962rmHenYbA7SsQxWywtGmUd8g2FCDhjZnRsLPR9KK+1XivzsbuF0o2Tit69O8041bf1sPg4We2kLrMB49LLbItqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e72d09a5-224a-422e-f7a2-08dc57470778 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2024 21:09:36.1901 (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: AS8P250MB0234 Subject: [FFmpeg-devel] [PATCH 06/17] avcodec/ac3enc: Remove always-false sample rate 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: EfOqP+T70+BW encode_preinit_audio() already checks that the sample rate is among AVCodec.supported_samplerates. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3enc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 272d2481d9..32aaf89ec1 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2246,10 +2246,6 @@ static av_cold int validate_options(AC3EncodeContext *s) if ((ff_ac3_sample_rate_tab[i % 3] >> (i / 3)) == avctx->sample_rate) break; } - if (i > max_sr) { - av_log(avctx, AV_LOG_ERROR, "invalid sample rate\n"); - return AVERROR(EINVAL); - } s->sample_rate = avctx->sample_rate; s->bit_alloc.sr_shift = i / 3; s->bit_alloc.sr_code = i % 3;