Updated version attached. Now only using six frames in order to avoid triggering differences on aarch64.
- Andreas
From 3b973c8bd47403348233a0b30fb03dfb0b7f5d75 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <andreas.rheinha...@outlook.com> Date: Fri, 23 May 2025 11:42:38 +0200 Subject: [PATCH v2] tests/fate/ac3: Make ac3-fixed-encode-2 bitexact across arches Don't use a 7.1 EAC3 input file for which our decoder is not bitexact; instead just use the asynth-44100-8.wav file which (as a 7.1 file) exhibits the same issue fixed by 1b3f4842c18409dba5a345ef9e7b3de7a4fa3657. (Either the encoder or the resampler are still not completely bitexact, so we limit the number of frames output.) Also switch to a framecrc test so that the output channel layout is directly contained in the ref file. Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> --- tests/fate/ac3.mak | 10 ++++++---- tests/ref/fate/ac3-fixed-encode-2 | 13 +++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 tests/ref/fate/ac3-fixed-encode-2 diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index b23a9e4dcc..e52678a2fd 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -91,10 +91,12 @@ fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -ab 128k -f ac3 -flags + fate-ac3-fixed-encode: CMP = oneline fate-ac3-fixed-encode: REF = e9d78bca187b4bbafc4512bcea8efd3e -FATE_AC3-$(call ALLYES, EAC3_DEMUXER AC3_FIXED_ENCODER AC3_MUXER ARESAMPLE_FILTER) += fate-ac3-fixed-encode-2 -fate-ac3-fixed-encode-2: CMD = md5pipe -i $(TARGET_SAMPLES)/eac3/the_great_wall_7.1.eac3 -c:a ac3_fixed -ab 256k -f ac3 -flags +bitexact -af aresample -fate-ac3-fixed-encode-2: CMP = oneline -fate-ac3-fixed-encode-2: REF = 1b92b037b23b231c9523f334ccfb11da +# This tests that the LFE does not get lost when converting the input 7.1 +# to a channel layout supported by the encoder. +FATE_AC3-$(call FRAMECRC, WAV, PCM_S16LE, ARESAMPLE_FILTER AC3_FIXED_ENCODER) += fate-ac3-fixed-encode-2 +fate-ac3-fixed-encode-2: tests/data/asynth-44100-8.wav +fate-ac3-fixed-encode-2: SRC = $(TARGET_PATH)/tests/data/asynth-44100-8.wav +fate-ac3-fixed-encode-2: CMD = framecrc -i $(SRC) -c:a ac3_fixed -ab 256k -frames:a 6 -af aresample FATE_EAC3-$(call ALLYES, EAC3_DEMUXER EAC3_MUXER EAC3_CORE_BSF) += fate-eac3-core-bsf fate-eac3-core-bsf: CMD = md5pipe -i $(TARGET_SAMPLES)/eac3/the_great_wall_7.1.eac3 -c:a copy -bsf:a eac3_core -fflags +bitexact -f eac3 diff --git a/tests/ref/fate/ac3-fixed-encode-2 b/tests/ref/fate/ac3-fixed-encode-2 new file mode 100644 index 0000000000..8e945b6637 --- /dev/null +++ b/tests/ref/fate/ac3-fixed-encode-2 @@ -0,0 +1,13 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: ac3 +#sample_rate 0: 44100 +#channel_layout_name 0: 5.1(side) +0, -256, -256, 1536, 1114, 0x32fd276c +0, 1280, 1280, 1536, 1116, 0x1ac63ba7 +0, 2816, 2816, 1536, 1114, 0xdde82dbc +0, 4352, 4352, 1536, 1114, 0x39313179 +0, 5888, 5888, 1536, 1116, 0x166214e2 +0, 7424, 7424, 1536, 1114, 0xfbcc27ad +0, 8960, 8960, 1536, 1114, 0xe7ed3321 +0, 10496, 10496, 1536, 1114, 0xa1823473 -- 2.45.2
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
