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 3E90245C55 for ; Thu, 30 Mar 2023 00:42:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1249468C349; Thu, 30 Mar 2023 03:42:49 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2090.outbound.protection.outlook.com [40.92.59.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA94D68C340 for ; Thu, 30 Mar 2023 03:42:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cnByRv3ayhZ4agNO7Ymv7UcY4xF38hS9/l4NQDiyS6Pun0sATbxqo53ak1gW3V7R659P5yoF49SKm77uC7h3l9vU4ySJ4/BzIFagbLlYLfjlbGnGt9gtmX1hc9xsQ5V+vqWdg+iV+OOAVZQ1Iw7Tg28LhmwOZ9Wgv1hg0T0OLN0lHCIfFJolNsZDfjJx1/FInEDhc/DHLn+TcvfZ0NE2/iRq85SoFduLF+QChs9GrDHXdIGJhhDgyDdyHb5I3O1mJyfenezG0w9m/e4oTOYGD1BnC0SF1sExIgkgg0oC+6OA+H2BlCD2H4t8CjszJ+EDlEdHJGlfyX5a+s5UkxkpOw== 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=fYn7JwcgLSXlV201aDu9VIXnTPmlS/WF9E3aANElvU0=; b=aK7OD9Dk9CIjHNOmhocFLYB/J0gVQsJEiZx4AADCrdyEr0uwc4SPHR9UmM7O/XbP1EdGk6Y1GGZT/pU1tWmv1roiM4sAucmxc0zZGZFWOHv4HvYh4MnfzplSOb6erzyDmvRimHpTSIEl0bnzf/w+v+UgobdQdSW3GoR82ygXf/NNrSnbUPRej7Ry3lzOAMSkPbadp0kpd+3r/uuiFk5o23AJMTW3ja1YrVxyLcgDXoFqCdBBUrcOeY++nnVr+pBUX7mDk7MIEWlHQveCNVsFItY1TEZhYrxc+T+g/3qxUeFrYnmC82lyxjLTvnIfLZ++gQKbiWX5fQxcJ+PCNvFoAg== 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=fYn7JwcgLSXlV201aDu9VIXnTPmlS/WF9E3aANElvU0=; b=OpnsEvAW2JaY8xtzkNaf0W31I99EEgZ/fn835xEbm6Lt/7LrSVtmx+zCXMgYAlIyBevuvNQQLf8qwSDC86hzAXowUnBQD/4GEubO8OAf88BtSweLxvvDKFUp3ae5jWytUN7bblCUR0oLEmw7n3kszL4hsuCcVlliiRJMiveZxoqqTEnK5ZUK1TiLO2B0iiT7tAnuUR8Osrqhh735+zkAfIR7pdFw0SldeeqjPla1OsBJrO5YWIPYV3YKNqqC9e5u1oiXTkrq5aEhnmVR2RmQLNgrhPyO0s8Ujt8iQ2DHtH73wgaFltX7jD3j/mgePdFd9qyugG09POElUWEhm9LGZg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0015.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.20; Thu, 30 Mar 2023 00:42:41 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::bd9b:b9f7:e94a:109e]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::bd9b:b9f7:e94a:109e%7]) with mapi id 15.20.6254.016; Thu, 30 Mar 2023 00:42:41 +0000 Message-ID: Date: Thu, 30 Mar 2023 02:43:18 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230324155213.3493-1-jamrial@gmail.com> <20230324155213.3493-4-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230324155213.3493-4-jamrial@gmail.com> X-TMN: [FkBK4rubqnxjVb6FpwzkNvHwwaZOI8N7AF6pGWz4iNM=] X-ClientProxiedBy: AM0PR02CA0112.eurprd02.prod.outlook.com (2603:10a6:20b:28c::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <8c784906-f149-76ee-4e38-22f5933d9adf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0015:EE_ X-MS-Office365-Filtering-Correlation-Id: 145ef07a-3762-4662-6943-08db30b7aafb X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Az7IEOAVvji4i1zdE6fzBwQ2CG+U3KhiohUxdngL+AaYTpGjkb6Bg4FP8H2cabEE7oOFjd+N+EEPm2jvjrc7Ul+U1GGhKHeTZMqB95uKqxTLcmpeEDUo2nyk9dhCIbcQd7VtFJOYsFbNEouDflNTsk0GbIPBAGRGmjhGL9hdyKHuWILoX2zqwX/G6trUW0wFE3+H83h8hqbuI4PvOGcs/STOvK6Tfbmc29xeIdlp2YAAUIKsbaIEYuxY0gxOHP5tzl6VKXsvdYP2OdWcD9WNiKiY0XRoImNqM9NMpY6Dt0y4Hz/+iLQBf3z9v+vO5zJnx8/3BAEZ9WzU/8F716vWjaTO2wr16AZ5OGJyIa4q0qxnyNBJBk0MY6NhgPFTgtvPaeD06oQV6CzwSeE1Z+qjY/0DzjkLEj6nvvU8xyICWE99CLU6BZ+xp7pZKeuIrAd9IoaI6TQfYvBZEgxf31xt6enHmye+0DQ/e7jU3Sty3i+wQrZRWdoOfL1Cr6D05YFZ2oOZPkTvzyEfC5MZj87cxuPutYpUv6wcbcXCQOvHs+XNM5epHmME5iflFTa/dgc82TzFAyLFOd45C4Cx4NsVA/Po2uGXGyK2xu0NaUglv0zVFR4dA1fglLkNQGpzJQ+6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U2lKR0NpOUhNODBLYkt3MVJFZEhWcG9TRnlobWRxWWl3MFdEZEs1UDVpR0dj?= =?utf-8?B?dTJtSVdDYTZjWDVRWkEvZmJJNUwrdjFZbk5xcXBKRWV0aWM0b3F6ekdobU5x?= =?utf-8?B?ZHpFbUdSUlUrZ2FuMlFiYjY2TmlETWRuRTQ0MCtBQ2krcE9TK2NadU5kWTZh?= =?utf-8?B?M2c3YUpTU0R5TURYZ0FPM2xmbjFnZFNNb1JrV0ZTd2orOUpnei9pUDl6ZU44?= =?utf-8?B?a05zZEZBZmpsK1lZUFgxK1Vwayt0RGk5eFRNb3ZmdzFSR2xabU1oNVcwZ09F?= =?utf-8?B?WnlMczVaT2VZdzNtWWhpRkg1VmczZURraE9tS1hRdDM1OHhOUVlqN1FHUkJI?= =?utf-8?B?alJCRytzQ05FaHFvR284blFIRkp2c2xsTllQSzFoNHNTeG5TSGJZaFA4d0Nx?= =?utf-8?B?L01saDBXaXR0VmE1bTZtUnB3VVBwVGFmTWNacktSWVloZ2l0SnpaYnZpZGdw?= =?utf-8?B?VVJLVldLbVJOOFZuYW5ZekZ2L3RKQmg0a3d5cUZaZnRzc0MvcFVrNFAvS0Nm?= =?utf-8?B?UVh6RlpsRUhSdXo2bEtDR2ErL201ZTlrSS9VRE1LNXZOaFVPelNTUEVnTVJU?= =?utf-8?B?aDY4MnFpenQxUTRvUk1KZHdaemYyTnFMQnN0aXJNVVJMZG1vTVM3RmJybHJN?= =?utf-8?B?RXc5dXlMMk92dXJVVUhHdjNsYTBWdzE0ejFmUmk0d2pUNGllN2o3U254Mllr?= =?utf-8?B?eXNHZFUraDZqKzFXUG1WNkp0RmdmVmlibm5uV3g2NkNxOHg1YWNBQTEyRWxs?= =?utf-8?B?QzRIWHRZOWwrRTNMdmlBTTlHZWVQbVFiRTUwL1ExUzc1ek8raDgvQ1VTUjh4?= =?utf-8?B?Smhaam1tVGNWWGRENkN6RlY3dTZ2bnNYSFNzZGJUOW80WXFScHJST3JMZy94?= =?utf-8?B?OUd4WWhEWnROMjhjZTQxSkZHSnByMnJCc1RDWnlPaURLcUlSSGFPM2s0eXV3?= =?utf-8?B?dUViOUI4ak1lSSsveGRaWjkwZTVTZlozeW5Tcmk2ZGNtUUxWdWFUTldLL0FR?= =?utf-8?B?MitOeHJ4Y3B5MWJ2U1ZZUGhsU2taNmdHQ1JuOEtmMmFzaW9nNlZqWjZ6OFJp?= =?utf-8?B?ZFJRM2dxTHlmS1lRdDVnYVZXbGlzRzEwalNMcGJseTdBTnVienN6ZU5lbjB6?= =?utf-8?B?VEdSd2hzNU5TUjlaNFBPV3IvUGVOam5ob2I5Zm5vbmlvLyt0d0Eyb1F3dU40?= =?utf-8?B?UUZWVmIyK1RFT3VKdGVUb0tJRnp5RnlVUkhaWm5MMWxwU25JaWpZR25lWWZ6?= =?utf-8?B?bENMZkk1Rjdnb0RyVit0dVRJNEdnbnp5RVdVYXVjSEEvUTMyWmJOV0RqNzdj?= =?utf-8?B?RmNsTndjZnUxWndpWWcyL1VxU1NmWjJpMHpURmI0NVgwWU9Sa0loN0Q2ZnNa?= =?utf-8?B?NjBmNlIrKzlpbTd6ZzE5U1dOZEtGRk1Pd1N1TUd2WTNibkRDcEQ4dlVrbWtt?= =?utf-8?B?bW5hcUdHR3VXNzFQc2ZQLzN0VXlrR2hLc3BVejQ0WXhNWkFjY1ZhbityV0p6?= =?utf-8?B?TGdjbmc3R2FGSDZPNWdjdHIrQkt0ZmxCc2txWFZpeVc4VC83ZzNLZ0J3cG1m?= =?utf-8?B?MHdPcGVpMWNRazU3V0E2Rk9ReGRPbHowcmJkZzI4eEZNVXlnZE1CbXBxaXdQ?= =?utf-8?B?RVBWdEF6NHpnUUJaRzhkMWdNSy9qUWFEcDg3WUdsK3hUNXB4eEFQTFdOUGcx?= =?utf-8?Q?VeoRdrvFYkv8veNrXV+r?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 145ef07a-3762-4662-6943-08db30b7aafb X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2023 00:42:41.0896 (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: DU2P250MB0015 Subject: Re: [FFmpeg-devel] [PATCH v2 4/7] avformat/matroska: add a few more Block Addition ID Type enum values 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: > Signed-off-by: James Almer > --- > libavformat/matroska.h | 4 ++++ > libavformat/matroskadec.c | 6 +++--- > libavformat/matroskaenc.c | 6 +++--- > 3 files changed, 10 insertions(+), 6 deletions(-) > > diff --git a/libavformat/matroska.h b/libavformat/matroska.h > index b39517709c..3827675777 100644 > --- a/libavformat/matroska.h > +++ b/libavformat/matroska.h > @@ -360,9 +360,13 @@ typedef enum { > > typedef enum { > MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT = 0, > + MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE_DATA = 1, > MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35 = 4, > + MATROSKA_BLOCK_ADD_ID_TYPE_DVCC = 0x64766343, > + MATROSKA_BLOCK_ADD_ID_TYPE_DVVC = 0x64767643, I regard the MKBETAG version as more enlightening, even though this is more in line with the spec. > } MatroskaBlockAddIDType; > > +#define MATROSKA_BLOCK_ADD_ID_OPAQUE_DATA 1 That's quite a lot to type. > #define MATROSKA_BLOCK_ADD_ID_ITU_T_T35 4 > > /* > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index ad8b352f31..b18c9e31dc 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -767,7 +767,7 @@ static EbmlSyntax matroska_segments[] = { > }; > > static EbmlSyntax matroska_blockmore[] = { > - { MATROSKA_ID_BLOCKADDID, EBML_UINT, 0, 0, offsetof(MatroskaBlockMore,additional_id), { .u = 1 } }, > + { MATROSKA_ID_BLOCKADDID, EBML_UINT, 0, 0, offsetof(MatroskaBlockMore,additional_id), { .u = MATROSKA_BLOCK_ADD_ID_OPAQUE_DATA } }, > { MATROSKA_ID_BLOCKADDITIONAL, EBML_BIN, 0, 0, offsetof(MatroskaBlockMore,additional) }, > CHILD_OF(matroska_blockadditions) > }; > @@ -2404,8 +2404,8 @@ static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, M > } > track->blockaddid_itu_t_t35 = 1; > break; > - case MKBETAG('d','v','c','C'): > - case MKBETAG('d','v','v','C'): > + case MATROSKA_BLOCK_ADD_ID_TYPE_DVCC: > + case MATROSKA_BLOCK_ADD_ID_TYPE_DVVC: > if ((ret = mkv_parse_dvcc_dvvc(s, st, track, &mapping->extradata)) < 0) > return ret; > > diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c > index 954b7d828f..c083f55319 100644 > --- a/libavformat/matroskaenc.c > +++ b/libavformat/matroskaenc.c > @@ -1612,9 +1612,9 @@ static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) > + (2 + 1 + 4) + (2 + 1 + ISOM_DVCC_DVVC_SIZE); > > if (dovi->dv_profile > 7) { > - type = MKBETAG('d', 'v', 'v', 'C'); > + type = MATROSKA_BLOCK_ADD_ID_TYPE_DVVC; > } else { > - type = MKBETAG('d', 'v', 'c', 'C'); > + type = MATROSKA_BLOCK_ADD_ID_TYPE_DVCC; > } > > ff_isom_put_dvcc_dvvc(s, buf, dovi); > @@ -2657,7 +2657,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, > &side_data_size); > if (side_data && side_data_size >= 8 && > // Only the Codec-specific BlockMore (id == 1) is currently supported. > - (additional_id = AV_RB64(side_data)) == 1) { > + (additional_id = AV_RB64(side_data)) == MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE_DATA) { > ebml_writer_open_master(&writer, MATROSKA_ID_BLOCKADDITIONS); > ebml_writer_open_master(&writer, MATROSKA_ID_BLOCKMORE); > /* Until dbc50f8a our demuxer used a wrong default value _______________________________________________ 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".