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 29AF744A84 for ; Mon, 31 Oct 2022 22:13:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC21268BE11; Tue, 1 Nov 2022 00:13:30 +0200 (EET) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2012.outbound.protection.outlook.com [40.92.50.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E83268B9A5 for ; Tue, 1 Nov 2022 00:13:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nmpSAitgFaRPfTPGNRaobVtwAsl1hPXCC7Dsc6M3bvqBzrKEOpzq0fekAGLKNvzGSJbb3KMQhjQmM8x0mA0Lmh84RWCyKQYThxDlujrQWx8DYTphLp63lDm3db3eml8VdALgpFliCwq+VMjAJizq5fdq4OtqG2XauoSrWSpYGHOmh5fl2i5nQybV4Q+e06pm+G2cz7a7y7hBQWp1VdVu4kU0mZBS4+4wLijGLKlzeoDHkAKBDsaT7cEMMTBQOSeN8Y7eNM2IqNXG8LVBBFsQ0/6yMtMDFJYTp3Pq8SUQo553MghXZhL5COjVPe3ec8q2lA5CrVA6ZhUo26z+LMuwxw== 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=toy6roniP69iP3x+4tNCf9WAs8beAcscM2k2yQF8Azw=; b=V/nhZACOatSM/nrwxwWRECui7W6r5JaaNdC3/Shd+f4S8Pbkvio994Hk0bDVwYVsUYrXhAghw7od49zUgk0WyA1kZP1opYAgxpPMOODXlEjHXue9kcVCVx4Ar2RwSN33E1n1z8Hx0d6F95MSxfC1lTbRPnsn4UOvFpPvPqVa+qHpDfD9owX5MtnCGeJdHTD09T/vg1AeoUQzwB6QdhQ5/QFgt9+OBkCFjSFNa28xOx4Gxu2/pf8BPYcTCeujBw7w1AGlQr+VU54qG/DCVrtWqSHqIGiTIDgMlAm7Ugm5BkLLI2Q/ayBPRR6sYZFDFnZJyh7MBNNR6XY++Ej5Z4CGKA== 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=toy6roniP69iP3x+4tNCf9WAs8beAcscM2k2yQF8Azw=; b=jNn8WLDYc6vSZRT2JeYRbZerrThJruAPMYP8BsFqUPQ6tl7kmsN9eumevnnI9fi307fidSAQ+3IraOX3vGHhBAeFh4LaCHiICCjglisfjvoTlXd7NYgf+NRuUWJdD7VguZkLNVtHEf7ed+hIBAsDbpx5pPjCvyuDNd9TE9yH0pj1F0f25wtR0SRucmh2DtqyWKmzvkcKOTKLJYtKEKkUQPU4W+O9XZcGoaXNNpSap1ec13DNQoKfB2xk7vbFCXPDJPjlH9hf9TT0i/j44mRbrBJe0mjD8aqpGhq+w9ZPWexGCBb64jvugGMf8ODN8l3FxET3qObuIvgGx1+veNWQNQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0058.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3d9::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16; Mon, 31 Oct 2022 22:13:22 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c%5]) with mapi id 15.20.5769.019; Mon, 31 Oct 2022 22:13:22 +0000 Message-ID: Date: Mon, 31 Oct 2022 23:13:34 +0100 To: ffmpeg-devel@ffmpeg.org References: <20221031202845.1860-1-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20221031202845.1860-1-jamrial@gmail.com> X-TMN: [GCO0prPakmEdCxYuSzU7lEcnpfHDyiCaBcGfLdr40wo=] X-ClientProxiedBy: FR0P281CA0052.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <0d35a6bd-af20-9eac-d727-4b380009774c@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0058:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f35be7f-dfdc-4d04-ac7b-08dabb8d1f61 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xijtXaGmq8YtWRVEHfDOBycnkNfU/qRWPNFVnelQ690DyoGQujx2gX0okHbmKYZ9qTWR+cTHpufLny4TaqpuptQi29yF+sR0ws7Y+VJvVnDVxCpaJg7+jhqu6HICOyrkQG/5PtknfG8hrjAabSfho+q1f99BufdTCWjRN1G5TavEcZE1a2esTrVAZ9ukS7DSF6+i7ifyYzqITqjQkL7eduV0oQTolqqGvBoNSnptThs1titkzAQMAyacD1uMvPGhz03il0AmcTT92QXsed9D4TGga6cyXoV5qR4UVBQb0u2+tAWFnUvyuNE7UT3EKDqhY+3ZzGQwCp/LdSgY58fWahbiUsu5awdsdrcH+k5y9YrGc5IOjrFi4TY7Zwe6JaCSwE8pF9dNFlRG6EFksM1nBGYQqj1wrxsLXD1qqu7Di+p5/O5TmL7H31n2qjByras4v2GW7fQ6zc2/W3C1vpqM4vdfcDiUJvNkGhUcvh3OB7A6AnSIaFrf8W38YsmFTiHvtsZuEw3WCklVnujvhxRe72yRMi84j820nqmfZSS1wfbxsVDVNeDTJqFRWIY8Zhh0+bNKkEsCqIK51TCmeCV+sjY9vl13LCHawR7NTxXzcRuFUcSLtUxbb+TNwq4ahqPNDTRDlRIO+0G5Kv6w602aFhf/7n6tq2RSrtl2KN/JhYT/8mi3j5tK4CwPp0BRjlt2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dms2MXJRM1VlRklIRjh3ZkFVY1pMV2lJMDcweTE4cUttVlRFOTl1K0tmMWsx?= =?utf-8?B?L002MnNqRFpzTHVqZGtjL3pRTzY2VXZTcnY0WGFrMVc2MDFaM29CVnQ5Vnl1?= =?utf-8?B?dWp4YUVCNFlzMjFzZ1BDVmRjRXorbTNDMzZGUnhCdHJmRHlrcUtNTEI5cWRO?= =?utf-8?B?dmplWEpvd2pLUkZrbnczQzVkeWxLSllYZTYrR0NwMWJpemU2SzJ5T2oyMlkx?= =?utf-8?B?eUhLWXhXbUlzckdJQkdJWlVaNWcvRDBYQ3A2ckNuZkJaeVlNRVcyS041a3Fm?= =?utf-8?B?bHJnc3Q0Z2pSQThUWFZkZDJNVzN6NU4vRUZaa1dHSXFkNTY2ZWlJMmhpdTkx?= =?utf-8?B?UXByZHZuMDEwRUhOZ2ZJNU5XamZ2bXUxbDA2Sk5HSWJ3M1lOS25XUGI1dkNp?= =?utf-8?B?UDRORGg5WW1LdmR4UTZZUU8xckRwNE5jdTRuTEpGeGZZeE1hUjZCcXM3Zm4z?= =?utf-8?B?RE9oUUtjWGFEV0s2ZWkrcmhEWmZsS2NQL09LdEFDckZXSVdZdXBoR0MvWktT?= =?utf-8?B?SHdSRE1XRmFicHp5NFY4OENUSXEwNUFOTnFoN0RtVGxOUkQ4RndzeTBMdXJn?= =?utf-8?B?dlNncytabndiUDFDUWFTWTJhbEFnVHlzMmtMYUhSaldGZ0t5MCtPSVN0bE5t?= =?utf-8?B?NEdJTEZrbUQ1c0NncmRCZ1Q5MzdDbXNveHk4ZncvTW04UWNEMjN4OTJWR3Vl?= =?utf-8?B?bFo3bFg4TGNnR0ZCbzMrUmJ3YVdhV1l2UEM3S041Q2FDWUIyT0QvWTNaK3ls?= =?utf-8?B?c3dFT201MWN2ZytNZk1PcFphS0lyU1JrYy9DdlVNak9TaDNlQ3pvdHpNTmo5?= =?utf-8?B?dktsUkpYMEU2NDFZZENLeEl2UFJRakMxUXB3T3hwU1Fkd1JhNFdvYk0xR0g3?= =?utf-8?B?MCtHamRTNVdlYW8zTWZ5dm9KWDM4ZXpEZmNlWkxvdHgzS210RUlITGtQSG5V?= =?utf-8?B?UjdwZkI3R2Z2N21QeDF6SHI0RnZQbVBvdG5IRWFwWUhMRkttSVBnUkQ0dVN5?= =?utf-8?B?YmZPM1NvZWM2MVplSDVXQTNJS0RRaVV4U0ZBMUlBWE5iUWg2bnU5a1Y1d0FC?= =?utf-8?B?L3o3eS9UM05CeEVveGNPSzZaT1UzVkVJRHdMVWVHS0JRcnc2WCtMMXRldlQv?= =?utf-8?B?ZkR1eS9WTkxkVWdVSjJGaDF5QlU1UEZ3WnRZcHNIYnpVMU9PazZWdnR5dWxu?= =?utf-8?B?dFdiczdNNE5UajV3TnVoRkZlNkZvUmFyaUV1b0tDNm04V05TaGxCYldZYXYr?= =?utf-8?B?Zm03b2RFbkYwaWhoWHZtaElvWXUvN09NRGVZN0svTUREQkx1cmgzQ2hpbEo3?= =?utf-8?B?b09wQjRsSU04VjIzVXlZQWh6aHBKTmNnby9IeFFBM2dvKzFTd1ZpUUluZ2lv?= =?utf-8?B?VnJ6QlcrQVV5RnpyVHErdXdVRmlkME9ieVBUYzFtQ0hHTThFeGVsOWQrSnUy?= =?utf-8?B?bUFIL0FMMm45QWtQaFFYSzN0Nzl2K3ZlS2Y4NzdXRldnOVRzQ0xjakN6ZVdS?= =?utf-8?B?N1RyQkZ5Qkh1TEw2dGdLV1JiS0NGSCtKT0FjZGU3TVRldGdhMWQra3lSVkRH?= =?utf-8?B?V1dySithY1ZTOEJsM29LRHlsdm0xT0l3L3Vjb285YmVwZ2twMXpMVWg4RStW?= =?utf-8?B?elA0K01lclBhZXZHUUFkMVVEUmhmWGlGZ1puampyWnM4NmNrZ2RZMmR0cndV?= =?utf-8?B?Zmo3b2ZyQlNHZXllc3BUMTlLUy9XQUxMSzgvT1lyN2JmekZmU1dvTzBwSURw?= =?utf-8?Q?TZnXdUqbsd8IF7amgRiUNvs/0XpE7VRMqTmu04g?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f35be7f-dfdc-4d04-ac7b-08dabb8d1f61 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2022 22:13:22.0123 (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: AM8P250MB0058 Subject: Re: [FFmpeg-devel] [PATCH v2] avcodec/atrac3plus: reorder channels to match the output 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 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: James Almer: > The order in which the channels are coded in the bitstream do not always follow > the native, bitmask-based order of channels both signaled by the WAV container > and forced by this same decoder. This is the case with layouts containing an > LFE channel, as it's always coded last. > > Fixes ticket #9964. > > Signed-off-by: James Almer > --- > libavcodec/atrac3plusdec.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c > index ee71645a3c..9e12f21930 100644 > --- a/libavcodec/atrac3plusdec.c > +++ b/libavcodec/atrac3plusdec.c > @@ -48,6 +48,17 @@ > #include "atrac.h" > #include "atrac3plus.h" > > +static uint8_t channel_map[8][8] = { > + { 0, }, > + { 0, 1, }, > + { 0, 1, 2, }, > + { 0, 1, 2, 3, }, > + { 0, }, > + { 0, 1, 2, 4, 5, 3, }, > + { 0, 1, 2, 4, 5, 8, 3, }, > + { 0, 1, 2, 4, 5, 9, 10, 3, }, > +}; > + > typedef struct ATRAC3PContext { > GetBitContext gb; > AVFloatDSPContext *fdsp; > @@ -378,7 +389,7 @@ static int atrac3p_decode_frame(AVCodecContext *avctx, AVFrame *frame, > channels_to_process, avctx); > > for (i = 0; i < channels_to_process; i++) > - memcpy(samples_p[out_ch_index + i], ctx->outp_buf[i], > + memcpy(samples_p[channel_map[frame->ch_layout.nb_channels - 1][out_ch_index + i]], ctx->outp_buf[i], > ATRAC3P_FRAME_SAMPLES * sizeof(**samples_p)); > > ch_block++; Looking at the last two entries, it seems to me that you simply used the numerical values of the AV_CHAN_* constants, i.e. as if you wanted to write { AV_CHAN_FRONT_LEFT, AV_CHAN_FRONT_RIGHT, AV_CHAN_FRONT_CENTER, AV_CHAN_BACK_LEFT, AV_CHAN_BACK_RIGHT, AV_CHAN_SIDE_LEFT, AV_CHAN_SIDE_RIGHT, AV_CHAN_LOW_FREQUENCY } for the last entry. This is wrong, as it conflates the enum AVChannel domain with the index domain; it will segfault for 6.1 and 7.1, because there are no data planes with indices 8, 9 and 10 in the output frame. The array for 6.1 is { 0, 1, 2, 4, 5, 6, 3 }, for 7.1 it is { 0, 1, 2, 4, 5, 6, 7, 3, } (presuming that your first patch was right). The derivation for 6.1 is as follows: The first channel in atrac is FL, which is also the first channel in AV_CHANNEL_LAYOUT_6POINT1_BACK. So the first entry is 0; the next channel is FR which is the second channel in AV_CHANNEL_LAYOUT_6POINT1_BACK, so the second entry is 1. The next atrac entry is FC, which is also the next entry in AV_CHANNEL_LAYOUT_6POINT1_BACK, so the next entry is 2. The next atrac entry is BL, which is not the next channel in AV_CHANNEL_LAYOUT_6POINT1_BACK (which is lfe), but the one after that. So the next entry is four. Similarly, the next entry is five. The atrac entry after that is BC, which is the next (and last) entry of AV_CHANNEL_LAYOUT_6POINT1_BACK and has index six. It doesn't matter for this that there are several channels in enum AVChannel between BR and BC, as these channels are not present in AV_CHANNEL_LAYOUT_6POINT1_BACK (it would also not matter if there were any gaps in the values of the AV_CHAN_* constants in between). The next (and last) atrac entry is LFE, which is the fourth channel in AV_CHANNEL_LAYOUT_6POINT1_BACK and therefore has index 3. Is it really absolutely guaranteed that atrac only has one channel layout per channel count? It seems to me that adding a const uint8_t *channel_map to the context that gets set like ctx->channel_map = (const uint8_t[]){ 0, 1, 2, 4, 5, 6, 3 } (for 6.1) would be simpler. - 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".