From patchwork Fri Mar 24 15:52:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40801 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp721607pzb; Fri, 24 Mar 2023 08:52:47 -0700 (PDT) X-Google-Smtp-Source: AKy350b/86piQ6FhYpRM1uQYQIv/W/hKkEfqYt8/CFlOfPDiZ4+aqQqLlPKmPNapirGI4K2qM4jt X-Received: by 2002:a05:6402:524e:b0:502:465:28e0 with SMTP id t14-20020a056402524e00b00502046528e0mr3685319edd.0.1679673167040; Fri, 24 Mar 2023 08:52:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679673167; cv=none; d=google.com; s=arc-20160816; b=oQ+8KzlKjyggAHuIglW14Jla0yzb7K/0ijuUo5OapjvCACRRE1bHIf2xOVgMwB9/m1 CkRTKp/IUWbbbzgGsYsb08rckc/PlZVy+0w25B7JP2fZznoDfbzuPHOaz8Wwqzl+WClA l+1vZzyjB1ZKOgc9Yy7r6kpIuCg9JGmL+2SKn8iUEtB4xIwEyqTmD3GREUX+VPphPKVT 2h8LCDhbeCs8bZWYXoXpOpLrQ/UJjFQfoe8x4ELBLviT4esWpboMPXeU22jlBMpYgLxZ xHGawSjmmS3iMgenII7Xof8wkxXSP/vGolfYtghlloHA5OytZI+hWst8B1Q1yAH92Zy3 OseQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=8qgtNWJHe+Mp22k9RrhCzKROHKpjmKfo8qS5BrNRx+o=; b=kq5Pw/itpQo8g+YQWfI2XHo0ef+BEtCTgjToqbjgl94oraLv6iwWp8q0EsM+WeAxof W9YyPJsxwITqcPm0ADxWVRR1a3boKOm8wn5omRfsSVpAefRx1p4zag8uJl+o7jqbsOCG qVTZ1ImK3r2s6LNfYfCsrrNKueVf+FGjieLS9zM0Ld7dUVpcM8RxO+S562dY6mBI8/VJ fTqUV6BbfuvaX6qATUaSw2ohj9QiKk0nz2g6pFA2Klq20WpDjjmefq2T5yBSGlEugZWP ZKGW1F0Fy2h44sOwZEEYDGzqKx/T5aPYCXo67IDDDqKegXG/1fc+NUEvR7idh2iQlym0 3POQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=j3byTVes; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q1-20020aa7cc01000000b0050212939157si3786023edt.654.2023.03.24.08.52.46; Fri, 24 Mar 2023 08:52:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=j3byTVes; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9E3268C836; Fri, 24 Mar 2023 17:52:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05C2168A1BA for ; Fri, 24 Mar 2023 17:52:38 +0200 (EET) Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-17ebba88c60so2159791fac.3 for ; Fri, 24 Mar 2023 08:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679673156; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=AAW0PwIUl8A4jNGEgJCE5xhV0y9xLkuG4hIBVqW/bw0=; b=j3byTVes+gXV+nrQkibRn6mKNjJ4ZMhH9Cuy6r1OiuXK4p5sSK8O7hXD8fcNrBzuPr NdsaxRUZtfGa5eRQoBhcj6AiY61mwVdqud3cxa/i28hH2wp0sphBY88l8chgiXk4/26e m6GVyeLkpheNyZ4GQHgdkZoHPBSneeLEuC+Juzdl7F/gBzwtGk29XYlvmO2xdUHrgqV3 HI0PLKEXWgDUSjSeFjMQhwCy/eWzeJMQYjrXRvqBnjOCaLxfwLC3Qq7BOTYn15Mo3USj OoBeN3k9P0ZGHTKP5UFDZ93qNzkUBywbfEA/vp1G1YRdsNZ/JSceuDcjlrd5BRYULijK Z8SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679673156; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AAW0PwIUl8A4jNGEgJCE5xhV0y9xLkuG4hIBVqW/bw0=; b=FpoN3lnP/pKtkVnXwFJwVk641oFvGH55eLJKtCQhrFnlCFF315H6uvw0iqu/0HMRmg srDWYf5lAOw7PozqyD9Dcfoet8z7Si4dbSh6w+RmDjwDDSaXJAvQ8lu2plPyxDTgpsaS tFQfrJeu4T2hrizpBnvuj8uGqGWRNUO3uldN/RKnrMAw2IVRANRXv+hTOprTFZ1zbhpq pCf7trStkUEKznzGDmTsE6lae+e9zEFQwoALTwEMjEvNWSVEwiHX/gIt7CaaJeeNnUfq zf+QPH0xCN6Ixpu/iQ06pJZj1GHwc4nysEdPgSWR4EffLdw7Alxnl8EgFCjNPdTk9qwf jxdw== X-Gm-Message-State: AAQBX9cUKdLKPZsSEhxkiRig1Mr0+BtnJZqfXFKXKLJX42JsGLYiSTId 32Q7UqLRwSVpRxz09NlFbY2Dc7IU1c0= X-Received: by 2002:a05:6870:89a3:b0:17e:da36:665a with SMTP id f35-20020a05687089a300b0017eda36665amr1356182oaq.8.1679673155965; Fri, 24 Mar 2023 08:52:35 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id yx24-20020a056871251800b0017eb6cc4609sm1475940oab.39.2023.03.24.08.52.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 08:52:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Mar 2023 12:52:07 -0300 Message-Id: <20230324155213.3493-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RSvUI+kcmXUO 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); + 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); } - 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); }