From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 27FA2410DF for ; Sun, 7 Apr 2024 21:09:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06C3268D154; Mon, 8 Apr 2024 00:09:47 +0300 (EEST) 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 3238D68D14C for ; Mon, 8 Apr 2024 00:09:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gRapEH2PODIO/NN5M0iYfOI9Qtak7K4jKgiutloMKPr+e60KThU0XCHyb0ZA/1R0K+T2JHE+roxXHnV/uDrvWuntzStRoBzDf2K6zLXcipsUJmMI02zlxuMIjDCUNVBzUflJbj9IbivAqE1+IognY56cwwTY2hsweY4JZ4F3E1zjW1duqtLYM2LDdsbiSIy4YHsanifQfel15Bu5R9F0ysoYC2rt9o9fT9WBo7HU5ZNtuYSwPoRixAj7dn09CG2xD2w1+Gu2opft7fFDhJbWNUho2bBAOdqQ4uFNhrPRN0A3iUxlXMSnOMY2L1vq7xfNAWqGRkNKQ+kJELFFRQjRSA== 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=JrAWIpK+Xvx+SRayBmMokI1Hh9Qov2BEG5mz8rMAs4I=; b=Rxq16FNZcwWYo2UF9Q1rnxwzQ17nAvq+czBixGnVUkUhHwHT2i2KjBBt2kevYsbT2dhrNeAx+vebbSctyarwmMCqGal8WT29MscloUxR1LxAYhIOMCEduEq0YUowia6F+XSkVoKy2ylxkY/7/86vaxml9Pku1zRm2PdI5wbcZQT77ja8lTIviS8HVG3itWrNBw/XFoZTEiYYmg57F2Y8uJCbDyvWC0STYi7PU7gvv4DWNdHqJFWZ19hyIpqFSkQDeJFBxnIZ8F8AueEakuEkuKOjrJxrfh1vLM2Kh6cNw1RWnI0N4QwXZWmwZ079L4pc/b03V+G8WhOOWCAgMfieLg== 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=JrAWIpK+Xvx+SRayBmMokI1Hh9Qov2BEG5mz8rMAs4I=; b=GMs545qVPq6yyMluB5VNwjKoij5BCpIA8LF9K9Z3IO2RuZ5CdNxhO89wDnfME0KNlbmbEMsltPxMsKBM3jso8/TtgO0+Ou2sW174mcey/FlDRPanDzyy/eMm9+ngs4cIMvcJfCe6aL8wnRhCPFnsl+/fO1pdeLurCi7PG2GBKel7Tql/L7FMNANXZTl7FIpfbM8PC4b9qeuEo11GexUZggkaQ5ZtF01TAsXSWv9MOJBHkd/nzkE7ppIGLkIR/3iA/XVt837sbtOuD72x0LHsaLobRWeJY4IyqaX1m71elmoMtTxCMfEUreeXIoFckd2g2j2SPyOo0RxFiV8DRbR8LA== 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:34 +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:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Apr 2024 23:09:02 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [2mBluIW1Qn1yCl8KJ6moi1/lKuARjmar] 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-3-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: 4a8fb6ce-58f6-40cf-d915-08dc5747065d X-MS-Exchange-SLBlob-MailProps: quCBMN2EvO+2u7sZ7OSLhMIkTSfckR5Uyku0MLan1FsCZgvY8Qx2X6bnK/25h/N+I97GZvPwmbslPlx8CJOYkG128KktNJzdh3mAiiYxR6pOfeIy+1SPV4JluDHxBLKapg4scSkaPSFJzQGmKuH73+GVBGpjHsqB9oOzwY6ov5JPgawjbapAx7I3tCElicRntym2d+62pG9eHmbfmNxtCTS9lWL2pL1nFWH2LSKjBwVW2of2HTg1B6I0z6xCwucz4hMVhxvCjpi6XeYhOG2okqebZJKQ8RhrJVSkOwx61qQtVWqLWQBzakHGfroyu+PCxX3yEG1jE/Q7zYFwvhDj9x7zRcvdnEOZ0EkZSDBMZABwKi/JKfKyXxaR/AfajpvrZzlQRCTi1ytfTeIl53YzpjuwM9RplrmIo1N6yvOpSMv+OR2kam9+sGXGqsLyWcEaI0HCoTnKrA+2j0nAFvYnuFT1r+0ajiZmbJ+zsRX2GFEeESCSpzEMNC3kaTc/WGH+A27qPbAcT/tdWTW85RykWkgCg/F02oJualksA/yO5paUYC31z+nBVfMIOpLRyk+vlRMajFy3/naVu9Ki0zJ07rm4m3NgzHYQQS7QgomWRGOQtKBZgBUHBaLHFxBXLEg3Rdq95hGUSe/Fo3wU39XhLvvjdjaoK7IRnG/p+bhQrdupiROY70pGElwoeVd5OYduLX7nyRLl/dCgJxtM004Ijw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9AMBJC8Pnz9W+9WVYSk645Ay7p7zTKycvSTPZUuIcqOhVOdf4SD9F9NUrFxM+W74faFzFtGshC24rTyMLAPM/XFbFUrneQNCzljCbBCWxOgqAOa5q1knxF7fB9ECnd5JVu3miEy/22IUD1Qh24Ivkhg2d2OSnmpVRCW2zdnPePkHVWWtcOJMXafh6TXBX35sjVY3ZEltgM+qHYVMqfRr4rgTVeMMwFYNVziCORh50lQh0Z1BW9DMjcKCfxlxs/V94d6AeDDtIY5uUTWBw6VlqB7iP/vQo+w1gbSW99x7kd2bRJBiOaRLLr/iNFrQK84OcRhw5KpUv7k33I3DYuHPpYZI6q2jH/qvASQ2i1/n+MiDu4I72K0K7P/KWPkrr5d1IT6alxMIsfXCaMAJsBv2IB1GR01va/dnxzsTI2rpFcufllFjHaNf+JbT+y+//l5o0WfkYPf+H0fnA6jJ5YrdKoJRpI+ln3picEjT75Bw7ztJzMsEOoPLP1KcaeoYAoaeQ44dwyKWOGNdTwlexpRqswSjDc5L1XtaoZRHB2QBSYQez3dYV5qZaDXZY1frj5W5lmIjCyCRYH6BUGFOeKP/CnWOiaSH/Jf6ZVOGxbc6LYVfABq9aVxWZRp06z1+SXLC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5YAH9GIoQQ95X1JbfAYxVeHLDEf0FNhlTeZLZB5MD0NL72RcdDm3QOHbqtzJ?= =?us-ascii?Q?T7VBcVYf+U4ZiWx2ml5WNKg8MyujI4C26X1KV105omS+7fJJfzEJoiD4EOJL?= =?us-ascii?Q?0y7DFDSyHztLSeBVbXaE1QjZPdOUsL3VoklvauAUKu0XanlSeqDMZoQa9f06?= =?us-ascii?Q?Iz/Cvy7miXVor5UbV1N+k6mN7JrHai76yTZ0vMW0MAw3jpO9vwXwGcBKtKx6?= =?us-ascii?Q?arHwi6K+mEqQPzGylNxippFhTrrByOVU5Z49Qlg1AF2JA6WKMvitljNjGAsy?= =?us-ascii?Q?VS2wG8284Z4fwGJIzhMgD/jlTjo5f5YfGbp3SdMLgwJDQYNVRjpGqZdcKh3V?= =?us-ascii?Q?Vo7QULazB4toTuaA/dH3A5deO3Sicuqte2CcBDp4i22m7S2jILmOznCWnJGo?= =?us-ascii?Q?CfaU+NjcYQdgVaGliMw//njQJb9IZMlL04/eRx9KcV+nyv0i3beIDnZVixof?= =?us-ascii?Q?Lv5cPhmEQH/dbVMbtxaCrD8wb4pfZiU4XnnfRrSy3Wg02TAteeIqsQ6TCRLi?= =?us-ascii?Q?8BHrO5VaO9huny1+p8wREOm3ywS3obiW4FHPSAxnX4mjfp9GEWcZoNQZEvzM?= =?us-ascii?Q?uyz3CVbUgNpQRc0N5Yx3zMUDYCWZp7bjvU5TNrPnWaHPtWIZzrCRb5I4CAmt?= =?us-ascii?Q?oDWz4mvBDVXoB/hUdO+hSZ8kTGSdsl1RWn7KWJ0rtPysUktw5YLr547Z9G5g?= =?us-ascii?Q?Aj8CPbd5jc9ZNqJeNAA1sYi0isARJ9sOabnBvqwUdnN9j8L0dOIcspbRJ2hW?= =?us-ascii?Q?vml4KsUKb7EtM7pCFoxKV2Digs2LYDM/Dy/dG0d20KTYX96NqHYCnHvOk1Gf?= =?us-ascii?Q?eWcuJfFEcU94lJpypILgVoM3KsyTHcFhIkenHPL4aqWQOinzirsxp9lXKH/j?= =?us-ascii?Q?kBYFqyKLLx3w5wvg5l7w7rKIcYAIocQS72TIiUUyiDAPNDp2zg8TJtpQePuC?= =?us-ascii?Q?f3RVYQoNDUghVBdt4iR6Pga0Qj3nPdU/XDCROIZgZKo9NzfJk6mMKK15oN1a?= =?us-ascii?Q?qbSVy0YJ589NlJYpCHBKgR7gfCFqVoeTK/bloj9Fe5vBoVhaDlKG/UwpHwUJ?= =?us-ascii?Q?m3PRdnGKWR8cyMSnu99gtL7QQJkaU56s/yc28OW99mBISx8a3tjFnMyBhx+O?= =?us-ascii?Q?XjLqyRbECOKGHhr+NN7JXeisvW6g/idtRAU65kccIojnURMK4stQdoFm58Om?= =?us-ascii?Q?4z07Y+olp8ZlABChkM+CbVijPFr3lFMrK5ezqa+DO9dkezSOeMWPi5825ew3?= =?us-ascii?Q?IQk97GyW+N586Ymj4mo0anM015cMms9l0wnVm/7iHA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a8fb6ce-58f6-40cf-d915-08dc5747065d 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:34.3106 (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 04/17] avcodec/ac3enc: Use bit-operations for bit-mask 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Simply masking the LFE bit is more natural than subtracting if set. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3enc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 1a65e35161..31b9474822 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2199,10 +2199,8 @@ static av_cold void set_channel_info(AVCodecContext *avctx) s->channels = channels; s->fbw_channels = channels - s->lfe_on; s->lfe_channel = s->lfe_on ? s->fbw_channels + 1 : -1; - if (s->lfe_on) - mask -= AV_CH_LOW_FREQUENCY; - switch (mask) { + switch (mask & ~AV_CH_LOW_FREQUENCY) { case AV_CH_LAYOUT_MONO: s->channel_mode = AC3_CHMODE_MONO; break; case AV_CH_LAYOUT_STEREO: s->channel_mode = AC3_CHMODE_STEREO; break; case AV_CH_LAYOUT_SURROUND: s->channel_mode = AC3_CHMODE_3F; break; -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".