This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 07e3d760bf6cd308a522a32cc1bf70ba3975ce82 Author: Marton Balint <[email protected]> AuthorDate: Sun Nov 30 23:00:15 2025 +0100 Commit: Marton Balint <[email protected]> CommitDate: Sun Dec 7 19:36:49 2025 +0000 fate/filter-audio: add amerge layout_mode test Signed-off-by: Marton Balint <[email protected]> --- tests/fate/filter-audio.mak | 6 ++++ tests/ref/fate/filter-amerge-mode | 65 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index b244f82bb7..526645a634 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -75,6 +75,12 @@ fate-filter-amerge: tests/data/asynth-44100-1.wav fate-filter-amerge: SRC = $(TARGET_PATH)/tests/data/asynth-44100-1.wav fate-filter-amerge: CMD = framecrc -i $(SRC) -i $(SRC) -filter_complex "[0:a][1:a]amerge=inputs=2[aout]" -map "[aout]" +FATE_AFILTER-$(call FILTERDEMDECENCMUX, AMERGE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-amerge-mode +fate-filter-amerge-mode: tests/data/asynth-44100-1.wav +fate-filter-amerge-mode: SRC = $(TARGET_PATH)/tests/data/asynth-44100-1.wav +fate-filter-amerge-mode: CMD = framecrc -channel_layout FL -i $(SRC) -ss 0.1 -channel_layout FR -i $(SRC) -ss 0.2 -i $(SRC) -ss 0.3 -i $(SRC) -ss 0.4 -i $(SRC) -ss 0.5 -i $(SRC) \ + -filter_complex "[1:a][0:a]amerge[tmp1];[2:a][3:a]amerge=layout_mode=reset[tmp2];[tmp1][tmp2][4:a][5:a]amerge=inputs=4:layout_mode=normal[aout]" -map "[aout]" + FATE_AFILTER-$(call FILTERDEMDECENCMUX, APAD, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-apad fate-filter-apad: tests/data/asynth-44100-2.wav fate-filter-apad: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav diff --git a/tests/ref/fate/filter-amerge-mode b/tests/ref/fate/filter-amerge-mode new file mode 100644 index 0000000000..b066323f13 --- /dev/null +++ b/tests/ref/fate/filter-amerge-mode @@ -0,0 +1,65 @@ +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout_name 0: 6 channels (FL+FR+UNK+UNK+FC+FC) +0, 0, 0, 4096, 49152, 0xd5b59e0b +0, 4096, 4096, 4096, 49152, 0x5d99b2bc +0, 8192, 8192, 4096, 49152, 0xafa8901f +0, 12288, 12288, 4096, 49152, 0x97cd98b3 +0, 16384, 16384, 4096, 49152, 0x767fa951 +0, 20480, 20480, 4096, 49152, 0x09bc8763 +0, 24576, 24576, 4096, 49152, 0xd50e90ae +0, 28672, 28672, 4096, 49152, 0xc7ce978d +0, 32768, 32768, 4096, 49152, 0xb90ac520 +0, 36864, 36864, 4096, 49152, 0x32a2ac52 +0, 40960, 40960, 4096, 49152, 0x71ec85c8 +0, 45056, 45056, 4096, 49152, 0x4401b98a +0, 49152, 49152, 4096, 49152, 0x972cb3b7 +0, 53248, 53248, 4096, 49152, 0x2c37f62d +0, 57344, 57344, 4096, 49152, 0xee612003 +0, 61440, 61440, 4096, 49152, 0x4f46e987 +0, 65536, 65536, 4096, 49152, 0xb39484ca +0, 69632, 69632, 4096, 49152, 0xc9042028 +0, 73728, 73728, 4096, 49152, 0xb196a39a +0, 77824, 77824, 4096, 49152, 0xe4627739 +0, 81920, 81920, 4096, 49152, 0x3107d993 +0, 86016, 86016, 4096, 49152, 0x88606597 +0, 90112, 90112, 4096, 49152, 0xa3df9656 +0, 94208, 94208, 4096, 49152, 0x49442705 +0, 98304, 98304, 4096, 49152, 0x800256b2 +0, 102400, 102400, 4096, 49152, 0x1cb9af12 +0, 106496, 106496, 4096, 49152, 0xbe2d3e59 +0, 110592, 110592, 4096, 49152, 0x73e17139 +0, 114688, 114688, 4096, 49152, 0xc91a7787 +0, 118784, 118784, 4096, 49152, 0x4edf8c55 +0, 122880, 122880, 4096, 49152, 0x70057319 +0, 126976, 126976, 4096, 49152, 0x8a629a55 +0, 131072, 131072, 4096, 49152, 0xc9786b28 +0, 135168, 135168, 4096, 49152, 0x2efd7e7c +0, 139264, 139264, 4096, 49152, 0x28877cd0 +0, 143360, 143360, 4096, 49152, 0xfd64967e +0, 147456, 147456, 4096, 49152, 0x0caa8be5 +0, 151552, 151552, 4096, 49152, 0x097dc3c2 +0, 155648, 155648, 4096, 49152, 0xde78524d +0, 159744, 159744, 4096, 49152, 0xbddb968b +0, 163840, 163840, 4096, 49152, 0x146347cd +0, 167936, 167936, 4096, 49152, 0x21ab8f0d +0, 172032, 172032, 4096, 49152, 0xd2a0b60e +0, 176128, 176128, 4096, 49152, 0xc7916e40 +0, 180224, 180224, 4096, 49152, 0xd42f5b66 +0, 184320, 184320, 4096, 49152, 0x2daeda35 +0, 188416, 188416, 4096, 49152, 0xd0220a25 +0, 192512, 192512, 4096, 49152, 0xfb962b0d +0, 196608, 196608, 4096, 49152, 0xb1c6418c +0, 200704, 200704, 4096, 49152, 0xc5e35827 +0, 204800, 204800, 4096, 49152, 0xf3cb0c12 +0, 208896, 208896, 4096, 49152, 0xfec64d90 +0, 212992, 212992, 4096, 49152, 0xb8685f78 +0, 217088, 217088, 4096, 49152, 0xe7d1562f +0, 221184, 221184, 4096, 49152, 0xf453cba9 +0, 225280, 225280, 4096, 49152, 0x28928fce +0, 229376, 229376, 4096, 49152, 0x64a909d9 +0, 233472, 233472, 4096, 49152, 0x2bf762b1 +0, 237568, 237568, 4096, 49152, 0x085daec8 +0, 241664, 241664, 886, 10632, 0x1522906c _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
