ffmpeg/tests/ref/seek
Andreas Rheinhardt 4ebfc13c33 avformat/matroskaenc: Don't ignore tags of chapters written late
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>
2020-05-19 03:34:44 +02:00
..
acodec-adpcm-ima_qt
acodec-adpcm-ima_qt-trellis
acodec-adpcm-ima_wav
acodec-adpcm-ima_wav-trellis
acodec-adpcm-ms
acodec-adpcm-ms-trellis
acodec-adpcm-swf
acodec-adpcm-swf-trellis
acodec-adpcm-yamaha
acodec-adpcm-yamaha-trellis
acodec-alac
acodec-flac
acodec-mp2
acodec-pcm-alaw
acodec-pcm-f32be
acodec-pcm-f32le
acodec-pcm-f64be
acodec-pcm-f64le
acodec-pcm-mulaw
acodec-pcm-s8
acodec-pcm-s16be
acodec-pcm-s16le
acodec-pcm-s24be
acodec-pcm-s24le
acodec-pcm-s32be
acodec-pcm-s32le
acodec-pcm-u8
cache-pipe
empty-edit-mp4
extra-mp3
extra-mp4
lavf-aiff
lavf-al
lavf-asf
lavf-au
lavf-avi
lavf-bmp
lavf-dv
lavf-flv
lavf-gif
lavf-gxf
lavf-jpg
lavf-mkv avformat/matroskaenc: Don't ignore tags of chapters written late 2020-05-19 03:34:44 +02:00
lavf-mmf
lavf-mov
lavf-mpg
lavf-mxf
lavf-mxf_d10
lavf-mxf_dv25
lavf-mxf_dvcpro50
lavf-mxf_opatom
lavf-mxf_opatom_audio
lavf-nut
lavf-ogg
lavf-pbmpipe
lavf-pcx
lavf-pgm
lavf-pgmpipe
lavf-ppm
lavf-ppmpipe
lavf-rm
lavf-sgi
lavf-swf
lavf-tga
lavf-tiff
lavf-ts
lavf-ul
lavf-voc
lavf-wav
lavf-wtv
lavf-y4m
mkv-codec-delay
test-iibbibb-mp4
test-iibbibb-neg-ctts-mp4
vsynth_lena-asv1
vsynth_lena-asv2
vsynth_lena-dnxhd-4k-hr-lb
vsynth_lena-dnxhd-720p
vsynth_lena-dnxhd-720p-rd
vsynth_lena-dnxhd-1080i
vsynth_lena-dv
vsynth_lena-dv-50
vsynth_lena-dv-411
vsynth_lena-ffv1
vsynth_lena-flashsv
vsynth_lena-flv
vsynth_lena-h261
vsynth_lena-h263
vsynth_lena-h263p
vsynth_lena-huffyuv
vsynth_lena-jpegls
vsynth_lena-ljpeg
vsynth_lena-mjpeg
vsynth_lena-mpeg1
vsynth_lena-mpeg1b
vsynth_lena-mpeg2-422
vsynth_lena-mpeg2-idct-int
vsynth_lena-mpeg2-ilace
vsynth_lena-mpeg2-ivlc-qprd
vsynth_lena-mpeg2-thread
vsynth_lena-mpeg2-thread-ivlc
vsynth_lena-mpeg4
vsynth_lena-mpeg4-adap
vsynth_lena-mpeg4-adv
vsynth_lena-mpeg4-error
vsynth_lena-mpeg4-nr
vsynth_lena-mpeg4-nsse
vsynth_lena-mpeg4-qpel
vsynth_lena-mpeg4-qprd
vsynth_lena-mpeg4-rc
vsynth_lena-mpeg4-thread
vsynth_lena-msmpeg4
vsynth_lena-msmpeg4v2
vsynth_lena-rgb
vsynth_lena-roqvideo
vsynth_lena-rv10
vsynth_lena-rv20
vsynth_lena-snow
vsynth_lena-snow-ll
vsynth_lena-svq1
vsynth_lena-wmv1
vsynth_lena-wmv2
vsynth_lena-yuv