This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 1019f8f036602a8464185baa4857654337eeca14 Author: James Almer <[email protected]> AuthorDate: Thu Aug 20 23:14:22 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Sun Aug 23 13:35:29 2026 -0300 tests/fate/aac: add tests for PCE layouts with height channels Signed-off-by: James Almer <[email protected]> --- tests/fate/aac.mak | 67 ++++++++++++++++++++++++++++++++++++++++- tests/ref/fate/aac-encode-5_1_2 | 4 +++ tests/ref/fate/aac-encode-5_1_4 | 4 +++ tests/ref/fate/aac-encode-7_1_2 | 4 +++ tests/ref/fate/aac-encode-7_1_4 | 4 +++ tests/ref/fate/aac-encode-7_2_3 | 4 +++ tests/ref/fate/aac-encode-9_1_4 | 4 +++ tests/ref/fate/aac-encode-9_1_6 | 4 +++ 8 files changed, 94 insertions(+), 1 deletion(-) diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index cf0c70c46a..e89b4274a9 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -263,6 +263,69 @@ fate-aac-yoraw-encode: REF = $(SAMPLES)/audio-reference/yo.raw-short.wav fate-aac-yoraw-encode: CMP_TARGET = 226 fate-aac-yoraw-encode: FUZZ = 17 +tests/data/fate/aac-5_1_2.adts: TAG = GEN +tests/data/fate/aac-5_1_2.adts: tests/data/asynth-44100-8.wav +tests/data/fate/aac-5_1_2.adts: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data/fate + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ + -ch_layout "5.1.2(back)" -i $(TARGET_PATH)/tests/data/asynth-44100-8.wav \ + -c:a aac -aac_pce 1 -aframes 5 -f adts -y $(TARGET_PATH)/$@ 2>/dev/null + +tests/data/fate/aac-5_1_4.adts: TAG = GEN +tests/data/fate/aac-5_1_4.adts: tests/data/asynth-44100-10.wav +tests/data/fate/aac-5_1_4.adts: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data/fate + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ + -ch_layout "5.1.4" -i $(TARGET_PATH)/tests/data/asynth-44100-10.wav \ + -c:a aac -aac_pce 1 -aframes 5 -f adts -y $(TARGET_PATH)/$@ 2>/dev/null + +tests/data/fate/aac-7_1_2.adts: TAG = GEN +tests/data/fate/aac-7_1_2.adts: tests/data/asynth-44100-10.wav +tests/data/fate/aac-7_1_2.adts: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data/fate + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ + -ch_layout "7.1.2" -i $(TARGET_PATH)/tests/data/asynth-44100-10.wav \ + -c:a aac -aac_pce 1 -aframes 5 -f adts -y $(TARGET_PATH)/$@ 2>/dev/null + +tests/data/fate/aac-7_2_3.adts: TAG = GEN +tests/data/fate/aac-7_2_3.adts: tests/data/asynth-44100-12.wav +tests/data/fate/aac-7_2_3.adts: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data/fate + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ + -ch_layout "7.2.3" -i $(TARGET_PATH)/tests/data/asynth-44100-12.wav \ + -c:a aac -aac_pce 1 -aframes 5 -f adts -y $(TARGET_PATH)/$@ 2>/dev/null + +tests/data/fate/aac-7_1_4.adts: TAG = GEN +tests/data/fate/aac-7_1_4.adts: tests/data/asynth-44100-12.wav +tests/data/fate/aac-7_1_4.adts: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data/fate + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ + -ch_layout "7.1.4" -i $(TARGET_PATH)/tests/data/asynth-44100-12.wav \ + -c:a aac -aac_pce 1 -aframes 5 -f adts -y $(TARGET_PATH)/$@ 2>/dev/null + +tests/data/fate/aac-9_1_4.adts: TAG = GEN +tests/data/fate/aac-9_1_4.adts: tests/data/asynth-44100-14.wav +tests/data/fate/aac-9_1_4.adts: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data/fate + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ + -ch_layout "9.1.4" -i $(TARGET_PATH)/tests/data/asynth-44100-14.wav \ + -c:a aac -aac_pce 1 -aframes 5 -f adts -y $(TARGET_PATH)/$@ 2>/dev/null + +tests/data/fate/aac-9_1_6.adts: TAG = GEN +tests/data/fate/aac-9_1_6.adts: tests/data/asynth-44100-16.wav +tests/data/fate/aac-9_1_6.adts: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data/fate + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ + -ch_layout "9.1.6" -i $(TARGET_PATH)/tests/data/asynth-44100-16.wav \ + -c:a aac -aac_pce 1 -aframes 5 -f adts -y $(TARGET_PATH)/$@ 2>/dev/null + +define FATE_AAC_LAYOUT_TEST +FATE_AAC_ENCODE_FFPROBE += fate-aac-encode-$(1) +fate-aac-encode-$(1): tests/data/fate/aac-$(1).adts +fate-aac-encode-$(1): CMD = probe -show_entries stream=codec_name,channel_layout $(TARGET_PATH)/tests/data/fate/aac-$(1).adts +endef + +$(eval $(call FATE_AAC_LAYOUT_TEST,5_1_2)) +$(eval $(call FATE_AAC_LAYOUT_TEST,5_1_4)) +$(eval $(call FATE_AAC_LAYOUT_TEST,7_1_2)) +$(eval $(call FATE_AAC_LAYOUT_TEST,7_1_4)) +$(eval $(call FATE_AAC_LAYOUT_TEST,7_2_3)) +$(eval $(call FATE_AAC_LAYOUT_TEST,9_1_4)) +$(eval $(call FATE_AAC_LAYOUT_TEST,9_1_6)) + FATE_AAC_LATM += fate-aac-latm_000000001180bc60 fate-aac-latm_000000001180bc60: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_000000001180bc60.mpg fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 @@ -285,10 +348,12 @@ $(FATE_AAC_ALL): CMP = oneoff $(FATE_AAC_ALL): FUZZ = 2 FATE_AAC_ENCODE-$(call TRANSCODE, AAC, MP4 MOV, WAV_MUXER WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += $(FATE_AAC_ENCODE) +FATE_AAC_ENCODE_FFPROBE-$(call TRANSCODE, AAC, ADTS AAC, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += $(FATE_AAC_ENCODE_FFPROBE) FATE_AAC_BSF-$(call FRAMECRC, AAC MATROSKA, AAC, AAC_PARSER AAC_ADTSTOASC_BSF MATROSKA_MUXER) += fate-aac-autobsf-adtstoasc FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes) $(FATE_AAC_BSF-yes) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_AAC_ENCODE_FFPROBE-yes) -fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes) $(FATE_AAC_BSF-yes) +fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes) $(FATE_AAC_ENCODE_FFPROBE-yes) $(FATE_AAC_BSF-yes) fate-aac-latm: $(FATE_AAC_LATM-yes) diff --git a/tests/ref/fate/aac-encode-5_1_2 b/tests/ref/fate/aac-encode-5_1_2 new file mode 100644 index 0000000000..3949755023 --- /dev/null +++ b/tests/ref/fate/aac-encode-5_1_2 @@ -0,0 +1,4 @@ +[STREAM] +codec_name=aac +channel_layout=5.1.2(back) +[/STREAM] diff --git a/tests/ref/fate/aac-encode-5_1_4 b/tests/ref/fate/aac-encode-5_1_4 new file mode 100644 index 0000000000..f3204e2ead --- /dev/null +++ b/tests/ref/fate/aac-encode-5_1_4 @@ -0,0 +1,4 @@ +[STREAM] +codec_name=aac +channel_layout=10 channels (FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR) +[/STREAM] diff --git a/tests/ref/fate/aac-encode-7_1_2 b/tests/ref/fate/aac-encode-7_1_2 new file mode 100644 index 0000000000..9ebf8e63a1 --- /dev/null +++ b/tests/ref/fate/aac-encode-7_1_2 @@ -0,0 +1,4 @@ +[STREAM] +codec_name=aac +channel_layout=7.1.2 +[/STREAM] diff --git a/tests/ref/fate/aac-encode-7_1_4 b/tests/ref/fate/aac-encode-7_1_4 new file mode 100644 index 0000000000..83ff23540c --- /dev/null +++ b/tests/ref/fate/aac-encode-7_1_4 @@ -0,0 +1,4 @@ +[STREAM] +codec_name=aac +channel_layout=7.1.4 +[/STREAM] diff --git a/tests/ref/fate/aac-encode-7_2_3 b/tests/ref/fate/aac-encode-7_2_3 new file mode 100644 index 0000000000..e9080cd69a --- /dev/null +++ b/tests/ref/fate/aac-encode-7_2_3 @@ -0,0 +1,4 @@ +[STREAM] +codec_name=aac +channel_layout=7.2.3 +[/STREAM] diff --git a/tests/ref/fate/aac-encode-9_1_4 b/tests/ref/fate/aac-encode-9_1_4 new file mode 100644 index 0000000000..215cfadbbb --- /dev/null +++ b/tests/ref/fate/aac-encode-9_1_4 @@ -0,0 +1,4 @@ +[STREAM] +codec_name=aac +channel_layout=9.1.4 +[/STREAM] diff --git a/tests/ref/fate/aac-encode-9_1_6 b/tests/ref/fate/aac-encode-9_1_6 new file mode 100644 index 0000000000..2e461cdb47 --- /dev/null +++ b/tests/ref/fate/aac-encode-9_1_6 @@ -0,0 +1,4 @@ +[STREAM] +codec_name=aac +channel_layout=9.1.6 +[/STREAM] -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
