From patchwork Thu May 16 22:30:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13164 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3CDB9449A02 for ; Fri, 17 May 2019 01:48:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EFEC68A1CC; Fri, 17 May 2019 01:48:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 986A1689AD1 for ; Fri, 17 May 2019 01:48:47 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id j187so4969176wmj.1 for ; Thu, 16 May 2019 15:48:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rwLOwKjQUtaJiR3k3Txoe4xlTWRmXBzI+Vz3stuFS5k=; b=PnHwWc640SHOoITlE+vEz+d8697Sf2UjkYNkj+UjlaoM5ccrwDNL8mUp319I1tlOid gE3iShdByV2Ip/TdD7bF8VMhLZ9TJklye2NulreimxCMTVTxSj8nm/GpsSSQtu+AFFoB dSUG62s4lx3relNkAHm1OZAW54Ba80lz32kj2JLl1MnKrXAGf6k4suz9/5BospHBA7sl hnl+n8CN8RUQq6UocT/xqyRm3p8iKJgAb3uNl9Nn7dUZ1eqRj7wFNSaHO/lFmWVQ4vRX 3cooBNokCkotjQp/oF2D4q88HT6h40rRAWyrUOfRclDnszPY7v79obqvDKI8SVkbCKtS f0+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rwLOwKjQUtaJiR3k3Txoe4xlTWRmXBzI+Vz3stuFS5k=; b=TRVfngSyoCx47puJ0wrN/pf+oOMbwunUybzBMOt+IYLWQzQE1QowuTaZJl84bpjbMD lv0Tm8qVxCGZvLvUWFv2RxYm0lRQu5/WELY02ju5vfFqlwHtjehS2olr2gvuDpYFafWV s4/XhbZjXDIDS0rcjHXskfiODymZykiq2zFPus4qMZ59RTOjCehr0WuHUtK6Gn+92hO1 dlaLqSGOGAkKVlNhvf+bJVabz+p2f6QlmZmTJorxH7c/ICi9wvhn88Hzxjjf44SMbkpS a70eG1f+MbWQfHxhQE9eB1qFc5cOiAj0NiKND7hG3pWPLfuvjHvBEh1O7SyFKat8skFR twpQ== X-Gm-Message-State: APjAAAWDFV9MCvpkiVVbriO035wKZfoCJmJROo4Ec/kQOI90/oiIvbxW PAVfBXq2mJXz+n7f9E9knBqQhFfm X-Google-Smtp-Source: APXvYqyggb6XTZQrHTFVWJxhHluyzAwRtc8dNU5tHozcNbFfKQ0OxX2ADUcEugUxnWgonkPIjnIR1g== X-Received: by 2002:a1c:4102:: with SMTP id o2mr70478wma.91.1558046598271; Thu, 16 May 2019 15:43:18 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id i185sm11168725wmg.32.2019.05.16.15.43.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 15:43:17 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2019 00:30:04 +0200 Message-Id: <20190516223018.30827-21-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> References: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/37] avformat/matroskadec: Refactor some functions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Since the changes to the parsing of SimpleBlocks, both ebml_parse_id and ebml_parse_elem are only called from one place, so that it is possible to inline these two function calls. This is done, but not completely: ebml_parse_id still exists in a modified form. This is done in preparation for a further patch regarding the handling of unknown-length elements. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 59 +++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 2084b72748..deb01578d5 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1052,40 +1052,17 @@ static int matroska_ebmlnum_sint(MatroskaDemuxContext *matroska, return res; } -static int ebml_parse_elem(MatroskaDemuxContext *matroska, - EbmlSyntax *syntax, void *data); +static int ebml_parse(MatroskaDemuxContext *matroska, + EbmlSyntax *syntax, void *data); -static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, - uint32_t id, void *data) +static EbmlSyntax *ebml_parse_id(EbmlSyntax *syntax, uint32_t id) { int i; for (i = 0; syntax[i].id; i++) if (id == syntax[i].id) break; - if (!syntax[i].id && id == MATROSKA_ID_CLUSTER && - matroska->num_levels > 0 && - matroska->levels[matroska->num_levels - 1].length == EBML_UNKNOWN_LENGTH) - return 0; // we reached the end of an unknown size cluster - if (!syntax[i].id && id != EBML_ID_VOID && id != EBML_ID_CRC32) { - av_log(matroska->ctx, AV_LOG_DEBUG, "Unknown entry 0x%"PRIX32"\n", id); - } - return ebml_parse_elem(matroska, &syntax[i], data); -} -static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, - void *data) -{ - if (!matroska->current_id) { - uint64_t id; - int res = ebml_read_num(matroska, matroska->ctx->pb, 4, &id, 0); - if (res < 0) { - // in live mode, finish parsing if EOF is reached. - return (matroska->is_live && matroska->ctx->pb->eof_reached && - res == AVERROR_EOF) ? 1 : res; - } - matroska->current_id = id | 1 << 7 * res; - } - return ebml_parse_id(matroska, syntax, matroska->current_id, data); + return &syntax[i]; } static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, @@ -1170,8 +1147,8 @@ static MatroskaLevel1Element *matroska_find_level1_elem(MatroskaDemuxContext *ma return elem; } -static int ebml_parse_elem(MatroskaDemuxContext *matroska, - EbmlSyntax *syntax, void *data) +static int ebml_parse(MatroskaDemuxContext *matroska, + EbmlSyntax *syntax, void *data) { static const uint64_t max_lengths[EBML_TYPE_COUNT] = { [EBML_UINT] = 8, @@ -1185,12 +1162,34 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, // no limits for anything else }; AVIOContext *pb = matroska->ctx->pb; - uint32_t id = syntax->id; + uint32_t id; uint64_t length; int res; void *newelem; MatroskaLevel1Element *level1_elem; + if (!matroska->current_id) { + uint64_t id; + res = ebml_read_num(matroska, pb, 4, &id, 0); + if (res < 0) { + // in live mode, finish parsing if EOF is reached. + return (matroska->is_live && pb->eof_reached && + res == AVERROR_EOF) ? 1 : res; + } + matroska->current_id = id | 1 << 7 * res; + } + + id = matroska->current_id; + + syntax = ebml_parse_id(syntax, id); + if (!syntax->id && id == MATROSKA_ID_CLUSTER && + matroska->num_levels > 0 && + matroska->levels[matroska->num_levels - 1].length == EBML_UNKNOWN_LENGTH) + return 0; // we reached the end of an unknown size cluster + if (!syntax->id && id != EBML_ID_VOID && id != EBML_ID_CRC32) { + av_log(matroska->ctx, AV_LOG_DEBUG, "Unknown entry 0x%"PRIX32"\n", id); + } + data = (char *) data + syntax->data_offset; if (syntax->list_elem_size) { EbmlList *list = data;