This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 412aa488683db12bf1cad5ce6a6af5ddf8c5eeca Author: James Almer <[email protected]> AuthorDate: Thu May 7 19:48:58 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Sat May 16 13:55:23 2026 -0300 fftools/ffmpeg_mux_init: propagate the muxer request for fixed frame size Signed-off-by: James Almer <[email protected]> --- fftools/ffmpeg_mux_init.c | 6 ++++ tests/ref/fate/iamf-5_1_4 | 28 ++++++++-------- tests/ref/fate/iamf-7_1_4 | 32 +++++++++--------- tests/ref/fate/iamf-9_1_6 | 44 ++++++++++++------------- tests/ref/fate/iamf-ambisonic_1 | 20 +++++------ tests/ref/fate/iamf-ambisonic_1-projection | 20 +++++------ tests/ref/fate/iamf-stereo | 8 ++--- tests/ref/fate/mov-mp4-iamf-5_1_4 | 28 ++++++++-------- tests/ref/fate/mov-mp4-iamf-7_1_4-video-first | 28 ++++++++-------- tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-2 | 4 +-- tests/ref/fate/mov-mp4-iamf-7_1_4-video-first-3 | 4 +-- tests/ref/fate/mov-mp4-iamf-7_1_4-video-last | 32 +++++++++--------- tests/ref/fate/mov-mp4-iamf-ambisonic_1 | 20 +++++------ tests/ref/fate/mov-mp4-iamf-stereo | 8 ++--- 14 files changed, 144 insertions(+), 138 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 638c53cfb3..ca84c7d84d 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1531,6 +1531,8 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, if (oc->oformat->flags & AVFMT_GLOBALHEADER && ost->enc) ost->enc->enc_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + if (oc->oformat->flags & AVFMT_FIXED_FRAMESIZE && ost->enc) + ost->enc->enc_ctx->flags2 |= AV_CODEC_FLAG2_FIXED_FRAME_SIZE; opt_match_per_stream_int(ost, &o->copy_initial_nonkeyframes, oc, st, &ms->copy_initial_nonkeyframes); @@ -2653,6 +2655,10 @@ static int of_parse_group_token(Muxer *mux, const char *token, char *ptr) ret = avformat_stream_group_add_stream(stg, oc->streams[idx]); if (ret < 0) goto end; + OutputStream *ost = mux->of.streams[idx]; + if (ost->enc && (type == AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT || + type == AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION)) + ost->enc->enc_ctx->flags2 |= AV_CODEC_FLAG2_FIXED_FRAME_SIZE; } while (e = av_dict_get(dict, "stg", e, 0)) { char *endptr; diff --git a/tests/ref/fate/iamf-5_1_4 b/tests/ref/fate/iamf-5_1_4 index 71c8267afc..7f5bd930ed 100644 --- a/tests/ref/fate/iamf-5_1_4 +++ b/tests/ref/fate/iamf-5_1_4 @@ -1,11 +1,11 @@ -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 +9a64dd4f370f0d89cd2462e3683e689d *tests/data/fate/iamf-5_1_4.iamf +85423 tests/data/fate/iamf-5_1_4.iamf +#extradata 0: 34, 0xa77c0cd6 +#extradata 1: 34, 0xa77c0cd6 +#extradata 2: 34, 0xa7500cd4 +#extradata 3: 34, 0xa7500cd4 +#extradata 4: 34, 0xa77c0cd6 +#extradata 5: 34, 0xa77c0cd6 #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -96,12 +96,12 @@ 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 +0, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +1, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +2, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +3, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +4, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +5, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/iamf-7_1_4 b/tests/ref/fate/iamf-7_1_4 index bd7b2c6004..b0e7ee604c 100644 --- a/tests/ref/fate/iamf-7_1_4 +++ b/tests/ref/fate/iamf-7_1_4 @@ -1,12 +1,12 @@ -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 +78063ed53103369b68902d315c545495 *tests/data/fate/iamf-7_1_4.iamf +99642 tests/data/fate/iamf-7_1_4.iamf +#extradata 0: 34, 0xa77c0cd6 +#extradata 1: 34, 0xa77c0cd6 +#extradata 2: 34, 0xa7500cd4 +#extradata 3: 34, 0xa7500cd4 +#extradata 4: 34, 0xa77c0cd6 +#extradata 5: 34, 0xa77c0cd6 +#extradata 6: 34, 0xa77c0cd6 #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -112,13 +112,13 @@ 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 +0, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +1, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +2, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +3, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +4, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +5, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +6, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/iamf-9_1_6 b/tests/ref/fate/iamf-9_1_6 index 0e7d25d5a5..f2cc676b0c 100644 --- a/tests/ref/fate/iamf-9_1_6 +++ b/tests/ref/fate/iamf-9_1_6 @@ -1,15 +1,15 @@ -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 +ced4047d684733bf84e7796704b49502 *tests/data/fate/iamf-9_1_6.iamf +142298 tests/data/fate/iamf-9_1_6.iamf +#extradata 0: 34, 0xa77c0cd6 +#extradata 1: 34, 0xa77c0cd6 +#extradata 2: 34, 0xa77c0cd6 +#extradata 3: 34, 0xa77c0cd6 +#extradata 4: 34, 0xa77c0cd6 +#extradata 5: 34, 0xa77c0cd6 +#extradata 6: 34, 0xa77c0cd6 +#extradata 7: 34, 0xa7500cd4 +#extradata 8: 34, 0xa7500cd4 +#extradata 9: 34, 0xa77c0cd6 #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -160,16 +160,16 @@ 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 +0, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +1, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +2, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +3, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +4, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +5, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +6, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +7, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +8, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +9, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/iamf-ambisonic_1 b/tests/ref/fate/iamf-ambisonic_1 index 00b2adab59..318383bbff 100644 --- a/tests/ref/fate/iamf-ambisonic_1 +++ b/tests/ref/fate/iamf-ambisonic_1 @@ -1,9 +1,9 @@ -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 +080a07d57dba74ffe9e238832ec7338a *tests/data/fate/iamf-ambisonic_1.iamf +56878 tests/data/fate/iamf-ambisonic_1.iamf +#extradata 0: 34, 0x9f9f0c6b +#extradata 1: 34, 0x9f9f0c6b +#extradata 2: 34, 0x9f9f0c6b +#extradata 3: 34, 0x9f9f0c6b #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -64,10 +64,10 @@ 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 +0, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +1, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +2, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +3, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf [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 983c8812c0..ab8fbb3b66 100644 --- a/tests/ref/fate/iamf-ambisonic_1-projection +++ b/tests/ref/fate/iamf-ambisonic_1-projection @@ -1,9 +1,9 @@ -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 +ed03b6fda77f5bdb1f5da78fcec6ee46 *tests/data/fate/iamf-ambisonic_1-projection.iamf +56907 tests/data/fate/iamf-ambisonic_1-projection.iamf +#extradata 0: 34, 0x9f9f0c6b +#extradata 1: 34, 0x9f9f0c6b +#extradata 2: 34, 0x9f9f0c6b +#extradata 3: 34, 0x9f9f0c6b #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -64,10 +64,10 @@ 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 +0, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +1, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +2, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +3, 40960, 40960, 4096, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/iamf-stereo b/tests/ref/fate/iamf-stereo index 5a0567df6e..659835cbc4 100644 --- a/tests/ref/fate/iamf-stereo +++ b/tests/ref/fate/iamf-stereo @@ -1,6 +1,6 @@ -6367d64b7488bb90a1c9d8fbe05458da *tests/data/fate/iamf-stereo.iamf -14255 tests/data/fate/iamf-stereo.iamf -#extradata 0: 34, 0x94110c4f +76a2b09ad6366df642be576129322f36 *tests/data/fate/iamf-stereo.iamf +14397 tests/data/fate/iamf-stereo.iamf +#extradata 0: 34, 0xa77c0cd6 #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -16,7 +16,7 @@ 0, 28672, 28672, 4096, 1313, 0x2e79ffa2 0, 32768, 32768, 4096, 1323, 0xb9f70fce 0, 36864, 36864, 4096, 1254, 0xf6f01051 -0, 40960, 40960, 4096, 1096, 0xa3059b16 +0, 40960, 40960, 4096, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf [STREAM_GROUP] index=0 id=0x1 diff --git a/tests/ref/fate/mov-mp4-iamf-5_1_4 b/tests/ref/fate/mov-mp4-iamf-5_1_4 index e5ce65f8e6..4a3a4becc0 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 @@ -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 +7c491c82378b97a6347a3c554fb47855 *tests/data/fate/mov-mp4-iamf-5_1_4.mp4 +86164 tests/data/fate/mov-mp4-iamf-5_1_4.mp4 +#extradata 0: 34, 0xa77c0cd6 +#extradata 1: 34, 0xa77c0cd6 +#extradata 2: 34, 0xa7500cd4 +#extradata 3: 34, 0xa7500cd4 +#extradata 4: 34, 0xa77c0cd6 +#extradata 5: 34, 0xa77c0cd6 #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -96,12 +96,12 @@ e36699ae6a8a167c38f9fdbee2dd64c3 *tests/data/fate/mov-mp4-iamf-5_1_4.mp4 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 +0, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +1, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +2, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +3, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +4, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +5, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf [STREAM_GROUP] index=0 id=0x1 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 543226f4dd..af1620575e 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, 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 +#extradata 1: 34, 0xa77c0cd6 +#extradata 2: 34, 0xa77c0cd6 +#extradata 3: 34, 0xa7500cd4 +#extradata 4: 34, 0xa7500cd4 +#extradata 5: 34, 0xa77c0cd6 +#extradata 6: 34, 0xa77c0cd6 +#extradata 7: 34, 0xa77c0cd6 #tb 0: 1/12800 #media_type 0: video #codec_id 0: mpeg4 @@ -140,13 +140,13 @@ 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, 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 +1, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +2, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +3, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +4, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +5, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +6, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +7, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf 0, 12288, 12288, 512, 11659, 0x6bcb830e [STREAM_GROUP] index=0 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 aebc93f25b..a0d0a63244 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,4 +1,4 @@ -#extradata 0: 34, 0x94110c4f +#extradata 0: 34, 0xa77c0cd6 #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -14,4 +14,4 @@ 0, 28672, 28672, 4096, 1313, 0x2e79ffa2 0, 32768, 32768, 4096, 1323, 0xb9f70fce 0, 36864, 36864, 4096, 1254, 0xf6f01051 -0, 40960, 40960, 3140, 1096, 0xa3059b16 +0, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf 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 0eda931063..8097c9df1c 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,4 +1,4 @@ -#extradata 0: 34, 0x93e50c4d +#extradata 0: 34, 0xa7500cd4 #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -14,4 +14,4 @@ 0, 28672, 28672, 4096, 1310, 0x1f77ff91 0, 32768, 32768, 4096, 1320, 0xea180f1a 0, 36864, 36864, 4096, 1251, 0x0b380fcb -0, 40960, 40960, 3140, 1093, 0x6c429ba0 +0, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf 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 563a1aa015..e03b9c080f 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 @@ -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 +1aa236b0e15a79b96101770ed87c25d2 *tests/data/fate/mov-mp4-iamf-7_1_4-video-last.mp4 +416432 tests/data/fate/mov-mp4-iamf-7_1_4-video-last.mp4 +#extradata 0: 34, 0xa77c0cd6 +#extradata 1: 34, 0xa77c0cd6 +#extradata 2: 34, 0xa7500cd4 +#extradata 3: 34, 0xa7500cd4 +#extradata 4: 34, 0xa77c0cd6 +#extradata 5: 34, 0xa77c0cd6 +#extradata 6: 34, 0xa77c0cd6 #extradata 7: 30, 0x47ab0576 #tb 0: 1/44100 #media_type 0: audio @@ -142,13 +142,13 @@ f95fad00863071121aed5243f04b9ff0 *tests/data/fate/mov-mp4-iamf-7_1_4-video-last. 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, 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 +0, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +1, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +2, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +3, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +4, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +5, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf +6, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf 7, 12288, 12288, 512, 11659, 0x6bcb830e [STREAM_GROUP] index=0 diff --git a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 index a2642c7393..ab1491c86f 100644 --- a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 +++ b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 @@ -1,9 +1,9 @@ -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 +a422105d867b14847b179814e3cdd630 *tests/data/fate/mov-mp4-iamf-ambisonic_1.mp4 +57619 tests/data/fate/mov-mp4-iamf-ambisonic_1.mp4 +#extradata 0: 34, 0x9f9f0c6b +#extradata 1: 34, 0x9f9f0c6b +#extradata 2: 34, 0x9f9f0c6b +#extradata 3: 34, 0x9f9f0c6b #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -64,10 +64,10 @@ f8e57d8de34e8e2b6caed88d17939c6b *tests/data/fate/mov-mp4-iamf-ambisonic_1.mp4 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 +0, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +1, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +2, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf +3, 40960, 40960, 3140, 1231, 0x98611f9f, S=1, Skip Samples, 10, 0x047700bf [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 34e99c5f20..c2f2e08e2c 100644 --- a/tests/ref/fate/mov-mp4-iamf-stereo +++ b/tests/ref/fate/mov-mp4-iamf-stereo @@ -1,6 +1,6 @@ -96590f027a304c4afc872bac8bba815c *tests/data/fate/mov-mp4-iamf-stereo.mp4 -14996 tests/data/fate/mov-mp4-iamf-stereo.mp4 -#extradata 0: 34, 0x94110c4f +613c23fcdc589c1227efb18c93fd3219 *tests/data/fate/mov-mp4-iamf-stereo.mp4 +15138 tests/data/fate/mov-mp4-iamf-stereo.mp4 +#extradata 0: 34, 0xa77c0cd6 #tb 0: 1/44100 #media_type 0: audio #codec_id 0: flac @@ -16,7 +16,7 @@ 0, 28672, 28672, 4096, 1313, 0x2e79ffa2 0, 32768, 32768, 4096, 1323, 0xb9f70fce 0, 36864, 36864, 4096, 1254, 0xf6f01051 -0, 40960, 40960, 3140, 1096, 0xa3059b16 +0, 40960, 40960, 3140, 1235, 0xcf181f77, S=1, Skip Samples, 10, 0x047700bf [STREAM_GROUP] index=0 id=0x1 _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
