From patchwork Thu Apr 23 03:07:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19186 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 4C06144BA43 for ; Thu, 23 Apr 2020 06:08:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 39AFF68BE28; Thu, 23 Apr 2020 06:08:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3797C68BE00 for ; Thu, 23 Apr 2020 06:08:17 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id d15so3421865wrx.3 for ; Wed, 22 Apr 2020 20:08:17 -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=Av8FM9zWap5kaV6nvpbpWFQrf7QCC63I7SeiVybj/Yg=; b=u5qpAlTZvQdkYDq9hNF3297C5n5Ur1soOqPAI5F9eNKSR7rcupJxBIjaI1KwHRZRTm bZV8Ne2+Xn9RTXzibhHZbvUONpNpnQT2EoQTZI3etoVtjfQ0ranZbRwWPlmA5kXLarfc 4iFz4XTJM45W27oGDF8Me818hlPCivTD31gm/fqDx7aLk4wHJ/1zrpZ4cAH/6psFTnP4 2Tm0dpYujypFpD1P9rNeUw2IkAq7bP/4OFsyFg2yXjjoxDbuEVKpOk9lpw9qYrn/Fh90 rAXmiRNQ6jRRxyc1Rp/7pZYM68aOP8UJXWp0bkuvIvYZLMe6vtuUqE5AdSC0AXHfjuyu lbxA== 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=Av8FM9zWap5kaV6nvpbpWFQrf7QCC63I7SeiVybj/Yg=; b=qUZdNgnVGy3/x9fSzQVEdqE64fWwSB8Bph81H+e4mUKTTMyCBVMOxpq7TgI8ZPR28p Sd1JwZoDee9OHn0AgCU5gohlDrafzIceNk+rkvEQsfGy8r02uj3JF/EU4QL3YAX+LacT U+X3QWnpiFDm+e3o5+3YAWJIQxBwRFk/L1pqr6XZL/UWU7jmLEG2X4vi0Pn68U12j+iA rCtKVx8k+JY8AwlJFPPI8z5FCFkw3laMwP5Q6//UtyjUe3bX55rk1itmqs8aavti6ret oIH4aUs7OAmkn2ZJvtuzjMXidkKtR/ShzWeBiChG99qEQgr9paAEFjGgBtytmUrSBF75 FrvA== X-Gm-Message-State: AGi0PubHO+YbtAfZysYrR3OZs3PiKFvuaFGrpObsIfJl3eDVpICCH4fy GolV/E6tVXO5Q74nP92yd1E9LnS1 X-Google-Smtp-Source: APiQypJ+2UL9CIL0oI4JeLVuQdEFk2hvasOtYXzwStvkRnMgwmmXNa+7oYkCPQCZWaUEloJteK8vKw== X-Received: by 2002:adf:9d85:: with SMTP id p5mr2371177wre.101.1587611295569; Wed, 22 Apr 2020 20:08:15 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m1sm1497733wro.64.2020.04.22.20.08.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 20:08:14 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Apr 2020 05:07:39 +0200 Message-Id: <20200423030741.12158-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200423030741.12158-1-andreas.rheinhardt@gmail.com> References: <20200423030741.12158-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/11] avformat/matroskadec: Cache whether a track needs to be decoded 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" There is no need to recheck this for every frame. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 088eeabf2d..9e3e98e9c0 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -249,6 +249,7 @@ typedef struct MatroskaTrack { AVStream *stream; int64_t end_timecode; int ms_compat; + int needs_decoding; uint64_t max_block_additional_id; uint32_t palette[AVPALETTE_COUNT]; @@ -2405,6 +2406,11 @@ static int matroska_parse_tracks(AVFormatContext *s) } } } + track->needs_decoding = encodings && !encodings[0].type && + encodings[0].scope & 1 && + (encodings[0].compression.algo != + MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP || + encodings[0].compression.settings.size); for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { if (!strncmp(ff_mkv_codec_tags[j].str, track->codec_id, @@ -3413,12 +3419,11 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, uint8_t *additional, uint64_t additional_id, int additional_size, int64_t discard_padding) { - MatroskaTrackEncoding *encodings = track->encodings.elem; uint8_t *pkt_data = data; int res = 0; AVPacket pktl, *pkt = &pktl; - if (encodings && !encodings->type && encodings->scope & 1) { + if (track->needs_decoding) { res = matroska_decode_buffer(&pkt_data, &pkt_size, track); if (res < 0) return res;