virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
19e189b1f0
FFmpeg/tests/ref/fate/matroska-flac-extradata-update

54 lines
2.3 KiB
Plaintext
Raw Normal View History

avformat/matroskaenc: Redo handling of FlagDefault Up until now, the Matroska muxer would mark a track as default if it had the disposition AV_DISPOSITION_DEFAULT or if there was no track with AV_DISPOSITION_DEFAULT set; in the latter case even more than one track of a kind (audio, video, subtitles) was marked as default which is not sensible. This commit changes the logic used to mark tracks as default. There are now three modes for this: a) In the "infer" mode the first track of every type (audio, video, subtitles) with default disposition set will be marked as default; if there is no such track (for a given type), then the first track of this type (if existing) will be marked as default. This behaviour is inspired by mkvmerge. It ensures that the default flags will be set in a sensible way even if the input comes from containers that lack the concept of default flags. This mode is the default mode. b) The "infer_no_subs" mode is similar to the "infer" mode; the difference is that if no subtitle track with default disposition exists, no subtitle track will be marked as default at all. c) The "passthrough" mode: Here the track will be marked as default if and only the corresponding input stream had disposition default. This fixes ticket #8173 (the passthrough mode is ideal for this) as well as ticket #8416 (the "infer_no_subs" mode leads to the desired output). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-01-18 08:05:20 +02:00
332bf4d9c92d24478d2a218e81223433 *tests/data/fate/matroska-flac-extradata-update.matroska
2011 tests/data/fate/matroska-flac-extradata-update.matroska
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>
2020-04-01 20:22:29 +02:00
#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
Reference in New Issue Copy Permalink