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 BEE3B45C4A for ; Thu, 30 Mar 2023 00:42:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB31F68C324; Thu, 30 Mar 2023 03:42:36 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2051.outbound.protection.outlook.com [40.92.59.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4842E68C0D4 for ; Thu, 30 Mar 2023 03:42:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m+oK3WezOQz+y63MbQnsGzGF7YU0gDB5HKChQDxSQfZH9DZK8jPHmBD0AQl+4cVx3C/jO3drkO6FM9e+GpP1rXZw/AsQrpL57k/xDskWYxg9zKBc47D1hSqSV/abBEKkpLpGAAAk0vq8QU1uUQzoIgrhs4b0LFZ1wEcC+5+DOoiiUeRwwesTd/PLNRrlz63+43DunTO2pXGI8ey8V2itazPLsYBhXBCaMg401s2dS2ooy2C31B8rMV9sIlm60ZiWvrmyKjtxBT5UcF6QOu5oSieR5CrpgviiXwH1p3z9gDK2COTguKg3cfd2CM7hGMnzn7AcbuJT5icMg6eiDxcNfg== 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=MNsUIg52qozfLFooTzhkgjJI8j41oHmrr4kclxZspEM=; b=NE1kozg57JTWgTnP83hlMqKHK5oUaSyUg4EpFB4YCwEhykg7o0Hcui3f+mNFIVvtwperCM3C2753Qgzcp7ol1WUnU0DeAHtIkccgt/oU4jix9WsKJ0Q9UI28zDOfJs3U3OWxfN8D2W50K5Fs134Hvmem6dM/RWiVL9mAPxizxWWGeIlYqc1J6AM+KkH/gc4tevF8eu5XWGeUxBntjLkcVVudDrjKz5kcjSk/JeAVKY91g/6fHdwq2k3ikHNDj9o5E91UUciDC9wtU2HwKqropT5aQZBNFqrP8eAOgaZkjyDbGIAFUp8mxtFHzWH0UyhXsmHbf/REAkqpxsibZp9gTA== 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=MNsUIg52qozfLFooTzhkgjJI8j41oHmrr4kclxZspEM=; b=d4tV5e8xjpNs0JlSxD695OIDUhiVGsiqNsDkmmChDM5Hw/fsm0RqmlempxFDcYgnTx1P7yC+45sWjgqIjrO6hOMO5zW+RAosYVlqirQwSaGf7zC2v4FIznxHBq+PgHuBoX+1bBSFPLb+28L2/u/lWEpp6lli/NV97Jb1LzvYlnGqsMayoyAzve4nwHUgjvjZgh+Lfxbcn/LurBQInZOcFs141o3b/nfauv/cXkrszLsiyk5d93SU//wSj6FM7zOSiiLLQ9BZPpABEEgwCy14CGqKipDY1zLmijho0meZiNg1kbGwH6z3bsZ2oCMVexyvDylvM7hPIjYqLOGXsn1fxg== 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:27 +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:27 +0000 Message-ID: Date: Thu, 30 Mar 2023 02:43:05 +0200 To: ffmpeg-devel@ffmpeg.org References: <20230324155213.3493-1-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20230324155213.3493-1-jamrial@gmail.com> X-TMN: [Tc/hrNNd3JSAwKrcPU1z20YGBYskwKOA3eGHOTmS9V8=] X-ClientProxiedBy: AM0PR02CA0138.eurprd02.prod.outlook.com (2603:10a6:20b:28c::35) 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_|DU2P250MB0015:EE_ X-MS-Office365-Filtering-Correlation-Id: 5cf78353-293e-41ce-7947-08db30b7a2d9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ciHjKtP2GSYdwYCM4hje8BFLXFMj05BNQpqq3TSCRiwI0cPzmgGOfFGdM0hImZ73A9fiMkeYlhGZP2XBhPq5t36CXohGhZsrJoJSIMPVSyz7+0/TQN/U+aD0OCDn/txQ2l8LV7sngVv5JuKKXQfWLG+xFxVUi5g+bRVNcQIKIWkA3W9kY6aI9WhrqmO4g+EI9gw4AVpWKsA3YMd8hIKTgCylq/qJpX7FB9+RliqdyR32tIWkANLeen7fvH79uAQ/RLrfvnD7PaKlHazZB8fClW9BZDVF6X7G5ONMTdr31otO3H0TkQVIxbOHcq93KzU/3K3byt4y/84aEhWxCNDhiLxhSEGDJXI/695ipCHA8l/UHALr1uMgnQiU1Hbx3t8Db74/VcRYJXXVTvpwAKPnByCgBAqVybK9u3uJxxhKnqESC2QOzwSNbvtsy27IfTZYysC/vJROm3n+qqdAVq79VVRsmd6wd9tFT6ZKmYjP5YgTWj8xYRferYmk9vZi5dMOXrQCdsh+RB54MMybKmyx7MuJoM2uhv34tcztj74RTulTFNmewXUCe7u95PGXDNw2PsdbZKKhM8K3vUFbT1ypi0z4aCD7BiTpdYCYGmRmnwKQNZRGhaILB8sOAQnyKPrK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VUY0UVdMU0F4Nm5QR2Z1cXY4aDk0dVRISlRzeGErZ2JnVHVlZUI4L2JuVFBV?= =?utf-8?B?YVNReTgxNy9qbnlROTNtUTdLRmVjbllIa3BkbVRub1BTeGthcnA1bEVYd2Q1?= =?utf-8?B?bnYyVVFkdVlycmpLVlR0WSt3S014ams2MUNpdzFQMThyN2NZMFB5TU9IVTBu?= =?utf-8?B?OUVPT2VTeE9TUDl1cXpPNGlTQUJ3R1ZSNjJVOENaeGZwMlF6Um52RXhWMUlj?= =?utf-8?B?djBrZ1lhdGN1NUN3ME1BWldHZnBoVGo4UTE5ZkRQOUIxZWFBVHJqS2F6cXlX?= =?utf-8?B?TkdabC85V0VMTnhvbUVMTXc5VWVlSmtOYUl0NUN6dXR2cktkN0duMXJUSXhB?= =?utf-8?B?VzZMVVRMMGhtbkJMYnlLeStsS1FZeHRkMkhGSUVGYXZBZVhINjRQWWFGK0Rl?= =?utf-8?B?OWFtdm9qSmtSdU8zdzNPeFU5bmc4aGhEaTZ5UitrY3I5TTF4KzhyeXExcGcv?= =?utf-8?B?Sk9ZeGFGZ25kNFJBdFRTYUVtYmlVdVlJZ1VRZ3BkVTI4RThIV0tpRWxsOStv?= =?utf-8?B?WWg0RXA3RWExT2VEMzJkUTJWUTJYejF4Z1h0MFV6d3lMQmVxYkJjZjd6UFYx?= =?utf-8?B?cmxYUTJSSkNCTDZUTklFN0MyMkJVQ1drRmQ1K0RFV2M0UzR3c3VoMVJmQWpD?= =?utf-8?B?VzcyM3FXMWhETFZ6T3NBSXNNNlM1dENqVHZhR0ZHdlUvdGM1S2N2UWtLdnUr?= =?utf-8?B?YTY5QThRZ2tYaXZCUzBvNHIzaFRFZUJRbnJrdURlTTQzZS9xaUo2Z1FEcnlM?= =?utf-8?B?dEJOSlFJczB5TG5DTlJSMTlhQXQzNklLVHFQbjNYcklzRkNET1JHYTZqWHhu?= =?utf-8?B?b2NINDRGc0tSM0tDZVJheUJCeTViWW5TaVljNUVPdWVNYzVpSGFHTCtGcVp3?= =?utf-8?B?aEJsNmZmeDVxTHRPdS9RQWsvU2tzWjgzWjVDZ0crelVzVEI5anFLNFg1Nmlw?= =?utf-8?B?aU94UU5Ua0J5RW1XNCtKSHRzdGdZK1p0bnAyejFpZ2ZkS0lHRDR6TmlDdXBF?= =?utf-8?B?ZTVvZlNVMzJmalV3NzdneG55WGpva0pjUnpWSlpjeGZtYkMzZndsbWRuQ2Yy?= =?utf-8?B?Ny94bm93VjNmTDNSVGoyQmtpRzVWYkdkdzBYUjl5UUNrQ0ZCMWVLM1M2Z2lB?= =?utf-8?B?Tm5OcDN3Z0F4UW1uTXk4dGhhbTExcGtTL3V3eUI4VDRaNVRrSzBIK1Q0WURJ?= =?utf-8?B?SkRaanlPbXNJOGxlSk9MbmNMUzhIVDdGcHQyUUtTYjB1RGttbUhRazJDOUxU?= =?utf-8?B?a3MvdmxBT3JhSXlORHpkMFJYenIvV0JDYWN5dmEvVHdwK2tkMkpSK2VJWTNt?= =?utf-8?B?Zlg0T2RBM002VjNJcStCS2dkaTUwdGhCYi8xYUZoQUNJZ0YvMTJYS0I1TnRX?= =?utf-8?B?RVM0MzVoelE1WC9qU3hQbWdlMmlxREF3em5MZHVOM0ZJcGFsRTF5SEplS1c1?= =?utf-8?B?elBOMGUrVnhPUnExMmR5emlYNEhyaHVndHdGem13ako0SWFVaFRGMUMvU3o3?= =?utf-8?B?a2E2bjRXVTJTTHdvZ0lPaGk5Y2RKSTZ5SHZBekhZNGFXK2pHczNPaVpOZFU2?= =?utf-8?B?NTM3bjJ2cWJIc1dMZ0pvZm9kK3htRUhLSVlXNDB2ekREell4QXo1YS9rWEJt?= =?utf-8?B?TlNpN0NTZmlMczQzU1h2M2xjZjREZjRWbUdzQkJBRmdlY05aSlNaNlZ0a1dy?= =?utf-8?Q?+kEEf1TYY8Nmp4dZubN7?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5cf78353-293e-41ce-7947-08db30b7a2d9 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:27.5119 (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 1/7] avformat/matroskadec: support parsing more than one BlockMore element 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 > --- > No changes since v1. > > libavformat/matroskadec.c | 60 ++++++++++++++++++++++++++------------- > 1 file changed, 40 insertions(+), 20 deletions(-) > > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index 3a888e3ada..60f9a78fe8 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -349,13 +349,17 @@ typedef struct MatroskaLevel { > uint64_t length; > } MatroskaLevel; > > +typedef struct MatroskaBlockMore { > + uint64_t additional_id; > + EbmlBin additional; > +} MatroskaBlockMore; > + > typedef struct MatroskaBlock { > uint64_t duration; > CountedElement reference; > uint64_t non_simple; > EbmlBin bin; > - uint64_t additional_id; > - EbmlBin additional; > + EbmlList blockmore; > int64_t discard_padding; > } MatroskaBlock; > > @@ -759,13 +763,13 @@ static EbmlSyntax matroska_segments[] = { > }; > > static EbmlSyntax matroska_blockmore[] = { > - { MATROSKA_ID_BLOCKADDID, EBML_UINT, 0, 0, offsetof(MatroskaBlock,additional_id), { .u = 1 } }, > - { MATROSKA_ID_BLOCKADDITIONAL, EBML_BIN, 0, 0, offsetof(MatroskaBlock,additional) }, > + { MATROSKA_ID_BLOCKADDID, EBML_UINT, 0, 0, offsetof(MatroskaBlockMore,additional_id), { .u = 1 } }, > + { MATROSKA_ID_BLOCKADDITIONAL, EBML_BIN, 0, 0, offsetof(MatroskaBlockMore,additional) }, > CHILD_OF(matroska_blockadditions) > }; > > static EbmlSyntax matroska_blockadditions[] = { > - { MATROSKA_ID_BLOCKMORE, EBML_NEST, 0, 0, 0, {.n = matroska_blockmore} }, > + { MATROSKA_ID_BLOCKMORE, EBML_NEST, 0, sizeof(MatroskaBlockMore), offsetof(MatroskaBlock, blockmore), { .n = matroska_blockmore } }, > CHILD_OF(matroska_blockgroup) > }; > > @@ -3610,12 +3614,28 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska, > return 0; > } > > +static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, > + AVPacket *pkt, > + const uint8_t *data, int size, uint64_t id) > +{ > + uint8_t *side_data = av_packet_new_side_data(pkt, > + AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, > + size + 8); size + (size_t)8 > + if (!side_data) > + return AVERROR(ENOMEM); > + > + AV_WB64(side_data, id); > + memcpy(side_data + 8, data, size); > + > + return 0; > +} > + > static int matroska_parse_frame(MatroskaDemuxContext *matroska, > MatroskaTrack *track, AVStream *st, > AVBufferRef *buf, uint8_t *data, int pkt_size, > uint64_t timecode, uint64_t lace_duration, > int64_t pos, int is_keyframe, > - uint8_t *additional, uint64_t additional_id, int additional_size, > + MatroskaBlockMore *blockmore, int nb_blockmore, > int64_t discard_padding) > { > uint8_t *pkt_data = data; > @@ -3647,7 +3667,7 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, > buf = NULL; > } > > - if (!pkt_size && !additional_size) > + if (!pkt_size && !nb_blockmore) > goto no_output; > > if (!buf) > @@ -3666,16 +3686,18 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, > pkt->flags = is_keyframe; > pkt->stream_index = st->index; > > - if (additional_size > 0) { > - uint8_t *side_data = av_packet_new_side_data(pkt, > - AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, > - additional_size + 8); > - if (!side_data) { > + for (int i = 0; i < nb_blockmore; i++) { > + MatroskaBlockMore *more = &blockmore[i]; > + > + if (!more->additional.size) > + continue; > + > + res = matroska_parse_block_additional(matroska, pkt, more->additional.data, > + more->additional.size, more->additional_id); > + if (res < 0) { > av_packet_unref(pkt); > return AVERROR(ENOMEM); return res; > } > - AV_WB64(side_data, additional_id); > - memcpy(side_data + 8, additional, additional_size); > } > > if (discard_padding) { > @@ -3721,7 +3743,7 @@ fail: > static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf, uint8_t *data, > int size, int64_t pos, uint64_t cluster_time, > uint64_t block_duration, int is_keyframe, > - uint8_t *additional, uint64_t additional_id, int additional_size, > + MatroskaBlockMore *blockmore, int nb_blockmore, > int64_t cluster_pos, int64_t discard_padding) > { > uint64_t timecode = AV_NOPTS_VALUE; > @@ -3856,7 +3878,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf > res = matroska_parse_frame(matroska, track, st, buf, out_data, > out_size, timecode, lace_duration, > pos, !n ? is_keyframe : 0, > - additional, additional_id, additional_size, > + blockmore, nb_blockmore, > discard_padding); > if (res) > return res; > @@ -3897,14 +3919,12 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) > > if (res >= 0 && block->bin.size > 0) { > int is_keyframe = block->non_simple ? block->reference.count == 0 : -1; > - uint8_t* additional = block->additional.size > 0 ? > - block->additional.data : NULL; > > res = matroska_parse_block(matroska, block->bin.buf, block->bin.data, > block->bin.size, block->bin.pos, > cluster->timecode, block->duration, > - is_keyframe, additional, block->additional_id, > - block->additional.size, cluster->pos, > + is_keyframe, block->blockmore.elem, > + block->blockmore.nb_elem, cluster->pos, > block->discard_padding); > } > _______________________________________________ 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".