1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
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 fate: enable fate-seek-acodec-adpcm-ima_qt-trellis 2014-06-06 18:03:31 +02:00
acodec-adpcm-ima_wav
acodec-adpcm-ima_wav-trellis tests: add adpcm trellis tests 2014-06-05 12:20:49 +02:00
acodec-adpcm-ms
acodec-adpcm-ms-trellis tests: add adpcm trellis tests 2014-06-05 12:20:49 +02:00
acodec-adpcm-swf lavf/flvdec: init AVPacket::pos to FLVTAG offset 2016-10-26 02:12:18 +02:00
acodec-adpcm-swf-trellis lavf/flvdec: init AVPacket::pos to FLVTAG offset 2016-10-26 02:12:18 +02:00
acodec-adpcm-yamaha
acodec-adpcm-yamaha-trellis tests: add adpcm trellis tests 2014-06-05 12:20:49 +02:00
acodec-alac avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
acodec-flac fate: update seeking reference for flac 2014-04-14 17:43:25 +02:00
acodec-mp2 avformat/mp3dec: use the common mechanism for skipping samples 2015-04-22 14:16:35 +02:00
acodec-pcm-alaw
acodec-pcm-f32be
acodec-pcm-f32le
acodec-pcm-f64be
acodec-pcm-f64le
acodec-pcm-mulaw
acodec-pcm-s8 avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
acodec-pcm-s16be avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
acodec-pcm-s16le ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
acodec-pcm-s24be avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
acodec-pcm-s24le
acodec-pcm-s32be avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
acodec-pcm-s32le
acodec-pcm-u8 ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
cache-pipe ffmpeg, ffprobe: don't "merge" side data into packet data by default 2017-03-14 23:37:28 +01:00
empty-edit-mp4 lavf/mov.c: Use the correct offset to shift timestamp when seeking. 2018-03-10 17:55:50 +01:00
extra-mp3 ffmpeg, ffprobe: don't "merge" side data into packet data by default 2017-03-14 23:37:28 +01:00
extra-mp4 libavformat/mov.c: use calculated dts offset when seeking in streams 2017-10-30 01:09:40 +01:00
lavf-aiff
lavf-al Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
lavf-asf lavf: Replace the ASF demuxer 2015-06-28 10:16:40 +02:00
lavf-au avformat/au: Write MetaData in AU Sun audio file header 2016-06-03 12:18:57 +02:00
lavf-avi avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
lavf-bmp
lavf-dv Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
lavf-flv Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c' 2019-03-14 14:36:24 -03:00
lavf-gif
lavf-gxf avcodec/mpeg12enc: store sequence display extension only if we have something to store in it 2014-06-06 22:54:22 +02:00
lavf-jpg mjpegenc: enable optimal huffman coding by default 2017-04-09 00:00:39 +01:00
lavf-mkv avformat/matroskaenc: Don't ignore tags of chapters written late 2020-05-19 03:34:44 +02:00
lavf-mmf
lavf-mov avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
lavf-mpg
lavf-mxf avformat/mxfenc: Add Padding Bits 2018-05-08 23:02:58 +02:00
lavf-mxf_d10 avformat/mxfenc: Add Padding Bits 2018-05-08 23:02:58 +02:00
lavf-mxf_dv25 avformat/mxfenc: Add Padding Bits 2018-05-08 23:02:58 +02:00
lavf-mxf_dvcpro50 avformat/mxfenc: Add Padding Bits 2018-05-08 23:02:58 +02:00
lavf-mxf_opatom avformat/mxfenc: Add Padding Bits 2018-05-08 23:02:58 +02:00
lavf-mxf_opatom_audio avformat/mxfenc: Add Padding Bits 2018-05-08 23:02:58 +02:00
lavf-nut nutenc: do not use has_b_frames 2015-01-27 09:15:07 +01:00
lavf-ogg ffmpeg: prefix encoder with "Lavc " in bitexact mode 2014-05-18 22:57:20 +02:00
lavf-pbmpipe lavf/img2dec: add pnm pipe demuxers 2016-06-22 15:24:19 +02:00
lavf-pcx
lavf-pgm
lavf-pgmpipe lavf/img2dec: add pnm pipe demuxers 2016-06-22 15:24:19 +02:00
lavf-ppm
lavf-ppmpipe lavf/img2dec: add pnm pipe demuxers 2016-06-22 15:24:19 +02:00
lavf-rm avcodec/eac3: add support for dependent stream 2018-03-29 10:19:03 +02:00
lavf-sgi Merge commit '99f40fd02f1870c2dee70977b672da9cb198f0be' 2015-11-29 15:42:33 +01:00
lavf-swf
lavf-tga
lavf-tiff
lavf-ts avformat/mpegtsenc: get rid of packet counting for sdt/pat/pmt 2019-08-23 22:49:01 +02:00
lavf-ul Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c' 2019-03-14 14:19:03 -03:00
lavf-voc Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 2016-04-10 20:59:55 +01:00
lavf-wav ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
lavf-wtv avcodec/mpeg12enc: store sequence display extension only if we have something to store in it 2014-06-06 22:54:22 +02:00
lavf-y4m Merge commit 'f8df5e2f31a5ba7b30a0e1caaaf5a03c753b3f9b' 2019-03-14 14:59:45 -03:00
mkv-codec-delay ffmpeg, ffprobe: don't "merge" side data into packet data by default 2017-03-14 23:37:28 +01:00
test-iibbibb-mp4 lavf/mov.c: Use the correct offset to shift timestamp when seeking. 2018-03-10 17:55:50 +01:00
test-iibbibb-neg-ctts-mp4 lavf/mov.c: Use the correct offset to shift timestamp when seeking. 2018-03-10 17:55:50 +01:00
vsynth_lena-asv1 avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-asv2 avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-dnxhd-4k-hr-lb tests/fate: add dnxhr encoding tests 2016-07-24 12:31:07 +02:00
vsynth_lena-dnxhd-720p tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-dnxhd-720p-rd tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-dnxhd-1080i avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
vsynth_lena-dv tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-dv-50 tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-dv-411 tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-ffv1 avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-flashsv lavf/flvdec: init AVPacket::pos to FLVTAG offset 2016-10-26 02:12:18 +02:00
vsynth_lena-flv lavf/flvdec: init AVPacket::pos to FLVTAG offset 2016-10-26 02:12:18 +02:00
vsynth_lena-h261 avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-h263 avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-h263p avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-huffyuv avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-jpegls avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-ljpeg avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-mjpeg mjpegenc: enable optimal huffman coding by default 2017-04-09 00:00:39 +01:00
vsynth_lena-mpeg1 tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-mpeg1b tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-mpeg2-422 tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-mpeg2-idct-int tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-mpeg2-ilace tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-mpeg2-ivlc-qprd tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-mpeg2-thread tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-mpeg2-thread-ivlc tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-mpeg4 avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
vsynth_lena-mpeg4-adap avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-mpeg4-adv avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-mpeg4-error avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-mpeg4-nr avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-mpeg4-nsse avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-mpeg4-qpel avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-mpeg4-qprd avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-mpeg4-rc avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-mpeg4-thread avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-msmpeg4 avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-msmpeg4v2 avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-rgb avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-roqvideo tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-rv10 tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-rv20 tests: Rename vsynth2 to vsynth_lena 2014-12-02 03:02:30 +01:00
vsynth_lena-snow avcodec/snowenc: set dia_size for the first pass of motion estimation too 2015-05-10 14:19:56 +02:00
vsynth_lena-snow-ll avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-svq1 avformat/movenc: ensure we don't write the major brand as a compatible brand more than once 2019-12-21 11:57:28 -03:00
vsynth_lena-wmv1 avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-wmv2 avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00
vsynth_lena-yuv avformat/avienc: Fix wrongly placed comment 2015-03-19 17:30:28 +01:00