This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 8e162daf9a171e8fe54d42e8023c73490e9220f9 Author: James Almer <[email protected]> AuthorDate: Thu May 7 15:20:20 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Sat May 16 13:55:22 2026 -0300 fftools:/ffmpeg_enc: honor the user request for fixed size frames And set it also for non-variable frame size encoders. FATE changes are the result of passing a frame_size to flac and wavenc encoders, instead of letting them choose one. Signed-off-by: James Almer <[email protected]> --- fftools/ffmpeg_enc.c | 3 + fftools/ffmpeg_mux_init.c | 3 +- tests/ref/acodec/flac | 4 +- tests/ref/acodec/flac-exact-rice | 4 +- tests/ref/acodec/wavpack | 4 +- tests/ref/fate/cover-art-flac-remux | 24 +-- tests/ref/fate/iamf-5_1_4 | 148 ++++++++------- tests/ref/fate/iamf-7_1_4 | 171 ++++++++--------- tests/ref/fate/iamf-9_1_6 | 234 ++++++++++++------------ tests/ref/fate/iamf-ambisonic_1 | 96 +++++----- tests/ref/fate/iamf-ambisonic_1-projection | 96 +++++----- tests/ref/fate/iamf-stereo | 27 +-- tests/ref/fate/matroska-flac-extradata-update | 56 +++--- tests/ref/fate/mov-mp4-iamf-5_1_4 | 148 ++++++++------- tests/ref/fate/mov-mp4-iamf-7_1_4-video-first | 167 +++++++++-------- tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-2 | 23 +-- tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-3 | 23 +-- tests/ref/fate/mov-mp4-iamf-7_1_4-video-last | 171 ++++++++--------- tests/ref/fate/mov-mp4-iamf-ambisonic_1 | 96 +++++----- tests/ref/fate/mov-mp4-iamf-stereo | 27 +-- tests/ref/lavf/wv | 4 +- tests/ref/seek/acodec-flac | 54 +++--- 22 files changed, 824 insertions(+), 759 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index a595912933..1ce37d3b29 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -227,6 +227,9 @@ int enc_open(void *opaque, const AVFrame *frame) frame->ch_layout.nb_channels > 0); enc_ctx->sample_fmt = frame->format; enc_ctx->sample_rate = frame->sample_rate; + if (!enc_ctx->frame_size && (!(enc->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) || + (enc_ctx->flags2 & AV_CODEC_FLAG2_FIXED_FRAME_SIZE))) + enc_ctx->frame_size = frame->nb_samples; ret = av_channel_layout_copy(&enc_ctx->ch_layout, &frame->ch_layout); if (ret < 0) return ret; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index e0eecf78f2..638c53cfb3 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2127,7 +2127,8 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, nb_interleaved += IS_INTERLEAVED(type); nb_av_enc += IS_AV_ENC(ost, type); nb_audio_fs += (ost->enc && type == AVMEDIA_TYPE_AUDIO && - !(ost->enc->enc_ctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)); + (!(ost->enc->enc_ctx->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) || + (ost->enc->enc_ctx->flags2 & AV_CODEC_FLAG2_FIXED_FRAME_SIZE))); limit_frames |= ms->max_frames < INT64_MAX; limit_frames_av_enc |= (ms->max_frames < INT64_MAX) && IS_AV_ENC(ost, type); diff --git a/tests/ref/acodec/flac b/tests/ref/acodec/flac index c2e7f2099b..7b67e5dc64 100644 --- a/tests/ref/acodec/flac +++ b/tests/ref/acodec/flac @@ -1,4 +1,4 @@ -151eef9097f944726968bec48649f00a *tests/data/fate/acodec-flac.flac -361582 tests/data/fate/acodec-flac.flac +eb908cfce45d1b11408be4387472ae92 *tests/data/fate/acodec-flac.flac +363881 tests/data/fate/acodec-flac.flac 95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-flac.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/acodec/flac-exact-rice b/tests/ref/acodec/flac-exact-rice index 6f6d27427d..60bb76464a 100644 --- a/tests/ref/acodec/flac-exact-rice +++ b/tests/ref/acodec/flac-exact-rice @@ -1,4 +1,4 @@ -aab144de213ae684ca008a3e0afe5e28 *tests/data/fate/acodec-flac-exact-rice.flac -360454 tests/data/fate/acodec-flac-exact-rice.flac +eb3bddd3a7ab504981bc2725f6c2eb65 *tests/data/fate/acodec-flac-exact-rice.flac +362904 tests/data/fate/acodec-flac-exact-rice.flac 95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-flac-exact-rice.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/acodec/wavpack b/tests/ref/acodec/wavpack index 02f09ae5ed..35bca6433b 100644 --- a/tests/ref/acodec/wavpack +++ b/tests/ref/acodec/wavpack @@ -1,4 +1,4 @@ -000420796cc3e526650ce6f4c6334471 *tests/data/fate/acodec-wavpack.wv -338166 tests/data/fate/acodec-wavpack.wv +72604d44fff5d797cd1e421c384e659f *tests/data/fate/acodec-wavpack.wv +343032 tests/data/fate/acodec-wavpack.wv 95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-wavpack.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/fate/cover-art-flac-remux b/tests/ref/fate/cover-art-flac-remux index 8d4dc9ae5d..7badb2544d 100644 --- a/tests/ref/fate/cover-art-flac-remux +++ b/tests/ref/fate/cover-art-flac-remux @@ -1,6 +1,6 @@ -2535b1a3c759250e7f470ece217971a4 *tests/data/fate/cover-art-flac-remux.flac -964234 tests/data/fate/cover-art-flac-remux.flac -#extradata 0: 34, 0x8d830abd +f41881b70a18d8405c1dd43ee8502349 *tests/data/fate/cover-art-flac-remux.flac +964331 tests/data/fate/cover-art-flac-remux.flac +#extradata 0: 34, 0x8f1f0acf #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -36,19 +36,21 @@ #codec_id 6: pcm_s16le #sample_rate 6: 44100 #channel_layout_name 6: 2 channels (FL+FC) -0, 0, 0, 4608, 14, 0x242b036d +0, 0, 0, 4096, 14, 0x2e2e0540 1, 0, 0, 0, 66888, 0x1fd72743 2, 0, 0, 0, 304403, 0xaf7c7667 3, 0, 0, 0, 21671, 0x7d1c6030 4, 0, 0, 0, 522758, 0x7a63572f 5, 0, 0, 0, 21671, 0x7d1c6030 -6, 0, 0, 4608, 18432, 0x00000000 -0, 4608, 4608, 4608, 7636, 0xc3775d85 -6, 4608, 4608, 4608, 18432, 0xaaab4d62 -0, 9216, 9216, 4608, 5700, 0x8b9a3cc7 -6, 9216, 9216, 4608, 18432, 0x49410f52 -0, 13824, 13824, 3816, 4512, 0x0ded5f71 -6, 13824, 13824, 3816, 15264, 0x155b5c95 +6, 0, 0, 4096, 16384, 0x00000000 +0, 4096, 4096, 4096, 6128, 0x2072ccde +6, 4096, 4096, 4096, 16384, 0x29cd639d +0, 8192, 8192, 4096, 5361, 0xe7316a81 +6, 8192, 8192, 4096, 16384, 0xd52066e5 +0, 12288, 12288, 4096, 5015, 0x366ffd34 +6, 12288, 12288, 4096, 16384, 0x0c933408 +0, 16384, 16384, 1256, 1441, 0x44376426 +6, 16384, 16384, 1256, 5024, 0xde7bbab0 [STREAM] index=0 codec_name=flac diff --git a/tests/ref/fate/iamf-5_1_4 b/tests/ref/fate/iamf-5_1_4 index 4c765dc8e1..71c8267afc 100644 --- a/tests/ref/fate/iamf-5_1_4 +++ b/tests/ref/fate/iamf-5_1_4 @@ -1,11 +1,11 @@ -7749af0b8f37c91e4cc0dbc6f31d7f67 *tests/data/fate/iamf-5_1_4.iamf -85603 tests/data/fate/iamf-5_1_4.iamf -#extradata 0: 34, 0xafa70d5e -#extradata 1: 34, 0xafa70d5e -#extradata 2: 34, 0xaf7b0d5c -#extradata 3: 34, 0xaf7b0d5c -#extradata 4: 34, 0xafa70d5e -#extradata 5: 34, 0xafa70d5e +2300b02c277bd7da2c3db54a27565314 *tests/data/fate/iamf-5_1_4.iamf +84573 tests/data/fate/iamf-5_1_4.iamf +#extradata 0: 34, 0x94110c4f +#extradata 1: 34, 0x94110c4f +#extradata 2: 34, 0x93e50c4d +#extradata 3: 34, 0x93e50c4d +#extradata 4: 34, 0x94110c4f +#extradata 5: 34, 0x94110c4f #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -36,66 +36,72 @@ #codec_id 5: flac #sample_rate 5: 44100 #channel_layout_name 5: stereo -0, 0, 0, 4608, 1399, 0x6e89566e -1, 0, 0, 4608, 1399, 0x6e89566e -2, 0, 0, 4608, 1396, 0x0dcb5677 -3, 0, 0, 4608, 1396, 0x0dcb5677 -4, 0, 0, 4608, 1399, 0x6e89566e -5, 0, 0, 4608, 1399, 0x6e89566e -0, 4608, 4608, 4608, 1442, 0x6c3c5b13 -1, 4608, 4608, 4608, 1442, 0x6c3c5b13 -2, 4608, 4608, 4608, 1439, 0xc46b5ac5 -3, 4608, 4608, 4608, 1439, 0xc46b5ac5 -4, 4608, 4608, 4608, 1442, 0x6c3c5b13 -5, 4608, 4608, 4608, 1442, 0x6c3c5b13 -0, 9216, 9216, 4608, 1380, 0xc497571b -1, 9216, 9216, 4608, 1380, 0xc497571b -2, 9216, 9216, 4608, 1377, 0x5b2a55fe -3, 9216, 9216, 4608, 1377, 0x5b2a55fe -4, 9216, 9216, 4608, 1380, 0xc497571b -5, 9216, 9216, 4608, 1380, 0xc497571b -0, 13824, 13824, 4608, 1383, 0x48e9510f -1, 13824, 13824, 4608, 1383, 0x48e9510f -2, 13824, 13824, 4608, 1380, 0x045550d3 -3, 13824, 13824, 4608, 1380, 0x045550d3 -4, 13824, 13824, 4608, 1383, 0x48e9510f -5, 13824, 13824, 4608, 1383, 0x48e9510f -0, 18432, 18432, 4608, 1572, 0x9a514719 -1, 18432, 18432, 4608, 1572, 0x9a514719 -2, 18432, 18432, 4608, 1568, 0xa2bc45f4 -3, 18432, 18432, 4608, 1568, 0xa2bc45f4 -4, 18432, 18432, 4608, 1572, 0x9a514719 -5, 18432, 18432, 4608, 1572, 0x9a514719 -0, 23040, 23040, 4608, 1391, 0x74ac5014 -1, 23040, 23040, 4608, 1391, 0x74ac5014 -2, 23040, 23040, 4608, 1388, 0x96c85007 -3, 23040, 23040, 4608, 1388, 0x96c85007 -4, 23040, 23040, 4608, 1391, 0x74ac5014 -5, 23040, 23040, 4608, 1391, 0x74ac5014 -0, 27648, 27648, 4608, 1422, 0x2f9d47c5 -1, 27648, 27648, 4608, 1422, 0x2f9d47c5 -2, 27648, 27648, 4608, 1419, 0x4d4d466a -3, 27648, 27648, 4608, 1419, 0x4d4d466a -4, 27648, 27648, 4608, 1422, 0x2f9d47c5 -5, 27648, 27648, 4608, 1422, 0x2f9d47c5 -0, 32256, 32256, 4608, 1768, 0x2a044b99 -1, 32256, 32256, 4608, 1768, 0x2a044b99 -2, 32256, 32256, 4608, 1765, 0xacb84b24 -3, 32256, 32256, 4608, 1765, 0xacb84b24 -4, 32256, 32256, 4608, 1768, 0x2a044b99 -5, 32256, 32256, 4608, 1768, 0x2a044b99 -0, 36864, 36864, 4608, 1534, 0xb0b35a3f -1, 36864, 36864, 4608, 1534, 0xb0b35a3f -2, 36864, 36864, 4608, 1531, 0x996458aa -3, 36864, 36864, 4608, 1531, 0x996458aa -4, 36864, 36864, 4608, 1534, 0xb0b35a3f -5, 36864, 36864, 4608, 1534, 0xb0b35a3f -0, 41472, 41472, 4608, 926, 0xc26a5eae -1, 41472, 41472, 4608, 926, 0xc26a5eae -2, 41472, 41472, 4608, 923, 0xa7225edf -3, 41472, 41472, 4608, 923, 0xa7225edf -4, 41472, 41472, 4608, 926, 0xc26a5eae -5, 41472, 41472, 4608, 926, 0xc26a5eae +0, 0, 0, 4096, 1323, 0xb9bc0f9a +1, 0, 0, 4096, 1323, 0xb9bc0f9a +2, 0, 0, 4096, 1320, 0x45220e92 +3, 0, 0, 4096, 1320, 0x45220e92 +4, 0, 0, 4096, 1323, 0xb9bc0f9a +5, 0, 0, 4096, 1323, 0xb9bc0f9a +0, 4096, 4096, 4096, 1254, 0xf7e910bc +1, 4096, 4096, 4096, 1254, 0xf7e910bc +2, 4096, 4096, 4096, 1251, 0x70521040 +3, 4096, 4096, 4096, 1251, 0x70521040 +4, 4096, 4096, 4096, 1254, 0xf7e910bc +5, 4096, 4096, 4096, 1254, 0xf7e910bc +0, 8192, 8192, 4096, 1320, 0xe4fe09c9 +1, 8192, 8192, 4096, 1320, 0xe4fe09c9 +2, 8192, 8192, 4096, 1317, 0x6c5408ea +3, 8192, 8192, 4096, 1317, 0x6c5408ea +4, 8192, 8192, 4096, 1320, 0xe4fe09c9 +5, 8192, 8192, 4096, 1320, 0xe4fe09c9 +0, 12288, 12288, 4096, 1280, 0x22e9127e +1, 12288, 12288, 4096, 1280, 0x22e9127e +2, 12288, 12288, 4096, 1277, 0xa6e11330 +3, 12288, 12288, 4096, 1277, 0xa6e11330 +4, 12288, 12288, 4096, 1280, 0x22e9127e +5, 12288, 12288, 4096, 1280, 0x22e9127e +0, 16384, 16384, 4096, 1331, 0x8bc61bbf +1, 16384, 16384, 4096, 1331, 0x8bc61bbf +2, 16384, 16384, 4096, 1328, 0x21371b83 +3, 16384, 16384, 4096, 1328, 0x21371b83 +4, 16384, 16384, 4096, 1331, 0x8bc61bbf +5, 16384, 16384, 4096, 1331, 0x8bc61bbf +0, 20480, 20480, 4096, 1267, 0x2c4708fa +1, 20480, 20480, 4096, 1267, 0x2c4708fa +2, 20480, 20480, 4096, 1264, 0x4358080b +3, 20480, 20480, 4096, 1264, 0x4358080b +4, 20480, 20480, 4096, 1267, 0x2c4708fa +5, 20480, 20480, 4096, 1267, 0x2c4708fa +0, 24576, 24576, 4096, 1282, 0x0438152d +1, 24576, 24576, 4096, 1282, 0x0438152d +2, 24576, 24576, 4096, 1279, 0xf63b158e +3, 24576, 24576, 4096, 1279, 0xf63b158e +4, 24576, 24576, 4096, 1282, 0x0438152d +5, 24576, 24576, 4096, 1282, 0x0438152d +0, 28672, 28672, 4096, 1313, 0x2e79ffa2 +1, 28672, 28672, 4096, 1313, 0x2e79ffa2 +2, 28672, 28672, 4096, 1310, 0x1f77ff91 +3, 28672, 28672, 4096, 1310, 0x1f77ff91 +4, 28672, 28672, 4096, 1313, 0x2e79ffa2 +5, 28672, 28672, 4096, 1313, 0x2e79ffa2 +0, 32768, 32768, 4096, 1323, 0xb9f70fce +1, 32768, 32768, 4096, 1323, 0xb9f70fce +2, 32768, 32768, 4096, 1320, 0xea180f1a +3, 32768, 32768, 4096, 1320, 0xea180f1a +4, 32768, 32768, 4096, 1323, 0xb9f70fce +5, 32768, 32768, 4096, 1323, 0xb9f70fce +0, 36864, 36864, 4096, 1254, 0xf6f01051 +1, 36864, 36864, 4096, 1254, 0xf6f01051 +2, 36864, 36864, 4096, 1251, 0x0b380fcb +3, 36864, 36864, 4096, 1251, 0x0b380fcb +4, 36864, 36864, 4096, 1254, 0xf6f01051 +5, 36864, 36864, 4096, 1254, 0xf6f01051 +0, 40960, 40960, 4096, 1096, 0xa3059b16 +1, 40960, 40960, 4096, 1096, 0xa3059b16 +2, 40960, 40960, 4096, 1093, 0x6c429ba0 +3, 40960, 40960, 4096, 1093, 0x6c429ba0 +4, 40960, 40960, 4096, 1096, 0xa3059b16 +5, 40960, 40960, 4096, 1096, 0xa3059b16 [STREAM_GROUP] index=0 id=0x1 @@ -131,10 +137,10 @@ nb_subblocks=1 type=1 parameter_id=998 parameter_rate=44100 -duration=4608 -constant_subblock_duration=4608 +duration=4096 +constant_subblock_duration=4096 [PIECE] -subblock_duration=4608 +subblock_duration=4096 dmixp_mode=1 [/PIECE] [/SUBCOMPONENT] diff --git a/tests/ref/fate/iamf-7_1_4 b/tests/ref/fate/iamf-7_1_4 index 4259e40135..bd7b2c6004 100644 --- a/tests/ref/fate/iamf-7_1_4 +++ b/tests/ref/fate/iamf-7_1_4 @@ -1,12 +1,12 @@ -5d9fcee2b9b2ad3c802c40bb1147016e *tests/data/fate/iamf-7_1_4.iamf -99851 tests/data/fate/iamf-7_1_4.iamf -#extradata 0: 34, 0xafa70d5e -#extradata 1: 34, 0xafa70d5e -#extradata 2: 34, 0xaf7b0d5c -#extradata 3: 34, 0xaf7b0d5c -#extradata 4: 34, 0xafa70d5e -#extradata 5: 34, 0xafa70d5e -#extradata 6: 34, 0xafa70d5e +33d29010264e0aa0719ba3e5640e958f *tests/data/fate/iamf-7_1_4.iamf +98650 tests/data/fate/iamf-7_1_4.iamf +#extradata 0: 34, 0x94110c4f +#extradata 1: 34, 0x94110c4f +#extradata 2: 34, 0x93e50c4d +#extradata 3: 34, 0x93e50c4d +#extradata 4: 34, 0x94110c4f +#extradata 5: 34, 0x94110c4f +#extradata 6: 34, 0x94110c4f #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -42,76 +42,83 @@ #codec_id 6: flac #sample_rate 6: 44100 #channel_layout_name 6: stereo -0, 0, 0, 4608, 1399, 0x6e89566e -1, 0, 0, 4608, 1399, 0x6e89566e -2, 0, 0, 4608, 1396, 0x0dcb5677 -3, 0, 0, 4608, 1396, 0x0dcb5677 -4, 0, 0, 4608, 1399, 0x6e89566e -5, 0, 0, 4608, 1399, 0x6e89566e -6, 0, 0, 4608, 1399, 0x6e89566e -0, 4608, 4608, 4608, 1442, 0x6c3c5b13 -1, 4608, 4608, 4608, 1442, 0x6c3c5b13 -2, 4608, 4608, 4608, 1439, 0xc46b5ac5 -3, 4608, 4608, 4608, 1439, 0xc46b5ac5 -4, 4608, 4608, 4608, 1442, 0x6c3c5b13 -5, 4608, 4608, 4608, 1442, 0x6c3c5b13 -6, 4608, 4608, 4608, 1442, 0x6c3c5b13 -0, 9216, 9216, 4608, 1380, 0xc497571b -1, 9216, 9216, 4608, 1380, 0xc497571b -2, 9216, 9216, 4608, 1377, 0x5b2a55fe -3, 9216, 9216, 4608, 1377, 0x5b2a55fe -4, 9216, 9216, 4608, 1380, 0xc497571b -5, 9216, 9216, 4608, 1380, 0xc497571b -6, 9216, 9216, 4608, 1380, 0xc497571b -0, 13824, 13824, 4608, 1383, 0x48e9510f -1, 13824, 13824, 4608, 1383, 0x48e9510f -2, 13824, 13824, 4608, 1380, 0x045550d3 -3, 13824, 13824, 4608, 1380, 0x045550d3 -4, 13824, 13824, 4608, 1383, 0x48e9510f -5, 13824, 13824, 4608, 1383, 0x48e9510f -6, 13824, 13824, 4608, 1383, 0x48e9510f -0, 18432, 18432, 4608, 1572, 0x9a514719 -1, 18432, 18432, 4608, 1572, 0x9a514719 -2, 18432, 18432, 4608, 1568, 0xa2bc45f4 -3, 18432, 18432, 4608, 1568, 0xa2bc45f4 -4, 18432, 18432, 4608, 1572, 0x9a514719 -5, 18432, 18432, 4608, 1572, 0x9a514719 -6, 18432, 18432, 4608, 1572, 0x9a514719 -0, 23040, 23040, 4608, 1391, 0x74ac5014 -1, 23040, 23040, 4608, 1391, 0x74ac5014 -2, 23040, 23040, 4608, 1388, 0x96c85007 -3, 23040, 23040, 4608, 1388, 0x96c85007 -4, 23040, 23040, 4608, 1391, 0x74ac5014 -5, 23040, 23040, 4608, 1391, 0x74ac5014 -6, 23040, 23040, 4608, 1391, 0x74ac5014 -0, 27648, 27648, 4608, 1422, 0x2f9d47c5 -1, 27648, 27648, 4608, 1422, 0x2f9d47c5 -2, 27648, 27648, 4608, 1419, 0x4d4d466a -3, 27648, 27648, 4608, 1419, 0x4d4d466a -4, 27648, 27648, 4608, 1422, 0x2f9d47c5 -5, 27648, 27648, 4608, 1422, 0x2f9d47c5 -6, 27648, 27648, 4608, 1422, 0x2f9d47c5 -0, 32256, 32256, 4608, 1768, 0x2a044b99 -1, 32256, 32256, 4608, 1768, 0x2a044b99 -2, 32256, 32256, 4608, 1765, 0xacb84b24 -3, 32256, 32256, 4608, 1765, 0xacb84b24 -4, 32256, 32256, 4608, 1768, 0x2a044b99 -5, 32256, 32256, 4608, 1768, 0x2a044b99 -6, 32256, 32256, 4608, 1768, 0x2a044b99 -0, 36864, 36864, 4608, 1534, 0xb0b35a3f -1, 36864, 36864, 4608, 1534, 0xb0b35a3f -2, 36864, 36864, 4608, 1531, 0x996458aa -3, 36864, 36864, 4608, 1531, 0x996458aa -4, 36864, 36864, 4608, 1534, 0xb0b35a3f -5, 36864, 36864, 4608, 1534, 0xb0b35a3f -6, 36864, 36864, 4608, 1534, 0xb0b35a3f -0, 41472, 41472, 4608, 926, 0xc26a5eae -1, 41472, 41472, 4608, 926, 0xc26a5eae -2, 41472, 41472, 4608, 923, 0xa7225edf -3, 41472, 41472, 4608, 923, 0xa7225edf -4, 41472, 41472, 4608, 926, 0xc26a5eae -5, 41472, 41472, 4608, 926, 0xc26a5eae -6, 41472, 41472, 4608, 926, 0xc26a5eae +0, 0, 0, 4096, 1323, 0xb9bc0f9a +1, 0, 0, 4096, 1323, 0xb9bc0f9a +2, 0, 0, 4096, 1320, 0x45220e92 +3, 0, 0, 4096, 1320, 0x45220e92 +4, 0, 0, 4096, 1323, 0xb9bc0f9a +5, 0, 0, 4096, 1323, 0xb9bc0f9a +6, 0, 0, 4096, 1323, 0xb9bc0f9a +0, 4096, 4096, 4096, 1254, 0xf7e910bc +1, 4096, 4096, 4096, 1254, 0xf7e910bc +2, 4096, 4096, 4096, 1251, 0x70521040 +3, 4096, 4096, 4096, 1251, 0x70521040 +4, 4096, 4096, 4096, 1254, 0xf7e910bc +5, 4096, 4096, 4096, 1254, 0xf7e910bc +6, 4096, 4096, 4096, 1254, 0xf7e910bc +0, 8192, 8192, 4096, 1320, 0xe4fe09c9 +1, 8192, 8192, 4096, 1320, 0xe4fe09c9 +2, 8192, 8192, 4096, 1317, 0x6c5408ea +3, 8192, 8192, 4096, 1317, 0x6c5408ea +4, 8192, 8192, 4096, 1320, 0xe4fe09c9 +5, 8192, 8192, 4096, 1320, 0xe4fe09c9 +6, 8192, 8192, 4096, 1320, 0xe4fe09c9 +0, 12288, 12288, 4096, 1280, 0x22e9127e +1, 12288, 12288, 4096, 1280, 0x22e9127e +2, 12288, 12288, 4096, 1277, 0xa6e11330 +3, 12288, 12288, 4096, 1277, 0xa6e11330 +4, 12288, 12288, 4096, 1280, 0x22e9127e +5, 12288, 12288, 4096, 1280, 0x22e9127e +6, 12288, 12288, 4096, 1280, 0x22e9127e +0, 16384, 16384, 4096, 1331, 0x8bc61bbf +1, 16384, 16384, 4096, 1331, 0x8bc61bbf +2, 16384, 16384, 4096, 1328, 0x21371b83 +3, 16384, 16384, 4096, 1328, 0x21371b83 +4, 16384, 16384, 4096, 1331, 0x8bc61bbf +5, 16384, 16384, 4096, 1331, 0x8bc61bbf +6, 16384, 16384, 4096, 1331, 0x8bc61bbf +0, 20480, 20480, 4096, 1267, 0x2c4708fa +1, 20480, 20480, 4096, 1267, 0x2c4708fa +2, 20480, 20480, 4096, 1264, 0x4358080b +3, 20480, 20480, 4096, 1264, 0x4358080b +4, 20480, 20480, 4096, 1267, 0x2c4708fa +5, 20480, 20480, 4096, 1267, 0x2c4708fa +6, 20480, 20480, 4096, 1267, 0x2c4708fa +0, 24576, 24576, 4096, 1282, 0x0438152d +1, 24576, 24576, 4096, 1282, 0x0438152d +2, 24576, 24576, 4096, 1279, 0xf63b158e +3, 24576, 24576, 4096, 1279, 0xf63b158e +4, 24576, 24576, 4096, 1282, 0x0438152d +5, 24576, 24576, 4096, 1282, 0x0438152d +6, 24576, 24576, 4096, 1282, 0x0438152d +0, 28672, 28672, 4096, 1313, 0x2e79ffa2 +1, 28672, 28672, 4096, 1313, 0x2e79ffa2 +2, 28672, 28672, 4096, 1310, 0x1f77ff91 +3, 28672, 28672, 4096, 1310, 0x1f77ff91 +4, 28672, 28672, 4096, 1313, 0x2e79ffa2 +5, 28672, 28672, 4096, 1313, 0x2e79ffa2 +6, 28672, 28672, 4096, 1313, 0x2e79ffa2 +0, 32768, 32768, 4096, 1323, 0xb9f70fce +1, 32768, 32768, 4096, 1323, 0xb9f70fce +2, 32768, 32768, 4096, 1320, 0xea180f1a +3, 32768, 32768, 4096, 1320, 0xea180f1a +4, 32768, 32768, 4096, 1323, 0xb9f70fce +5, 32768, 32768, 4096, 1323, 0xb9f70fce +6, 32768, 32768, 4096, 1323, 0xb9f70fce +0, 36864, 36864, 4096, 1254, 0xf6f01051 +1, 36864, 36864, 4096, 1254, 0xf6f01051 +2, 36864, 36864, 4096, 1251, 0x0b380fcb +3, 36864, 36864, 4096, 1251, 0x0b380fcb +4, 36864, 36864, 4096, 1254, 0xf6f01051 +5, 36864, 36864, 4096, 1254, 0xf6f01051 +6, 36864, 36864, 4096, 1254, 0xf6f01051 +0, 40960, 40960, 4096, 1096, 0xa3059b16 +1, 40960, 40960, 4096, 1096, 0xa3059b16 +2, 40960, 40960, 4096, 1093, 0x6c429ba0 +3, 40960, 40960, 4096, 1093, 0x6c429ba0 +4, 40960, 40960, 4096, 1096, 0xa3059b16 +5, 40960, 40960, 4096, 1096, 0xa3059b16 +6, 40960, 40960, 4096, 1096, 0xa3059b16 [STREAM_GROUP] index=0 id=0x1 @@ -147,10 +154,10 @@ nb_subblocks=1 type=1 parameter_id=998 parameter_rate=44100 -duration=4608 -constant_subblock_duration=4608 +duration=4096 +constant_subblock_duration=4096 [PIECE] -subblock_duration=4608 +subblock_duration=4096 dmixp_mode=1 [/PIECE] [/SUBCOMPONENT] diff --git a/tests/ref/fate/iamf-9_1_6 b/tests/ref/fate/iamf-9_1_6 index 4082d35729..0e7d25d5a5 100644 --- a/tests/ref/fate/iamf-9_1_6 +++ b/tests/ref/fate/iamf-9_1_6 @@ -1,15 +1,15 @@ -bba1dc4edb2c5011dfddfe53bd412e99 *tests/data/fate/iamf-9_1_6.iamf -142594 tests/data/fate/iamf-9_1_6.iamf -#extradata 0: 34, 0xafa70d5e -#extradata 1: 34, 0xafa70d5e -#extradata 2: 34, 0xafa70d5e -#extradata 3: 34, 0xafa70d5e -#extradata 4: 34, 0xafa70d5e -#extradata 5: 34, 0xafa70d5e -#extradata 6: 34, 0xafa70d5e -#extradata 7: 34, 0xaf7b0d5c -#extradata 8: 34, 0xaf7b0d5c -#extradata 9: 34, 0xafa70d5e +8718687441c7d77e29db5f363b855407 *tests/data/fate/iamf-9_1_6.iamf +140880 tests/data/fate/iamf-9_1_6.iamf +#extradata 0: 34, 0x94110c4f +#extradata 1: 34, 0x94110c4f +#extradata 2: 34, 0x94110c4f +#extradata 3: 34, 0x94110c4f +#extradata 4: 34, 0x94110c4f +#extradata 5: 34, 0x94110c4f +#extradata 6: 34, 0x94110c4f +#extradata 7: 34, 0x93e50c4d +#extradata 8: 34, 0x93e50c4d +#extradata 9: 34, 0x94110c4f #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -60,106 +60,116 @@ bba1dc4edb2c5011dfddfe53bd412e99 *tests/data/fate/iamf-9_1_6.iamf #codec_id 9: flac #sample_rate 9: 44100 #channel_layout_name 9: stereo -0, 0, 0, 4608, 1399, 0x6e89566e -1, 0, 0, 4608, 1399, 0x6e89566e -2, 0, 0, 4608, 1399, 0x6e89566e -3, 0, 0, 4608, 1399, 0x6e89566e -4, 0, 0, 4608, 1399, 0x6e89566e -5, 0, 0, 4608, 1399, 0x6e89566e -6, 0, 0, 4608, 1399, 0x6e89566e -7, 0, 0, 4608, 1396, 0x0dcb5677 -8, 0, 0, 4608, 1396, 0x0dcb5677 -9, 0, 0, 4608, 1399, 0x6e89566e -0, 4608, 4608, 4608, 1442, 0x6c3c5b13 -1, 4608, 4608, 4608, 1442, 0x6c3c5b13 -2, 4608, 4608, 4608, 1442, 0x6c3c5b13 -3, 4608, 4608, 4608, 1442, 0x6c3c5b13 -4, 4608, 4608, 4608, 1442, 0x6c3c5b13 -5, 4608, 4608, 4608, 1442, 0x6c3c5b13 -6, 4608, 4608, 4608, 1442, 0x6c3c5b13 -7, 4608, 4608, 4608, 1439, 0xc46b5ac5 -8, 4608, 4608, 4608, 1439, 0xc46b5ac5 -9, 4608, 4608, 4608, 1442, 0x6c3c5b13 -0, 9216, 9216, 4608, 1380, 0xc497571b -1, 9216, 9216, 4608, 1380, 0xc497571b -2, 9216, 9216, 4608, 1380, 0xc497571b -3, 9216, 9216, 4608, 1380, 0xc497571b -4, 9216, 9216, 4608, 1380, 0xc497571b -5, 9216, 9216, 4608, 1380, 0xc497571b -6, 9216, 9216, 4608, 1380, 0xc497571b -7, 9216, 9216, 4608, 1377, 0x5b2a55fe -8, 9216, 9216, 4608, 1377, 0x5b2a55fe -9, 9216, 9216, 4608, 1380, 0xc497571b -0, 13824, 13824, 4608, 1383, 0x48e9510f -1, 13824, 13824, 4608, 1383, 0x48e9510f -2, 13824, 13824, 4608, 1383, 0x48e9510f -3, 13824, 13824, 4608, 1383, 0x48e9510f -4, 13824, 13824, 4608, 1383, 0x48e9510f -5, 13824, 13824, 4608, 1383, 0x48e9510f -6, 13824, 13824, 4608, 1383, 0x48e9510f -7, 13824, 13824, 4608, 1380, 0x045550d3 -8, 13824, 13824, 4608, 1380, 0x045550d3 -9, 13824, 13824, 4608, 1383, 0x48e9510f -0, 18432, 18432, 4608, 1572, 0x9a514719 -1, 18432, 18432, 4608, 1572, 0x9a514719 -2, 18432, 18432, 4608, 1572, 0x9a514719 -3, 18432, 18432, 4608, 1572, 0x9a514719 -4, 18432, 18432, 4608, 1572, 0x9a514719 -5, 18432, 18432, 4608, 1572, 0x9a514719 -6, 18432, 18432, 4608, 1572, 0x9a514719 -7, 18432, 18432, 4608, 1568, 0xa2bc45f4 -8, 18432, 18432, 4608, 1568, 0xa2bc45f4 -9, 18432, 18432, 4608, 1572, 0x9a514719 -0, 23040, 23040, 4608, 1391, 0x74ac5014 -1, 23040, 23040, 4608, 1391, 0x74ac5014 -2, 23040, 23040, 4608, 1391, 0x74ac5014 -3, 23040, 23040, 4608, 1391, 0x74ac5014 -4, 23040, 23040, 4608, 1391, 0x74ac5014 -5, 23040, 23040, 4608, 1391, 0x74ac5014 -6, 23040, 23040, 4608, 1391, 0x74ac5014 -7, 23040, 23040, 4608, 1388, 0x96c85007 -8, 23040, 23040, 4608, 1388, 0x96c85007 -9, 23040, 23040, 4608, 1391, 0x74ac5014 -0, 27648, 27648, 4608, 1422, 0x2f9d47c5 -1, 27648, 27648, 4608, 1422, 0x2f9d47c5 -2, 27648, 27648, 4608, 1422, 0x2f9d47c5 -3, 27648, 27648, 4608, 1422, 0x2f9d47c5 -4, 27648, 27648, 4608, 1422, 0x2f9d47c5 -5, 27648, 27648, 4608, 1422, 0x2f9d47c5 -6, 27648, 27648, 4608, 1422, 0x2f9d47c5 -7, 27648, 27648, 4608, 1419, 0x4d4d466a -8, 27648, 27648, 4608, 1419, 0x4d4d466a -9, 27648, 27648, 4608, 1422, 0x2f9d47c5 -0, 32256, 32256, 4608, 1768, 0x2a044b99 -1, 32256, 32256, 4608, 1768, 0x2a044b99 -2, 32256, 32256, 4608, 1768, 0x2a044b99 -3, 32256, 32256, 4608, 1768, 0x2a044b99 -4, 32256, 32256, 4608, 1768, 0x2a044b99 -5, 32256, 32256, 4608, 1768, 0x2a044b99 -6, 32256, 32256, 4608, 1768, 0x2a044b99 -7, 32256, 32256, 4608, 1765, 0xacb84b24 -8, 32256, 32256, 4608, 1765, 0xacb84b24 -9, 32256, 32256, 4608, 1768, 0x2a044b99 -0, 36864, 36864, 4608, 1534, 0xb0b35a3f -1, 36864, 36864, 4608, 1534, 0xb0b35a3f -2, 36864, 36864, 4608, 1534, 0xb0b35a3f -3, 36864, 36864, 4608, 1534, 0xb0b35a3f -4, 36864, 36864, 4608, 1534, 0xb0b35a3f -5, 36864, 36864, 4608, 1534, 0xb0b35a3f -6, 36864, 36864, 4608, 1534, 0xb0b35a3f -7, 36864, 36864, 4608, 1531, 0x996458aa -8, 36864, 36864, 4608, 1531, 0x996458aa -9, 36864, 36864, 4608, 1534, 0xb0b35a3f -0, 41472, 41472, 4608, 926, 0xc26a5eae -1, 41472, 41472, 4608, 926, 0xc26a5eae -2, 41472, 41472, 4608, 926, 0xc26a5eae -3, 41472, 41472, 4608, 926, 0xc26a5eae -4, 41472, 41472, 4608, 926, 0xc26a5eae -5, 41472, 41472, 4608, 926, 0xc26a5eae -6, 41472, 41472, 4608, 926, 0xc26a5eae -7, 41472, 41472, 4608, 923, 0xa7225edf -8, 41472, 41472, 4608, 923, 0xa7225edf -9, 41472, 41472, 4608, 926, 0xc26a5eae +0, 0, 0, 4096, 1323, 0xb9bc0f9a +1, 0, 0, 4096, 1323, 0xb9bc0f9a +2, 0, 0, 4096, 1323, 0xb9bc0f9a +3, 0, 0, 4096, 1323, 0xb9bc0f9a +4, 0, 0, 4096, 1323, 0xb9bc0f9a +5, 0, 0, 4096, 1323, 0xb9bc0f9a +6, 0, 0, 4096, 1323, 0xb9bc0f9a +7, 0, 0, 4096, 1320, 0x45220e92 +8, 0, 0, 4096, 1320, 0x45220e92 +9, 0, 0, 4096, 1323, 0xb9bc0f9a +0, 4096, 4096, 4096, 1254, 0xf7e910bc +1, 4096, 4096, 4096, 1254, 0xf7e910bc +2, 4096, 4096, 4096, 1254, 0xf7e910bc +3, 4096, 4096, 4096, 1254, 0xf7e910bc +4, 4096, 4096, 4096, 1254, 0xf7e910bc +5, 4096, 4096, 4096, 1254, 0xf7e910bc +6, 4096, 4096, 4096, 1254, 0xf7e910bc +7, 4096, 4096, 4096, 1251, 0x70521040 +8, 4096, 4096, 4096, 1251, 0x70521040 +9, 4096, 4096, 4096, 1254, 0xf7e910bc +0, 8192, 8192, 4096, 1320, 0xe4fe09c9 +1, 8192, 8192, 4096, 1320, 0xe4fe09c9 +2, 8192, 8192, 4096, 1320, 0xe4fe09c9 +3, 8192, 8192, 4096, 1320, 0xe4fe09c9 +4, 8192, 8192, 4096, 1320, 0xe4fe09c9 +5, 8192, 8192, 4096, 1320, 0xe4fe09c9 +6, 8192, 8192, 4096, 1320, 0xe4fe09c9 +7, 8192, 8192, 4096, 1317, 0x6c5408ea +8, 8192, 8192, 4096, 1317, 0x6c5408ea +9, 8192, 8192, 4096, 1320, 0xe4fe09c9 +0, 12288, 12288, 4096, 1280, 0x22e9127e +1, 12288, 12288, 4096, 1280, 0x22e9127e +2, 12288, 12288, 4096, 1280, 0x22e9127e +3, 12288, 12288, 4096, 1280, 0x22e9127e +4, 12288, 12288, 4096, 1280, 0x22e9127e +5, 12288, 12288, 4096, 1280, 0x22e9127e +6, 12288, 12288, 4096, 1280, 0x22e9127e +7, 12288, 12288, 4096, 1277, 0xa6e11330 +8, 12288, 12288, 4096, 1277, 0xa6e11330 +9, 12288, 12288, 4096, 1280, 0x22e9127e +0, 16384, 16384, 4096, 1331, 0x8bc61bbf +1, 16384, 16384, 4096, 1331, 0x8bc61bbf +2, 16384, 16384, 4096, 1331, 0x8bc61bbf +3, 16384, 16384, 4096, 1331, 0x8bc61bbf +4, 16384, 16384, 4096, 1331, 0x8bc61bbf +5, 16384, 16384, 4096, 1331, 0x8bc61bbf +6, 16384, 16384, 4096, 1331, 0x8bc61bbf +7, 16384, 16384, 4096, 1328, 0x21371b83 +8, 16384, 16384, 4096, 1328, 0x21371b83 +9, 16384, 16384, 4096, 1331, 0x8bc61bbf +0, 20480, 20480, 4096, 1267, 0x2c4708fa +1, 20480, 20480, 4096, 1267, 0x2c4708fa +2, 20480, 20480, 4096, 1267, 0x2c4708fa +3, 20480, 20480, 4096, 1267, 0x2c4708fa +4, 20480, 20480, 4096, 1267, 0x2c4708fa +5, 20480, 20480, 4096, 1267, 0x2c4708fa +6, 20480, 20480, 4096, 1267, 0x2c4708fa +7, 20480, 20480, 4096, 1264, 0x4358080b +8, 20480, 20480, 4096, 1264, 0x4358080b +9, 20480, 20480, 4096, 1267, 0x2c4708fa +0, 24576, 24576, 4096, 1282, 0x0438152d +1, 24576, 24576, 4096, 1282, 0x0438152d +2, 24576, 24576, 4096, 1282, 0x0438152d +3, 24576, 24576, 4096, 1282, 0x0438152d +4, 24576, 24576, 4096, 1282, 0x0438152d +5, 24576, 24576, 4096, 1282, 0x0438152d +6, 24576, 24576, 4096, 1282, 0x0438152d +7, 24576, 24576, 4096, 1279, 0xf63b158e +8, 24576, 24576, 4096, 1279, 0xf63b158e +9, 24576, 24576, 4096, 1282, 0x0438152d +0, 28672, 28672, 4096, 1313, 0x2e79ffa2 +1, 28672, 28672, 4096, 1313, 0x2e79ffa2 +2, 28672, 28672, 4096, 1313, 0x2e79ffa2 +3, 28672, 28672, 4096, 1313, 0x2e79ffa2 +4, 28672, 28672, 4096, 1313, 0x2e79ffa2 +5, 28672, 28672, 4096, 1313, 0x2e79ffa2 +6, 28672, 28672, 4096, 1313, 0x2e79ffa2 +7, 28672, 28672, 4096, 1310, 0x1f77ff91 +8, 28672, 28672, 4096, 1310, 0x1f77ff91 +9, 28672, 28672, 4096, 1313, 0x2e79ffa2 +0, 32768, 32768, 4096, 1323, 0xb9f70fce +1, 32768, 32768, 4096, 1323, 0xb9f70fce +2, 32768, 32768, 4096, 1323, 0xb9f70fce +3, 32768, 32768, 4096, 1323, 0xb9f70fce +4, 32768, 32768, 4096, 1323, 0xb9f70fce +5, 32768, 32768, 4096, 1323, 0xb9f70fce +6, 32768, 32768, 4096, 1323, 0xb9f70fce +7, 32768, 32768, 4096, 1320, 0xea180f1a +8, 32768, 32768, 4096, 1320, 0xea180f1a +9, 32768, 32768, 4096, 1323, 0xb9f70fce +0, 36864, 36864, 4096, 1254, 0xf6f01051 +1, 36864, 36864, 4096, 1254, 0xf6f01051 +2, 36864, 36864, 4096, 1254, 0xf6f01051 +3, 36864, 36864, 4096, 1254, 0xf6f01051 +4, 36864, 36864, 4096, 1254, 0xf6f01051 +5, 36864, 36864, 4096, 1254, 0xf6f01051 +6, 36864, 36864, 4096, 1254, 0xf6f01051 +7, 36864, 36864, 4096, 1251, 0x0b380fcb +8, 36864, 36864, 4096, 1251, 0x0b380fcb +9, 36864, 36864, 4096, 1254, 0xf6f01051 +0, 40960, 40960, 4096, 1096, 0xa3059b16 +1, 40960, 40960, 4096, 1096, 0xa3059b16 +2, 40960, 40960, 4096, 1096, 0xa3059b16 +3, 40960, 40960, 4096, 1096, 0xa3059b16 +4, 40960, 40960, 4096, 1096, 0xa3059b16 +5, 40960, 40960, 4096, 1096, 0xa3059b16 +6, 40960, 40960, 4096, 1096, 0xa3059b16 +7, 40960, 40960, 4096, 1093, 0x6c429ba0 +8, 40960, 40960, 4096, 1093, 0x6c429ba0 +9, 40960, 40960, 4096, 1096, 0xa3059b16 [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/iamf-ambisonic_1 b/tests/ref/fate/iamf-ambisonic_1 index e43f891597..00b2adab59 100644 --- a/tests/ref/fate/iamf-ambisonic_1 +++ b/tests/ref/fate/iamf-ambisonic_1 @@ -1,9 +1,9 @@ -c3751e6a2d85bd6a8318fe93b5754309 *tests/data/fate/iamf-ambisonic_1.iamf -57006 tests/data/fate/iamf-ambisonic_1.iamf -#extradata 0: 34, 0xad120cfe -#extradata 1: 34, 0xad120cfe -#extradata 2: 34, 0xad120cfe -#extradata 3: 34, 0xad120cfe +117fe12702c74a75cac1129c2cec427f *tests/data/fate/iamf-ambisonic_1.iamf +56314 tests/data/fate/iamf-ambisonic_1.iamf +#extradata 0: 34, 0x917c0bef +#extradata 1: 34, 0x917c0bef +#extradata 2: 34, 0x917c0bef +#extradata 3: 34, 0x917c0bef #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -24,46 +24,50 @@ c3751e6a2d85bd6a8318fe93b5754309 *tests/data/fate/iamf-ambisonic_1.iamf #codec_id 3: flac #sample_rate 3: 44100 #channel_layout_name 3: mono -0, 0, 0, 4608, 1396, 0x0dcb5677 -1, 0, 0, 4608, 1396, 0x0dcb5677 -2, 0, 0, 4608, 1396, 0x0dcb5677 -3, 0, 0, 4608, 1396, 0x0dcb5677 -0, 4608, 4608, 4608, 1439, 0xc46b5ac5 -1, 4608, 4608, 4608, 1439, 0xc46b5ac5 -2, 4608, 4608, 4608, 1439, 0xc46b5ac5 -3, 4608, 4608, 4608, 1439, 0xc46b5ac5 -0, 9216, 9216, 4608, 1377, 0x5b2a55fe -1, 9216, 9216, 4608, 1377, 0x5b2a55fe -2, 9216, 9216, 4608, 1377, 0x5b2a55fe -3, 9216, 9216, 4608, 1377, 0x5b2a55fe -0, 13824, 13824, 4608, 1380, 0x045550d3 -1, 13824, 13824, 4608, 1380, 0x045550d3 -2, 13824, 13824, 4608, 1380, 0x045550d3 -3, 13824, 13824, 4608, 1380, 0x045550d3 -0, 18432, 18432, 4608, 1568, 0xa2bc45f4 -1, 18432, 18432, 4608, 1568, 0xa2bc45f4 -2, 18432, 18432, 4608, 1568, 0xa2bc45f4 -3, 18432, 18432, 4608, 1568, 0xa2bc45f4 -0, 23040, 23040, 4608, 1388, 0x96c85007 -1, 23040, 23040, 4608, 1388, 0x96c85007 -2, 23040, 23040, 4608, 1388, 0x96c85007 -3, 23040, 23040, 4608, 1388, 0x96c85007 -0, 27648, 27648, 4608, 1419, 0x4d4d466a -1, 27648, 27648, 4608, 1419, 0x4d4d466a -2, 27648, 27648, 4608, 1419, 0x4d4d466a -3, 27648, 27648, 4608, 1419, 0x4d4d466a -0, 32256, 32256, 4608, 1765, 0xacb84b24 -1, 32256, 32256, 4608, 1765, 0xacb84b24 -2, 32256, 32256, 4608, 1765, 0xacb84b24 -3, 32256, 32256, 4608, 1765, 0xacb84b24 -0, 36864, 36864, 4608, 1531, 0x996458aa -1, 36864, 36864, 4608, 1531, 0x996458aa -2, 36864, 36864, 4608, 1531, 0x996458aa -3, 36864, 36864, 4608, 1531, 0x996458aa -0, 41472, 41472, 4608, 923, 0xa7225edf -1, 41472, 41472, 4608, 923, 0xa7225edf -2, 41472, 41472, 4608, 923, 0xa7225edf -3, 41472, 41472, 4608, 923, 0xa7225edf +0, 0, 0, 4096, 1320, 0x45220e92 +1, 0, 0, 4096, 1320, 0x45220e92 +2, 0, 0, 4096, 1320, 0x45220e92 +3, 0, 0, 4096, 1320, 0x45220e92 +0, 4096, 4096, 4096, 1251, 0x70521040 +1, 4096, 4096, 4096, 1251, 0x70521040 +2, 4096, 4096, 4096, 1251, 0x70521040 +3, 4096, 4096, 4096, 1251, 0x70521040 +0, 8192, 8192, 4096, 1317, 0x6c5408ea +1, 8192, 8192, 4096, 1317, 0x6c5408ea +2, 8192, 8192, 4096, 1317, 0x6c5408ea +3, 8192, 8192, 4096, 1317, 0x6c5408ea +0, 12288, 12288, 4096, 1277, 0xa6e11330 +1, 12288, 12288, 4096, 1277, 0xa6e11330 +2, 12288, 12288, 4096, 1277, 0xa6e11330 +3, 12288, 12288, 4096, 1277, 0xa6e11330 +0, 16384, 16384, 4096, 1328, 0x21371b83 +1, 16384, 16384, 4096, 1328, 0x21371b83 +2, 16384, 16384, 4096, 1328, 0x21371b83 +3, 16384, 16384, 4096, 1328, 0x21371b83 +0, 20480, 20480, 4096, 1264, 0x4358080b +1, 20480, 20480, 4096, 1264, 0x4358080b +2, 20480, 20480, 4096, 1264, 0x4358080b +3, 20480, 20480, 4096, 1264, 0x4358080b +0, 24576, 24576, 4096, 1279, 0xf63b158e +1, 24576, 24576, 4096, 1279, 0xf63b158e +2, 24576, 24576, 4096, 1279, 0xf63b158e +3, 24576, 24576, 4096, 1279, 0xf63b158e +0, 28672, 28672, 4096, 1310, 0x1f77ff91 +1, 28672, 28672, 4096, 1310, 0x1f77ff91 +2, 28672, 28672, 4096, 1310, 0x1f77ff91 +3, 28672, 28672, 4096, 1310, 0x1f77ff91 +0, 32768, 32768, 4096, 1320, 0xea180f1a +1, 32768, 32768, 4096, 1320, 0xea180f1a +2, 32768, 32768, 4096, 1320, 0xea180f1a +3, 32768, 32768, 4096, 1320, 0xea180f1a +0, 36864, 36864, 4096, 1251, 0x0b380fcb +1, 36864, 36864, 4096, 1251, 0x0b380fcb +2, 36864, 36864, 4096, 1251, 0x0b380fcb +3, 36864, 36864, 4096, 1251, 0x0b380fcb +0, 40960, 40960, 4096, 1093, 0x6c429ba0 +1, 40960, 40960, 4096, 1093, 0x6c429ba0 +2, 40960, 40960, 4096, 1093, 0x6c429ba0 +3, 40960, 40960, 4096, 1093, 0x6c429ba0 [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/iamf-ambisonic_1-projection b/tests/ref/fate/iamf-ambisonic_1-projection index 78b5a743b6..983c8812c0 100644 --- a/tests/ref/fate/iamf-ambisonic_1-projection +++ b/tests/ref/fate/iamf-ambisonic_1-projection @@ -1,9 +1,9 @@ -b87b28ca89da92d540047e8ad30bd470 *tests/data/fate/iamf-ambisonic_1-projection.iamf -57035 tests/data/fate/iamf-ambisonic_1-projection.iamf -#extradata 0: 34, 0xad120cfe -#extradata 1: 34, 0xad120cfe -#extradata 2: 34, 0xad120cfe -#extradata 3: 34, 0xad120cfe +301f9c2821dc24b3763ac3f4a19ea141 *tests/data/fate/iamf-ambisonic_1-projection.iamf +56343 tests/data/fate/iamf-ambisonic_1-projection.iamf +#extradata 0: 34, 0x917c0bef +#extradata 1: 34, 0x917c0bef +#extradata 2: 34, 0x917c0bef +#extradata 3: 34, 0x917c0bef #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -24,46 +24,50 @@ b87b28ca89da92d540047e8ad30bd470 *tests/data/fate/iamf-ambisonic_1-projection.ia #codec_id 3: flac #sample_rate 3: 44100 #channel_layout_name 3: mono -0, 0, 0, 4608, 1396, 0x0dcb5677 -1, 0, 0, 4608, 1396, 0x0dcb5677 -2, 0, 0, 4608, 1396, 0x0dcb5677 -3, 0, 0, 4608, 1396, 0x0dcb5677 -0, 4608, 4608, 4608, 1439, 0xc46b5ac5 -1, 4608, 4608, 4608, 1439, 0xc46b5ac5 -2, 4608, 4608, 4608, 1439, 0xc46b5ac5 -3, 4608, 4608, 4608, 1439, 0xc46b5ac5 -0, 9216, 9216, 4608, 1377, 0x5b2a55fe -1, 9216, 9216, 4608, 1377, 0x5b2a55fe -2, 9216, 9216, 4608, 1377, 0x5b2a55fe -3, 9216, 9216, 4608, 1377, 0x5b2a55fe -0, 13824, 13824, 4608, 1380, 0x045550d3 -1, 13824, 13824, 4608, 1380, 0x045550d3 -2, 13824, 13824, 4608, 1380, 0x045550d3 -3, 13824, 13824, 4608, 1380, 0x045550d3 -0, 18432, 18432, 4608, 1568, 0xa2bc45f4 -1, 18432, 18432, 4608, 1568, 0xa2bc45f4 -2, 18432, 18432, 4608, 1568, 0xa2bc45f4 -3, 18432, 18432, 4608, 1568, 0xa2bc45f4 -0, 23040, 23040, 4608, 1388, 0x96c85007 -1, 23040, 23040, 4608, 1388, 0x96c85007 -2, 23040, 23040, 4608, 1388, 0x96c85007 -3, 23040, 23040, 4608, 1388, 0x96c85007 -0, 27648, 27648, 4608, 1419, 0x4d4d466a -1, 27648, 27648, 4608, 1419, 0x4d4d466a -2, 27648, 27648, 4608, 1419, 0x4d4d466a -3, 27648, 27648, 4608, 1419, 0x4d4d466a -0, 32256, 32256, 4608, 1765, 0xacb84b24 -1, 32256, 32256, 4608, 1765, 0xacb84b24 -2, 32256, 32256, 4608, 1765, 0xacb84b24 -3, 32256, 32256, 4608, 1765, 0xacb84b24 -0, 36864, 36864, 4608, 1531, 0x996458aa -1, 36864, 36864, 4608, 1531, 0x996458aa -2, 36864, 36864, 4608, 1531, 0x996458aa -3, 36864, 36864, 4608, 1531, 0x996458aa -0, 41472, 41472, 4608, 923, 0xa7225edf -1, 41472, 41472, 4608, 923, 0xa7225edf -2, 41472, 41472, 4608, 923, 0xa7225edf -3, 41472, 41472, 4608, 923, 0xa7225edf +0, 0, 0, 4096, 1320, 0x45220e92 +1, 0, 0, 4096, 1320, 0x45220e92 +2, 0, 0, 4096, 1320, 0x45220e92 +3, 0, 0, 4096, 1320, 0x45220e92 +0, 4096, 4096, 4096, 1251, 0x70521040 +1, 4096, 4096, 4096, 1251, 0x70521040 +2, 4096, 4096, 4096, 1251, 0x70521040 +3, 4096, 4096, 4096, 1251, 0x70521040 +0, 8192, 8192, 4096, 1317, 0x6c5408ea +1, 8192, 8192, 4096, 1317, 0x6c5408ea +2, 8192, 8192, 4096, 1317, 0x6c5408ea +3, 8192, 8192, 4096, 1317, 0x6c5408ea +0, 12288, 12288, 4096, 1277, 0xa6e11330 +1, 12288, 12288, 4096, 1277, 0xa6e11330 +2, 12288, 12288, 4096, 1277, 0xa6e11330 +3, 12288, 12288, 4096, 1277, 0xa6e11330 +0, 16384, 16384, 4096, 1328, 0x21371b83 +1, 16384, 16384, 4096, 1328, 0x21371b83 +2, 16384, 16384, 4096, 1328, 0x21371b83 +3, 16384, 16384, 4096, 1328, 0x21371b83 +0, 20480, 20480, 4096, 1264, 0x4358080b +1, 20480, 20480, 4096, 1264, 0x4358080b +2, 20480, 20480, 4096, 1264, 0x4358080b +3, 20480, 20480, 4096, 1264, 0x4358080b +0, 24576, 24576, 4096, 1279, 0xf63b158e +1, 24576, 24576, 4096, 1279, 0xf63b158e +2, 24576, 24576, 4096, 1279, 0xf63b158e +3, 24576, 24576, 4096, 1279, 0xf63b158e +0, 28672, 28672, 4096, 1310, 0x1f77ff91 +1, 28672, 28672, 4096, 1310, 0x1f77ff91 +2, 28672, 28672, 4096, 1310, 0x1f77ff91 +3, 28672, 28672, 4096, 1310, 0x1f77ff91 +0, 32768, 32768, 4096, 1320, 0xea180f1a +1, 32768, 32768, 4096, 1320, 0xea180f1a +2, 32768, 32768, 4096, 1320, 0xea180f1a +3, 32768, 32768, 4096, 1320, 0xea180f1a +0, 36864, 36864, 4096, 1251, 0x0b380fcb +1, 36864, 36864, 4096, 1251, 0x0b380fcb +2, 36864, 36864, 4096, 1251, 0x0b380fcb +3, 36864, 36864, 4096, 1251, 0x0b380fcb +0, 40960, 40960, 4096, 1093, 0x6c429ba0 +1, 40960, 40960, 4096, 1093, 0x6c429ba0 +2, 40960, 40960, 4096, 1093, 0x6c429ba0 +3, 40960, 40960, 4096, 1093, 0x6c429ba0 [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/iamf-stereo b/tests/ref/fate/iamf-stereo index 843d1525e5..5a0567df6e 100644 --- a/tests/ref/fate/iamf-stereo +++ b/tests/ref/fate/iamf-stereo @@ -1,21 +1,22 @@ -4000d96f7363212c5a75c6f7fa5756f5 *tests/data/fate/iamf-stereo.iamf -14426 tests/data/fate/iamf-stereo.iamf -#extradata 0: 34, 0xafa70d5e +6367d64b7488bb90a1c9d8fbe05458da *tests/data/fate/iamf-stereo.iamf +14255 tests/data/fate/iamf-stereo.iamf +#extradata 0: 34, 0x94110c4f #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac #sample_rate 0: 44100 #channel_layout_name 0: stereo -0, 0, 0, 4608, 1399, 0x6e89566e -0, 4608, 4608, 4608, 1442, 0x6c3c5b13 -0, 9216, 9216, 4608, 1380, 0xc497571b -0, 13824, 13824, 4608, 1383, 0x48e9510f -0, 18432, 18432, 4608, 1572, 0x9a514719 -0, 23040, 23040, 4608, 1391, 0x74ac5014 -0, 27648, 27648, 4608, 1422, 0x2f9d47c5 -0, 32256, 32256, 4608, 1768, 0x2a044b99 -0, 36864, 36864, 4608, 1534, 0xb0b35a3f -0, 41472, 41472, 4608, 926, 0xc26a5eae +0, 0, 0, 4096, 1323, 0xb9bc0f9a +0, 4096, 4096, 4096, 1254, 0xf7e910bc +0, 8192, 8192, 4096, 1320, 0xe4fe09c9 +0, 12288, 12288, 4096, 1280, 0x22e9127e +0, 16384, 16384, 4096, 1331, 0x8bc61bbf +0, 20480, 20480, 4096, 1267, 0x2c4708fa +0, 24576, 24576, 4096, 1282, 0x0438152d +0, 28672, 28672, 4096, 1313, 0x2e79ffa2 +0, 32768, 32768, 4096, 1323, 0xb9f70fce +0, 36864, 36864, 4096, 1254, 0xf6f01051 +0, 40960, 40960, 4096, 1096, 0xa3059b16 [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update index 7bd2080f08..79acbb7426 100644 --- a/tests/ref/fate/matroska-flac-extradata-update +++ b/tests/ref/fate/matroska-flac-extradata-update @@ -1,8 +1,8 @@ -099e0feb5990575e2b46ed9abafc998a *tests/data/fate/matroska-flac-extradata-update.matroska +75ec39f0faaaff953e2d46b431acc307 *tests/data/fate/matroska-flac-extradata-update.matroska 1828 tests/data/fate/matroska-flac-extradata-update.matroska -#extradata 0: 34, 0x93650c81 -#extradata 1: 34, 0x93650c81 -#extradata 2: 34, 0x93650c81 +#extradata 0: 34, 0x7166090c +#extradata 1: 34, 0x7166090c +#extradata 2: 34, 0x7166090c #tb 0: 1/1000 #media_type 0: audio #codec_id 0: flac @@ -18,27 +18,27 @@ #codec_id 2: flac #sample_rate 2: 48000 #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, 0, 0, 85, 26, 0x50f80431 +1, 0, 0, 85, 26, 0x50f80431 +2, 0, 0, 85, 26, 0x50f80431 +0, 85, 85, 85, 26, 0x50d30416 +1, 85, 85, 85, 26, 0x50d30416 +2, 85, 85, 85, 26, 0x50d30416 +0, 171, 171, 85, 26, 0x51ee046f +1, 171, 171, 85, 26, 0x51ee046f +2, 171, 171, 85, 26, 0x51ee046f +0, 256, 256, 85, 26, 0x521d0458 +1, 256, 256, 85, 26, 0x521d0458 +2, 256, 256, 85, 26, 0x521d0458 +0, 341, 341, 85, 26, 0x531c043d +1, 341, 341, 85, 26, 0x531c043d +2, 341, 341, 85, 26, 0x531c043d +0, 427, 427, 85, 26, 0x53cf0442 +1, 427, 427, 85, 26, 0x53cf0442 +2, 427, 427, 85, 26, 0x53cf0442 +0, 512, 512, 85, 26, 0x536a0473 +1, 512, 512, 85, 26, 0x536a0473 +2, 512, 512, 85, 26, 0x536a0473 +0, 597, 597, 85, 26, 0x5321046c +1, 597, 597, 85, 26, 0x5321046c +2, 597, 597, 85, 26, 0x5321046c diff --git a/tests/ref/fate/mov-mp4-iamf-5_1_4 b/tests/ref/fate/mov-mp4-iamf-5_1_4 index 9eaa5ee42d..e5ce65f8e6 100644 --- a/tests/ref/fate/mov-mp4-iamf-5_1_4 +++ b/tests/ref/fate/mov-mp4-iamf-5_1_4 @@ -1,11 +1,11 @@ -0316d0a483480ccd582fd20f06c77420 *tests/data/fate/mov-mp4-iamf-5_1_4.mp4 -86340 tests/data/fate/mov-mp4-iamf-5_1_4.mp4 -#extradata 0: 34, 0xafa70d5e -#extradata 1: 34, 0xafa70d5e -#extradata 2: 34, 0xaf7b0d5c -#extradata 3: 34, 0xaf7b0d5c -#extradata 4: 34, 0xafa70d5e -#extradata 5: 34, 0xafa70d5e +e36699ae6a8a167c38f9fdbee2dd64c3 *tests/data/fate/mov-mp4-iamf-5_1_4.mp4 +85314 tests/data/fate/mov-mp4-iamf-5_1_4.mp4 +#extradata 0: 34, 0x94110c4f +#extradata 1: 34, 0x94110c4f +#extradata 2: 34, 0x93e50c4d +#extradata 3: 34, 0x93e50c4d +#extradata 4: 34, 0x94110c4f +#extradata 5: 34, 0x94110c4f #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -36,66 +36,72 @@ #codec_id 5: flac #sample_rate 5: 44100 #channel_layout_name 5: stereo -0, 0, 0, 4608, 1399, 0x6e89566e -1, 0, 0, 4608, 1399, 0x6e89566e -2, 0, 0, 4608, 1396, 0x0dcb5677 -3, 0, 0, 4608, 1396, 0x0dcb5677 -4, 0, 0, 4608, 1399, 0x6e89566e -5, 0, 0, 4608, 1399, 0x6e89566e -0, 4608, 4608, 4608, 1442, 0x6c3c5b13 -1, 4608, 4608, 4608, 1442, 0x6c3c5b13 -2, 4608, 4608, 4608, 1439, 0xc46b5ac5 -3, 4608, 4608, 4608, 1439, 0xc46b5ac5 -4, 4608, 4608, 4608, 1442, 0x6c3c5b13 -5, 4608, 4608, 4608, 1442, 0x6c3c5b13 -0, 9216, 9216, 4608, 1380, 0xc497571b -1, 9216, 9216, 4608, 1380, 0xc497571b -2, 9216, 9216, 4608, 1377, 0x5b2a55fe -3, 9216, 9216, 4608, 1377, 0x5b2a55fe -4, 9216, 9216, 4608, 1380, 0xc497571b -5, 9216, 9216, 4608, 1380, 0xc497571b -0, 13824, 13824, 4608, 1383, 0x48e9510f -1, 13824, 13824, 4608, 1383, 0x48e9510f -2, 13824, 13824, 4608, 1380, 0x045550d3 -3, 13824, 13824, 4608, 1380, 0x045550d3 -4, 13824, 13824, 4608, 1383, 0x48e9510f -5, 13824, 13824, 4608, 1383, 0x48e9510f -0, 18432, 18432, 4608, 1572, 0x9a514719 -1, 18432, 18432, 4608, 1572, 0x9a514719 -2, 18432, 18432, 4608, 1568, 0xa2bc45f4 -3, 18432, 18432, 4608, 1568, 0xa2bc45f4 -4, 18432, 18432, 4608, 1572, 0x9a514719 -5, 18432, 18432, 4608, 1572, 0x9a514719 -0, 23040, 23040, 4608, 1391, 0x74ac5014 -1, 23040, 23040, 4608, 1391, 0x74ac5014 -2, 23040, 23040, 4608, 1388, 0x96c85007 -3, 23040, 23040, 4608, 1388, 0x96c85007 -4, 23040, 23040, 4608, 1391, 0x74ac5014 -5, 23040, 23040, 4608, 1391, 0x74ac5014 -0, 27648, 27648, 4608, 1422, 0x2f9d47c5 -1, 27648, 27648, 4608, 1422, 0x2f9d47c5 -2, 27648, 27648, 4608, 1419, 0x4d4d466a -3, 27648, 27648, 4608, 1419, 0x4d4d466a -4, 27648, 27648, 4608, 1422, 0x2f9d47c5 -5, 27648, 27648, 4608, 1422, 0x2f9d47c5 -0, 32256, 32256, 4608, 1768, 0x2a044b99 -1, 32256, 32256, 4608, 1768, 0x2a044b99 -2, 32256, 32256, 4608, 1765, 0xacb84b24 -3, 32256, 32256, 4608, 1765, 0xacb84b24 -4, 32256, 32256, 4608, 1768, 0x2a044b99 -5, 32256, 32256, 4608, 1768, 0x2a044b99 -0, 36864, 36864, 4608, 1534, 0xb0b35a3f -1, 36864, 36864, 4608, 1534, 0xb0b35a3f -2, 36864, 36864, 4608, 1531, 0x996458aa -3, 36864, 36864, 4608, 1531, 0x996458aa -4, 36864, 36864, 4608, 1534, 0xb0b35a3f -5, 36864, 36864, 4608, 1534, 0xb0b35a3f -0, 41472, 41472, 2628, 926, 0xc26a5eae -1, 41472, 41472, 2628, 926, 0xc26a5eae -2, 41472, 41472, 2628, 923, 0xa7225edf -3, 41472, 41472, 2628, 923, 0xa7225edf -4, 41472, 41472, 2628, 926, 0xc26a5eae -5, 41472, 41472, 2628, 926, 0xc26a5eae +0, 0, 0, 4096, 1323, 0xb9bc0f9a +1, 0, 0, 4096, 1323, 0xb9bc0f9a +2, 0, 0, 4096, 1320, 0x45220e92 +3, 0, 0, 4096, 1320, 0x45220e92 +4, 0, 0, 4096, 1323, 0xb9bc0f9a +5, 0, 0, 4096, 1323, 0xb9bc0f9a +0, 4096, 4096, 4096, 1254, 0xf7e910bc +1, 4096, 4096, 4096, 1254, 0xf7e910bc +2, 4096, 4096, 4096, 1251, 0x70521040 +3, 4096, 4096, 4096, 1251, 0x70521040 +4, 4096, 4096, 4096, 1254, 0xf7e910bc +5, 4096, 4096, 4096, 1254, 0xf7e910bc +0, 8192, 8192, 4096, 1320, 0xe4fe09c9 +1, 8192, 8192, 4096, 1320, 0xe4fe09c9 +2, 8192, 8192, 4096, 1317, 0x6c5408ea +3, 8192, 8192, 4096, 1317, 0x6c5408ea +4, 8192, 8192, 4096, 1320, 0xe4fe09c9 +5, 8192, 8192, 4096, 1320, 0xe4fe09c9 +0, 12288, 12288, 4096, 1280, 0x22e9127e +1, 12288, 12288, 4096, 1280, 0x22e9127e +2, 12288, 12288, 4096, 1277, 0xa6e11330 +3, 12288, 12288, 4096, 1277, 0xa6e11330 +4, 12288, 12288, 4096, 1280, 0x22e9127e +5, 12288, 12288, 4096, 1280, 0x22e9127e +0, 16384, 16384, 4096, 1331, 0x8bc61bbf +1, 16384, 16384, 4096, 1331, 0x8bc61bbf +2, 16384, 16384, 4096, 1328, 0x21371b83 +3, 16384, 16384, 4096, 1328, 0x21371b83 +4, 16384, 16384, 4096, 1331, 0x8bc61bbf +5, 16384, 16384, 4096, 1331, 0x8bc61bbf +0, 20480, 20480, 4096, 1267, 0x2c4708fa +1, 20480, 20480, 4096, 1267, 0x2c4708fa +2, 20480, 20480, 4096, 1264, 0x4358080b +3, 20480, 20480, 4096, 1264, 0x4358080b +4, 20480, 20480, 4096, 1267, 0x2c4708fa +5, 20480, 20480, 4096, 1267, 0x2c4708fa +0, 24576, 24576, 4096, 1282, 0x0438152d +1, 24576, 24576, 4096, 1282, 0x0438152d +2, 24576, 24576, 4096, 1279, 0xf63b158e +3, 24576, 24576, 4096, 1279, 0xf63b158e +4, 24576, 24576, 4096, 1282, 0x0438152d +5, 24576, 24576, 4096, 1282, 0x0438152d +0, 28672, 28672, 4096, 1313, 0x2e79ffa2 +1, 28672, 28672, 4096, 1313, 0x2e79ffa2 +2, 28672, 28672, 4096, 1310, 0x1f77ff91 +3, 28672, 28672, 4096, 1310, 0x1f77ff91 +4, 28672, 28672, 4096, 1313, 0x2e79ffa2 +5, 28672, 28672, 4096, 1313, 0x2e79ffa2 +0, 32768, 32768, 4096, 1323, 0xb9f70fce +1, 32768, 32768, 4096, 1323, 0xb9f70fce +2, 32768, 32768, 4096, 1320, 0xea180f1a +3, 32768, 32768, 4096, 1320, 0xea180f1a +4, 32768, 32768, 4096, 1323, 0xb9f70fce +5, 32768, 32768, 4096, 1323, 0xb9f70fce +0, 36864, 36864, 4096, 1254, 0xf6f01051 +1, 36864, 36864, 4096, 1254, 0xf6f01051 +2, 36864, 36864, 4096, 1251, 0x0b380fcb +3, 36864, 36864, 4096, 1251, 0x0b380fcb +4, 36864, 36864, 4096, 1254, 0xf6f01051 +5, 36864, 36864, 4096, 1254, 0xf6f01051 +0, 40960, 40960, 3140, 1096, 0xa3059b16 +1, 40960, 40960, 3140, 1096, 0xa3059b16 +2, 40960, 40960, 3140, 1093, 0x6c429ba0 +3, 40960, 40960, 3140, 1093, 0x6c429ba0 +4, 40960, 40960, 3140, 1096, 0xa3059b16 +5, 40960, 40960, 3140, 1096, 0xa3059b16 [STREAM_GROUP] index=0 id=0x1 @@ -131,10 +137,10 @@ nb_subblocks=1 type=1 parameter_id=998 parameter_rate=44100 -duration=4608 -constant_subblock_duration=4608 +duration=4096 +constant_subblock_duration=4096 [PIECE] -subblock_duration=4608 +subblock_duration=4096 dmixp_mode=1 [/PIECE] [/SUBCOMPONENT] diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first index 50867b4f2b..543226f4dd 100644 --- a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first +++ b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first @@ -1,11 +1,11 @@ #extradata 0: 30, 0x47ab0576 -#extradata 1: 34, 0xafa70d5e -#extradata 2: 34, 0xafa70d5e -#extradata 3: 34, 0xaf7b0d5c -#extradata 4: 34, 0xaf7b0d5c -#extradata 5: 34, 0xafa70d5e -#extradata 6: 34, 0xafa70d5e -#extradata 7: 34, 0xafa70d5e +#extradata 1: 34, 0x94110c4f +#extradata 2: 34, 0x94110c4f +#extradata 3: 34, 0x93e50c4d +#extradata 4: 34, 0x93e50c4d +#extradata 5: 34, 0x94110c4f +#extradata 6: 34, 0x94110c4f +#extradata 7: 34, 0x94110c4f #tb 0: 1/12800 #media_type 0: video #codec_id 0: mpeg4 @@ -47,99 +47,106 @@ #sample_rate 7: 44100 #channel_layout_name 7: stereo 0, 0, 0, 512, 42002, 0xef0e5124 -1, 0, 0, 4608, 1399, 0x6e89566e -2, 0, 0, 4608, 1399, 0x6e89566e -3, 0, 0, 4608, 1396, 0x0dcb5677 -4, 0, 0, 4608, 1396, 0x0dcb5677 -5, 0, 0, 4608, 1399, 0x6e89566e -6, 0, 0, 4608, 1399, 0x6e89566e -7, 0, 0, 4608, 1399, 0x6e89566e +1, 0, 0, 4096, 1323, 0xb9bc0f9a +2, 0, 0, 4096, 1323, 0xb9bc0f9a +3, 0, 0, 4096, 1320, 0x45220e92 +4, 0, 0, 4096, 1320, 0x45220e92 +5, 0, 0, 4096, 1323, 0xb9bc0f9a +6, 0, 0, 4096, 1323, 0xb9bc0f9a +7, 0, 0, 4096, 1323, 0xb9bc0f9a 0, 512, 512, 512, 52619, 0xc794e830, F=0x0 0, 1024, 1024, 512, 51242, 0xf2f6be7f, F=0x0 -1, 4608, 4608, 4608, 1442, 0x6c3c5b13 -2, 4608, 4608, 4608, 1442, 0x6c3c5b13 -3, 4608, 4608, 4608, 1439, 0xc46b5ac5 -4, 4608, 4608, 4608, 1439, 0xc46b5ac5 -5, 4608, 4608, 4608, 1442, 0x6c3c5b13 -6, 4608, 4608, 4608, 1442, 0x6c3c5b13 -7, 4608, 4608, 4608, 1442, 0x6c3c5b13 +1, 4096, 4096, 4096, 1254, 0xf7e910bc +2, 4096, 4096, 4096, 1254, 0xf7e910bc +3, 4096, 4096, 4096, 1251, 0x70521040 +4, 4096, 4096, 4096, 1251, 0x70521040 +5, 4096, 4096, 4096, 1254, 0xf7e910bc +6, 4096, 4096, 4096, 1254, 0xf7e910bc +7, 4096, 4096, 4096, 1254, 0xf7e910bc 0, 1536, 1536, 512, 49320, 0xe87a921f, F=0x0 0, 2048, 2048, 512, 22461, 0xc858a20b, F=0x0 +1, 8192, 8192, 4096, 1320, 0xe4fe09c9 +2, 8192, 8192, 4096, 1320, 0xe4fe09c9 +3, 8192, 8192, 4096, 1317, 0x6c5408ea +4, 8192, 8192, 4096, 1317, 0x6c5408ea +5, 8192, 8192, 4096, 1320, 0xe4fe09c9 +6, 8192, 8192, 4096, 1320, 0xe4fe09c9 +7, 8192, 8192, 4096, 1320, 0xe4fe09c9 0, 2560, 2560, 512, 16731, 0x04beb863, F=0x0 -1, 9216, 9216, 4608, 1380, 0xc497571b -2, 9216, 9216, 4608, 1380, 0xc497571b -3, 9216, 9216, 4608, 1377, 0x5b2a55fe -4, 9216, 9216, 4608, 1377, 0x5b2a55fe -5, 9216, 9216, 4608, 1380, 0xc497571b -6, 9216, 9216, 4608, 1380, 0xc497571b -7, 9216, 9216, 4608, 1380, 0xc497571b 0, 3072, 3072, 512, 9983, 0x091aa8e8, F=0x0 +1, 12288, 12288, 4096, 1280, 0x22e9127e +2, 12288, 12288, 4096, 1280, 0x22e9127e +3, 12288, 12288, 4096, 1277, 0xa6e11330 +4, 12288, 12288, 4096, 1277, 0xa6e11330 +5, 12288, 12288, 4096, 1280, 0x22e9127e +6, 12288, 12288, 4096, 1280, 0x22e9127e +7, 12288, 12288, 4096, 1280, 0x22e9127e 0, 3584, 3584, 512, 6991, 0xa0385313, F=0x0 -1, 13824, 13824, 4608, 1383, 0x48e9510f -2, 13824, 13824, 4608, 1383, 0x48e9510f -3, 13824, 13824, 4608, 1380, 0x045550d3 -4, 13824, 13824, 4608, 1380, 0x045550d3 -5, 13824, 13824, 4608, 1383, 0x48e9510f -6, 13824, 13824, 4608, 1383, 0x48e9510f -7, 13824, 13824, 4608, 1383, 0x48e9510f 0, 4096, 4096, 512, 5825, 0x3c97cfbc, F=0x0 0, 4608, 4608, 512, 4331, 0xbaf5f982, F=0x0 +1, 16384, 16384, 4096, 1331, 0x8bc61bbf +2, 16384, 16384, 4096, 1331, 0x8bc61bbf +3, 16384, 16384, 4096, 1328, 0x21371b83 +4, 16384, 16384, 4096, 1328, 0x21371b83 +5, 16384, 16384, 4096, 1331, 0x8bc61bbf +6, 16384, 16384, 4096, 1331, 0x8bc61bbf +7, 16384, 16384, 4096, 1331, 0x8bc61bbf 0, 5120, 5120, 512, 2541, 0xe018c3cb, F=0x0 -1, 18432, 18432, 4608, 1572, 0x9a514719 -2, 18432, 18432, 4608, 1572, 0x9a514719 -3, 18432, 18432, 4608, 1568, 0xa2bc45f4 -4, 18432, 18432, 4608, 1568, 0xa2bc45f4 -5, 18432, 18432, 4608, 1572, 0x9a514719 -6, 18432, 18432, 4608, 1572, 0x9a514719 -7, 18432, 18432, 4608, 1572, 0x9a514719 0, 5632, 5632, 512, 2655, 0xf98af7a1, F=0x0 +1, 20480, 20480, 4096, 1267, 0x2c4708fa +2, 20480, 20480, 4096, 1267, 0x2c4708fa +3, 20480, 20480, 4096, 1264, 0x4358080b +4, 20480, 20480, 4096, 1264, 0x4358080b +5, 20480, 20480, 4096, 1267, 0x2c4708fa +6, 20480, 20480, 4096, 1267, 0x2c4708fa +7, 20480, 20480, 4096, 1267, 0x2c4708fa 0, 6144, 6144, 512, 13464, 0x33e5196f 0, 6656, 6656, 512, 2587, 0x90e198aa, F=0x0 -1, 23040, 23040, 4608, 1391, 0x74ac5014 -2, 23040, 23040, 4608, 1391, 0x74ac5014 -3, 23040, 23040, 4608, 1388, 0x96c85007 -4, 23040, 23040, 4608, 1388, 0x96c85007 -5, 23040, 23040, 4608, 1391, 0x74ac5014 -6, 23040, 23040, 4608, 1391, 0x74ac5014 -7, 23040, 23040, 4608, 1391, 0x74ac5014 +1, 24576, 24576, 4096, 1282, 0x0438152d +2, 24576, 24576, 4096, 1282, 0x0438152d +3, 24576, 24576, 4096, 1279, 0xf63b158e +4, 24576, 24576, 4096, 1279, 0xf63b158e +5, 24576, 24576, 4096, 1282, 0x0438152d +6, 24576, 24576, 4096, 1282, 0x0438152d +7, 24576, 24576, 4096, 1282, 0x0438152d 0, 7168, 7168, 512, 2313, 0x698c429b, F=0x0 0, 7680, 7680, 512, 2123, 0x63a3f034, F=0x0 -1, 27648, 27648, 4608, 1422, 0x2f9d47c5 -2, 27648, 27648, 4608, 1422, 0x2f9d47c5 -3, 27648, 27648, 4608, 1419, 0x4d4d466a -4, 27648, 27648, 4608, 1419, 0x4d4d466a -5, 27648, 27648, 4608, 1422, 0x2f9d47c5 -6, 27648, 27648, 4608, 1422, 0x2f9d47c5 -7, 27648, 27648, 4608, 1422, 0x2f9d47c5 0, 8192, 8192, 512, 2222, 0x442b233d, F=0x0 +1, 28672, 28672, 4096, 1313, 0x2e79ffa2 +2, 28672, 28672, 4096, 1313, 0x2e79ffa2 +3, 28672, 28672, 4096, 1310, 0x1f77ff91 +4, 28672, 28672, 4096, 1310, 0x1f77ff91 +5, 28672, 28672, 4096, 1313, 0x2e79ffa2 +6, 28672, 28672, 4096, 1313, 0x2e79ffa2 +7, 28672, 28672, 4096, 1313, 0x2e79ffa2 0, 8704, 8704, 512, 2332, 0x24c75b04, F=0x0 0, 9216, 9216, 512, 2302, 0xa0fa2ee7, F=0x0 -1, 32256, 32256, 4608, 1768, 0x2a044b99 -2, 32256, 32256, 4608, 1768, 0x2a044b99 -3, 32256, 32256, 4608, 1765, 0xacb84b24 -4, 32256, 32256, 4608, 1765, 0xacb84b24 -5, 32256, 32256, 4608, 1768, 0x2a044b99 -6, 32256, 32256, 4608, 1768, 0x2a044b99 -7, 32256, 32256, 4608, 1768, 0x2a044b99 +1, 32768, 32768, 4096, 1323, 0xb9f70fce +2, 32768, 32768, 4096, 1323, 0xb9f70fce +3, 32768, 32768, 4096, 1320, 0xea180f1a +4, 32768, 32768, 4096, 1320, 0xea180f1a +5, 32768, 32768, 4096, 1323, 0xb9f70fce +6, 32768, 32768, 4096, 1323, 0xb9f70fce +7, 32768, 32768, 4096, 1323, 0xb9f70fce 0, 9728, 9728, 512, 1740, 0xdf772eb3, F=0x0 0, 10240, 10240, 512, 1994, 0x8830ad23, F=0x0 -1, 36864, 36864, 4608, 1534, 0xb0b35a3f -2, 36864, 36864, 4608, 1534, 0xb0b35a3f -3, 36864, 36864, 4608, 1531, 0x996458aa -4, 36864, 36864, 4608, 1531, 0x996458aa -5, 36864, 36864, 4608, 1534, 0xb0b35a3f -6, 36864, 36864, 4608, 1534, 0xb0b35a3f -7, 36864, 36864, 4608, 1534, 0xb0b35a3f +1, 36864, 36864, 4096, 1254, 0xf6f01051 +2, 36864, 36864, 4096, 1254, 0xf6f01051 +3, 36864, 36864, 4096, 1251, 0x0b380fcb +4, 36864, 36864, 4096, 1251, 0x0b380fcb +5, 36864, 36864, 4096, 1254, 0xf6f01051 +6, 36864, 36864, 4096, 1254, 0xf6f01051 +7, 36864, 36864, 4096, 1254, 0xf6f01051 0, 10752, 10752, 512, 1884, 0x2c567db6, F=0x0 0, 11264, 11264, 512, 1880, 0x72237c52, F=0x0 0, 11776, 11776, 512, 1970, 0x60708ff8, F=0x0 -1, 41472, 41472, 2628, 926, 0xc26a5eae -2, 41472, 41472, 2628, 926, 0xc26a5eae -3, 41472, 41472, 2628, 923, 0xa7225edf -4, 41472, 41472, 2628, 923, 0xa7225edf -5, 41472, 41472, 2628, 926, 0xc26a5eae -6, 41472, 41472, 2628, 926, 0xc26a5eae -7, 41472, 41472, 2628, 926, 0xc26a5eae +1, 40960, 40960, 3140, 1096, 0xa3059b16 +2, 40960, 40960, 3140, 1096, 0xa3059b16 +3, 40960, 40960, 3140, 1093, 0x6c429ba0 +4, 40960, 40960, 3140, 1093, 0x6c429ba0 +5, 40960, 40960, 3140, 1096, 0xa3059b16 +6, 40960, 40960, 3140, 1096, 0xa3059b16 +7, 40960, 40960, 3140, 1096, 0xa3059b16 0, 12288, 12288, 512, 11659, 0x6bcb830e [STREAM_GROUP] index=0 @@ -176,10 +183,10 @@ nb_subblocks=1 type=1 parameter_id=998 parameter_rate=44100 -duration=4608 -constant_subblock_duration=4608 +duration=4096 +constant_subblock_duration=4096 [PIECE] -subblock_duration=4608 +subblock_duration=4096 dmixp_mode=1 [/PIECE] [/SUBCOMPONENT] diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-2 b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-2 index 1f86432730..aebc93f25b 100644 --- a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-2 +++ b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-2 @@ -1,16 +1,17 @@ -#extradata 0: 34, 0xafa70d5e +#extradata 0: 34, 0x94110c4f #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac #sample_rate 0: 44100 #channel_layout_name 0: stereo -0, 0, 0, 4608, 1399, 0x6e89566e -0, 4608, 4608, 4608, 1442, 0x6c3c5b13 -0, 9216, 9216, 4608, 1380, 0xc497571b -0, 13824, 13824, 4608, 1383, 0x48e9510f -0, 18432, 18432, 4608, 1572, 0x9a514719 -0, 23040, 23040, 4608, 1391, 0x74ac5014 -0, 27648, 27648, 4608, 1422, 0x2f9d47c5 -0, 32256, 32256, 4608, 1768, 0x2a044b99 -0, 36864, 36864, 4608, 1534, 0xb0b35a3f -0, 41472, 41472, 2628, 926, 0xc26a5eae +0, 0, 0, 4096, 1323, 0xb9bc0f9a +0, 4096, 4096, 4096, 1254, 0xf7e910bc +0, 8192, 8192, 4096, 1320, 0xe4fe09c9 +0, 12288, 12288, 4096, 1280, 0x22e9127e +0, 16384, 16384, 4096, 1331, 0x8bc61bbf +0, 20480, 20480, 4096, 1267, 0x2c4708fa +0, 24576, 24576, 4096, 1282, 0x0438152d +0, 28672, 28672, 4096, 1313, 0x2e79ffa2 +0, 32768, 32768, 4096, 1323, 0xb9f70fce +0, 36864, 36864, 4096, 1254, 0xf6f01051 +0, 40960, 40960, 3140, 1096, 0xa3059b16 diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-3 b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-3 index 88e4d18e4e..0eda931063 100644 --- a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-3 +++ b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-3 @@ -1,16 +1,17 @@ -#extradata 0: 34, 0xaf7b0d5c +#extradata 0: 34, 0x93e50c4d #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac #sample_rate 0: 44100 #channel_layout_name 0: mono -0, 0, 0, 4608, 1396, 0x0dcb5677 -0, 4608, 4608, 4608, 1439, 0xc46b5ac5 -0, 9216, 9216, 4608, 1377, 0x5b2a55fe -0, 13824, 13824, 4608, 1380, 0x045550d3 -0, 18432, 18432, 4608, 1568, 0xa2bc45f4 -0, 23040, 23040, 4608, 1388, 0x96c85007 -0, 27648, 27648, 4608, 1419, 0x4d4d466a -0, 32256, 32256, 4608, 1765, 0xacb84b24 -0, 36864, 36864, 4608, 1531, 0x996458aa -0, 41472, 41472, 2628, 923, 0xa7225edf +0, 0, 0, 4096, 1320, 0x45220e92 +0, 4096, 4096, 4096, 1251, 0x70521040 +0, 8192, 8192, 4096, 1317, 0x6c5408ea +0, 12288, 12288, 4096, 1277, 0xa6e11330 +0, 16384, 16384, 4096, 1328, 0x21371b83 +0, 20480, 20480, 4096, 1264, 0x4358080b +0, 24576, 24576, 4096, 1279, 0xf63b158e +0, 28672, 28672, 4096, 1310, 0x1f77ff91 +0, 32768, 32768, 4096, 1320, 0xea180f1a +0, 36864, 36864, 4096, 1251, 0x0b380fcb +0, 40960, 40960, 3140, 1093, 0x6c429ba0 diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last index 80c924c821..563a1aa015 100644 --- a/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last +++ b/tests/ref/fate/mov-mp4-iamf-7_1_4-video-last @@ -1,12 +1,12 @@ -d398cd7938efbe3dc570b407fe543a31 *tests/data/fate/mov-mp4-iamf-7_1_4-video-last.mp4 -416629 tests/data/fate/mov-mp4-iamf-7_1_4-video-last.mp4 -#extradata 0: 34, 0xafa70d5e -#extradata 1: 34, 0xafa70d5e -#extradata 2: 34, 0xaf7b0d5c -#extradata 3: 34, 0xaf7b0d5c -#extradata 4: 34, 0xafa70d5e -#extradata 5: 34, 0xafa70d5e -#extradata 6: 34, 0xafa70d5e +f95fad00863071121aed5243f04b9ff0 *tests/data/fate/mov-mp4-iamf-7_1_4-video-last.mp4 +415440 tests/data/fate/mov-mp4-iamf-7_1_4-video-last.mp4 +#extradata 0: 34, 0x94110c4f +#extradata 1: 34, 0x94110c4f +#extradata 2: 34, 0x93e50c4d +#extradata 3: 34, 0x93e50c4d +#extradata 4: 34, 0x94110c4f +#extradata 5: 34, 0x94110c4f +#extradata 6: 34, 0x94110c4f #extradata 7: 30, 0x47ab0576 #tb 0: 1/44100 #media_type 0: audio @@ -48,100 +48,107 @@ d398cd7938efbe3dc570b407fe543a31 *tests/data/fate/mov-mp4-iamf-7_1_4-video-last. #codec_id 7: mpeg4 #dimensions 7: 352x288 #sar 7: 1/1 -0, 0, 0, 4608, 1399, 0x6e89566e -1, 0, 0, 4608, 1399, 0x6e89566e -2, 0, 0, 4608, 1396, 0x0dcb5677 -3, 0, 0, 4608, 1396, 0x0dcb5677 -4, 0, 0, 4608, 1399, 0x6e89566e -5, 0, 0, 4608, 1399, 0x6e89566e -6, 0, 0, 4608, 1399, 0x6e89566e +0, 0, 0, 4096, 1323, 0xb9bc0f9a +1, 0, 0, 4096, 1323, 0xb9bc0f9a +2, 0, 0, 4096, 1320, 0x45220e92 +3, 0, 0, 4096, 1320, 0x45220e92 +4, 0, 0, 4096, 1323, 0xb9bc0f9a +5, 0, 0, 4096, 1323, 0xb9bc0f9a +6, 0, 0, 4096, 1323, 0xb9bc0f9a 7, 0, 0, 512, 42002, 0xef0e5124 7, 512, 512, 512, 52619, 0xc794e830, F=0x0 7, 1024, 1024, 512, 51242, 0xf2f6be7f, F=0x0 -0, 4608, 4608, 4608, 1442, 0x6c3c5b13 -1, 4608, 4608, 4608, 1442, 0x6c3c5b13 -2, 4608, 4608, 4608, 1439, 0xc46b5ac5 -3, 4608, 4608, 4608, 1439, 0xc46b5ac5 -4, 4608, 4608, 4608, 1442, 0x6c3c5b13 -5, 4608, 4608, 4608, 1442, 0x6c3c5b13 -6, 4608, 4608, 4608, 1442, 0x6c3c5b13 +0, 4096, 4096, 4096, 1254, 0xf7e910bc +1, 4096, 4096, 4096, 1254, 0xf7e910bc +2, 4096, 4096, 4096, 1251, 0x70521040 +3, 4096, 4096, 4096, 1251, 0x70521040 +4, 4096, 4096, 4096, 1254, 0xf7e910bc +5, 4096, 4096, 4096, 1254, 0xf7e910bc +6, 4096, 4096, 4096, 1254, 0xf7e910bc 7, 1536, 1536, 512, 49320, 0xe87a921f, F=0x0 7, 2048, 2048, 512, 22461, 0xc858a20b, F=0x0 +0, 8192, 8192, 4096, 1320, 0xe4fe09c9 +1, 8192, 8192, 4096, 1320, 0xe4fe09c9 +2, 8192, 8192, 4096, 1317, 0x6c5408ea +3, 8192, 8192, 4096, 1317, 0x6c5408ea +4, 8192, 8192, 4096, 1320, 0xe4fe09c9 +5, 8192, 8192, 4096, 1320, 0xe4fe09c9 +6, 8192, 8192, 4096, 1320, 0xe4fe09c9 7, 2560, 2560, 512, 16731, 0x04beb863, F=0x0 -0, 9216, 9216, 4608, 1380, 0xc497571b -1, 9216, 9216, 4608, 1380, 0xc497571b -2, 9216, 9216, 4608, 1377, 0x5b2a55fe -3, 9216, 9216, 4608, 1377, 0x5b2a55fe -4, 9216, 9216, 4608, 1380, 0xc497571b -5, 9216, 9216, 4608, 1380, 0xc497571b -6, 9216, 9216, 4608, 1380, 0xc497571b 7, 3072, 3072, 512, 9983, 0x091aa8e8, F=0x0 +0, 12288, 12288, 4096, 1280, 0x22e9127e +1, 12288, 12288, 4096, 1280, 0x22e9127e +2, 12288, 12288, 4096, 1277, 0xa6e11330 +3, 12288, 12288, 4096, 1277, 0xa6e11330 +4, 12288, 12288, 4096, 1280, 0x22e9127e +5, 12288, 12288, 4096, 1280, 0x22e9127e +6, 12288, 12288, 4096, 1280, 0x22e9127e 7, 3584, 3584, 512, 6991, 0xa0385313, F=0x0 -0, 13824, 13824, 4608, 1383, 0x48e9510f -1, 13824, 13824, 4608, 1383, 0x48e9510f -2, 13824, 13824, 4608, 1380, 0x045550d3 -3, 13824, 13824, 4608, 1380, 0x045550d3 -4, 13824, 13824, 4608, 1383, 0x48e9510f -5, 13824, 13824, 4608, 1383, 0x48e9510f -6, 13824, 13824, 4608, 1383, 0x48e9510f 7, 4096, 4096, 512, 5825, 0x3c97cfbc, F=0x0 7, 4608, 4608, 512, 4331, 0xbaf5f982, F=0x0 +0, 16384, 16384, 4096, 1331, 0x8bc61bbf +1, 16384, 16384, 4096, 1331, 0x8bc61bbf +2, 16384, 16384, 4096, 1328, 0x21371b83 +3, 16384, 16384, 4096, 1328, 0x21371b83 +4, 16384, 16384, 4096, 1331, 0x8bc61bbf +5, 16384, 16384, 4096, 1331, 0x8bc61bbf +6, 16384, 16384, 4096, 1331, 0x8bc61bbf 7, 5120, 5120, 512, 2541, 0xe018c3cb, F=0x0 -0, 18432, 18432, 4608, 1572, 0x9a514719 -1, 18432, 18432, 4608, 1572, 0x9a514719 -2, 18432, 18432, 4608, 1568, 0xa2bc45f4 -3, 18432, 18432, 4608, 1568, 0xa2bc45f4 -4, 18432, 18432, 4608, 1572, 0x9a514719 -5, 18432, 18432, 4608, 1572, 0x9a514719 -6, 18432, 18432, 4608, 1572, 0x9a514719 7, 5632, 5632, 512, 2655, 0xf98af7a1, F=0x0 +0, 20480, 20480, 4096, 1267, 0x2c4708fa +1, 20480, 20480, 4096, 1267, 0x2c4708fa +2, 20480, 20480, 4096, 1264, 0x4358080b +3, 20480, 20480, 4096, 1264, 0x4358080b +4, 20480, 20480, 4096, 1267, 0x2c4708fa +5, 20480, 20480, 4096, 1267, 0x2c4708fa +6, 20480, 20480, 4096, 1267, 0x2c4708fa 7, 6144, 6144, 512, 13464, 0x33e5196f 7, 6656, 6656, 512, 2587, 0x90e198aa, F=0x0 -0, 23040, 23040, 4608, 1391, 0x74ac5014 -1, 23040, 23040, 4608, 1391, 0x74ac5014 -2, 23040, 23040, 4608, 1388, 0x96c85007 -3, 23040, 23040, 4608, 1388, 0x96c85007 -4, 23040, 23040, 4608, 1391, 0x74ac5014 -5, 23040, 23040, 4608, 1391, 0x74ac5014 -6, 23040, 23040, 4608, 1391, 0x74ac5014 +0, 24576, 24576, 4096, 1282, 0x0438152d +1, 24576, 24576, 4096, 1282, 0x0438152d +2, 24576, 24576, 4096, 1279, 0xf63b158e +3, 24576, 24576, 4096, 1279, 0xf63b158e +4, 24576, 24576, 4096, 1282, 0x0438152d +5, 24576, 24576, 4096, 1282, 0x0438152d +6, 24576, 24576, 4096, 1282, 0x0438152d 7, 7168, 7168, 512, 2313, 0x698c429b, F=0x0 7, 7680, 7680, 512, 2123, 0x63a3f034, F=0x0 -0, 27648, 27648, 4608, 1422, 0x2f9d47c5 -1, 27648, 27648, 4608, 1422, 0x2f9d47c5 -2, 27648, 27648, 4608, 1419, 0x4d4d466a -3, 27648, 27648, 4608, 1419, 0x4d4d466a -4, 27648, 27648, 4608, 1422, 0x2f9d47c5 -5, 27648, 27648, 4608, 1422, 0x2f9d47c5 -6, 27648, 27648, 4608, 1422, 0x2f9d47c5 7, 8192, 8192, 512, 2222, 0x442b233d, F=0x0 +0, 28672, 28672, 4096, 1313, 0x2e79ffa2 +1, 28672, 28672, 4096, 1313, 0x2e79ffa2 +2, 28672, 28672, 4096, 1310, 0x1f77ff91 +3, 28672, 28672, 4096, 1310, 0x1f77ff91 +4, 28672, 28672, 4096, 1313, 0x2e79ffa2 +5, 28672, 28672, 4096, 1313, 0x2e79ffa2 +6, 28672, 28672, 4096, 1313, 0x2e79ffa2 7, 8704, 8704, 512, 2332, 0x24c75b04, F=0x0 7, 9216, 9216, 512, 2302, 0xa0fa2ee7, F=0x0 -0, 32256, 32256, 4608, 1768, 0x2a044b99 -1, 32256, 32256, 4608, 1768, 0x2a044b99 -2, 32256, 32256, 4608, 1765, 0xacb84b24 -3, 32256, 32256, 4608, 1765, 0xacb84b24 -4, 32256, 32256, 4608, 1768, 0x2a044b99 -5, 32256, 32256, 4608, 1768, 0x2a044b99 -6, 32256, 32256, 4608, 1768, 0x2a044b99 +0, 32768, 32768, 4096, 1323, 0xb9f70fce +1, 32768, 32768, 4096, 1323, 0xb9f70fce +2, 32768, 32768, 4096, 1320, 0xea180f1a +3, 32768, 32768, 4096, 1320, 0xea180f1a +4, 32768, 32768, 4096, 1323, 0xb9f70fce +5, 32768, 32768, 4096, 1323, 0xb9f70fce +6, 32768, 32768, 4096, 1323, 0xb9f70fce 7, 9728, 9728, 512, 1740, 0xdf772eb3, F=0x0 7, 10240, 10240, 512, 1994, 0x8830ad23, F=0x0 -0, 36864, 36864, 4608, 1534, 0xb0b35a3f -1, 36864, 36864, 4608, 1534, 0xb0b35a3f -2, 36864, 36864, 4608, 1531, 0x996458aa -3, 36864, 36864, 4608, 1531, 0x996458aa -4, 36864, 36864, 4608, 1534, 0xb0b35a3f -5, 36864, 36864, 4608, 1534, 0xb0b35a3f -6, 36864, 36864, 4608, 1534, 0xb0b35a3f +0, 36864, 36864, 4096, 1254, 0xf6f01051 +1, 36864, 36864, 4096, 1254, 0xf6f01051 +2, 36864, 36864, 4096, 1251, 0x0b380fcb +3, 36864, 36864, 4096, 1251, 0x0b380fcb +4, 36864, 36864, 4096, 1254, 0xf6f01051 +5, 36864, 36864, 4096, 1254, 0xf6f01051 +6, 36864, 36864, 4096, 1254, 0xf6f01051 7, 10752, 10752, 512, 1884, 0x2c567db6, F=0x0 7, 11264, 11264, 512, 1880, 0x72237c52, F=0x0 7, 11776, 11776, 512, 1970, 0x60708ff8, F=0x0 -0, 41472, 41472, 2628, 926, 0xc26a5eae -1, 41472, 41472, 2628, 926, 0xc26a5eae -2, 41472, 41472, 2628, 923, 0xa7225edf -3, 41472, 41472, 2628, 923, 0xa7225edf -4, 41472, 41472, 2628, 926, 0xc26a5eae -5, 41472, 41472, 2628, 926, 0xc26a5eae -6, 41472, 41472, 2628, 926, 0xc26a5eae +0, 40960, 40960, 3140, 1096, 0xa3059b16 +1, 40960, 40960, 3140, 1096, 0xa3059b16 +2, 40960, 40960, 3140, 1093, 0x6c429ba0 +3, 40960, 40960, 3140, 1093, 0x6c429ba0 +4, 40960, 40960, 3140, 1096, 0xa3059b16 +5, 40960, 40960, 3140, 1096, 0xa3059b16 +6, 40960, 40960, 3140, 1096, 0xa3059b16 7, 12288, 12288, 512, 11659, 0x6bcb830e [STREAM_GROUP] index=0 @@ -178,10 +185,10 @@ nb_subblocks=1 type=1 parameter_id=998 parameter_rate=44100 -duration=4608 -constant_subblock_duration=4608 +duration=4096 +constant_subblock_duration=4096 [PIECE] -subblock_duration=4608 +subblock_duration=4096 dmixp_mode=1 [/PIECE] [/SUBCOMPONENT] diff --git a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 index b6f14099c3..a2642c7393 100644 --- a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 +++ b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 @@ -1,9 +1,9 @@ -b0f4accdb8f1f3dfe594a6cbd6c00603 *tests/data/fate/mov-mp4-iamf-ambisonic_1.mp4 -57743 tests/data/fate/mov-mp4-iamf-ambisonic_1.mp4 -#extradata 0: 34, 0xad120cfe -#extradata 1: 34, 0xad120cfe -#extradata 2: 34, 0xad120cfe -#extradata 3: 34, 0xad120cfe +f8e57d8de34e8e2b6caed88d17939c6b *tests/data/fate/mov-mp4-iamf-ambisonic_1.mp4 +57055 tests/data/fate/mov-mp4-iamf-ambisonic_1.mp4 +#extradata 0: 34, 0x917c0bef +#extradata 1: 34, 0x917c0bef +#extradata 2: 34, 0x917c0bef +#extradata 3: 34, 0x917c0bef #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -24,46 +24,50 @@ b0f4accdb8f1f3dfe594a6cbd6c00603 *tests/data/fate/mov-mp4-iamf-ambisonic_1.mp4 #codec_id 3: flac #sample_rate 3: 44100 #channel_layout_name 3: mono -0, 0, 0, 4608, 1396, 0x0dcb5677 -1, 0, 0, 4608, 1396, 0x0dcb5677 -2, 0, 0, 4608, 1396, 0x0dcb5677 -3, 0, 0, 4608, 1396, 0x0dcb5677 -0, 4608, 4608, 4608, 1439, 0xc46b5ac5 -1, 4608, 4608, 4608, 1439, 0xc46b5ac5 -2, 4608, 4608, 4608, 1439, 0xc46b5ac5 -3, 4608, 4608, 4608, 1439, 0xc46b5ac5 -0, 9216, 9216, 4608, 1377, 0x5b2a55fe -1, 9216, 9216, 4608, 1377, 0x5b2a55fe -2, 9216, 9216, 4608, 1377, 0x5b2a55fe -3, 9216, 9216, 4608, 1377, 0x5b2a55fe -0, 13824, 13824, 4608, 1380, 0x045550d3 -1, 13824, 13824, 4608, 1380, 0x045550d3 -2, 13824, 13824, 4608, 1380, 0x045550d3 -3, 13824, 13824, 4608, 1380, 0x045550d3 -0, 18432, 18432, 4608, 1568, 0xa2bc45f4 -1, 18432, 18432, 4608, 1568, 0xa2bc45f4 -2, 18432, 18432, 4608, 1568, 0xa2bc45f4 -3, 18432, 18432, 4608, 1568, 0xa2bc45f4 -0, 23040, 23040, 4608, 1388, 0x96c85007 -1, 23040, 23040, 4608, 1388, 0x96c85007 -2, 23040, 23040, 4608, 1388, 0x96c85007 -3, 23040, 23040, 4608, 1388, 0x96c85007 -0, 27648, 27648, 4608, 1419, 0x4d4d466a -1, 27648, 27648, 4608, 1419, 0x4d4d466a -2, 27648, 27648, 4608, 1419, 0x4d4d466a -3, 27648, 27648, 4608, 1419, 0x4d4d466a -0, 32256, 32256, 4608, 1765, 0xacb84b24 -1, 32256, 32256, 4608, 1765, 0xacb84b24 -2, 32256, 32256, 4608, 1765, 0xacb84b24 -3, 32256, 32256, 4608, 1765, 0xacb84b24 -0, 36864, 36864, 4608, 1531, 0x996458aa -1, 36864, 36864, 4608, 1531, 0x996458aa -2, 36864, 36864, 4608, 1531, 0x996458aa -3, 36864, 36864, 4608, 1531, 0x996458aa -0, 41472, 41472, 2628, 923, 0xa7225edf -1, 41472, 41472, 2628, 923, 0xa7225edf -2, 41472, 41472, 2628, 923, 0xa7225edf -3, 41472, 41472, 2628, 923, 0xa7225edf +0, 0, 0, 4096, 1320, 0x45220e92 +1, 0, 0, 4096, 1320, 0x45220e92 +2, 0, 0, 4096, 1320, 0x45220e92 +3, 0, 0, 4096, 1320, 0x45220e92 +0, 4096, 4096, 4096, 1251, 0x70521040 +1, 4096, 4096, 4096, 1251, 0x70521040 +2, 4096, 4096, 4096, 1251, 0x70521040 +3, 4096, 4096, 4096, 1251, 0x70521040 +0, 8192, 8192, 4096, 1317, 0x6c5408ea +1, 8192, 8192, 4096, 1317, 0x6c5408ea +2, 8192, 8192, 4096, 1317, 0x6c5408ea +3, 8192, 8192, 4096, 1317, 0x6c5408ea +0, 12288, 12288, 4096, 1277, 0xa6e11330 +1, 12288, 12288, 4096, 1277, 0xa6e11330 +2, 12288, 12288, 4096, 1277, 0xa6e11330 +3, 12288, 12288, 4096, 1277, 0xa6e11330 +0, 16384, 16384, 4096, 1328, 0x21371b83 +1, 16384, 16384, 4096, 1328, 0x21371b83 +2, 16384, 16384, 4096, 1328, 0x21371b83 +3, 16384, 16384, 4096, 1328, 0x21371b83 +0, 20480, 20480, 4096, 1264, 0x4358080b +1, 20480, 20480, 4096, 1264, 0x4358080b +2, 20480, 20480, 4096, 1264, 0x4358080b +3, 20480, 20480, 4096, 1264, 0x4358080b +0, 24576, 24576, 4096, 1279, 0xf63b158e +1, 24576, 24576, 4096, 1279, 0xf63b158e +2, 24576, 24576, 4096, 1279, 0xf63b158e +3, 24576, 24576, 4096, 1279, 0xf63b158e +0, 28672, 28672, 4096, 1310, 0x1f77ff91 +1, 28672, 28672, 4096, 1310, 0x1f77ff91 +2, 28672, 28672, 4096, 1310, 0x1f77ff91 +3, 28672, 28672, 4096, 1310, 0x1f77ff91 +0, 32768, 32768, 4096, 1320, 0xea180f1a +1, 32768, 32768, 4096, 1320, 0xea180f1a +2, 32768, 32768, 4096, 1320, 0xea180f1a +3, 32768, 32768, 4096, 1320, 0xea180f1a +0, 36864, 36864, 4096, 1251, 0x0b380fcb +1, 36864, 36864, 4096, 1251, 0x0b380fcb +2, 36864, 36864, 4096, 1251, 0x0b380fcb +3, 36864, 36864, 4096, 1251, 0x0b380fcb +0, 40960, 40960, 3140, 1093, 0x6c429ba0 +1, 40960, 40960, 3140, 1093, 0x6c429ba0 +2, 40960, 40960, 3140, 1093, 0x6c429ba0 +3, 40960, 40960, 3140, 1093, 0x6c429ba0 [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/mov-mp4-iamf-stereo b/tests/ref/fate/mov-mp4-iamf-stereo index 85e6e3efbb..34e99c5f20 100644 --- a/tests/ref/fate/mov-mp4-iamf-stereo +++ b/tests/ref/fate/mov-mp4-iamf-stereo @@ -1,21 +1,22 @@ -87c17d1a9fd07e16c369d386d39c3249 *tests/data/fate/mov-mp4-iamf-stereo.mp4 -15163 tests/data/fate/mov-mp4-iamf-stereo.mp4 -#extradata 0: 34, 0xafa70d5e +96590f027a304c4afc872bac8bba815c *tests/data/fate/mov-mp4-iamf-stereo.mp4 +14996 tests/data/fate/mov-mp4-iamf-stereo.mp4 +#extradata 0: 34, 0x94110c4f #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac #sample_rate 0: 44100 #channel_layout_name 0: stereo -0, 0, 0, 4608, 1399, 0x6e89566e -0, 4608, 4608, 4608, 1442, 0x6c3c5b13 -0, 9216, 9216, 4608, 1380, 0xc497571b -0, 13824, 13824, 4608, 1383, 0x48e9510f -0, 18432, 18432, 4608, 1572, 0x9a514719 -0, 23040, 23040, 4608, 1391, 0x74ac5014 -0, 27648, 27648, 4608, 1422, 0x2f9d47c5 -0, 32256, 32256, 4608, 1768, 0x2a044b99 -0, 36864, 36864, 4608, 1534, 0xb0b35a3f -0, 41472, 41472, 2628, 926, 0xc26a5eae +0, 0, 0, 4096, 1323, 0xb9bc0f9a +0, 4096, 4096, 4096, 1254, 0xf7e910bc +0, 8192, 8192, 4096, 1320, 0xe4fe09c9 +0, 12288, 12288, 4096, 1280, 0x22e9127e +0, 16384, 16384, 4096, 1331, 0x8bc61bbf +0, 20480, 20480, 4096, 1267, 0x2c4708fa +0, 24576, 24576, 4096, 1282, 0x0438152d +0, 28672, 28672, 4096, 1313, 0x2e79ffa2 +0, 32768, 32768, 4096, 1323, 0xb9f70fce +0, 36864, 36864, 4096, 1254, 0xf6f01051 +0, 40960, 40960, 3140, 1096, 0xa3059b16 [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/lavf/wv b/tests/ref/lavf/wv index 07205093f3..3b0c154761 100644 --- a/tests/ref/lavf/wv +++ b/tests/ref/lavf/wv @@ -1,3 +1,3 @@ -47d9a381d9c3f99b8b059f3b17f1dc11 *tests/data/lavf/lavf.wv -59560 tests/data/lavf/lavf.wv +bb085606d40a45530826269fbbcfaa8e *tests/data/lavf/lavf.wv +61078 tests/data/lavf/lavf.wv tests/data/lavf/lavf.wv CRC=0x3a1da17e diff --git a/tests/ref/seek/acodec-flac b/tests/ref/seek/acodec-flac index f6add9abd2..9f6ea765b0 100644 --- a/tests/ref/seek/acodec-flac +++ b/tests/ref/seek/acodec-flac @@ -1,53 +1,53 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 2137 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 2137 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.880816 pts: 1.880816 pos: 86742 size: 2191 +ret: 0 st: 0 flags:1 dts: 1.857596 pts: 1.857596 pos: 84066 size: 7758 ret: 0 st: 0 flags:0 ts: 0.788345 -ret: 0 st: 0 flags:1 dts: 0.809796 pts: 0.809796 pos: 27366 size: 615 +ret: 0 st: 0 flags:1 dts: 0.835918 pts: 0.835918 pos: 27528 size: 2149 ret: 0 st: 0 flags:1 ts:-0.317506 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 2137 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 2.586122 pts: 2.586122 pos: 145606 size: 2384 +ret: 0 st: 0 flags:1 dts: 2.600635 pts: 2.600635 pos: 145926 size: 8455 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.462857 pts: 1.462857 pos: 53388 size: 1851 +ret: 0 st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos: 48089 size: 6342 ret: 0 st: 0 flags:0 ts: 0.365011 -ret: 0 st: 0 flags:1 dts: 0.365714 pts: 0.365714 pos: 16890 size: 614 +ret: 0 st: 0 flags:1 dts: 0.371519 pts: 0.371519 pos: 16824 size: 2139 ret: 0 st: 0 flags:1 ts:-0.740839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 2137 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 2.168163 pts: 2.168163 pos: 110531 size: 2143 +ret: 0 st: 0 flags:1 dts: 2.229116 pts: 2.229116 pos: 114661 size: 7572 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.044898 pts: 1.044898 pos: 32880 size: 579 +ret: 0 st: 0 flags:1 dts: 1.021678 pts: 1.021678 pos: 31960 size: 2135 ret: 0 st: 0 flags:0 ts:-0.058322 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 2137 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 2.821224 pts: 2.821224 pos: 167112 size: 2391 +ret: 0 st: 0 flags:1 dts: 2.786395 pts: 2.786395 pos: 162845 size: 8470 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.750204 pts: 1.750204 pos: 75788 size: 2191 +ret: 0 st: 0 flags:1 dts: 1.764717 pts: 1.764717 pos: 76312 size: 7754 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.600816 pts: 0.600816 pos: 22446 size: 616 +ret: 0 st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos: 21106 size: 2149 ret: 0 st: 0 flags:0 ts:-0.481655 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 2137 ret: 0 st: 0 flags:1 ts: 2.412494 -ret: 0 st: 0 flags:1 dts: 2.403265 pts: 2.403265 pos: 129793 size: 2138 +ret: 0 st: 0 flags:1 dts: 2.321995 pts: 2.321995 pos: 122233 size: 7569 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.332245 pts: 1.332245 pos: 44812 size: 1609 +ret: 0 st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos: 48089 size: 6342 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.182857 pts: 0.182857 pos: 12572 size: 628 +ret: 0 st: 0 flags:1 dts: 0.185760 pts: 0.185760 pos: 12542 size: 2143 ret: 0 st: 0 flags:0 ts:-0.904989 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 2137 ret: 0 st: 0 flags:1 ts: 1.989184 -ret: 0 st: 0 flags:1 dts: 1.985306 pts: 1.985306 pos: 95508 size: 2169 +ret: 0 st: 0 flags:1 dts: 1.950476 pts: 1.950476 pos: 91824 size: 7672 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.888163 pts: 0.888163 pos: 29211 size: 620 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 29677 size: 2283 ret: 0 st:-1 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 2137 ret: 0 st: 0 flags:0 ts: 2.671678 -ret: 0 st: 0 flags:1 dts: 2.690612 pts: 2.690612 pos: 155154 size: 2394 +ret: 0 st: 0 flags:1 dts: 2.693515 pts: 2.693515 pos: 154381 size: 8464 ret: 0 st: 0 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 1.541224 pts: 1.541224 pos: 59082 size: 1974 +ret: 0 st: 0 flags:1 dts: 1.486077 pts: 1.486077 pos: 54431 size: 6874 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.470204 pts: 0.470204 pos: 19353 size: 608 +ret: 0 st: 0 flags:1 dts: 0.464399 pts: 0.464399 pos: 18963 size: 2143 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 614 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 8256 size: 2137 _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
