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 14AAC49D79 for ; Wed, 10 Apr 2024 06:16:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D1E168CDE3; Wed, 10 Apr 2024 09:16:27 +0300 (EEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2068.outbound.protection.outlook.com [40.92.58.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A36B68C25D for ; Wed, 10 Apr 2024 09:16:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KH67+ieiQgI8BggJmG07fS3fozp99QH/8gdjOeBgBRK/awBD1KGhaH1r7LY055s8eBJaTTfd+DUXn4TrEx/hoCqxvDGaVqBXf/RWIBcin7KjCHLDNPuaGWPbC57j1Z6EsfAkGH1sWKlEOB60rEDiMCmj+YCcd7GQUrID5k7fG494Xk1hnpbKRNq0Tl73mk1BI5Bx+SKKmrinSIhPdRqTuV6HnrpYWYk2pN4xvgg68tgbpdzmyL3jctZIpWLrhreTHDKjkChMxsZwcAbY/OTdkR6IC4/5gg7c8WlUoswU6CiN/mx1czZgklF6vVMRDYuJMPmpcR76XAtff6M+VQVpWg== 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=r1925xMpWmKk2p9agGRMili/5GouqYdmw0iFTIl2ORA=; b=Il4lsSwuUXdbKq0bk5s5PnTZMmYOoFyTNPrn9J0baKoCvUd3XLD9IgOUPn4C7bD+zm+QYBKGotJdZDS3UPSpE27cipGkt5Bk+MJjvZuvxjrHtWGZi24Bifpp7OYklyHpUlUFxYfjqE2VEPOMYC09mGjAeGsGxZNjEfQpACCOYdLmHzqEmzP21oTnMkM0ciiNYZPFxW8oihTh1M1VXXhd1ZwAb1sLNsBOpe2LONOaOsD22+zRhf84liv3VnuWB9W8XakSrTNFe3hYS4OQ+g6Wc/iWlghG0lQ6kn/Fru021wO7ufZHTKVbJitUewlKuSsxXwhncjTxwcAJPYcCJY3E+A== 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=r1925xMpWmKk2p9agGRMili/5GouqYdmw0iFTIl2ORA=; b=BtQtR9l17lENRS6RxBhOB70F341kZ4ptD9AKudmhIHvlvH/Anf6tJb0Csv9MdJUeSxIjpAmJdsV0S7UAEZ+OZ9+j1zV9jctJRU4M83Suz5ypZM6dAUrysm3PHs/DB3VYt8lA/bjsTJhQYig2EI8BzQn4DQG9C0CewO8QWca8fDM0y4+PregV499g/INrsMB0gnPGON+1JY0TfKAk8ANW70YDr5meh3jtpvlL5DuvZry+qQjWtaey6ogzSqtV/qqTL2S1fzB7XHOL62UpkkIdvmw7U1fpjXCFWu1zh6Ac/uZeeldYudH9LCfUe2eHDe7h1Hd8+4U6L8PuC8RF+MENdw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0172.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:323::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 06:16:16 +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; Wed, 10 Apr 2024 06:16:13 +0000 Message-ID: Date: Wed, 10 Apr 2024 08:16:09 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [hxGr5AyOnkt6KWr1/EU4Eo6t3nAP/M4hP+AeszceDRw=] X-ClientProxiedBy: ZR0P278CA0044.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0172:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a5e9c36-0e44-4f41-3a44-08dc5925b917 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JBsgRY01TOOUmplMcKPo3ORqgVl7VB8nGxp/NGYpQwiHzLtaTbY2A+aShYt58rt9oSkmBsQHH6b3S47b8X0RVeJF6KQPBMjhWz4nct2PvRso42iq8fb7IOebdybKRyNbyx1oqbWwENLwIja44Uik0G/9yGyuLAhBoxB/pogBKrYBk8fiBHFp/JUwFHr7NyKvKBcfwFcZM3cQ40n0DKNgo1tW9F7xNlaBE7Djrga85MJWS+mPywx1mvEFJbhpRNZJNbjVSWnVvBeyRtvpG90yGcwpPjHIZn81euC51qArTy0loC65d28tlkHkNz9qBJ2IsRUnbGm5a9JBrsLZOSgUW5SbWrk5U3PMgJs6JTs5FaRcN/94iZmN+W+jVf16BMuvqn+LsvFFZkcgttLpTn2LSpTjGijB1yjNuL83agZmYz8VhOF4AhinUBwRaT9PzruGOFmHlzfZgVyLAh0huKHcwsyFMiRtiRo7sSiT3d0aiJM0axQZoayrwKg3ux5lnBDuC6Wo65RWEjgtL3hkCjD6+pZUrbojCYkptNWkwwgcbp3po1e8lPayMdwJrKmd4adL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TmtBeXh0dEVNRzY1NWZzaVhPYTZmU0d6Ri8zTVdPVDZQQ0p6NE5WK2h0SDYy?= =?utf-8?B?MUFrajN2WG5yUXhZUHRWTUVGQi9lTWc4QUNoRitaQ3lhU01QOXdnU1c2YzZN?= =?utf-8?B?SEl1L2tEd1gxQkM5Nmw1QXpOd1puZlhnT09iWVlFY0h6OXJhM0FNcE52bGlC?= =?utf-8?B?RHlFVnZnUEZkNWxXOFNCaHZxMXNoL1ZuL1c3N3ZUSU9INmpLRUhWMGV6Z2Ex?= =?utf-8?B?Mm9ZZHB4dmpZQlNMUWp5VnZIdGxEUDdQZ2xHVzQ5T3dxUDFzYkJ2aXhyVmpS?= =?utf-8?B?SGRKamtvaW83bzlkRE43WERaNUNiZGR1dldCNjlGMDBYWjMyb1RTUytaOVBq?= =?utf-8?B?MG1xbUIveEQ2VjV1ZnQxbWxqNDFCYzY1VTJITzNNTk03SE01Y1craFd5VzRk?= =?utf-8?B?dTNYMkxyUksvNnBQSXh4WnFIbUZBcmdvMzY3M3JYSnhHWGxwMFYzNTdhZWp2?= =?utf-8?B?Ulp4WU9NUGQwYXBiSk5TWE9DS2ZOYkRkQlZqTkw2dWVjVVd5UTR5NHlZcXZr?= =?utf-8?B?NHRNVU9td0FrR1EreStsNisrWXhxQ3lXTEFXSG1lL2ZTRmhWQ1RMN2x6amoy?= =?utf-8?B?QnZsSk5WMDRxeVp6SUVIU3ZkNGlOVlZlWjAvWnNlUk42aGx0MGVsc1orK1Bv?= =?utf-8?B?VHdwMXNZK0w2dG01V1JNTHdldDU3bkJpdlR5QitsbEFFY2VWUzRCK1Y4elJ4?= =?utf-8?B?SVgxajkvMEZqNVlKSXhzS3UxTTdYd1JyUDYxTFVvaVhIeXZnK1lLNmJxQk54?= =?utf-8?B?Nk5JS2w2T2VYSklvbWhvbUNmODBXd1FKbUp5aEFScHE5UXBFcEtTdlJmbXdP?= =?utf-8?B?S2wzeFh6UHpUZWthQmJvNmh3Z1EwZmRac09IMWI3aC96ZnFpL2JKYUlzRFAv?= =?utf-8?B?cU9WWHJlVVFNY2hQUDF3cStWVDNYalNKTGRRaWl6YlZHb0ZlZHlkM3hzSHht?= =?utf-8?B?NWN2dVEzZnFvSWFNWThVcTk2TE8wNFQ4Sm4zMGROUmJ3azA2TENsejVKbVcr?= =?utf-8?B?QWhtNUI1THo2SW1SZW9RVk1GelZ4V1licWwvend6T2RwVDBnWUZIcHI2cEpL?= =?utf-8?B?RWVCTG5VdTNndW9zcW55Q2RsMkRoaHZkOUF0eWt0YnZYTUVNK1JVTjNzT3U3?= =?utf-8?B?WDZkK2Noa01KZ2JGQ1pvZGJFYklhN0RXTmFod1Yra3NqanZUV1lwckVkV1RD?= =?utf-8?B?REhta2JHRE5paVJDWk9lTnBJSEhjVUhubi9kMlVCSFl0ci9yNHVmQ0lLYXJR?= =?utf-8?B?M3VmV1dWWkhYR1RCbVVrMlBlN0RUd1k4UGZDSk5VVmJQK2hkbmtzQmJCbkFv?= =?utf-8?B?c09mY3Z0dmh5UzVrdE14U2NDNFBLcEpMVXV6Tk5WblJVb25NSEI3Wk1ETVlW?= =?utf-8?B?RUZQTVhQTmRGY2d1TzlpU0E1Sy9BckVDZGJrZldONjBTNFV6SmczcVFmT1BQ?= =?utf-8?B?amoxTjNGRUhtZE9LdklDaEt2SUorVVM0VkpzWFpyZlN4d2FXL0FLN3M5OVZJ?= =?utf-8?B?ZmFBSzllcVZudWl0Szd4RXVDcTd2K1lzQndESDdGL09xNGM2LzdTZzlyQ0xD?= =?utf-8?B?VmRJcjFVNXdMZmFMbndGdlA4SkV5a0ErK3JDV0RoYU1SZDVQcmIyMnI2SzNm?= =?utf-8?B?UW5Dd0JMODd3NCt2U2VsSDdOeWJCc296ZUYxSEFHRjNIejI5UjVZNW9rc2xX?= =?utf-8?B?cFJhamR4TkNMSHJiTitMaytOSnhuQVVPN1BTSG83R3haaG1UOHlBTkVBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a5e9c36-0e44-4f41-3a44-08dc5925b917 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 06:16:13.6332 (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: AM8P250MB0172 Subject: Re: [FFmpeg-devel] [PATCH 01/17] avcodec/ac3enc: Don't presume ch_layout to be AV_CHANNEL_ORDER_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 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: Andreas Rheinhardt: > It is perfectly legal for users to use a custom layout > that is equivalent to a supported native one. > In this case the union in AVChannelLayout is not an uint64_t mask, > but a pointer to a custom map. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/ac3enc.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c > index 7a6bcf7900..dc197c1517 100644 > --- a/libavcodec/ac3enc.c > +++ b/libavcodec/ac3enc.c > @@ -2192,18 +2192,14 @@ av_cold int ff_ac3_encode_close(AVCodecContext *avctx) > static av_cold int set_channel_info(AVCodecContext *avctx) > { > AC3EncodeContext *s = avctx->priv_data; > + uint64_t mask = av_channel_layout_subset(&avctx->ch_layout, ~(uint64_t)0); > int channels = avctx->ch_layout.nb_channels; > - uint64_t mask = avctx->ch_layout.u.mask; > > if (channels < 1 || channels > AC3_MAX_CHANNELS) > return AVERROR(EINVAL); > if (mask > 0x7FF) > return AVERROR(EINVAL); > > - if (!mask) > - av_channel_layout_default(&avctx->ch_layout, channels); > - mask = avctx->ch_layout.u.mask; > - > s->lfe_on = !!(mask & AV_CH_LOW_FREQUENCY); > s->channels = channels; > s->fbw_channels = channels - s->lfe_on; Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ 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".