Browse Source

fate/matroska: Add test for updating CodecPrivate from packet sidedata

containing updated extradata, in this case a new FLAC streaminfo.
Furthermore, it also tests that the Matroska muxer is able to preserve
uncommon channel layouts by adding Vorbis comments to the CodecPrivate.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
tags/n4.3
Andreas Rheinhardt 5 years ago
parent
commit
45cb93e9bd
2 changed files with 65 additions and 0 deletions
  1. +12
    -0
      tests/fate/matroska.mak
  2. +53
    -0
      tests/ref/fate/matroska-flac-extradata-update

+ 12
- 0
tests/fate/matroska.mak View File

@@ -37,6 +37,18 @@ fate-matroska-lzo-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/lzo.mka
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

# This tests that the Matroska muxer writes the channel layout
# of FLAC tracks as a Vorbis comment in the CodecPrivate if necessary
# and that FLAC extradata is correctly updated when a packet
# with sidedata containing new extradata is encountered.
# Furthermore it tests everything the matroska-flac-channel-mapping test
# tests and it also tests the FLAC decoder and encoder, in particular
# the latter's ability to send updated extradata.
FATE_MATROSKA-$(call ALLYES, FLAC_DECODER FLAC_ENCODER FLAC_PARSER \
MATROSKA_DEMUXER MATROSKA_MUXER) += fate-matroska-flac-extradata-update
fate-matroska-flac-extradata-update: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/flac_channel_layouts.mka \
matroska "-map 0 -map 0:0 -c flac -frames:a:2 8" "-map 0 -c 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



+ 53
- 0
tests/ref/fate/matroska-flac-extradata-update View File

@@ -0,0 +1,53 @@
2b363aecd6422c3ce9964983f5d0f3ef *tests/data/fate/matroska-flac-extradata-update.matroska
2049 tests/data/fate/matroska-flac-extradata-update.matroska
#extradata 0: 34, 0x7acb09e7
#extradata 1: 34, 0x7acb09e7
#extradata 2: 34, 0x443402dd
#tb 0: 1/1000
#media_type 0: audio
#codec_id 0: flac
#sample_rate 0: 48000
#channel_layout 0: 3f
#channel_layout_name 0: 5.1
#tb 1: 1/1000
#media_type 1: audio
#codec_id 1: flac
#sample_rate 1: 48000
#channel_layout 1: 60f
#channel_layout_name 1: 5.1(side)
#tb 2: 1/1000
#media_type 2: audio
#codec_id 2: flac
#sample_rate 2: 48000
#channel_layout 2: 3f
#channel_layout_name 2: 5.1
0, 0, 0, 96, 26, 0x4e160341
1, 0, 0, 96, 26, 0x4e160341
2, 0, 0, 96, 26, 0x4e160341
0, 96, 96, 96, 26, 0x4e17035c
1, 96, 96, 96, 26, 0x4e17035c
2, 96, 96, 96, 26, 0x4e17035c
0, 192, 192, 96, 26, 0x4de40383
1, 192, 192, 96, 26, 0x4de40383
2, 192, 192, 96, 26, 0x4de40383
0, 288, 288, 96, 26, 0x4e3903a2
1, 288, 288, 96, 26, 0x4e3903a2
2, 288, 288, 96, 26, 0x4e3903a2
0, 384, 384, 96, 26, 0x4f9a03d5
1, 384, 384, 96, 26, 0x4f9a03d5
2, 384, 384, 96, 26, 0x4f9a03d5
0, 480, 480, 96, 26, 0x501303e0
1, 480, 480, 96, 26, 0x501303e0
2, 480, 480, 96, 26, 0x501303e0
0, 576, 576, 96, 26, 0x5160042f
1, 576, 576, 96, 26, 0x5160042f
2, 576, 576, 96, 26, 0x5160042f
0, 672, 672, 96, 26, 0x50dd042e
1, 672, 672, 96, 26, 0x50dd042e
2, 672, 672, 96, 26, 0x50dd042e
0, 768, 768, 96, 26, 0x53de0499
1, 768, 768, 96, 26, 0x53de0499
0, 864, 864, 96, 26, 0x53df04b4
1, 864, 864, 96, 26, 0x53df04b4
0, 960, 960, 42, 26, 0x5740044b
1, 960, 960, 42, 26, 0x5740044b

Loading…
Cancel
Save