aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-12-07 17:35:10 +0100
committerJames Almer <jamrial@gmail.com>2019-12-07 23:11:55 -0300
commitff2b75d94cee65e47db7a56f3924497016e5b420 (patch)
treeff54544e018407e1f06fcd5ba17cfa4102b3c09c
parente1d836d2375c93cbc44a2b0d34e404682c1e8436 (diff)
downloadffmpeg-ff2b75d94cee65e47db7a56f3924497016e5b420.tar.gz
avformat/matroskadec: Add a fate test for CodecPrivate compression
This test contains a track with zlib compressed CodecPrivate in addition to compressed frames; the former was unchecked before. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--tests/fate/matroska.mak5
-rw-r--r--tests/ref/fate/matroska-zlib-decompression5
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index 94a9ccfdf7..36fec6e991 100644
--- a/tests/fate/matroska.mak
+++ b/tests/fate/matroska.mak
@@ -12,6 +12,11 @@ fate-matroska-remux: REF = e5457e5fa606d564a54914bd12f426c8
FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER VORBIS_PARSER) += fate-matroska-xiph-lacing
fate-matroska-xiph-lacing: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/xiph_lacing.mka -c:a copy
+# This tests that the matroska demuxer supports decompressing
+# zlib compressed tracks (both the CodecPrivate as well as the actual frames).
+FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-zlib-decompression
+fate-matroska-zlib-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/subtitle_zlib.mks -c:s copy
+
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-zlib-decompression b/tests/ref/fate/matroska-zlib-decompression
new file mode 100644
index 0000000000..0ea732346a
--- /dev/null
+++ b/tests/ref/fate/matroska-zlib-decompression
@@ -0,0 +1,5 @@
+#extradata 0: 348, 0x5f625922
+#tb 0: 1/1000
+#media_type 0: subtitle
+#codec_id 0: dvd_subtitle
+0, 1000, 1000, 1991, 191, 0x52f74934