From patchwork Fri Dec 6 23:16:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16654 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 6F98744AD30 for ; Sat, 7 Dec 2019 01:18:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5816B68B6D5; Sat, 7 Dec 2019 01:18:16 +0200 (EET) 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 4613468B6D0 for ; Sat, 7 Dec 2019 01:18:08 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id y17so9525913wrh.5 for ; Fri, 06 Dec 2019 15:18:08 -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 :mime-version:content-transfer-encoding; bh=N13UObln/Q12EtcABGEwsEwFp2HeFJClXZoZLO1FLT4=; b=rheOWYkC9jdIj9VtxNgRe6cS+nDcHge7BVIv6SBFymzD+bu8wAGdyBMQy3dITb5va9 WqU+jrg0YsdGnDHHOvszkfDatzjfFc6tOlzQL9fEmAUmp3R+aj/CEImNFv2oU9DF/EMe ZGkmrZG7bzf4D0zjfDF6Z5MJ1I1SjdaakD+2u51IjZ4UhzBKfB04gBuHp71nTEEKydql PF9DdmqAbwnQCvlNABLpHiXF3vIzcllHjUxqXxrgoU+U+A9Vv6y1mdFd5wVytsEFlrrF osHdIdvjxGQ5VxbeNr+uinVDfY4x/5lpV/SkOyBUNOKjpZdGotv08DX9lQkJnCBe4Zpj /0Fg== 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=N13UObln/Q12EtcABGEwsEwFp2HeFJClXZoZLO1FLT4=; b=bR/tBAvJIif17o6Icg2Fo5PdR80E0z/f5C7QIQXrUPZq2Zpoewh1gsgKlzi3HXF95S SCGphXn5HFvmVtcm4p4wsW+8AZafhwdxixSD5bmL/EOtavPMLrRKjr3eHy5yWQ7pp52d UUWprlg4z23YItGqwW8l8WfsA0SimKM8FIkil8Gc4ROcbLTGzAaWalPg+wU8Xq4OV1z4 Hv/bsplgUC+aNxe55BVmG+a6pzap3FpOqPbfjexymHtB3PizBTtwkEHhzLA1H+ycvd9R 0raTa/nN2ytqBxVc2blsZ3PU6QeVCNFLgDcOIOaGpWO96NgkTOjGnprqchiJUjeUQail N6EQ== X-Gm-Message-State: APjAAAXRt0+gPfXPj0gJwQej98lh2QB33I0IhtMKqL7Bp9hFZ1MQWaVJ Bz8yk/rrbxilneStIUilA8/EfVsV X-Google-Smtp-Source: APXvYqwa8x4DFhwy1zGwnL/qSboTWhy+JMIa13yzVZMVKJ5UR7JdG68HSFBcQeNX6oiGclC+L18dWQ== X-Received: by 2002:adf:82a7:: with SMTP id 36mr18118890wrc.203.1575674287520; Fri, 06 Dec 2019 15:18:07 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id j12sm18758461wrw.54.2019.12.06.15.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 15:18:07 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Dec 2019 00:16:20 +0100 Message-Id: <20191206231622.13672-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191206231622.13672-1-andreas.rheinhardt@gmail.com> References: <20191206231622.13672-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] 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 d1a0a07782..a7226ee810 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]; @@ -2385,6 +2386,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, @@ -3381,12 +3387,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; 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;