[FFmpeg-devel] [PATCH] fate/libswresample: add a test downmixing with a custom order layout

[FFmpeg-devel] [PATCH] fate/libswresample: add a test downmixing with a custom order layout

[James Almer]

Signed-off-by: James Almer <jamrial@gmail.com>
---
 tests/fate/libswresample.mak       | 8 ++++++++
 tests/filtergraphs/custom_rematrix | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 tests/filtergraphs/custom_rematrix

diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak
index a1e5ab91fa..aa4438a4bd 100644
--- a/tests/fate/libswresample.mak
+++ b/tests/fate/libswresample.mak
@@ -1097,5 +1097,13 @@ fate-swr-audioconvert: CMP = stddev
 fate-swr-audioconvert: FUZZ = 0
 
 FATE_SWR += $(FATE_SWR_AUDIOCONVERT-yes)
+
+FATE_SWR_CUSTOM_REMATRIX-$(call FILTERDEMDECENCMUX, ARESAMPLE CHANNELMAP AFORMAT, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-swr-custom-rematrix
+fate-swr-custom-rematrix: tests/data/asynth-44100-8.wav tests/data/filtergraphs/custom_rematrix
+fate-swr-custom-rematrix: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-44100-8.wav -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/custom_rematrix -map [OUT] -f s16le
+fate-swr-custom-rematrix: CMP = oneline
+fate-swr-custom-rematrix: REF = 2a14a44deb4ae26e3b474ddbfbc048f8
+
+FATE_SWR += $(FATE_SWR_CUSTOM_REMATRIX-yes)
 FATE_FFMPEG += $(FATE_SWR)
 fate-swr: $(FATE_SWR)
diff --git a/tests/filtergraphs/custom_rematrix b/tests/filtergraphs/custom_rematrix
new file mode 100644
index 0000000000..8579b43867
--- /dev/null
+++ b/tests/filtergraphs/custom_rematrix
@@ -0,0 +1 @@
+[0:a]aresample,channelmap=0|1|2|3|6|7|4|5:8 channels (FL+FR+FC+LFE+SL+SR+BL+BR),aresample,aformat=cl=stereo[OUT];
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] fate/libswresample: add a test downmixing with a custom order layout

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1505 bytes --]

Hi James

On Wed, Feb 05, 2025 at 11:46:32AM -0300, James Almer wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  tests/fate/libswresample.mak       | 8 ++++++++
>  tests/filtergraphs/custom_rematrix | 1 +
>  2 files changed, 9 insertions(+)
>  create mode 100644 tests/filtergraphs/custom_rematrix
> 
> diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak
> index a1e5ab91fa..aa4438a4bd 100644
> --- a/tests/fate/libswresample.mak
> +++ b/tests/fate/libswresample.mak
> @@ -1097,5 +1097,13 @@ fate-swr-audioconvert: CMP = stddev
>  fate-swr-audioconvert: FUZZ = 0
>  
>  FATE_SWR += $(FATE_SWR_AUDIOCONVERT-yes)
> +
> +FATE_SWR_CUSTOM_REMATRIX-$(call FILTERDEMDECENCMUX, ARESAMPLE CHANNELMAP AFORMAT, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-swr-custom-rematrix
> +fate-swr-custom-rematrix: tests/data/asynth-44100-8.wav tests/data/filtergraphs/custom_rematrix
> +fate-swr-custom-rematrix: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-44100-8.wav -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/custom_rematrix -map [OUT] -f s16le
> +fate-swr-custom-rematrix: CMP = oneline
> +fate-swr-custom-rematrix: REF = 2a14a44deb4ae26e3b474ddbfbc048f8

not a huge fan of md5 based testing of downmixing as it provides just a
"same" vs "different"

but patch ok

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

There will always be a question for which you do not know the correct answer.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] fate/libswresample: add a test downmixing with a custom order layout

[James Almer]

[-- Attachment #1.1.1: Type: text/plain, Size: 2063 bytes --]

On 2/6/2025 11:26 AM, Michael Niedermayer wrote:
> Hi James
> 
> On Wed, Feb 05, 2025 at 11:46:32AM -0300, James Almer wrote:
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>   tests/fate/libswresample.mak       | 8 ++++++++
>>   tests/filtergraphs/custom_rematrix | 1 +
>>   2 files changed, 9 insertions(+)
>>   create mode 100644 tests/filtergraphs/custom_rematrix
>>
>> diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak
>> index a1e5ab91fa..aa4438a4bd 100644
>> --- a/tests/fate/libswresample.mak
>> +++ b/tests/fate/libswresample.mak
>> @@ -1097,5 +1097,13 @@ fate-swr-audioconvert: CMP = stddev
>>   fate-swr-audioconvert: FUZZ = 0
>>   
>>   FATE_SWR += $(FATE_SWR_AUDIOCONVERT-yes)
>> +
>> +FATE_SWR_CUSTOM_REMATRIX-$(call FILTERDEMDECENCMUX, ARESAMPLE CHANNELMAP AFORMAT, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-swr-custom-rematrix
>> +fate-swr-custom-rematrix: tests/data/asynth-44100-8.wav tests/data/filtergraphs/custom_rematrix
>> +fate-swr-custom-rematrix: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-44100-8.wav -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/custom_rematrix -map [OUT] -f s16le
>> +fate-swr-custom-rematrix: CMP = oneline
>> +fate-swr-custom-rematrix: REF = 2a14a44deb4ae26e3b474ddbfbc048f8
> 
> not a huge fan of md5 based testing of downmixing as it provides just a
> "same" vs "different"

Afaict, downmixing this sample to stereo using either 
FL+FR+FC+LFE+SL+SR+BL+BR (custom order) and 7.1 (native) as input layout 
will result in the same output given that both side and back channels 
are assigned the exact same coeffs, so this test is mainly just making 
sure swr doesn't reject the non-native input layout.

> 
> but patch ok
> 
> thx
> 
> [...]
> 
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".