From patchwork Tue Apr 28 12:46:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19318 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 3B08444893D for ; Tue, 28 Apr 2020 15:46:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F274268C230; Tue, 28 Apr 2020 15:46:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 322DB68BD9B for ; Tue, 28 Apr 2020 15:46:23 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id y24so2706562wma.4 for ; Tue, 28 Apr 2020 05:46:23 -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=9R+3tzI0uYhxZSklsun4Mt2wGXYBCiwnj8DCKm6Hbdk=; b=k5ttoEtULl1vGpZPKkAK8u+K2Rss8uh3wjwJgF4EI+u4ME3Lmk5p9Dzmo++9P6/zSf I9HWdHOxD/d//Gpzr2xlZWSYjl+JqUvHJzuWV67i9z4r+EYvtcrxf7ALeHA4iOADVrj2 3sHyXG0jzYkq/5ZnMUCimLKDzu/Yf34kh6bqzAxeDeDEsrjuLQT6DH/nIj+OuhbuEn7o 3cEPzeRZGL1/99GZaeuuPUYHg532m5OPxPY9OeYCT7UM5eQZXoy7ul5JDnBIh2JkwxtH 2Tk9pXPy8KqhC91Ht9I30t898PUWmgY6KfzlxAOUTew9krlK8K2wl6M6wcWc760Oha7F xh5g== 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=9R+3tzI0uYhxZSklsun4Mt2wGXYBCiwnj8DCKm6Hbdk=; b=C3vwbcC71e5wSiKDruHY2svTppgbtVWwjdvMCPaJO6UohBMMtxed40HhS/+9/DPvhf 5QCUyaKDRLSgLELPiHhDLsqdyVwkf3HQVnK+WJzoXyj+8684x3CMXNt/m16XFe6lzecS OAJ2hqDHlMb1A6BB7e5oySQtArAXbBSjIycJ1iKEZjDsn1B0sdpVwo/AfOnS0sXun0Bq 1bPMPck/JPwlQSSsX8PWF/s3qVs0QZtnibVjq7WMyqUgdKpwUt3Yzx8wRwxtlVEH0PoK e/6H3HuAK5o5Hdv8KyCt5KV1BD1F8UVrTGSLpdk+ZAeK62axINXrimeivppfsHAjltyJ biIg== X-Gm-Message-State: AGi0PubXfIstZeeZQGXPac1n4na8UoUy5+nde012gJ8cQpQAiYxfD/dG Dre2fMcno6djOvydQ5seoOM+kIt/ X-Google-Smtp-Source: APiQypKNm1fzNI+9VrD2T0OHQdDLXUsIkN7iflxeaWKnIigkq79lQEapPbT4LuXqgrq6O1XAavylfw== X-Received: by 2002:a1c:750a:: with SMTP id o10mr4366677wmc.161.1588077982314; Tue, 28 Apr 2020 05:46:22 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q8sm3122968wmg.22.2020.04.28.05.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 05:46:21 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Apr 2020 14:46:13 +0200 Message-Id: <20200428124613.2369-1-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 12/12] tests/fate: Add test for zero-length Block 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" It furthermore tests the demuxer's handling of chained SeekHeads, level 1-elements after the Clusters and the muxer's capability of writing huge TrackNumbers as well as expanding the Cues' length field by one byte if necessary to fill the reserved space. It also tests propagation of metadata. Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 10 ++++++++++ tests/ref/fate/matroska-zero-length-block | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 tests/ref/fate/matroska-zero-length-block diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 1d2921194f..101502f668 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -57,6 +57,16 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER OGG_DEMUXER \ += fate-webm-dash-chapters fate-webm-dash-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg webm "-c copy -cluster_time_limit 1500 -dash 1 -dash_track_number 124 -reserve_index_space 400" "-c copy -t 0.5" "" -show_chapters +# The input file has a Block whose payload has a size of zero before reversing +# header removal compression; it furthermore uses chained SeekHeads and has +# level 1-elements after the Cluster. This is tested on the demuxer's side. +# For the muxer this tests that it can correctly write huge TrackNumbers and +# that it can expand the Cues element's length field by one byte if necessary. +# It furthermore tests correct propagation of the description tag. +FATE_MATROSKA_FFMPEG_FFPROBE-$(call DEMMUX, MATROSKA, MATROSKA) \ + += fate-matroska-zero-length-block +fate-matroska-zero-length-block: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/zero_length_block.mks matroska "-c:s copy -dash 1 -dash_track_number 2000000000 -reserve_index_space 62 -metadata_header_padding 1" "-c:s copy" "" "-show_entries stream_tags=description" + FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block new file mode 100644 index 0000000000..8fae333a4d --- /dev/null +++ b/tests/ref/fate/matroska-zero-length-block @@ -0,0 +1,10 @@ +46c2885959b8a72ac4f7a221ba456565 *tests/data/fate/matroska-zero-length-block.matroska +622 tests/data/fate/matroska-zero-length-block.matroska +#tb 0: 1/1000 +#media_type 0: subtitle +#codec_id 0: subrip +0, 1000, 1000, 2000, 5, 0x05b801df +0, 3300, 3300, 3700, 16, 0x300705b2 +[STREAM] +TAG:DESCRIPTION=This track uses header removal compression and has a Block of size zero before reversing it. +[/STREAM]