@@ -17,6 +17,12 @@ fate-matroska-xiph-lacing: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/xiph_lacing.m
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
+# This tests that the matroska demuxer correctly propagates
+# the channel layout contained in vorbis comments in the CodecPrivate
+# of flac tracks. It also tests header removal compression.
+FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER FLAC_PARSER) += fate-matroska-flac-channel-mapping
+fate-matroska-flac-channel-mapping: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/flac_channel_layouts.mka -map 0 -c:a 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
new file mode 100644
@@ -0,0 +1,38 @@
+#extradata 0: 34, 0x7a7909e5
+#extradata 1: 34, 0x7a7909e5
+#tb 0: 651/31250000
+#media_type 0: audio
+#codec_id 0: flac
+#sample_rate 0: 48000
+#channel_layout 0: 3f
+#channel_layout_name 0: 5.1
+#tb 1: 651/31250000
+#media_type 1: audio
+#codec_id 1: flac
+#sample_rate 1: 48000
+#channel_layout 1: 60f
+#channel_layout_name 1: 5.1(side)
+0, 0, 0, 4096, 26, 0x50f80431
+1, 0, 0, 4096, 26, 0x50f80431
+0, 4096, 4096, 4096, 26, 0x50d30416
+1, 4096, 4096, 4096, 26, 0x50d30416
+0, 8192, 8192, 4096, 26, 0x51ee046f
+1, 8192, 8192, 4096, 26, 0x51ee046f
+0, 12288, 12288, 4096, 26, 0x521d0458
+1, 12288, 12288, 4096, 26, 0x521d0458
+0, 16385, 16385, 4096, 26, 0x531c043d
+1, 16385, 16385, 4096, 26, 0x531c043d
+0, 20481, 20481, 4096, 26, 0x53cf0442
+1, 20481, 20481, 4096, 26, 0x53cf0442
+0, 24577, 24577, 4096, 26, 0x536a0473
+1, 24577, 24577, 4096, 26, 0x536a0473
+0, 28673, 28673, 4096, 26, 0x5321046c
+1, 28673, 28673, 4096, 26, 0x5321046c
+0, 32770, 32770, 4096, 26, 0x51b00449
+1, 32770, 32770, 4096, 26, 0x51b00449
+0, 36866, 36866, 4096, 26, 0x518b042e
+1, 36866, 36866, 4096, 26, 0x518b042e
+0, 40962, 40962, 4096, 26, 0x50f60447
+1, 40962, 40962, 4096, 26, 0x50f60447
+0, 45059, 45059, 3072, 28, 0x72540504
+1, 45059, 45059, 3072, 28, 0x72540504
contained in Vorbis comments in the CodecPrivate of flac tracks. Moreover, it also tests header removal compression. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- Sample already sent to James to take care of uploading it. tests/fate/matroska.mak | 6 ++++ tests/ref/fate/matroska-flac-channel-mapping | 38 ++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 tests/ref/fate/matroska-flac-channel-mapping