From patchwork Mon Oct 3 23:36:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 850 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1858917vsd; Mon, 3 Oct 2016 16:39:37 -0700 (PDT) X-Received: by 10.28.50.199 with SMTP id y190mr12175111wmy.61.1475537977271; Mon, 03 Oct 2016 16:39:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r184si1495538wmf.109.2016.10.03.16.39.36; Mon, 03 Oct 2016 16:39:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73677689C0B; Tue, 4 Oct 2016 02:39:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f67.google.com (mail-oi0-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E30968993C for ; Tue, 4 Oct 2016 02:39:07 +0300 (EEST) Received: by mail-oi0-f67.google.com with SMTP id n202so12656368oig.2 for ; Mon, 03 Oct 2016 16:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=Vy0v5yBYBYtA6SXY97nw2fllha7ZGJQ6/2MeaiLVI4E=; b=lfhC/LFNdsSYSH+9CNiiuyPsr8OFHx7RnHg//S1yUj0eg6Lp681FD7IXlj5vxOJVhs 5KN4hbvfmi+Ed5sx2AfQOsTZE6bnYpLJievJliichBBIrW9AjCxNbzQ8UDGYXM3nLGk0 VqzJtE+JF19EDUB9flLUVTL8/j3+ew1XbK6c1MD3ojpboebBwtGWOfWSvQ6oB6S0yhGM YcNiWgs/mE0Ije3TjMtxtYd9NY2UiwhfQUKgu7OqLbqmEgGU8WZNx4L8gWW7UYoGw9hl qUz4DUdtFt+cfT2rtx1CpYbEzw0cAXWQXZpCEy5ygb66Ho4Pf58+SDyX3pRJFBxSA5MR qrWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Vy0v5yBYBYtA6SXY97nw2fllha7ZGJQ6/2MeaiLVI4E=; b=EojzoMuoStE7G2c6VnJgATVpKaQ0ibl4IqgEv0NShHAoW3f0eW0pi1MFbKx2d2jYhM QoQabu6p55El421ARHAbqES/6YgNZQ8qyqim64PaWzqBnDH3tsi4bNXdFnuKfj23CGgM hJAYbvpJcVDcLDQS0AS4TWDRJR1aDAqwfyLZkOUj27dacxCRGhv4MqHL7NXxlOg9uRZZ KjUuW+ZEqMwL6DtMBxu4GXeRmmyYNcVUf6RDw6xy0XVpRX+qYwQBlyqfVb5Be0UYzOnV LkU497qOtV/KS3eZF9JwZoibLvJ0Ft3t4hDkTu2viqgeY/NXVHyQbYiXCsPxfnJXmcGl FVsg== X-Gm-Message-State: AA6/9Rn4Vy/SCtQe9GGkDRrcKthIw7MdwgfuE0U41hCqbN+uIawp4vEiiIJykQP5U4G1lQ== X-Received: by 10.202.232.21 with SMTP id f21mr517407oih.98.1475537960314; Mon, 03 Oct 2016 16:39:20 -0700 (PDT) Received: from localhost.localdomain ([181.22.58.118]) by smtp.gmail.com with ESMTPSA id m66sm183582oia.25.2016.10.03.16.39.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Oct 2016 16:39:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Oct 2016 20:36:57 -0300 Message-Id: <20161003233707.3624-2-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20161003233707.3624-1-jamrial@gmail.com> References: <20161003233707.3624-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 01/11] avformat/matroskaenc: don't reserve space for stream duration tags if the output is not seekable 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The durations are never written in that situation. Signed-off-by: James Almer --- libavformat/matroskaenc.c | 2 +- tests/fate/matroska.mak | 2 +- tests/fate/wavpack.mak | 4 ++-- tests/ref/fate/binsub-mksenc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3eeb09b..32d5dcf 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1376,7 +1376,7 @@ static int mkv_write_tags(AVFormatContext *s) if (ret < 0) return ret; } - if (!mkv->is_live) { + if (s->pb->seekable && !mkv->is_live) { for (i = 0; i < s->nb_streams; i++) { ebml_master tag_target; ebml_master tag; diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 8e4a1e8..36cc779 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -4,6 +4,6 @@ FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux fate-matroska-remux: CMD = md5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska fate-matroska-remux: CMP = oneline -fate-matroska-remux: REF = f08b20b90f158a4de5a02a52c25596b9 +fate-matroska-remux: REF = 1040692ffdfee2428954af79a7d5d155 FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes) diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index a825a02..240f5ea 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -91,12 +91,12 @@ fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matros FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono fate-wavpack-matroska_mux-mono: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska fate-wavpack-matroska_mux-mono: CMP = oneline -fate-wavpack-matroska_mux-mono: REF = 4befcc41dab6c690a15d0c396c324468 +fate-wavpack-matroska_mux-mono: REF = a2987e2e51e01a35e47e7da13eb47a35 FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61 fate-wavpack-matroska_mux-61: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska fate-wavpack-matroska_mux-61: CMP = oneline -fate-wavpack-matroska_mux-61: REF = 7fedbfc3b9ea7348761db664626c29f4 +fate-wavpack-matroska_mux-61: REF = ffba4ddea1ba71f7a5901d9ed1a267be FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes) fate-wavpack: $(FATE_WAVPACK-yes) diff --git a/tests/ref/fate/binsub-mksenc b/tests/ref/fate/binsub-mksenc index 128ca31..c473497 100644 --- a/tests/ref/fate/binsub-mksenc +++ b/tests/ref/fate/binsub-mksenc @@ -1 +1 @@ -37a212f8d56ad71e7466d5129f88e756 +2dad5f63688ec613a04e94c8d4d167db