You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-04 22:03:09 +02:00
tests/iamf: reorder muxed streams
Follows the proper order defined by the spec, even if mostly cosmetic, and is also preparation for a following change. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
@ -24,7 +24,7 @@ fate-iamf-7_1_4: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \
|
||||
-/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/iamf_7_1_4 \
|
||||
-/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-7_1_4 \
|
||||
-/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-7_1_4 \
|
||||
-streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -streamid 6:6 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [SIDE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" \
|
||||
-streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -streamid 6:6 -map [FRONT] -map [TOP_FRONT] -map [CENTER] -map [LFE] -map [SIDE] -map [BACK] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" \
|
||||
"-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition"
|
||||
|
||||
FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-iamf-9_1_6
|
||||
@ -35,7 +35,7 @@ fate-iamf-9_1_6: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \
|
||||
-/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-9_1_6 \
|
||||
-/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-9_1_6-stereo \
|
||||
-/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-9_1_6 \
|
||||
-streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -streamid 6:6 -streamid 7:7 -streamid 8:8 -streamid 9:9 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [FRONT_CENTER] -map [SIDE] -map [TOP_FRONT] -map [TOP_BACK] -map [TOP_SIDE] -map [STEREO] -c:a flac -t 1" "-c:a copy -map 0" \
|
||||
-streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -streamid 6:6 -streamid 7:7 -streamid 8:8 -streamid 9:9 -map [FRONT] -map [FRONT_CENTER] -map [SIDE] -map [BACK] -map [TOP_FRONT] -map [TOP_SIDE] -map [TOP_BACK] -map [CENTER] -map [LFE] -map [STEREO] -c:a flac -t 1" "-c:a copy -map 0" \
|
||||
"-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition"
|
||||
|
||||
FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-iamf-ambisonic_1
|
||||
|
||||
@ -265,7 +265,7 @@ fate-mov-mp4-iamf-7_1_4-video-first: CMD = transcode wav $(SRC) mp4 "-auto_conve
|
||||
-/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/iamf_7_1_4 \
|
||||
-/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-7_1_4-2 \
|
||||
-/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-7_1_4 \
|
||||
-streamid 0:1 -streamid 1:2 -streamid 2:3 -streamid 3:4 -streamid 4:5 -streamid 5:6 -streamid 6:7 -streamid 7:8 -map 1:v:0 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [SIDE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -c:v mpeg4 -t 1" "-c:a copy -c:v copy -map 0" \
|
||||
-streamid 0:1 -streamid 1:2 -streamid 2:3 -streamid 3:4 -streamid 4:5 -streamid 5:6 -streamid 6:7 -streamid 7:8 -map 1:v:0 -map [FRONT] -map [TOP_FRONT] -map [CENTER] -map [LFE] -map [SIDE] -map [BACK] -map [TOP_BACK] -c:a flac -c:v mpeg4 -t 1" "-c:a copy -c:v copy -map 0" \
|
||||
"-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition:stream=index,id" \
|
||||
"-f rawvideo -s 352x288 -pix_fmt yuv420p -i $(SRC2)"
|
||||
|
||||
@ -278,7 +278,7 @@ fate-mov-mp4-iamf-7_1_4-video-last: CMD = transcode wav $(SRC) mp4 "-auto_conver
|
||||
-/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/iamf_7_1_4 \
|
||||
-/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-7_1_4 \
|
||||
-/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-7_1_4 \
|
||||
-streamid 0:1 -streamid 1:2 -streamid 2:3 -streamid 3:4 -streamid 4:5 -streamid 5:6 -streamid 6:7 -streamid 7:8 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [SIDE] -map [TOP_FRONT] -map [TOP_BACK] -map 1:v:0 -use_stream_ids_as_track_ids true -c:a flac -c:v mpeg4 -t 1" "-c:a copy -c:v copy -map 0" \
|
||||
-streamid 0:1 -streamid 1:2 -streamid 2:3 -streamid 3:4 -streamid 4:5 -streamid 5:6 -streamid 6:7 -streamid 7:8 -map [FRONT] -map [TOP_FRONT] -map [CENTER] -map [LFE] -map [SIDE] -map [BACK] -map [TOP_BACK] -map 1:v:0 -use_stream_ids_as_track_ids true -c:a flac -c:v mpeg4 -t 1" "-c:a copy -c:v copy -map 0" \
|
||||
"-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition:stream=index,id" \
|
||||
"-f rawvideo -s 352x288 -pix_fmt yuv420p -i $(SRC2)"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
bf3dd0294cbf9b842d09f388da706554 *tests/data/fate/iamf-9_1_6.iamf
|
||||
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
|
||||
@ -62,103 +62,103 @@ bf3dd0294cbf9b842d09f388da706554 *tests/data/fate/iamf-9_1_6.iamf
|
||||
#channel_layout_name 9: 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
|
||||
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, 1399, 0x6e89566e
|
||||
8, 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, 1439, 0xc46b5ac5
|
||||
3, 4608, 4608, 4608, 1439, 0xc46b5ac5
|
||||
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, 1442, 0x6c3c5b13
|
||||
8, 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, 1377, 0x5b2a55fe
|
||||
3, 9216, 9216, 4608, 1377, 0x5b2a55fe
|
||||
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, 1380, 0xc497571b
|
||||
8, 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, 1380, 0x045550d3
|
||||
3, 13824, 13824, 4608, 1380, 0x045550d3
|
||||
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, 1383, 0x48e9510f
|
||||
8, 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, 1568, 0xa2bc45f4
|
||||
3, 18432, 18432, 4608, 1568, 0xa2bc45f4
|
||||
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, 1572, 0x9a514719
|
||||
8, 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, 1388, 0x96c85007
|
||||
3, 23040, 23040, 4608, 1388, 0x96c85007
|
||||
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, 1391, 0x74ac5014
|
||||
8, 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, 1419, 0x4d4d466a
|
||||
3, 27648, 27648, 4608, 1419, 0x4d4d466a
|
||||
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, 1422, 0x2f9d47c5
|
||||
8, 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, 1765, 0xacb84b24
|
||||
3, 32256, 32256, 4608, 1765, 0xacb84b24
|
||||
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, 1768, 0x2a044b99
|
||||
8, 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, 1531, 0x996458aa
|
||||
3, 36864, 36864, 4608, 1531, 0x996458aa
|
||||
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, 1534, 0xb0b35a3f
|
||||
8, 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, 923, 0xa7225edf
|
||||
3, 41472, 41472, 4608, 923, 0xa7225edf
|
||||
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, 926, 0xc26a5eae
|
||||
8, 41472, 41472, 4608, 926, 0xc26a5eae
|
||||
7, 41472, 41472, 4608, 923, 0xa7225edf
|
||||
8, 41472, 41472, 4608, 923, 0xa7225edf
|
||||
9, 41472, 41472, 4608, 926, 0xc26a5eae
|
||||
[STREAM_GROUP]
|
||||
index=0
|
||||
|
||||
Reference in New Issue
Block a user