From patchwork Fri Mar 8 09:26:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12249 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 28A6644903F for ; Fri, 8 Mar 2019 11:27:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1610C68A793; Fri, 8 Mar 2019 11:27:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 554476809C0 for ; Fri, 8 Mar 2019 11:27:30 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id i16so20548229wrs.13 for ; Fri, 08 Mar 2019 01:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1hODkthN6LsviIoGdsyV5I4kzRiSkiJefRMZNv64WwE=; b=rmIEf0lsgfoEEES+atKd80xQr37waBKNl03vOgE8pfeclWkBlsJ9Xh4q1wOz+gjhwD qpQdX0VhKa049jvpjRrkfSlVgkA8TXYqzXz6aTH0sjLR2T4BQlRoTEKfwBiE3AxoEjcr /h4BnCRkdd5ZrN17LgUD/obtjBS9cf5b0Oz+c31JK3GCIvex5f5/+G3FyzbBP//mXFqo TAt9L6zLaPzInpXVWZcXxM5cHX0eZZxGA741o6w18UgbCuIj5IK+9oi+2nXGGCQsk4Hv HQTJFEAk5j8njdqbBOS/aHN7E3CQN07uDKjaVJ66PpffSeFu2PHp+az1n4tETBixdN7G 7GWA== 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=1hODkthN6LsviIoGdsyV5I4kzRiSkiJefRMZNv64WwE=; b=H70q7DPdKcBj+A62cMw7weazf1txvMFwoG9vLutRb0plVMrO6xS4mQWS3FTApOdIbH PtorCPVEczV252w0qHTnfv8nxE0tRU5XBb0BlSNhd+SQ/rZOBHY9aT5vsijpBirWYF0B M0rSHRbzQNQZfTeB/jydj0qdlyb6zMFNGcTTgCSZ9evLWLaSsk39ZCHRRMJ7PDOBkAyt L34rxed4oUxujhP9OoVmKJZ1X68gTv7vACoA2OWDm2/VjblCCu0VvVa9KPqGOlCdCXE4 RbEP/HPYrDnLEK8XNU9I39dfRpNystwdi+VieykqHEO9JmPBiAPFpdqdoGNCDy4zN6yY Qr3w== X-Gm-Message-State: APjAAAX/klw3cTRg7XJWQvjEoxspxUH4Gl3cdgCbcxCOwvC5sBp4imlN ld2tvIIkmm5igWYxQJXjl9w11JNwPJk= X-Google-Smtp-Source: APXvYqxCS2KDvvDRJ6BaCAQvjElQaRT1lCcpE3AWkwIBqlqKyB9YRFMikbK/kp1Ipihp4KiX2BL1/A== X-Received: by 2002:adf:f846:: with SMTP id d6mr10669584wrq.53.1552037249460; Fri, 08 Mar 2019 01:27:29 -0800 (PST) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id v20sm12179825wmj.2.2019.03.08.01.27.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 01:27:28 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2019 10:26:01 +0100 Message-Id: <20190308092604.3752-8-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> References: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/10] avformat/matroskadec: Treat SimpleBlock as EBML_BIN 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" Up until now, the SimpleBlock was treated specially: It basically had its own EBML category and it was also included in the BlockGroup EBML syntax (although a SimpleBlock must not exist in a BlockGroup according to the Matroska specifications). The latter fact also meant that a MatroskaBlock's buffer was always unreferenced twice. This has been changed: The type of a SimpleBlock is now an EBML_BIN. The only way in which SimpleBlocks are still different is that they share their associated structure with another unit (namely BlockGroup). This is also used to unref the block: It is always unreferenced via the BlockGroup syntax. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e7f84d545c..0e76fd828d 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -79,7 +79,6 @@ typedef enum { EBML_BIN, EBML_NEST, EBML_LEVEL1, - EBML_PASS, EBML_STOP, EBML_SINT, EBML_TYPE_COUNT @@ -694,7 +693,6 @@ static const EbmlSyntax matroska_blockadditions[] = { static const EbmlSyntax matroska_blockgroup[] = { { MATROSKA_ID_BLOCK, EBML_BIN, 0, offsetof(MatroskaBlock, bin) }, { MATROSKA_ID_BLOCKADDITIONS, EBML_NEST, 0, 0, { .n = matroska_blockadditions} }, - { MATROSKA_ID_SIMPLEBLOCK, EBML_BIN, 0, offsetof(MatroskaBlock, bin) }, { MATROSKA_ID_BLOCKDURATION, EBML_UINT, 0, offsetof(MatroskaBlock, duration) }, { MATROSKA_ID_DISCARDPADDING, EBML_SINT, 0, offsetof(MatroskaBlock, discard_padding) }, { MATROSKA_ID_BLOCKREFERENCE, EBML_SINT, 0, offsetof(MatroskaBlock, reference), { .i = INT64_MIN } }, @@ -706,7 +704,7 @@ static const EbmlSyntax matroska_blockgroup[] = { static const EbmlSyntax matroska_cluster_parsing[] = { { MATROSKA_ID_CLUSTERTIMECODE, EBML_UINT, 0, offsetof(MatroskaCluster, timecode) }, { MATROSKA_ID_BLOCKGROUP, EBML_NEST, 0, 0, { .n = matroska_blockgroup } }, - { MATROSKA_ID_SIMPLEBLOCK, EBML_PASS, 0, 0, { .n = matroska_blockgroup } }, + { MATROSKA_ID_SIMPLEBLOCK, EBML_BIN, 0, offsetof(MatroskaBlock, bin) }, { MATROSKA_ID_CLUSTERPOSITION, EBML_NONE }, { MATROSKA_ID_CLUSTERPREVSIZE, EBML_NONE }, { MATROSKA_ID_INFO, EBML_NONE }, @@ -1161,7 +1159,7 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, list->nb_elem++; } - if (syntax->type != EBML_PASS && syntax->type != EBML_STOP) { + if (syntax->type != EBML_STOP) { matroska->current_id = 0; if ((res = ebml_read_length(matroska, pb, &length)) < 0) return res; @@ -1217,8 +1215,6 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, level1_elem->parsed = 1; } return ebml_parse_nest(matroska, syntax->def.n, data); - case EBML_PASS: - return ebml_parse_id(matroska, syntax->def.n, id, data); case EBML_STOP: return 1; default: