diff --git a/tests/fate/iamf.mak b/tests/fate/iamf.mak index 8b0de7f4b2..f1292a3572 100644 --- a/tests/fate/iamf.mak +++ b/tests/fate/iamf.mak @@ -4,7 +4,7 @@ fate-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-iamf-stereo: CMD = transcode wav $(SRC) iamf " \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-stereo \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-stereo \ - -streamid 0:0 -c:a flac -t 1" "-c:a copy -map 0" + -streamid 0:0 -c:a flac -t 1" "-c:a copy -map 0" "-show_entries stream_group=index,id,nb_streams,type:stream_group_stream=index,id" FATE_IAMF += fate-iamf-5_1_4 fate-iamf-5_1_4: tests/data/asynth-44100-10.wav tests/data/filtergraphs/iamf_5_1_4 tests/data/streamgroups/audio_element-5_1_4 tests/data/streamgroups/mix_presentation-5_1_4 @@ -13,7 +13,7 @@ fate-iamf-5_1_4: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \ -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/iamf_5_1_4 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-5_1_4 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-5_1_4 \ - -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -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 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" "-show_entries stream_group=index,id,nb_streams,type:stream_group_stream=index,id" FATE_IAMF += fate-iamf-7_1_4 fate-iamf-7_1_4: tests/data/asynth-44100-12.wav tests/data/filtergraphs/iamf_7_1_4 tests/data/streamgroups/audio_element-7_1_4 tests/data/streamgroups/mix_presentation-7_1_4 @@ -22,7 +22,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 [BACK] -map [CENTER] -map [LFE] -map [SIDE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" "-show_entries stream_group=index,id,nb_streams,type:stream_group_stream=index,id" FATE_IAMF += fate-iamf-ambisonic_1 fate-iamf-ambisonic_1: tests/data/asynth-44100-4.wav tests/data/filtergraphs/iamf_ambisonic_1 tests/data/streamgroups/audio_element-ambisonic_1 tests/data/streamgroups/mix_presentation-ambisonic_1 @@ -31,10 +31,10 @@ fate-iamf-ambisonic_1: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/iamf_ambisonic_1 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-ambisonic_1 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-ambisonic_1 \ - -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -map [MONO0] -map [MONO1] -map [MONO2] -map [MONO3] -c:a flac -t 1" "-c:a copy -map 0" + -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -map [MONO0] -map [MONO1] -map [MONO2] -map [MONO3] -c:a flac -t 1" "-c:a copy -map 0" "-show_entries stream_group=index,id,nb_streams,type:stream_group_stream=index,id" FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER) += $(FATE_IAMF) -FATE_FFMPEG += $(FATE_IAMF-yes) +FATE_FFMPEG_FFPROBE += $(FATE_IAMF-yes) fate-iamf: $(FATE_IAMF-yes) diff --git a/tests/ref/fate/iamf-5_1_4 b/tests/ref/fate/iamf-5_1_4 index 030765ecee..65542e0991 100644 --- a/tests/ref/fate/iamf-5_1_4 +++ b/tests/ref/fate/iamf-5_1_4 @@ -96,3 +96,63 @@ 3, 41472, 41472, 4608, 923, 0xa7225edf 4, 41472, 41472, 4608, 926, 0xc26a5eae 5, 41472, 41472, 4608, 926, 0xc26a5eae +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=6 +type=IAMF Audio Element +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[STREAM] +index=4 +id=0x4 +[/STREAM] +[STREAM] +index=5 +id=0x5 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=6 +type=IAMF Mix Presentation +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[STREAM] +index=4 +id=0x4 +[/STREAM] +[STREAM] +index=5 +id=0x5 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/iamf-7_1_4 b/tests/ref/fate/iamf-7_1_4 index 39cbd6d840..ad96bf6733 100644 --- a/tests/ref/fate/iamf-7_1_4 +++ b/tests/ref/fate/iamf-7_1_4 @@ -112,3 +112,71 @@ 4, 41472, 41472, 4608, 926, 0xc26a5eae 5, 41472, 41472, 4608, 926, 0xc26a5eae 6, 41472, 41472, 4608, 926, 0xc26a5eae +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=7 +type=IAMF Audio Element +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[STREAM] +index=4 +id=0x4 +[/STREAM] +[STREAM] +index=5 +id=0x5 +[/STREAM] +[STREAM] +index=6 +id=0x6 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=7 +type=IAMF Mix Presentation +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[STREAM] +index=4 +id=0x4 +[/STREAM] +[STREAM] +index=5 +id=0x5 +[/STREAM] +[STREAM] +index=6 +id=0x6 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/iamf-ambisonic_1 b/tests/ref/fate/iamf-ambisonic_1 index ed73dd4d09..034405416d 100644 --- a/tests/ref/fate/iamf-ambisonic_1 +++ b/tests/ref/fate/iamf-ambisonic_1 @@ -64,3 +64,47 @@ c3751e6a2d85bd6a8318fe93b5754309 *tests/data/fate/iamf-ambisonic_1.iamf 1, 41472, 41472, 4608, 923, 0xa7225edf 2, 41472, 41472, 4608, 923, 0xa7225edf 3, 41472, 41472, 4608, 923, 0xa7225edf +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=4 +type=IAMF Audio Element +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=4 +type=IAMF Mix Presentation +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/iamf-stereo b/tests/ref/fate/iamf-stereo index 82206f84bf..cf0289f999 100644 --- a/tests/ref/fate/iamf-stereo +++ b/tests/ref/fate/iamf-stereo @@ -16,3 +16,23 @@ 0, 32256, 32256, 4608, 1768, 0x2a044b99 0, 36864, 36864, 4608, 1534, 0xb0b35a3f 0, 41472, 41472, 4608, 926, 0xc26a5eae +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=1 +type=IAMF Audio Element +[STREAM] +index=0 +id=0x0 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=1 +type=IAMF Mix Presentation +[STREAM] +index=0 +id=0x0 +[/STREAM] +[/STREAM_GROUP]