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 8C59A49FD0 for ; Sun, 17 Mar 2024 23:47:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 948C868D207; Mon, 18 Mar 2024 01:47:19 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2039.outbound.protection.outlook.com [40.92.73.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CBF668D199 for ; Mon, 18 Mar 2024 01:47:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G53u6DnYKu6QGsl7W2zK94z59493ZsCe8cBVDYZwJB5bzw08TvXx5sG3YyhG3ENG2YQMn4sku6WeaEwGd9d9xzh0WlxsNIyPM5O7Zdhk/fOv7sNOPfk5+okqDx9uYwd/nBzUdGwgGtRO51EbXG0zmG3P9IPfMoIXg0EUh2ois77gQ7qtnyWXF8WWy/HgbmTHHXJbgQcQM2JhTHyaNQYBfcVhclWmZ94TylADcsEdkxLLFBbQV6d5sASIfTOJxos0zIhne4Svz6xn8LT00ywCHxEoMLR5EzHGJ8naPQNQw2HNMMYybb12y5JdGu88DeoC+kRXnLKaYrQXGCMdYtERVQ== 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=TABkn6pgynOQLP29eAlxJC7r/S+YcDH47hvxN+rfsyU=; b=Hm2Tb8BYLu4UWAPd8NVAx8SqptsRLbZzRsHKsQ9xoOhfRvX836GU6hn5fO/7oV3z8HmA88OibzuHck5d7zbw6SdrA/XC0w9kHT/1qWL/g1ekAZ+JJVpZw/MiKnTJJpjnswz8cGBrWXtOJqyB9gRmnaX7kpWJwKaKl6qPgmaKOQ2eAcncQkJfJW3ZA3tVG6rwaaUNZg8int0gYprRfblSkFqEhoEvUE/wzRvpnPf0JB8OsP5HfS++qMfmpr0bM0nnW/eDyNLCw25THRT9bq7zG8F6WewHhnyb84dDhozGJGfKUcZIROxnZsnQ2iTV//FlICT4+m5Nz7o//DdnZlBIMw== 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=TABkn6pgynOQLP29eAlxJC7r/S+YcDH47hvxN+rfsyU=; b=qBpIISjDISiVxen1OHFeRfjBpCp6x70Qun9kZs3dPmeC+FMD47eElZLQAWPqcc6hBWvW9l+IDjsS4waJ/lfHwSBwZTLxFIrpDHRMNzxOtk3lvKUZ35J5lBuyLZlbRPvEuvRsVp/dPCkTlZAirqjeTZ4gmBXs6rLiqINyF5kYn6PZY/SndaeZzTFAvnFjKghpHB7HYIFs/lyRa+AVkWH8VHuOgTPBqpmRofM6OIsCbuYgkgHQ61WEcB+nb1ZllfbqXKP0DcTj+Q2MSGolKqnBNHz2pvw6lYRtTIuZPYxMtI3TkMrRzVEE2BvwL6qGL0doVfqZEJuAIOzLJlmdS+eZqA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0071.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.26; Sun, 17 Mar 2024 23:47:11 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Sun, 17 Mar 2024 23:47:11 +0000 Message-ID: Date: Mon, 18 Mar 2024 00:47:09 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240317195611.11278-1-cus@passwd.hu> From: Andreas Rheinhardt In-Reply-To: <20240317195611.11278-1-cus@passwd.hu> X-TMN: [zftxRadV2rnFSCoYTGIFxq0rkcNGEHeJ6Z4CWRu0YRg=] X-ClientProxiedBy: ZR0P278CA0210.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <6ebfd201-f334-427b-b0bf-8803caee0035@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0071:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ef87f59-c3df-4c61-5187-08dc46dc906d X-MS-Exchange-SLBlob-MailProps: obhAqMD0nT9pc207ciP663M9kFxxdleardssiLGTfZYp0bYHQhY2ZOaOB8/JNzYVlfoAL9IK52St+Fa60CTOTxJn9bEiWhMqQliMy18B8RomxMidp+Ecs54gjVWfGg38StZbE96n8uTjXGG1QpZSiKe8wNeZjWzzCcw1ng00LH/DwWE03Zr6+2vTVmilBxa9SF5HUvpBlV2m0pAUo11ey4VzcdvsP1ixlC2sPBS4b6lXFTPK1tZ7gOmUHys5h0TYeJgbgvj8jXeQ2QlJ6hfuiCQI6hRFstwE1iPOMMfH60qdSd1H4Y8heJ2RGwCKKhhpX2dHpTTYI5U8l++jAaDiO1zo+zG1etYUgvrkFtGnpt19qIXoJl2s6UTNABy8tsSJW+2jv1jFhEmQmzRUVx3tsabq+wtfexpptn5g6neBJaj9sn1/g/6f1doPfGiiUvUIAjNVbk2SPAsP+RZQt7y3JE+yc/T1JCWUDEZLJaF1VKtnWo9rQJedXZ03MdrOZde2YKtrANjaexpMM8I2KJqy4+2X88oBfBrkcyzEw08+xvs9dgXmW+BidFFBl9uHmVEFx7ltX3DNZwrIZ5O0kjxEIXlbfx8BxabP/fgqvjddaR9LaRXD9ErRHwzwrpiUEN6Mkm6DX/L04oFB1pmvE9+dx3C4F8PZ/yJR3Fuo0HcEAu3aSdm2mwH/591y4UxH391l9JU4NFBx+FEK2/4tN8C3CrGXqB7QDKYv7hs5gbrX/+tQbfU8TM6h90hbcpUtnq1IKnNdi7uAgBkBeA1C13jlkPauFF/cl6zWV0nq/Tn4VJ6pGB8C/ZThu2Tg//r9/bFX X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: my/SqHZUfsxy3fn4Y6wnK5ofqiqQ/CIaVOD8Pzix2pp4/zje+rLnMbhHmqW0T152ou/Kr64S4p8IQuFQZkhMHdGNHegMymhqjNlNqRIIWUa+V83+DrJlXDUM2Brsw7pazRjE6A2XeURz7bMD4zCQy3aCeIoLruVkpV1Wz6LO06GSFXszv2XaDw7pStkruh32D8M8x8YAHxy/9d6+1bTsnc/LjTn1dWGnhbx1/o7I5zwWNE5WMu86EIvVYwc4mNTz4OGEA39tKo3LeDoQrXEt246mDiq6h6lnRsmsqJToKNu1iNTmcWJPhXBsWU2aDgA02NluoseXhJ8rRhgvorMFZkn9LCQwOTo9Yn8YF2+ODhmz7NT9P0iqE0LPXcH4EVTdf43FBenmSWL6VAP2CSu6DKIBfEYNWT6rZhWQ+UF6zKLsjqbNzh2c8HcfnwBA2WgDV/hhuFMNYpZFwM6SKpd1wF0sHqT97x7uTFQq8x1vvdKkyhpHP5E/x+Wr5Ea+nfEtQrV8RyWQi/L/FO+9B4MqAGAG8V4wRQ/sb7RGT1nsAUeTSYJ2rQVizbfFAONDPajHAsyVFhR1SkHeZtgwE9wG2p1yacyPQjzwzo8mFxhIuvs= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bEY3bjdjMUxqSlZobTFzcCtuR2lvQ1M5cndjK2huS1NDT3ZuRVMzdlpmeXFh?= =?utf-8?B?bWN1UG1haDNPRkc1R2J0d3A2WkpCVm00YzcvNmRQaGdlbEJldThkSjNWWFV2?= =?utf-8?B?ZGZEdW9OWHlUcFo0WjVoVmRGeEZLTjhEQWVpYk1EaUtKUGhQT2lkREtZbk1n?= =?utf-8?B?Vyt1LzE5WkZ1d1VvS01PMXYrS3FhVGdoV2o0b2ZmQ1dXdHJlSVoxcVBTMXF0?= =?utf-8?B?LzAxUGtzSmo5R0NEYWc1R1R4WnBVQ3ZJdnhQc3lFYytiUmhkN2NZK2F1TzE0?= =?utf-8?B?YjZ0ekMrVHlTK1pEVmtXU0VHTkVoWTQ3WEZRT28rNVBUQkp0OER1anhTQmYw?= =?utf-8?B?amd4bHU3bDdMdXk4NGppaWE4ckRtWFRUTFJwMENkNFVzc2hzTkJCZlNxbWRN?= =?utf-8?B?OXYzRjJQSE83Q0pMQm5OdVRveHdxTlZ1OWFXN2paSmNnQkZPVFcyNjQvN2Zq?= =?utf-8?B?U3QwU0x5RUFaeFBoZnpPejZaKytqcG5qcmdZNkduRXV4N2cyaC9KYTFFSFJU?= =?utf-8?B?Ti9HSXVOVWVvdVZVZmx0N3JHakhiNmhIeXVIUWgxNVE2RUtGOW9tMDVBdGh0?= =?utf-8?B?aHRCL1U0YlFVdXN1YlhDcE5BblhrTnR1d2pZcWlYOUVydm9EVmRsekpDSEpp?= =?utf-8?B?R1J1V01RdWYvM0drSksza3lSWjdYUmVqdFQ0OC8vaXNqOEZCYmFMODBuZDVz?= =?utf-8?B?Unh4TzltdVBOdFJ0c3k0TzUwQWN5aGRKTXVmbGVudEd3aG5VUWdySkcyUGdl?= =?utf-8?B?RmE1REJRdW05MHowcEgrRzdPSU8rbnNaeFU4cnpIWm8zZzdWWHNtMllBSldP?= =?utf-8?B?QjEvdExycURhcE0ycnY2ZDBMb3U0UTN0NTh5UHgzSWJ6anN1bHBzVkpIajBv?= =?utf-8?B?cjMyaGdIVnY5bjFMQi8yN05QY20zTHRKb3FTMldBVG1sZ0pBcUpMRVJ0Tkpy?= =?utf-8?B?SzRLcmg1dmlndDVNQklmRnZFMkIzaGw1T1llTDNQUG1hRXJyUXk0T2pIRTNB?= =?utf-8?B?UFlxby80cEJxQUxjckgzQXNlR1FRdWprRGE5K0ZVODlxb3NBd1ltcU9NQzkz?= =?utf-8?B?Z2pPd1RLWk5QcGk0NVFub1c2RXdXRGhnUDd1N1lUZWFUaSt5bEpuUDRnZU15?= =?utf-8?B?c2xvNzJxcmtuQ1k5ZG5FM2Rwdit5UFVPNHh4OElMc3JEQlBuRGJ0Y0pHQ21k?= =?utf-8?B?SHJBSDJlMldYY1VFRXN2em9kYngreWVTdHF1U0ZIN3ZMZ3IwM0ZNWFU5NFVz?= =?utf-8?B?alFPT2pRS1RJOUlqSGtGWlBKcUtjK2dzZFgvamZwb3ZlYVVhY0ZZdUdzSXRU?= =?utf-8?B?OWRZV2ZGZUVuZFpXeSt1MmNYT1JSbExRQWh4UFk2bGJRV1dtOENhZjVkSzhx?= =?utf-8?B?UVhtWXhMNEFSMzlzRTRzcEx3blQxZWUxMXBTVmtYZGFPSklWa0U5U2M4cHQ4?= =?utf-8?B?Q0JIRk1LM0QxVGVhYTlXeFVGUjRJaWUvSzRCWkxpWWViRnI1SDBBK0wxNEJa?= =?utf-8?B?WDNSSmhRdkhETUNYNTQzUzVlaDdxNEFkZGcyTFZhN0RRbWpnZG5RdXNzczVO?= =?utf-8?B?Z1U2c0xwQlNPTmdzQXdKUElOaE1wSVd0bEZGckxQZk1Md3U3ZmtlWDBOaVNs?= =?utf-8?B?Z2MrS3RjSmIzQ3Z6UUxNaE5lUGE5WmRqRm4zUlU0c2RzbjRzcEpIc0h2RG5z?= =?utf-8?B?T2tuMWlYbW5JakJrM0VYOG1PdEZhTHp5Yk1ZT2FNTWdycXVtTmFiYWxRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ef87f59-c3df-4c61-5187-08dc46dc906d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2024 23:47:11.1262 (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: AS8P250MB0071 Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov_chan: respect channel order when parsing and creating chan atom 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: Marton Balint: > Previously we always assumed that the channels are in native order, even if > they were not. The new channel layout API allows us to signal the proper > channel order, so let's do so. > > Fixes ticket #98. > --- > libavformat/mov_chan.c | 464 +++++++++++++++++++---------------------- > 1 file changed, 211 insertions(+), 253 deletions(-) > > diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c > index ead3a9b91b..d48cfeabb0 100644 > --- a/libavformat/mov_chan.c > +++ b/libavformat/mov_chan.c > @@ -25,228 +25,163 @@ > > #include > > +#include "libavutil/avassert.h" > #include "libavutil/channel_layout.h" > #include "libavcodec/codec_id.h" > #include "mov_chan.h" > > -struct MovChannelLayoutMap { > - uint32_t tag; > - uint64_t layout; > -}; > - > -static const struct MovChannelLayoutMap mov_ch_layout_map_misc[] = { > - { MOV_CH_LAYOUT_USE_DESCRIPTIONS, 0 }, > - { MOV_CH_LAYOUT_USE_BITMAP, 0 }, > - { MOV_CH_LAYOUT_DISCRETEINORDER, 0 }, > - { MOV_CH_LAYOUT_UNKNOWN, 0 }, > - { MOV_CH_LAYOUT_TMH_10_2_STD, 0 }, // L, R, C, Vhc, Lsd, Rsd, > - // Ls, Rs, Vhl, Vhr, Lw, Rw, > - // Csd, Cs, LFE1, LFE2 > - { MOV_CH_LAYOUT_TMH_10_2_FULL, 0 }, // L, R, C, Vhc, Lsd, Rsd, > - // Ls, Rs, Vhl, Vhr, Lw, Rw, > - // Csd, Cs, LFE1, LFE2, Lc, Rc, > - // HI, VI, Haptic > - { 0, 0 }, > -}; > - > -static const struct MovChannelLayoutMap mov_ch_layout_map_1ch[] = { > - { MOV_CH_LAYOUT_MONO, AV_CH_LAYOUT_MONO }, // C > - { 0, 0 }, > -}; > - > -static const struct MovChannelLayoutMap mov_ch_layout_map_2ch[] = { > - { MOV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_STEREO }, // L, R > - { MOV_CH_LAYOUT_STEREOHEADPHONES, AV_CH_LAYOUT_STEREO }, // L, R > - { MOV_CH_LAYOUT_BINAURAL, AV_CH_LAYOUT_STEREO }, // L, R > - { MOV_CH_LAYOUT_MIDSIDE, AV_CH_LAYOUT_STEREO }, // C, sides > - { MOV_CH_LAYOUT_XY, AV_CH_LAYOUT_STEREO }, // X (left), Y (right) > - > - { MOV_CH_LAYOUT_MATRIXSTEREO, AV_CH_LAYOUT_STEREO_DOWNMIX }, // Lt, Rt > - > - { MOV_CH_LAYOUT_AC3_1_0_1, AV_CH_LAYOUT_MONO | // C, LFE > - AV_CH_LOW_FREQUENCY }, > - { 0, 0 }, > -}; > - > -static const struct MovChannelLayoutMap mov_ch_layout_map_3ch[] = { > - { MOV_CH_LAYOUT_MPEG_3_0_A, AV_CH_LAYOUT_SURROUND }, // L, R, C > - { MOV_CH_LAYOUT_MPEG_3_0_B, AV_CH_LAYOUT_SURROUND }, // C, L, R > - { MOV_CH_LAYOUT_AC3_3_0, AV_CH_LAYOUT_SURROUND }, // L, C, R > - > - { MOV_CH_LAYOUT_ITU_2_1, AV_CH_LAYOUT_2_1 }, // L, R, Cs > - > - { MOV_CH_LAYOUT_DVD_4, AV_CH_LAYOUT_2POINT1 }, // L, R, LFE > - { 0, 0 }, > -}; > - > -static const struct MovChannelLayoutMap mov_ch_layout_map_4ch[] = { > - { MOV_CH_LAYOUT_AMBISONIC_B_FORMAT, 0 }, // W, X, Y, Z > - > - { MOV_CH_LAYOUT_QUADRAPHONIC, AV_CH_LAYOUT_QUAD }, // L, R, Rls, Rrs > - > - { MOV_CH_LAYOUT_MPEG_4_0_A, AV_CH_LAYOUT_4POINT0 }, // L, R, C, Cs > - { MOV_CH_LAYOUT_MPEG_4_0_B, AV_CH_LAYOUT_4POINT0 }, // C, L, R, Cs > - { MOV_CH_LAYOUT_AC3_3_1, AV_CH_LAYOUT_4POINT0 }, // L, C, R, Cs > - > - { MOV_CH_LAYOUT_ITU_2_2, AV_CH_LAYOUT_2_2 }, // L, R, Ls, Rs > - > - { MOV_CH_LAYOUT_DVD_5, AV_CH_LAYOUT_2_1 | // L, R, LFE, Cs > - AV_CH_LOW_FREQUENCY }, > - { MOV_CH_LAYOUT_AC3_2_1_1, AV_CH_LAYOUT_2_1 | // L, R, Cs, LFE > - AV_CH_LOW_FREQUENCY }, > - > - { MOV_CH_LAYOUT_DVD_10, AV_CH_LAYOUT_3POINT1 }, // L, R, C, LFE > - { MOV_CH_LAYOUT_AC3_3_0_1, AV_CH_LAYOUT_3POINT1 }, // L, C, R, LFE > - { MOV_CH_LAYOUT_DTS_3_1, AV_CH_LAYOUT_3POINT1 }, // C, L, R, LFE > - { 0, 0 }, > -}; > - > -static const struct MovChannelLayoutMap mov_ch_layout_map_5ch[] = { > - { MOV_CH_LAYOUT_PENTAGONAL, AV_CH_LAYOUT_5POINT0_BACK }, // L, R, Rls, Rrs, C > - > - { MOV_CH_LAYOUT_MPEG_5_0_A, AV_CH_LAYOUT_5POINT0 }, // L, R, C, Ls, Rs > - { MOV_CH_LAYOUT_MPEG_5_0_B, AV_CH_LAYOUT_5POINT0 }, // L, R, Ls, Rs, C > - { MOV_CH_LAYOUT_MPEG_5_0_C, AV_CH_LAYOUT_5POINT0 }, // L, C, R, Ls, Rs > - { MOV_CH_LAYOUT_MPEG_5_0_D, AV_CH_LAYOUT_5POINT0 }, // C, L, R, Ls, Rs > - > - { MOV_CH_LAYOUT_DVD_6, AV_CH_LAYOUT_2_2 | // L, R, LFE, Ls, Rs > - AV_CH_LOW_FREQUENCY }, > - { MOV_CH_LAYOUT_DVD_18, AV_CH_LAYOUT_2_2 | // L, R, Ls, Rs, LFE > - AV_CH_LOW_FREQUENCY }, > - > - { MOV_CH_LAYOUT_DVD_11, AV_CH_LAYOUT_4POINT1 }, // L, R, C, LFE, Cs > - { MOV_CH_LAYOUT_AC3_3_1_1, AV_CH_LAYOUT_4POINT1 }, // L, C, R, Cs, LFE > - { MOV_CH_LAYOUT_DTS_4_1, AV_CH_LAYOUT_4POINT1 }, // C, L, R, Cs, LFE > - { 0, 0 }, > -}; > - > -static const struct MovChannelLayoutMap mov_ch_layout_map_6ch[] = { > - { MOV_CH_LAYOUT_HEXAGONAL, AV_CH_LAYOUT_HEXAGONAL }, // L, R, Rls, Rrs, C, Cs > - { MOV_CH_LAYOUT_DTS_6_0_C, AV_CH_LAYOUT_HEXAGONAL }, // C, Cs, L, R, Rls, Rrs > - > - { MOV_CH_LAYOUT_MPEG_5_1_A, AV_CH_LAYOUT_5POINT1 }, // L, R, C, LFE, Ls, Rs > - { MOV_CH_LAYOUT_MPEG_5_1_B, AV_CH_LAYOUT_5POINT1 }, // L, R, Ls, Rs, C, LFE > - { MOV_CH_LAYOUT_MPEG_5_1_C, AV_CH_LAYOUT_5POINT1 }, // L, C, R, Ls, Rs, LFE > - { MOV_CH_LAYOUT_MPEG_5_1_D, AV_CH_LAYOUT_5POINT1 }, // C, L, R, Ls, Rs, LFE > - > - { MOV_CH_LAYOUT_AUDIOUNIT_6_0, AV_CH_LAYOUT_6POINT0 }, // L, R, Ls, Rs, C, Cs > - { MOV_CH_LAYOUT_AAC_6_0, AV_CH_LAYOUT_6POINT0 }, // C, L, R, Ls, Rs, Cs > - { MOV_CH_LAYOUT_EAC3_6_0_A, AV_CH_LAYOUT_6POINT0 }, // L, C, R, Ls, Rs, Cs > - > - { MOV_CH_LAYOUT_DTS_6_0_A, AV_CH_LAYOUT_6POINT0_FRONT }, // Lc, Rc, L, R, Ls, Rs > - > - { MOV_CH_LAYOUT_DTS_6_0_B, AV_CH_LAYOUT_5POINT0_BACK | // C, L, R, Rls, Rrs, Ts > - AV_CH_TOP_CENTER }, > - { 0, 0 }, > -}; > - > -static const struct MovChannelLayoutMap mov_ch_layout_map_7ch[] = { > - { MOV_CH_LAYOUT_MPEG_6_1_A, AV_CH_LAYOUT_6POINT1 }, // L, R, C, LFE, Ls, Rs, Cs > - { MOV_CH_LAYOUT_AAC_6_1, AV_CH_LAYOUT_6POINT1 }, // C, L, R, Ls, Rs, Cs, LFE > - { MOV_CH_LAYOUT_EAC3_6_1_A, AV_CH_LAYOUT_6POINT1 }, // L, C, R, Ls, Rs, LFE, Cs > - { MOV_CH_LAYOUT_DTS_6_1_D, AV_CH_LAYOUT_6POINT1 }, // C, L, R, Ls, Rs, LFE, Cs > - > - { MOV_CH_LAYOUT_AUDIOUNIT_7_0, AV_CH_LAYOUT_7POINT0 }, // L, R, Ls, Rs, C, Rls, Rrs > - { MOV_CH_LAYOUT_AAC_7_0, AV_CH_LAYOUT_7POINT0 }, // C, L, R, Ls, Rs, Rls, Rrs > - { MOV_CH_LAYOUT_EAC3_7_0_A, AV_CH_LAYOUT_7POINT0 }, // L, C, R, Ls, Rs, Rls, Rrs > - > - { MOV_CH_LAYOUT_AUDIOUNIT_7_0_FRONT, AV_CH_LAYOUT_7POINT0_FRONT }, // L, R, Ls, Rs, C, Lc, Rc > - { MOV_CH_LAYOUT_DTS_7_0, AV_CH_LAYOUT_7POINT0_FRONT }, // Lc, C, Rc, L, R, Ls, Rs > - > - { MOV_CH_LAYOUT_EAC3_6_1_B, AV_CH_LAYOUT_5POINT1 | // L, C, R, Ls, Rs, LFE, Ts > - AV_CH_TOP_CENTER }, > - > - { MOV_CH_LAYOUT_EAC3_6_1_C, AV_CH_LAYOUT_5POINT1 | // L, C, R, Ls, Rs, LFE, Vhc > - AV_CH_TOP_FRONT_CENTER }, > - > - { MOV_CH_LAYOUT_DTS_6_1_A, AV_CH_LAYOUT_6POINT1_FRONT }, // Lc, Rc, L, R, Ls, Rs, LFE > - > - { MOV_CH_LAYOUT_DTS_6_1_B, AV_CH_LAYOUT_5POINT1_BACK | // C, L, R, Rls, Rrs, Ts, LFE > - AV_CH_TOP_CENTER }, > - > - { MOV_CH_LAYOUT_DTS_6_1_C, AV_CH_LAYOUT_6POINT1_BACK }, // C, Cs, L, R, Rls, Rrs, LFE > - { 0, 0 }, > +enum ShortChannelName { > + c_L = AV_CHAN_FRONT_LEFT, > + c_R = AV_CHAN_FRONT_RIGHT, > + c_C = AV_CHAN_FRONT_CENTER, > + c_LFE = AV_CHAN_LOW_FREQUENCY, > + c_Rls = AV_CHAN_BACK_LEFT, > + c_Rrs = AV_CHAN_BACK_RIGHT, > + c_Lc = AV_CHAN_FRONT_LEFT_OF_CENTER, > + c_Rc = AV_CHAN_FRONT_RIGHT_OF_CENTER, > + c_Cs = AV_CHAN_BACK_CENTER, > + c_Ls = AV_CHAN_SIDE_LEFT, > + c_Rs = AV_CHAN_SIDE_RIGHT, > + c_Ts = AV_CHAN_TOP_CENTER, > + c_Vhl = AV_CHAN_TOP_FRONT_LEFT, > + c_Vhc = AV_CHAN_TOP_FRONT_CENTER, > + c_Vhr = AV_CHAN_TOP_FRONT_RIGHT, > + c_Rlt = AV_CHAN_TOP_BACK_LEFT, > + // = AV_CHAN_TOP_BACK_CENTER, > + c_Rrt = AV_CHAN_TOP_BACK_RIGHT, > + c_Lt = AV_CHAN_STEREO_LEFT, > + c_Rt = AV_CHAN_STEREO_RIGHT, > + c_Lw = AV_CHAN_WIDE_LEFT, > + c_Rw = AV_CHAN_WIDE_RIGHT, > + c_Lsd = AV_CHAN_SURROUND_DIRECT_LEFT, > + c_Rsd = AV_CHAN_SURROUND_DIRECT_RIGHT, > + c_LFE2 = AV_CHAN_LOW_FREQUENCY_2, > + // = AV_CHAN_TOP_SIDE_LEFT, > + // = AV_CHAN_TOP_SIDE_RIGHT, > + // = AV_CHAN_BOTTOM_FRONT_CENTER, > + // = AV_CHAN_BOTTOM_FRONT_LEFT, > + // = AV_CHAN_BOTTOM_FRONT_RIGHT, > + c_W = AV_CHAN_AMBISONIC_BASE, > + c_Y = AV_CHAN_AMBISONIC_BASE + 1, > + c_Z = AV_CHAN_AMBISONIC_BASE + 2, > + c_X = AV_CHAN_AMBISONIC_BASE + 3, > + /* The following have no exact counterparts */ > + c_LFE1 = AV_CHAN_LOW_FREQUENCY, > + c_Csd = AV_CHAN_NONE, > + c_HI = AV_CHAN_NONE, > + c_VI = AV_CHAN_NONE, > + c_Haptic = AV_CHAN_NONE, > }; > > -static const struct MovChannelLayoutMap mov_ch_layout_map_8ch[] = { > - { MOV_CH_LAYOUT_OCTAGONAL, AV_CH_LAYOUT_OCTAGONAL }, // L, R, Rls, Rrs, C, Cs, Ls, Rs > - { MOV_CH_LAYOUT_AAC_OCTAGONAL, AV_CH_LAYOUT_OCTAGONAL }, // C, L, R, Ls, Rs, Rls, Rrs, Cs > - > - { MOV_CH_LAYOUT_CUBE, AV_CH_LAYOUT_CUBE }, // L, R, Rls, Rrs, Vhl, Vhr, Rlt, Rrt > - > - { MOV_CH_LAYOUT_MPEG_7_1_A, AV_CH_LAYOUT_7POINT1_WIDE }, // L, R, C, LFE, Ls, Rs, Lc, Rc > - { MOV_CH_LAYOUT_MPEG_7_1_B, AV_CH_LAYOUT_7POINT1_WIDE }, // C, Lc, Rc, L, R, Ls, Rs, LFE > - { MOV_CH_LAYOUT_EMAGIC_DEFAULT_7_1, AV_CH_LAYOUT_7POINT1_WIDE }, // L, R, Ls, Rs, C, LFE, Lc, Rc > - { MOV_CH_LAYOUT_EAC3_7_1_B, AV_CH_LAYOUT_7POINT1_WIDE }, // L, C, R, Ls, Rs, LFE, Lc, Rc > - { MOV_CH_LAYOUT_DTS_7_1, AV_CH_LAYOUT_7POINT1_WIDE }, // Lc, C, Rc, L, R, Ls, Rs, LFE > - > - { MOV_CH_LAYOUT_MPEG_7_1_C, AV_CH_LAYOUT_7POINT1 }, // L, R, C, LFE, Ls, Rs, Rls, Rrs > - { MOV_CH_LAYOUT_EAC3_7_1_A, AV_CH_LAYOUT_7POINT1 }, // L, C, R, Ls, Rs, LFE, Rls, Rrs > - > - { MOV_CH_LAYOUT_SMPTE_DTV, AV_CH_LAYOUT_5POINT1 | // L, R, C, LFE, Ls, Rs, Lt, Rt > - AV_CH_LAYOUT_STEREO_DOWNMIX }, > - > - { MOV_CH_LAYOUT_EAC3_7_1_C, AV_CH_LAYOUT_5POINT1 | // L, C, R, Ls, Rs, LFE, Lsd, Rsd > - AV_CH_SURROUND_DIRECT_LEFT | > - AV_CH_SURROUND_DIRECT_RIGHT }, > - > - { MOV_CH_LAYOUT_EAC3_7_1_D, AV_CH_LAYOUT_5POINT1 | // L, C, R, Ls, Rs, LFE, Lw, Rw > - AV_CH_WIDE_LEFT | > - AV_CH_WIDE_RIGHT }, > - > - { MOV_CH_LAYOUT_EAC3_7_1_E, AV_CH_LAYOUT_5POINT1 | // L, C, R, Ls, Rs, LFE, Vhl, Vhr > - AV_CH_TOP_FRONT_LEFT | > - AV_CH_TOP_FRONT_RIGHT }, > - > - { MOV_CH_LAYOUT_EAC3_7_1_F, AV_CH_LAYOUT_5POINT1 | // L, C, R, Ls, Rs, LFE, Cs, Ts > - AV_CH_BACK_CENTER | > - AV_CH_TOP_CENTER }, > - > - { MOV_CH_LAYOUT_EAC3_7_1_G, AV_CH_LAYOUT_5POINT1 | // L, C, R, Ls, Rs, LFE, Cs, Vhc > - AV_CH_BACK_CENTER | > - AV_CH_TOP_FRONT_CENTER }, > - > - { MOV_CH_LAYOUT_EAC3_7_1_H, AV_CH_LAYOUT_5POINT1 | // L, C, R, Ls, Rs, LFE, Ts, Vhc > - AV_CH_TOP_CENTER | > - AV_CH_TOP_FRONT_CENTER }, > - > - { MOV_CH_LAYOUT_DTS_8_0_A, AV_CH_LAYOUT_2_2 | // Lc, Rc, L, R, Ls, Rs, Rls, Rrs > - AV_CH_BACK_LEFT | > - AV_CH_BACK_RIGHT | > - AV_CH_FRONT_LEFT_OF_CENTER | > - AV_CH_FRONT_RIGHT_OF_CENTER }, > - > - { MOV_CH_LAYOUT_DTS_8_0_B, AV_CH_LAYOUT_5POINT0 | // Lc, C, Rc, L, R, Ls, Cs, Rs > - AV_CH_FRONT_LEFT_OF_CENTER | > - AV_CH_FRONT_RIGHT_OF_CENTER | > - AV_CH_BACK_CENTER }, > - { 0, 0 }, > -}; > - > -static const struct MovChannelLayoutMap mov_ch_layout_map_9ch[] = { > - { MOV_CH_LAYOUT_DTS_8_1_A, AV_CH_LAYOUT_2_2 | // Lc, Rc, L, R, Ls, Rs, Rls, Rrs, LFE > - AV_CH_BACK_LEFT | > - AV_CH_BACK_RIGHT | > - AV_CH_FRONT_LEFT_OF_CENTER | > - AV_CH_FRONT_RIGHT_OF_CENTER | > - AV_CH_LOW_FREQUENCY }, > - > - { MOV_CH_LAYOUT_DTS_8_1_B, AV_CH_LAYOUT_7POINT1_WIDE | // Lc, C, Rc, L, R, Ls, Cs, Rs, LFE > - AV_CH_BACK_CENTER }, > - { 0, 0 }, > +struct MovChannelLayoutMap { > + union { > + uint32_t tag; > + enum AVChannel id; > + }; > }; > > -static const struct MovChannelLayoutMap * const mov_ch_layout_map[] = { > - mov_ch_layout_map_misc, > - mov_ch_layout_map_1ch, > - mov_ch_layout_map_2ch, > - mov_ch_layout_map_3ch, > - mov_ch_layout_map_4ch, > - mov_ch_layout_map_5ch, > - mov_ch_layout_map_6ch, > - mov_ch_layout_map_7ch, > - mov_ch_layout_map_8ch, > - mov_ch_layout_map_9ch, > +#define TAG(_0) (struct MovChannelLayoutMap){.tag = _0} > +#define ID(_0) (struct MovChannelLayoutMap){.id = c_##_0} Code like typedef struct Foo { int a; } Foo; Foo bar[] = { (Foo) {.a = 1}, }; is not valid C11 (or C17), because initializers for static objects are subject to severe restrictions; in particular, compound literals are not allowed. GCC and Clang ignore this except when using -pedantic, but MSVC does not: https://godbolt.org/z/hvnrh63za Just remove the "(MovChannelLayoutMap)". _______________________________________________ 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".