diff mbox

[FFmpeg-devel] avformat/matroskadec: Add a fate test for CodecPrivate compression

Message ID 20191207163510.13808-1-andreas.rheinhardt@gmail.com
State Accepted
Headers show

Commit Message

Andreas Rheinhardt Dec. 7, 2019, 4:35 p.m. UTC
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>
---
 tests/fate/matroska.mak                    | 5 +++++
 tests/ref/fate/matroska-zlib-decompression | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 tests/ref/fate/matroska-zlib-decompression

Comments

James Almer Dec. 8, 2019, 2:13 a.m. UTC | #1
On 12/7/2019 1:35 PM, Andreas Rheinhardt wrote:
> 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>
> ---
>  tests/fate/matroska.mak                    | 5 +++++
>  tests/ref/fate/matroska-zlib-decompression | 5 +++++
>  2 files changed, 10 insertions(+)
>  create mode 100644 tests/ref/fate/matroska-zlib-decompression
> 
> diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
> index 25f5df82c8..04ac11aea5 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 FRAMECRC_MUXER FILE_PROTOCOL PIPE_PROTOCOL) += 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

Pushed (And sample uploaded). Thanks.
diff mbox

Patch

diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
index 25f5df82c8..04ac11aea5 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 FRAMECRC_MUXER FILE_PROTOCOL PIPE_PROTOCOL) += 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