This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit e1484a30e572e375e8ce41fd9539ba47085b8ea0 Author: James Almer <[email protected]> AuthorDate: Tue Feb 10 11:19:54 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Thu Feb 12 09:59:54 2026 -0300 avformat/dtshddec: properly support priming and padding samples Don't just export initial_padding, but also take it into account for timestamps by adjusting the stream's start_time. Also, export the padding samples in a way that's actually supported, as currently trailing_padding is unused so no user will look at it. For the sake of not reducing coverage and because the lossy tests have reference files that contain the priming samples, add the skip_manual flags2 to the tests so we still output them. A new ffprobe call will ensure the demuxer behavior is tested too. Signed-off-by: James Almer <[email protected]> --- libavformat/dtshddec.c | 8 ++++- tests/fate/dca.mak | 16 ++++----- tests/ref/fate/dca-xll_51_16_192_768_0 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_51_16_192_768_1 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_51_24_48_768 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_51_24_48_768-dmix_2 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_51_24_48_768-dmix_6 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_51_24_48_none | 29 +++++++++++++-- tests/ref/fate/dca-xll_51_24_48_none-dmix_2 | 29 +++++++++++++-- tests/ref/fate/dca-xll_51_24_48_none-dmix_6 | 29 +++++++++++++-- tests/ref/fate/dca-xll_71_24_48_768_0 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_71_24_48_768_1 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_71_24_96_768 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_71_24_96_768-dmix_2 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_71_24_96_768-dmix_6 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_x96_51_24_96_1509 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_xch_61_24_48_768 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 | 47 +++++++++++++++++++++---- tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 | 47 +++++++++++++++++++++---- 29 files changed, 1077 insertions(+), 162 deletions(-) diff --git a/libavformat/dtshddec.c b/libavformat/dtshddec.c index 28d3aeb47a..b980fde6a9 100644 --- a/libavformat/dtshddec.c +++ b/libavformat/dtshddec.c @@ -59,6 +59,7 @@ static int dtshd_read_header(AVFormatContext *s) uint64_t chunk_type, chunk_size; int64_t duration, orig_nb_samples, data_start; AVStream *st; + FFStream *sti; int ret; char *value; @@ -67,7 +68,8 @@ static int dtshd_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_DTS; - ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; + sti = ffstream(st); + sti->need_parsing = AVSTREAM_PARSE_FULL_RAW; for (;;) { chunk_type = avio_rb64(pb); @@ -111,6 +113,10 @@ static int dtshd_read_header(AVFormatContext *s) st->codecpar->ch_layout.nb_channels = ff_dca_count_chs_for_mask(avio_rb16(pb)); st->codecpar->initial_padding = avio_rb16(pb); st->codecpar->trailing_padding = FFMAX(st->duration - orig_nb_samples - st->codecpar->initial_padding, 0); + st->start_time = + sti->start_skip_samples = st->codecpar->initial_padding; + sti->first_discard_sample = orig_nb_samples + st->codecpar->initial_padding; + sti->last_discard_sample = st->duration; avio_skip(pb, chunk_size - 21); break; case FILEINFO: diff --git a/tests/fate/dca.mak b/tests/fate/dca.mak index c200cb06b6..62f2185edc 100644 --- a/tests/fate/dca.mak +++ b/tests/fate/dca.mak @@ -23,14 +23,14 @@ DCADEC_SUITE_LOSSY = core_51_24_48_768_0 \ define FATE_DCADEC_LOSSLESS_SUITE FATE_DCADEC_LOSSLESS_$(2) += fate-dca-$(1) fate-dca-$(1)-dmix_2 fate-dca-$(1)-dmix_6 -fate-dca-$(1): CMD = stream_demux dtshd $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd "" "-c:a pcm_$(2) -af aresample" -fate-dca-$(1)-dmix_2: CMD = stream_demux dtshd $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd "-downmix 0x3" "-c:a pcm_$(2) -af aresample" -fate-dca-$(1)-dmix_6: CMD = stream_demux dtshd $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd "-downmix 0x60f" "-c:a pcm_$(2) -af aresample" +fate-dca-$(1): CMD = stream_demux dtshd $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd "-flags2 skip_manual" "-c:a pcm_$(2) -af aresample" "-show_entries stream=start_time,initial_padding:packet=pts,duration:packet_side_data" +fate-dca-$(1)-dmix_2: CMD = stream_demux dtshd $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd "-downmix 0x3 -flags2 skip_manual" "-c:a pcm_$(2) -af aresample" "-show_entries stream=start_time,initial_padding:packet=pts,duration:packet_side_data" +fate-dca-$(1)-dmix_6: CMD = stream_demux dtshd $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd "-downmix 0x60f -flags2 skip_manual" "-c:a pcm_$(2) -af aresample" "-show_entries stream=start_time,initial_padding:packet=pts,duration:packet_side_data" endef define FATE_DCADEC_LOSSY_SUITE FATE_DCADEC_LOSSY += fate-dca-$(1) -fate-dca-$(1): CMD = ffmpeg -i $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd -f f32le -af aresample - +fate-dca-$(1): CMD = ffmpeg -flags2 skip_manual -i $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd -f f32le -af aresample - fate-dca-$(1): REF = $(SAMPLES)/dts/dcadec-suite/$(1).f32 endef @@ -40,21 +40,21 @@ $(foreach N,$(DCADEC_SUITE_LOSSY),$(eval $(call FATE_DCADEC_LOSSY_SUITE,$(N)))) # lossy downmix tests FATE_DCADEC_LOSSY += fate-dca-core_51_24_48_768_1-dmix_2 -fate-dca-core_51_24_48_768_1-dmix_2: CMD = ffmpeg -downmix stereo -i $(TARGET_SAMPLES)/dts/dcadec-suite/core_51_24_48_768_1.dtshd -f f32le -af aresample - +fate-dca-core_51_24_48_768_1-dmix_2: CMD = ffmpeg -downmix stereo -flags2 skip_manual -i $(TARGET_SAMPLES)/dts/dcadec-suite/core_51_24_48_768_1.dtshd -f f32le -af aresample - fate-dca-core_51_24_48_768_1-dmix_2: REF = $(SAMPLES)/dts/dcadec-suite/core_51_24_48_768_1-dmix_2.f32 FATE_DCADEC_LOSSY += fate-dca-x96_xxch_71_24_96_3840-dmix_2 -fate-dca-x96_xxch_71_24_96_3840-dmix_2: CMD = ffmpeg -downmix stereo -i $(TARGET_SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840.dtshd -f f32le -af aresample - +fate-dca-x96_xxch_71_24_96_3840-dmix_2: CMD = ffmpeg -downmix stereo -flags2 skip_manual -i $(TARGET_SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840.dtshd -f f32le -af aresample - # intentionally uses the dmix_6 reference because the sample does not contain stereo downmix coefficients fate-dca-x96_xxch_71_24_96_3840-dmix_2: REF = $(SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840-dmix_6.f32 FATE_DCADEC_LOSSY += fate-dca-x96_xxch_71_24_96_3840-dmix_6 -fate-dca-x96_xxch_71_24_96_3840-dmix_6: CMD = ffmpeg -downmix "FL+FR+FC+LFE+SL+SR" -i $(TARGET_SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840.dtshd -f f32le -af aresample - +fate-dca-x96_xxch_71_24_96_3840-dmix_6: CMD = ffmpeg -downmix "FL+FR+FC+LFE+SL+SR" -flags2 skip_manual -i $(TARGET_SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840.dtshd -f f32le -af aresample - fate-dca-x96_xxch_71_24_96_3840-dmix_6: REF = $(SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840-dmix_6.f32 FATE_DCADEC_LOSSY += fate-dca-xch_61_24_48_768-dmix_6 -fate-dca-xch_61_24_48_768-dmix_6: CMD = ffmpeg -downmix "5.1(side)" -i $(TARGET_SAMPLES)/dts/dcadec-suite/xch_61_24_48_768.dtshd -f f32le -af aresample - +fate-dca-xch_61_24_48_768-dmix_6: CMD = ffmpeg -downmix "5.1(side)" -flags2 skip_manual -i $(TARGET_SAMPLES)/dts/dcadec-suite/xch_61_24_48_768.dtshd -f f32le -af aresample - fate-dca-xch_61_24_48_768-dmix_6: REF = $(SAMPLES)/dts/dcadec-suite/xch_61_24_48_768-dmix_6.f32 $(FATE_DCADEC_LOSSY): CMP = oneoff diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0 b/tests/ref/fate/dca-xll_51_16_192_768_0 index 716ba6a50b..30bb49ca1a 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_0 +++ b/tests/ref/fate/dca-xll_51_16_192_768_0 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 2048, 24576, 0x00000000 -0, 2048, 2048, 2048, 24576, 0x00000000 -0, 4096, 4096, 2048, 24576, 0x004b62f1 -0, 6144, 6144, 2048, 24576, 0x66edba5f -0, 8192, 8192, 2048, 24576, 0xf2aa3d4b -0, 10240, 10240, 2048, 24576, 0xa6741aff +0, -4096, -4096, 2048, 24576, 0x00000000 +0, -2048, -2048, 2048, 24576, 0x00000000 +0, 0, 0, 2048, 24576, 0x004b62f1 +0, 2048, 2048, 2048, 24576, 0x66edba5f +0, 4096, 4096, 2048, 24576, 0xf2aa3d4b +0, 6144, 6144, 2048, 24576, 0xa6741aff +[PACKET] +pts=0 +duration=2048 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=4096 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=2048 +duration=2048 +[/PACKET] +[PACKET] +pts=4096 +duration=2048 +[/PACKET] +[PACKET] +pts=6144 +duration=2048 +[/PACKET] +[PACKET] +pts=8192 +duration=2048 +[/PACKET] +[PACKET] +pts=10240 +duration=2048 +[/PACKET] +[STREAM] +initial_padding=4096 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 index 716ba6a50b..30bb49ca1a 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 +++ b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 2048, 24576, 0x00000000 -0, 2048, 2048, 2048, 24576, 0x00000000 -0, 4096, 4096, 2048, 24576, 0x004b62f1 -0, 6144, 6144, 2048, 24576, 0x66edba5f -0, 8192, 8192, 2048, 24576, 0xf2aa3d4b -0, 10240, 10240, 2048, 24576, 0xa6741aff +0, -4096, -4096, 2048, 24576, 0x00000000 +0, -2048, -2048, 2048, 24576, 0x00000000 +0, 0, 0, 2048, 24576, 0x004b62f1 +0, 2048, 2048, 2048, 24576, 0x66edba5f +0, 4096, 4096, 2048, 24576, 0xf2aa3d4b +0, 6144, 6144, 2048, 24576, 0xa6741aff +[PACKET] +pts=0 +duration=2048 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=4096 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=2048 +duration=2048 +[/PACKET] +[PACKET] +pts=4096 +duration=2048 +[/PACKET] +[PACKET] +pts=6144 +duration=2048 +[/PACKET] +[PACKET] +pts=8192 +duration=2048 +[/PACKET] +[PACKET] +pts=10240 +duration=2048 +[/PACKET] +[STREAM] +initial_padding=4096 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 index 716ba6a50b..30bb49ca1a 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 +++ b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 2048, 24576, 0x00000000 -0, 2048, 2048, 2048, 24576, 0x00000000 -0, 4096, 4096, 2048, 24576, 0x004b62f1 -0, 6144, 6144, 2048, 24576, 0x66edba5f -0, 8192, 8192, 2048, 24576, 0xf2aa3d4b -0, 10240, 10240, 2048, 24576, 0xa6741aff +0, -4096, -4096, 2048, 24576, 0x00000000 +0, -2048, -2048, 2048, 24576, 0x00000000 +0, 0, 0, 2048, 24576, 0x004b62f1 +0, 2048, 2048, 2048, 24576, 0x66edba5f +0, 4096, 4096, 2048, 24576, 0xf2aa3d4b +0, 6144, 6144, 2048, 24576, 0xa6741aff +[PACKET] +pts=0 +duration=2048 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=4096 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=2048 +duration=2048 +[/PACKET] +[PACKET] +pts=4096 +duration=2048 +[/PACKET] +[PACKET] +pts=6144 +duration=2048 +[/PACKET] +[PACKET] +pts=8192 +duration=2048 +[/PACKET] +[PACKET] +pts=10240 +duration=2048 +[/PACKET] +[STREAM] +initial_padding=4096 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1 b/tests/ref/fate/dca-xll_51_16_192_768_1 index 716ba6a50b..30bb49ca1a 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_1 +++ b/tests/ref/fate/dca-xll_51_16_192_768_1 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 2048, 24576, 0x00000000 -0, 2048, 2048, 2048, 24576, 0x00000000 -0, 4096, 4096, 2048, 24576, 0x004b62f1 -0, 6144, 6144, 2048, 24576, 0x66edba5f -0, 8192, 8192, 2048, 24576, 0xf2aa3d4b -0, 10240, 10240, 2048, 24576, 0xa6741aff +0, -4096, -4096, 2048, 24576, 0x00000000 +0, -2048, -2048, 2048, 24576, 0x00000000 +0, 0, 0, 2048, 24576, 0x004b62f1 +0, 2048, 2048, 2048, 24576, 0x66edba5f +0, 4096, 4096, 2048, 24576, 0xf2aa3d4b +0, 6144, 6144, 2048, 24576, 0xa6741aff +[PACKET] +pts=0 +duration=2048 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=4096 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=2048 +duration=2048 +[/PACKET] +[PACKET] +pts=4096 +duration=2048 +[/PACKET] +[PACKET] +pts=6144 +duration=2048 +[/PACKET] +[PACKET] +pts=8192 +duration=2048 +[/PACKET] +[PACKET] +pts=10240 +duration=2048 +[/PACKET] +[STREAM] +initial_padding=4096 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 index fe13ca438c..2ebc65ab6c 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 +++ b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: stereo -0, 0, 0, 2048, 8192, 0x00000000 -0, 2048, 2048, 2048, 8192, 0x5a180402 -0, 4096, 4096, 2048, 8192, 0x53413568 -0, 6144, 6144, 2048, 8192, 0x2a34e9e1 -0, 8192, 8192, 2048, 8192, 0x51dad4d7 -0, 10240, 10240, 2048, 8192, 0x9861024c +0, -4096, -4096, 2048, 8192, 0x00000000 +0, -2048, -2048, 2048, 8192, 0x5a180402 +0, 0, 0, 2048, 8192, 0x53413568 +0, 2048, 2048, 2048, 8192, 0x2a34e9e1 +0, 4096, 4096, 2048, 8192, 0x51dad4d7 +0, 6144, 6144, 2048, 8192, 0x9861024c +[PACKET] +pts=0 +duration=2048 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=4096 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=2048 +duration=2048 +[/PACKET] +[PACKET] +pts=4096 +duration=2048 +[/PACKET] +[PACKET] +pts=6144 +duration=2048 +[/PACKET] +[PACKET] +pts=8192 +duration=2048 +[/PACKET] +[PACKET] +pts=10240 +duration=2048 +[/PACKET] +[STREAM] +initial_padding=4096 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 index 716ba6a50b..30bb49ca1a 100644 --- a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 +++ b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s16le #sample_rate 0: 192000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 2048, 24576, 0x00000000 -0, 2048, 2048, 2048, 24576, 0x00000000 -0, 4096, 4096, 2048, 24576, 0x004b62f1 -0, 6144, 6144, 2048, 24576, 0x66edba5f -0, 8192, 8192, 2048, 24576, 0xf2aa3d4b -0, 10240, 10240, 2048, 24576, 0xa6741aff +0, -4096, -4096, 2048, 24576, 0x00000000 +0, -2048, -2048, 2048, 24576, 0x00000000 +0, 0, 0, 2048, 24576, 0x004b62f1 +0, 2048, 2048, 2048, 24576, 0x66edba5f +0, 4096, 4096, 2048, 24576, 0xf2aa3d4b +0, 6144, 6144, 2048, 24576, 0xa6741aff +[PACKET] +pts=0 +duration=2048 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=4096 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=2048 +duration=2048 +[/PACKET] +[PACKET] +pts=4096 +duration=2048 +[/PACKET] +[PACKET] +pts=6144 +duration=2048 +[/PACKET] +[PACKET] +pts=8192 +duration=2048 +[/PACKET] +[PACKET] +pts=10240 +duration=2048 +[/PACKET] +[STREAM] +initial_padding=4096 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_24_48_768 b/tests/ref/fate/dca-xll_51_24_48_768 index f37c38d17f..e2c2e9c035 100644 --- a/tests/ref/fate/dca-xll_51_24_48_768 +++ b/tests/ref/fate/dca-xll_51_24_48_768 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 512, 9216, 0x00000000 -0, 512, 512, 512, 9216, 0x00000000 -0, 1024, 1024, 512, 9216, 0x03de31ea -0, 1536, 1536, 512, 9216, 0xfdbede52 -0, 2048, 2048, 512, 9216, 0x280a9c97 -0, 2560, 2560, 512, 9216, 0x2d8de2d5 +0, -1024, -1024, 512, 9216, 0x00000000 +0, -512, -512, 512, 9216, 0x00000000 +0, 0, 0, 512, 9216, 0x03de31ea +0, 512, 512, 512, 9216, 0xfdbede52 +0, 1024, 1024, 512, 9216, 0x280a9c97 +0, 1536, 1536, 512, 9216, 0x2d8de2d5 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 b/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 index 32edc3bedd..43396ba00f 100644 --- a/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 +++ b/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: stereo -0, 0, 0, 512, 3072, 0x00000000 -0, 512, 512, 512, 3072, 0x00000000 -0, 1024, 1024, 512, 3072, 0xa27d155c -0, 1536, 1536, 512, 3072, 0x56efed53 -0, 2048, 2048, 512, 3072, 0x0bf82010 -0, 2560, 2560, 512, 3072, 0x00af1cf2 +0, -1024, -1024, 512, 3072, 0x00000000 +0, -512, -512, 512, 3072, 0x00000000 +0, 0, 0, 512, 3072, 0xa27d155c +0, 512, 512, 512, 3072, 0x56efed53 +0, 1024, 1024, 512, 3072, 0x0bf82010 +0, 1536, 1536, 512, 3072, 0x00af1cf2 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 b/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 index f37c38d17f..e2c2e9c035 100644 --- a/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 +++ b/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 512, 9216, 0x00000000 -0, 512, 512, 512, 9216, 0x00000000 -0, 1024, 1024, 512, 9216, 0x03de31ea -0, 1536, 1536, 512, 9216, 0xfdbede52 -0, 2048, 2048, 512, 9216, 0x280a9c97 -0, 2560, 2560, 512, 9216, 0x2d8de2d5 +0, -1024, -1024, 512, 9216, 0x00000000 +0, -512, -512, 512, 9216, 0x00000000 +0, 0, 0, 512, 9216, 0x03de31ea +0, 512, 512, 512, 9216, 0xfdbede52 +0, 1024, 1024, 512, 9216, 0x280a9c97 +0, 1536, 1536, 512, 9216, 0x2d8de2d5 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_24_48_none b/tests/ref/fate/dca-xll_51_24_48_none index 2e6d17e292..26a7326039 100644 --- a/tests/ref/fate/dca-xll_51_24_48_none +++ b/tests/ref/fate/dca-xll_51_24_48_none @@ -3,6 +3,29 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 1024, 18432, 0x00000000 -0, 1024, 1024, 1024, 18432, 0x5ca6ebf7 -0, 2048, 2048, 1024, 18432, 0xb5520ea3 +0, -1024, -1024, 1024, 18432, 0x00000000 +0, 0, 0, 1024, 18432, 0x5ca6ebf7 +0, 1024, 1024, 1024, 18432, 0xb5520ea3 +[PACKET] +pts=0 +duration=1024 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=1024 +duration=1024 +[/PACKET] +[PACKET] +pts=2048 +duration=1024 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 b/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 index 2e6d17e292..26a7326039 100644 --- a/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 +++ b/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 @@ -3,6 +3,29 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 1024, 18432, 0x00000000 -0, 1024, 1024, 1024, 18432, 0x5ca6ebf7 -0, 2048, 2048, 1024, 18432, 0xb5520ea3 +0, -1024, -1024, 1024, 18432, 0x00000000 +0, 0, 0, 1024, 18432, 0x5ca6ebf7 +0, 1024, 1024, 1024, 18432, 0xb5520ea3 +[PACKET] +pts=0 +duration=1024 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=1024 +duration=1024 +[/PACKET] +[PACKET] +pts=2048 +duration=1024 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 b/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 index 2e6d17e292..26a7326039 100644 --- a/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 +++ b/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 @@ -3,6 +3,29 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 1024, 18432, 0x00000000 -0, 1024, 1024, 1024, 18432, 0x5ca6ebf7 -0, 2048, 2048, 1024, 18432, 0xb5520ea3 +0, -1024, -1024, 1024, 18432, 0x00000000 +0, 0, 0, 1024, 18432, 0x5ca6ebf7 +0, 1024, 1024, 1024, 18432, 0xb5520ea3 +[PACKET] +pts=0 +duration=1024 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=1024 +duration=1024 +[/PACKET] +[PACKET] +pts=2048 +duration=1024 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0 b/tests/ref/fate/dca-xll_71_24_48_768_0 index 64a0699f77..fc5e4cd09f 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_0 +++ b/tests/ref/fate/dca-xll_71_24_48_768_0 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 7.1 -0, 0, 0, 512, 12288, 0xa5edf1df -0, 512, 512, 512, 12288, 0x00000000 -0, 1024, 1024, 512, 12288, 0x6613373c -0, 1536, 1536, 512, 12288, 0xa36ccec0 -0, 2048, 2048, 512, 12288, 0xdf1c88c5 -0, 2560, 2560, 512, 12288, 0x71c4dd77 +0, -1024, -1024, 512, 12288, 0xa5edf1df +0, -512, -512, 512, 12288, 0x00000000 +0, 0, 0, 512, 12288, 0x6613373c +0, 512, 512, 512, 12288, 0xa36ccec0 +0, 1024, 1024, 512, 12288, 0xdf1c88c5 +0, 1536, 1536, 512, 12288, 0x71c4dd77 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 index 0db890b10c..e28ee93429 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 +++ b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 512, 9216, 0xa1d1f1df -0, 512, 512, 512, 9216, 0x00000000 -0, 1024, 1024, 512, 9216, 0xeeb20c83 -0, 1536, 1536, 512, 9216, 0xfda4b141 -0, 2048, 2048, 512, 9216, 0x252ab888 -0, 2560, 2560, 512, 9216, 0x744c04e4 +0, -1024, -1024, 512, 9216, 0xa1d1f1df +0, -512, -512, 512, 9216, 0x00000000 +0, 0, 0, 512, 9216, 0xeeb20c83 +0, 512, 512, 512, 9216, 0xfda4b141 +0, 1024, 1024, 512, 9216, 0x252ab888 +0, 1536, 1536, 512, 9216, 0x744c04e4 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 index 0db890b10c..e28ee93429 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 +++ b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 512, 9216, 0xa1d1f1df -0, 512, 512, 512, 9216, 0x00000000 -0, 1024, 1024, 512, 9216, 0xeeb20c83 -0, 1536, 1536, 512, 9216, 0xfda4b141 -0, 2048, 2048, 512, 9216, 0x252ab888 -0, 2560, 2560, 512, 9216, 0x744c04e4 +0, -1024, -1024, 512, 9216, 0xa1d1f1df +0, -512, -512, 512, 9216, 0x00000000 +0, 0, 0, 512, 9216, 0xeeb20c83 +0, 512, 512, 512, 9216, 0xfda4b141 +0, 1024, 1024, 512, 9216, 0x252ab888 +0, 1536, 1536, 512, 9216, 0x744c04e4 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1 b/tests/ref/fate/dca-xll_71_24_48_768_1 index 64a0699f77..fc5e4cd09f 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_1 +++ b/tests/ref/fate/dca-xll_71_24_48_768_1 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 7.1 -0, 0, 0, 512, 12288, 0xa5edf1df -0, 512, 512, 512, 12288, 0x00000000 -0, 1024, 1024, 512, 12288, 0x6613373c -0, 1536, 1536, 512, 12288, 0xa36ccec0 -0, 2048, 2048, 512, 12288, 0xdf1c88c5 -0, 2560, 2560, 512, 12288, 0x71c4dd77 +0, -1024, -1024, 512, 12288, 0xa5edf1df +0, -512, -512, 512, 12288, 0x00000000 +0, 0, 0, 512, 12288, 0x6613373c +0, 512, 512, 512, 12288, 0xa36ccec0 +0, 1024, 1024, 512, 12288, 0xdf1c88c5 +0, 1536, 1536, 512, 12288, 0x71c4dd77 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 index 0534dedc72..da70f543b6 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 +++ b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: stereo -0, 0, 0, 512, 3072, 0x00000000 -0, 512, 512, 512, 3072, 0x00000000 -0, 1024, 1024, 512, 3072, 0x1bf4e1f9 -0, 1536, 1536, 512, 3072, 0x89a1d6cd -0, 2048, 2048, 512, 3072, 0xf088ee73 -0, 2560, 2560, 512, 3072, 0x401cc303 +0, -1024, -1024, 512, 3072, 0x00000000 +0, -512, -512, 512, 3072, 0x00000000 +0, 0, 0, 512, 3072, 0x1bf4e1f9 +0, 512, 512, 512, 3072, 0x89a1d6cd +0, 1024, 1024, 512, 3072, 0xf088ee73 +0, 1536, 1536, 512, 3072, 0x401cc303 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 index 9f9d2a7a2f..f1f7ddddea 100644 --- a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 +++ b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 512, 9216, 0xa1d1f1df -0, 512, 512, 512, 9216, 0x00000000 -0, 1024, 1024, 512, 9216, 0xd12a04fd -0, 1536, 1536, 512, 9216, 0x7832be51 -0, 2048, 2048, 512, 9216, 0x1446a948 -0, 2560, 2560, 512, 9216, 0x83cefa37 +0, -1024, -1024, 512, 9216, 0xa1d1f1df +0, -512, -512, 512, 9216, 0x00000000 +0, 0, 0, 512, 9216, 0xd12a04fd +0, 512, 512, 512, 9216, 0x7832be51 +0, 1024, 1024, 512, 9216, 0x1446a948 +0, 1536, 1536, 512, 9216, 0x83cefa37 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_71_24_96_768 b/tests/ref/fate/dca-xll_71_24_96_768 index c3307f126d..6bbabfc736 100644 --- a/tests/ref/fate/dca-xll_71_24_96_768 +++ b/tests/ref/fate/dca-xll_71_24_96_768 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 7.1 -0, 0, 0, 1024, 24576, 0xbdfff0e4 -0, 1024, 1024, 1024, 24576, 0x00000000 -0, 2048, 2048, 1024, 24576, 0x47d8aee7 -0, 3072, 3072, 1024, 24576, 0x2018104b -0, 4096, 4096, 1024, 24576, 0x850b8f49 -0, 5120, 5120, 1024, 24576, 0x17f7ca6f +0, -2048, -2048, 1024, 24576, 0xbdfff0e4 +0, -1024, -1024, 1024, 24576, 0x00000000 +0, 0, 0, 1024, 24576, 0x47d8aee7 +0, 1024, 1024, 1024, 24576, 0x2018104b +0, 2048, 2048, 1024, 24576, 0x850b8f49 +0, 3072, 3072, 1024, 24576, 0x17f7ca6f +[PACKET] +pts=0 +duration=1024 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=2048 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=1024 +duration=1024 +[/PACKET] +[PACKET] +pts=2048 +duration=1024 +[/PACKET] +[PACKET] +pts=3072 +duration=1024 +[/PACKET] +[PACKET] +pts=4096 +duration=1024 +[/PACKET] +[PACKET] +pts=5120 +duration=1024 +[/PACKET] +[STREAM] +initial_padding=2048 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 b/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 index c91428aa8c..1c8bd6c0e7 100644 --- a/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 +++ b/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 1024, 18432, 0xb8cdf0e4 -0, 1024, 1024, 1024, 18432, 0x00000000 -0, 2048, 2048, 1024, 18432, 0x89262806 -0, 3072, 3072, 1024, 18432, 0xab935a48 -0, 4096, 4096, 1024, 18432, 0xb9d4ef6a -0, 5120, 5120, 1024, 18432, 0x259fb33e +0, -2048, -2048, 1024, 18432, 0xb8cdf0e4 +0, -1024, -1024, 1024, 18432, 0x00000000 +0, 0, 0, 1024, 18432, 0x89262806 +0, 1024, 1024, 1024, 18432, 0xab935a48 +0, 2048, 2048, 1024, 18432, 0xb9d4ef6a +0, 3072, 3072, 1024, 18432, 0x259fb33e +[PACKET] +pts=0 +duration=1024 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=2048 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=1024 +duration=1024 +[/PACKET] +[PACKET] +pts=2048 +duration=1024 +[/PACKET] +[PACKET] +pts=3072 +duration=1024 +[/PACKET] +[PACKET] +pts=4096 +duration=1024 +[/PACKET] +[PACKET] +pts=5120 +duration=1024 +[/PACKET] +[STREAM] +initial_padding=2048 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 b/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 index c91428aa8c..1c8bd6c0e7 100644 --- a/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 +++ b/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 1024, 18432, 0xb8cdf0e4 -0, 1024, 1024, 1024, 18432, 0x00000000 -0, 2048, 2048, 1024, 18432, 0x89262806 -0, 3072, 3072, 1024, 18432, 0xab935a48 -0, 4096, 4096, 1024, 18432, 0xb9d4ef6a -0, 5120, 5120, 1024, 18432, 0x259fb33e +0, -2048, -2048, 1024, 18432, 0xb8cdf0e4 +0, -1024, -1024, 1024, 18432, 0x00000000 +0, 0, 0, 1024, 18432, 0x89262806 +0, 1024, 1024, 1024, 18432, 0xab935a48 +0, 2048, 2048, 1024, 18432, 0xb9d4ef6a +0, 3072, 3072, 1024, 18432, 0x259fb33e +[PACKET] +pts=0 +duration=1024 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=2048 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=1024 +duration=1024 +[/PACKET] +[PACKET] +pts=2048 +duration=1024 +[/PACKET] +[PACKET] +pts=3072 +duration=1024 +[/PACKET] +[PACKET] +pts=4096 +duration=1024 +[/PACKET] +[PACKET] +pts=5120 +duration=1024 +[/PACKET] +[STREAM] +initial_padding=2048 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509 b/tests/ref/fate/dca-xll_x96_51_24_96_1509 index 5640e34633..05b36097d9 100644 --- a/tests/ref/fate/dca-xll_x96_51_24_96_1509 +++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 1024, 18432, 0x00000000 -0, 1024, 1024, 1024, 18432, 0x00000000 -0, 2048, 2048, 1024, 18432, 0xa6b18739 -0, 3072, 3072, 1024, 18432, 0xd4df050d -0, 4096, 4096, 1024, 18432, 0xd2fba779 -0, 5120, 5120, 1024, 18432, 0x9ba1c641 +0, -2048, -2048, 1024, 18432, 0x00000000 +0, -1024, -1024, 1024, 18432, 0x00000000 +0, 0, 0, 1024, 18432, 0xa6b18739 +0, 1024, 1024, 1024, 18432, 0xd4df050d +0, 2048, 2048, 1024, 18432, 0xd2fba779 +0, 3072, 3072, 1024, 18432, 0x9ba1c641 +[PACKET] +pts=0 +duration=1024 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=2048 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=1024 +duration=1024 +[/PACKET] +[PACKET] +pts=2048 +duration=1024 +[/PACKET] +[PACKET] +pts=3072 +duration=1024 +[/PACKET] +[PACKET] +pts=4096 +duration=1024 +[/PACKET] +[PACKET] +pts=5120 +duration=1024 +[/PACKET] +[STREAM] +initial_padding=2048 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 index 5640e34633..05b36097d9 100644 --- a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 +++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 1024, 18432, 0x00000000 -0, 1024, 1024, 1024, 18432, 0x00000000 -0, 2048, 2048, 1024, 18432, 0xa6b18739 -0, 3072, 3072, 1024, 18432, 0xd4df050d -0, 4096, 4096, 1024, 18432, 0xd2fba779 -0, 5120, 5120, 1024, 18432, 0x9ba1c641 +0, -2048, -2048, 1024, 18432, 0x00000000 +0, -1024, -1024, 1024, 18432, 0x00000000 +0, 0, 0, 1024, 18432, 0xa6b18739 +0, 1024, 1024, 1024, 18432, 0xd4df050d +0, 2048, 2048, 1024, 18432, 0xd2fba779 +0, 3072, 3072, 1024, 18432, 0x9ba1c641 +[PACKET] +pts=0 +duration=1024 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=2048 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=1024 +duration=1024 +[/PACKET] +[PACKET] +pts=2048 +duration=1024 +[/PACKET] +[PACKET] +pts=3072 +duration=1024 +[/PACKET] +[PACKET] +pts=4096 +duration=1024 +[/PACKET] +[PACKET] +pts=5120 +duration=1024 +[/PACKET] +[STREAM] +initial_padding=2048 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 index 5640e34633..05b36097d9 100644 --- a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 +++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 96000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 1024, 18432, 0x00000000 -0, 1024, 1024, 1024, 18432, 0x00000000 -0, 2048, 2048, 1024, 18432, 0xa6b18739 -0, 3072, 3072, 1024, 18432, 0xd4df050d -0, 4096, 4096, 1024, 18432, 0xd2fba779 -0, 5120, 5120, 1024, 18432, 0x9ba1c641 +0, -2048, -2048, 1024, 18432, 0x00000000 +0, -1024, -1024, 1024, 18432, 0x00000000 +0, 0, 0, 1024, 18432, 0xa6b18739 +0, 1024, 1024, 1024, 18432, 0xd4df050d +0, 2048, 2048, 1024, 18432, 0xd2fba779 +0, 3072, 3072, 1024, 18432, 0x9ba1c641 +[PACKET] +pts=0 +duration=1024 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=2048 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=1024 +duration=1024 +[/PACKET] +[PACKET] +pts=2048 +duration=1024 +[/PACKET] +[PACKET] +pts=3072 +duration=1024 +[/PACKET] +[PACKET] +pts=4096 +duration=1024 +[/PACKET] +[PACKET] +pts=5120 +duration=1024 +[/PACKET] +[STREAM] +initial_padding=2048 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768 b/tests/ref/fate/dca-xll_xch_61_24_48_768 index 9317c91145..8a17ddb5f9 100644 --- a/tests/ref/fate/dca-xll_xch_61_24_48_768 +++ b/tests/ref/fate/dca-xll_xch_61_24_48_768 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 6.1 -0, 0, 0, 512, 10752, 0xd4320448 -0, 512, 512, 512, 10752, 0x00000000 -0, 1024, 1024, 512, 10752, 0xb0d63493 -0, 1536, 1536, 512, 10752, 0xb25bd689 -0, 2048, 2048, 512, 10752, 0x946292ae -0, 2560, 2560, 512, 10752, 0x2cc3e026 +0, -1024, -1024, 512, 10752, 0xd4320448 +0, -512, -512, 512, 10752, 0x00000000 +0, 0, 0, 512, 10752, 0xb0d63493 +0, 512, 512, 512, 10752, 0xb25bd689 +0, 1024, 1024, 512, 10752, 0x946292ae +0, 1536, 1536, 512, 10752, 0x2cc3e026 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 index dd89ea31d5..1b0e77adaf 100644 --- a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 +++ b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 512, 9216, 0xb1820448 -0, 512, 512, 512, 9216, 0x00000000 -0, 1024, 1024, 512, 9216, 0xeeef4c10 -0, 1536, 1536, 512, 9216, 0x7bb4ed68 -0, 2048, 2048, 512, 9216, 0x6aaf9f0b -0, 2560, 2560, 512, 9216, 0x8ca1e2f7 +0, -1024, -1024, 512, 9216, 0xb1820448 +0, -512, -512, 512, 9216, 0x00000000 +0, 0, 0, 512, 9216, 0xeeef4c10 +0, 512, 512, 512, 9216, 0x7bb4ed68 +0, 1024, 1024, 512, 9216, 0x6aaf9f0b +0, 1536, 1536, 512, 9216, 0x8ca1e2f7 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 index dd89ea31d5..1b0e77adaf 100644 --- a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 +++ b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 @@ -3,9 +3,44 @@ #codec_id 0: pcm_s24le #sample_rate 0: 48000 #channel_layout_name 0: 5.1(side) -0, 0, 0, 512, 9216, 0xb1820448 -0, 512, 512, 512, 9216, 0x00000000 -0, 1024, 1024, 512, 9216, 0xeeef4c10 -0, 1536, 1536, 512, 9216, 0x7bb4ed68 -0, 2048, 2048, 512, 9216, 0x6aaf9f0b -0, 2560, 2560, 512, 9216, 0x8ca1e2f7 +0, -1024, -1024, 512, 9216, 0xb1820448 +0, -512, -512, 512, 9216, 0x00000000 +0, 0, 0, 512, 9216, 0xeeef4c10 +0, 512, 512, 512, 9216, 0x7bb4ed68 +0, 1024, 1024, 512, 9216, 0x6aaf9f0b +0, 1536, 1536, 512, 9216, 0x8ca1e2f7 +[PACKET] +pts=0 +duration=512 +[SIDE_DATA] +side_data_type=Skip Samples +skip_samples=1024 +discard_padding=0 +skip_reason=0 +discard_reason=0 +[/SIDE_DATA] +[/PACKET] +[PACKET] +pts=512 +duration=512 +[/PACKET] +[PACKET] +pts=1024 +duration=512 +[/PACKET] +[PACKET] +pts=1536 +duration=512 +[/PACKET] +[PACKET] +pts=2048 +duration=512 +[/PACKET] +[PACKET] +pts=2560 +duration=512 +[/PACKET] +[STREAM] +initial_padding=1024 +start_time=0.021333 +[/STREAM] _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
