mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
4ebfc13c33
The Matroska muxer writes the Chapters early when chapters were already available when writing the header; in this case any tags pertaining to these chapters get written, too. Yet if no chapters had been supplied before writing the header, Chapters can also be written when writing the trailer if any are supplied. Tags belonging to these chapters were up until now completely ignored. This commit changes this: Writing the tags belonging to chapters has been moved to mkv_write_chapters(). If mkv_write_tags() has not been called yet (i.e. when chapters are written when writing the header), the AVIOContext for writing the ordinary Tags element is used, but not output, as this is left to mkv_write_tags() in order to only write one Tags element. Yet if mkv_write_tags() has already been called, mkv_write_chapters() will output a Tags element of its own which only contains the tags for chapters. When chapters are available initially, the corresponding tags will now be the first tags in the Tags element; but the ordering of tags in Tags is irrelevant anyway. This commit also makes chapter_id_offset local to mkv_write_chapters() as it is used only there and not reused at all. Potentially writing a second Tags element means that the maximum number of SeekHead entries had to be incremented. All the changes to FATE result from the ensuing increase in the amount of space reserved for the SeekHead (21 bytes more). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
66 lines
4.4 KiB
Makefile
66 lines
4.4 KiB
Makefile
FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-prores-zlib
|
|
fate-matroska-prores-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/prores_zlib.mkv -c:v copy
|
|
|
|
# This tests that the matroska demuxer correctly adds the icpf header atom
|
|
# upon demuxing; it also tests bz2 decompression and unknown-length cluster.
|
|
FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER BZLIB) += fate-matroska-prores-header-insertion-bz2
|
|
fate-matroska-prores-header-insertion-bz2: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/prores_bz2.mkv -map 0 -c copy
|
|
|
|
# This tests that the matroska demuxer supports modifying the colorspace
|
|
# properties in remuxing (-c:v copy)
|
|
# It also tests automatic insertion of the vp9_superframe bitstream filter
|
|
FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux
|
|
fate-matroska-remux: CMD = md5pipe -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska
|
|
fate-matroska-remux: CMP = oneline
|
|
fate-matroska-remux: REF = 26fabd90326e3de4bb6afe1b216ce232
|
|
|
|
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 correctly demuxes WavPack
|
|
# without CodecPrivate; it also tests zlib compressed WavPack.
|
|
FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-wavpack-missing-codecprivate
|
|
fate-matroska-wavpack-missing-codecprivate: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/wavpack_missing_codecprivate.mka -c 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
|
|
|
|
# This tests that the matroska demuxer can decompress lzo compressed tracks.
|
|
FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER LZO) += fate-matroska-lzo-decompression
|
|
fate-matroska-lzo-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/lzo.mka -c 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
|
|
|
|
# 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"
|
|
|
|
# This test tests demuxing Vorbis and chapters from ogg and muxing it in and
|
|
# demuxing it from Matroska/WebM. It furthermore tests the WebM muxer, in
|
|
# particular its DASH mode. Finally, it tests writing the Cues at the front.
|
|
FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER OGG_DEMUXER \
|
|
VORBIS_DECODER VORBIS_PARSER WEBM_MUXER) \
|
|
+= fate-webm-dash-chapters
|
|
fate-webm-dash-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg webm "-c copy -cluster_time_limit 1500 -dash 1 -dash_track_number 124 -reserve_index_space 400" "-c copy -t 0.5" "" -show_chapters
|
|
|
|
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
|
|
|
|
FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)
|
|
FATE_SAMPLES_FFPROBE += $(FATE_MATROSKA_FFPROBE-yes)
|
|
FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MATROSKA_FFMPEG_FFPROBE-yes)
|