From patchwork Sun Apr 7 21:09:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47894 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp2146845pzd; Sun, 7 Apr 2024 14:09:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwokRP8HGwZqJe/lHGVN5p1t5JPspS9lB9sQgl/J0Q28B3RDgfDJ4wi6hFpHVnpl3yUGFnrTM+qobYgbyksHnYGlIze/UlEd1bhg== X-Google-Smtp-Source: AGHT+IH12MIy5E3+UqUbPWAMz78brvpiyEVtE3u96d1TJNW+28hFehvMD+KJolYU+8Wv4T3YeYwJ X-Received: by 2002:a05:6512:6a:b0:516:c7e0:6493 with SMTP id i10-20020a056512006a00b00516c7e06493mr4518029lfo.6.1712524176518; Sun, 07 Apr 2024 14:09:36 -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 i30-20020a198c5e000000b00515d13604absi1828952lfj.472.2024.04.07.14.09.36; Sun, 07 Apr 2024 14:09:36 -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=AGEWBHvJ; 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 329F668C7AE; Mon, 8 Apr 2024 00:09:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2080.outbound.protection.outlook.com [40.92.58.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA97468D14A for ; Mon, 8 Apr 2024 00:09:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ViX6Hai06VxxJZNm41WYT7nX6ThrDvPJtHooE1hBl+3DlyCmdeQ81ZbbF4OuvAjlju9c8lQVFIlTVU8i1wZFsR9rXFraUsvmiCxPj7zZJV7Fx2Re8PG7c0MxhQSr3oqVyj9ZvU+nMuUW8V770G9K1a3Oj6LTtJWr5L2fYmLbQXupWmILCTIuTSSMQwRYPbbqQ/u/SaE2s+0aeWoNWRvIJXUsGCnS3mEsl76MzfJtru98Lg0bSFCQQsLbM8tGRK3ES7qBWw60pFbTwRaQx9yaxGcWtFX8DoLVwQnIlhdErfxT5xte1zpkTBdN6SqRR93X4Jq2gNS9yJ4r+qhbvPqS6A== 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=QbL1VWNSLVgcEnhvI9inKvhh468YmgdMgdX325ZJSbg=; b=moDdkjWZHPCnz2MNT0CgfhXXdMYKTUqatKaY7PoIcQD/ystlJPMM7BDKvt3Ukr3ws9C1VLpjkyF+4Rm5myUQweBsGT5nKNOJNmXK8vz0WFLyhDAtgE+zWm8qQMIL5Y+mOaeWRmyCjUJfZ3NCHCVohpItW/pgf98pWwrGvfy6UeSLWdDWONGsAvYPdTrz8uo2aeVPTRDcouTHJMJMZWqNOWDScibM0HljbF4p/UpHWA6iYjSTjlZlMvEofQ+P/4rH1SVNSGq4DrDo3D0HIQFYkZw7ppRqRQAMqZWuX5a9HibeOgBDku7rhxG1Jzocn5x94jqhPp9np3mVo6PFKuWyGg== 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=QbL1VWNSLVgcEnhvI9inKvhh468YmgdMgdX325ZJSbg=; b=AGEWBHvJyelm6ddRk3ZR/cGqBK9eR8zeIFztWHz91a+sBZxeDNH/2Ja5JCWKalO8w3MKkXzqm9mQ5wxmcfWhX/cKU4tEhoNMLc7zEEwQT6E5YNQeGR2H/OwCxqIG2uugU2aAR9pGSfDHFBgGIviabFnPorlbUNiUOM37ZHbjOSHzLimxT7Jq0EAMXNrMUybDwJiuDc3lnx47/tmIrZPFugFzwdiD3hLns0CRqOsKcvLaqHSVZN65qYUYJ7zjpWKqknENn7IFN6PdXaoGj1x6YrMOteAvu8dlEIe5qc1GOdDA5e+RXaHtw7V9WcmEQWDCeS7mkzwjsXKRg3o93uGeCg== 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Apr 2024 23:09:00 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ofgPuwpn/gNJAQRUlppROxhSUsEQZIeH] 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-1-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: 25b2b45f-2a37-40d5-97bb-08dc5746ffb0 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnpOxDCcKCE3ew6GouC7ydNhuMwvg431uzY1y4FLD5JO0Qb/BNpUCS/+w0tfE5RabOUsBK63Ddu95jh1Vr09hlVxXLFN0EFq8nVNk9vkZnLnob5J7qtgbwzNIubDb8H37l8SccFUqe60P3Y1yU2DZwwJhqSMrLslxrdV09ac0m3pB4HL0jBPQtQR3Y7/13aDXawF5n47/Pm9YUkAt34BvOZgYDEt55iThatgtt5iXqxbtTdvlzSTMG6qwN+HXbuVZBDRxRe2lXQXr5lp+Fdl+buemg9sb3aWki0S1dhM6FgclILFgxnXqI6XLe1SMPxilYubKaKbRPlG10ZsRyk08LQ9S5vrpEBxnD6Q9jLgwpjL6o6EOnia8EYvkNbEQ4Ofh5/J0jy8Kt8pZweXBZVh61ML1FmzC2N0SG/LqaRtTPXTJB0hsnyNa8aAvq1wQUNXEZhMi1d+poOvyjEYGTZuOkOe6XhyNbRaptwCM++po4gUZ/d2SHOrNji17I97fl64rhlvlA0CjkgEmJhuM5hts/4lQTLbDaPa52hccoyCKEWRVv6HAiEbHiQJ4wiWNpWgxQj6Ed8O5SkK+tOuhac7djrSvVNOJw8OLoTiebNGv1rGmInfKk7UdwtG60VJF43Zmq/X+Q8Ew6lX6vcULL24x4c65XGpPeipGkdW3VdxOzycquid6byvTQhjjHmvtZFH0nfMFe9vwFM8FYkVwiJlzjIjdVdfuQMiZab+4eqq1Hg60dzBlHLhEjGhLoYumkqXSVc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UWyGNlagbL39uP/XrdngUFYOcADQiiqm+O071PfMy4yo96G14HZT86f0Z6pZLpV35Fg0+3y8hktUwUI0mHVvaOPuubYkRmbXZbBPFBk8U/2PXlmrxu0YOAkuCMgRC9+FCuvpgKSEv2lSDe8Xc/YrMeZ4My+Ab5EFZlKcvPAoZLZlQSXiVtl4bo4N+Imm4+HL+BaLseOOWXf+ZknRAHb2cPzfxqU+WIgNCha9auobp8hVj4vPn4A4WM4l/LnGHcB+vvEwlzoFqFuKTwjHfOTKlHvqnhXIPMifghzPs+YHZ1igYo9m5pXwtFLwjbmXSBcSUmBQ/jnDoFze/8btCu3bu75b7ur3CpnByhgozFvi7FsisrF9dnxusSuAnieVNVCIHo0QXIxPgW8+nmxmoF5BgcTlqfpDaj8U7w4zNSGSN8fYHJGsg6UtwKwfLmu/YXqYS/uwUJqS2skBiwegHBWI2uADZlODIwSJDF0fc6dEaJNyBZfME23pAFTN7y/CNwgEU0nYSJV2VC7QeB/C5jaI7Ad9TGp7xTF3y5LNhzVHvN4aOc2vdIoepJSCJBJrgMPkKnKAJxHOV+K9zL4r+o8MTeUXCz6ebEbGpCQSMTcRPZWDAXsVWt74i9NDefxK8hu9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +oVB8D6gG5Z9/ZHxl9eiD1CIKCoLMWHfKCXRIU3pexBQoqjXykcYQVh3diLI3smDMz9u+dWQiFXWLkRrZNhy2f6rcBLN5MxOBEPjl1i3tbY32IW4dLtwRWrfjTmCYUEplNbOFnjY7YT19Ex1heEwb8ljONU8oW2m0itKf42V0Y7ovpfFMarVlR+hYwVrv0LOUFDxNf4EvUa4RI76TMkZUAqqxYfZlkjLY+oxW81PcZj81z2fcIYKvSBDXNo0iz6aiV2QbbMzQiilUeZ5LicftOaeTXcPG9uW1XtIJVKJtmAE2Kg0shxB9lCFHSoGiiD0Z+r8X9uzTCkDLefv8zTXcD6oADkrQufJZ927ouSl3pHdMij97GGjZWRVKEwYjLM4gHniJb1FBWEQOPMHCh0VpYsoDI2RIq3pfNKueVSx9ah2OLMvooLH+pl2tCHw7m+D0hyTqML8GcdGrPvbUH1eE+OERHh415KoEG7Yd0Zo8zL/mU0moE2oMgRFsY5epc8PpjQtwcVsAfYK5JY0KMIfnuEql1ryPBa8p6JQo4N/fONjGIgW5VjM+Ht1QErc+FF9LD58/usu1FA/UUvE03c09YsHNB/eclrNdPw3Pmidzf1FuF33qWwUsaDUGZwiFkFBuJvSUmW6JzeEoXwSAgtkypxaYDAC32ebahVIztIXp6Sfhh1xiS57zLe4D4sXlrFQx2zW5CBHJkBSuvISfUzRvqK6Fs9o+CWXCzJNY2WNI8PUE1qz0IL7N6kEKzGg0tJHdufp2ro6Kg+5X/QT8HMTFdSniDDj0ghic4f6ViW9JcDU3+6zuV3fLIgozMUdfCo9ZJUz93l8vD/aikOiYZidhmlQ8m7QPWYrfeD0CRJvf9XMl/UEOnlQrcyp1vyAnSN6r/IAymTXqoPur5AeEduWCkeCIG7HS5eAxlAAZ5KUba3YMYbiZBXraYasHKNhQlMd2va6m0m4WUEo6gPU0xDwc0ObuhfSm9YJ/6DhyTc51qxmVFjmCIdfKDhuypbZvkhJhPbTMCFfnPQUOrLUxdUpNoOrPsdV8eHIwXiazuoNc5M32AuHAPpFsW31bYSpcgnQg2Ki+Y2YkvjI6ffaRMXufMDiitw5lU+GhWntkTdMuhAK7A3ORvfKJHo3r+VbBKPsTy4d+SV0MSCHmCvAOD7M6EaUvFPvM7uGmYipc6K7r1oLY36tVCb4qt1d92H/gbWxPToFMZE5x29CfbeCVGArR6Q/CnCwqxuRJUBIikbW8ThC1J0zGXzV1rfazwffWrlHATVvx+AlDzWl1EbUEAQn3Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25b2b45f-2a37-40d5-97bb-08dc5746ffb0 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:23.1325 (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 02/17] avcodec/ac3enc: Don't overwrite AVCodecContext.ch_layout 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: FdwlfUND2DKm This is unnecessary (the channel layout guessing code became moot when the channel layouts were enforced generically) and also dangerous, as a custom channel layout mapping would leak in case one was used. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3enc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index dc197c1517..f6456b2a22 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2224,9 +2224,6 @@ static av_cold int set_channel_info(AVCodecContext *avctx) s->has_surround = s->channel_mode & 0x04; s->channel_map = ac3_enc_channel_map[s->channel_mode][s->lfe_on]; - if (s->lfe_on) - mask |= AV_CH_LOW_FREQUENCY; - av_channel_layout_from_mask(&avctx->ch_layout, mask); return 0; }