From patchwork Wed Feb 17 10:13:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25689 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 F042D449181 for ; Wed, 17 Feb 2021 12:14:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA5F068A6F0; Wed, 17 Feb 2021 12:14:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E8EE68A329 for ; Wed, 17 Feb 2021 12:14:26 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id n6so16720986wrv.8 for ; Wed, 17 Feb 2021 02:14:26 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=V6zO21MzTLPXxRal+mQ0KgnnfYtTDSmUXrnk6LiZxHM=; b=BY2hpK8v5O+yMYW8KDXnhHyY9tYVBRraapVQvqKI82gvT7YIlIVFs0Et0ezME3LgC/ OE9p96uVVlOKql+NoDGkDJL2KIDFKCc+FcTLJn8GMNGF1p1o50015P1qwaD1CwUjWmRj rPI2aq5TXdO+MntdMEpalAZr4MkueMJL0UoyDZkmxZFExQcApD0gdVGBC3Tw6i2Wy6Hd 4dFSHYWSjn4JPCBvabmASVVLugbA3HZvLz5L5byfJZITZqbQPG95ejHeeteZDs+MBwYR iwMvoUbiUCNGeq+aGDLRSexc+2jJIZPI/jYv/GVtvJB5pGhNEJSQFooZnL+3/u+5ixRv E+TQ== 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:reply-to:mime-version:content-transfer-encoding; bh=V6zO21MzTLPXxRal+mQ0KgnnfYtTDSmUXrnk6LiZxHM=; b=sKR2ll1mzGOwMW/XQ7V0rZXzGg1jM1Xyd+hXWbYQtWuUzQHnnnn5gdy2XyOvSscwtt T9NOeTKUGugaowjym9LiJy1XYAzA1lnesi/gNzDIUylXOZ/lbqVMUad17IMaFHrjc6GZ IJvc6o0OT2q+uITC83uj483jyRikOZ9hL9490G8rLSF1XdwkIwNaMD+laI6A0uotXPRJ PyJur4qZ4ijVr0IPBYmNmNCrq9px7UZj68m71ZE1B3VCRPVYo2yr8fGvjK2Efw0X0Kuw weR2XuuQabBbfO9aCLW/0+zu2Wr6wwIFKMuWV0Qv3y3NeoU5Ya2ds/KD5o/faoDhHsLq bwMQ== X-Gm-Message-State: AOAM532I0JfoS5vEvQkvuHmbne6Cmpzcz3maHfW5HBXBTWHcg7hLStIc OKGG0gibhrq8F00BSVGuKo+duDv7KdU= X-Google-Smtp-Source: ABdhPJy/bTaCEwzadL23rf8/yMxlhPKerO/ITAscS5bZCqBSggrPHmSkr6xBXvMDkdWMaJacRZIYtw== X-Received: by 2002:a5d:550c:: with SMTP id b12mr22467220wrv.200.1613556865524; Wed, 17 Feb 2021 02:14:25 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id v12sm3502828wrv.69.2021.02.17.02.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 02:14:25 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Feb 2021 11:13:42 +0100 Message-Id: <20210217101356.1723370-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> References: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/19] avformat/matroskadec: Don't use fake default value for ReferenceBlock 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" This has been done in order to find out whether this element is present at all; but this can now be done in a cleaner way by using a CountedElement for it. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e6f4faa337..069c879404 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -330,7 +330,7 @@ typedef struct MatroskaLevel { typedef struct MatroskaBlock { uint64_t duration; - int64_t reference; + CountedElement reference; uint64_t non_simple; EbmlBin bin; uint64_t additional_id; @@ -736,7 +736,7 @@ static EbmlSyntax matroska_blockgroup[] = { { MATROSKA_ID_BLOCKADDITIONS, EBML_NEST, 0, 0, 0, { .n = matroska_blockadditions} }, { MATROSKA_ID_BLOCKDURATION, EBML_UINT, 0, 0, offsetof(MatroskaBlock, duration) }, { MATROSKA_ID_DISCARDPADDING, EBML_SINT, 0, 0, offsetof(MatroskaBlock, discard_padding) }, - { MATROSKA_ID_BLOCKREFERENCE, EBML_SINT, 0, 0, offsetof(MatroskaBlock, reference), { .i = INT64_MIN } }, + { MATROSKA_ID_BLOCKREFERENCE, EBML_SINT, 1, 0, offsetof(MatroskaBlock, reference) }, { MATROSKA_ID_CODECSTATE, EBML_NONE }, { 1, EBML_UINT, 0, 0, offsetof(MatroskaBlock, non_simple), { .u = 1 } }, CHILD_OF(matroska_cluster_parsing) @@ -3737,7 +3737,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) res = ebml_parse(matroska, matroska_cluster_parsing, cluster); if (res >= 0 && block->bin.size > 0) { - int is_keyframe = block->non_simple ? block->reference == INT64_MIN : -1; + int is_keyframe = block->non_simple ? block->reference.count == 0 : -1; uint8_t* additional = block->additional.size > 0 ? block->additional.data : NULL;