PR #21794 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21794 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21794.patch
>From 7032c544a1750d0b2846bf25782e5ae9ff5ca3fd Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Thu, 19 Feb 2026 13:16:01 +0100 Subject: [PATCH 1/2] tests/fate/dca: Add ffprobe dependency to dca-lossless tests Forgotten in e1484a30e572e375e8ce41fd9539ba47085b8ea0. Signed-off-by: Andreas Rheinhardt <[email protected]> --- tests/fate/dca.mak | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/fate/dca.mak b/tests/fate/dca.mak index 62f2185edc..6e599a6bd6 100644 --- a/tests/fate/dca.mak +++ b/tests/fate/dca.mak @@ -61,8 +61,8 @@ $(FATE_DCADEC_LOSSY): CMP = oneoff $(FATE_DCADEC_LOSSY): CMP_UNIT = f32 $(FATE_DCADEC_LOSSY): FUZZ = 9 -FATE_DCA-$(call FRAMEMD5, DTSHD, DCA, ARESAMPLE_FILTER PCM_S16LE_ENCODER) += $(FATE_DCADEC_LOSSLESS_s16le) -FATE_DCA-$(call FRAMEMD5, DTSHD, DCA, ARESAMPLE_FILTER PCM_S24LE_ENCODER) += $(FATE_DCADEC_LOSSLESS_s24le) +FATE_DCA_FFMPEG_FFPROBE-$(call FRAMEMD5, DTSHD, DCA, ARESAMPLE_FILTER PCM_S16LE_ENCODER) += $(FATE_DCADEC_LOSSLESS_s16le) +FATE_DCA_FFMPEG_FFPROBE-$(call FRAMEMD5, DTSHD, DCA, ARESAMPLE_FILTER PCM_S24LE_ENCODER) += $(FATE_DCADEC_LOSSLESS_s24le) FATE_DCA-$(call FILTERDEMDECENCMUX, ARESAMPLE, DTSHD, DCA, PCM_F32LE, PCM_F32LE, PIPE_PROTOCOL) += $(FATE_DCADEC_LOSSY) FATE_DCA-$(call PCM, MPEGTS, DCA, DTS_DEMUXER ARESAMPLE_FILTER) += fate-dca-core @@ -83,5 +83,6 @@ fate-dca-core-bsf: CMD = md5pipe -i $(TARGET_SAMPLES)/dts/master_audio_7.1_24bit fate-dca-core-bsf: CMP = oneline fate-dca-core-bsf: REF = ca22b00d8c641cd168e2f7ca8d2f340e -FATE_SAMPLES_AUDIO += $(FATE_DCA-yes) -fate-dca: $(FATE_DCA-yes) +FATE_SAMPLES_FFMPEG += $(FATE_DCA-yes) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_DCA_FFMPEG_FFPROBE-yes) +fate-dca: $(FATE_DCA-yes) $(FATE_DCA_FFMPEG_FFPROBE-yes) -- 2.52.0 >From fe0dc786ba91f9585602f3bb7e082d348b64336a Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Thu, 19 Feb 2026 13:23:06 +0100 Subject: [PATCH 2/2] tests/fate/{dca,qoa,truehd}: Make fate-audio work Based on the Makefile variables, "make fate-audio" is supposed to include the tests for several audio codecs with their own Makefile. Yet because they are included after audio.mak*, this doesn't work atm. Fix this by adding explicit prerequisites. *: Expansion of variables is not deferred in the context of prerequisites. Signed-off-by: Andreas Rheinhardt <[email protected]> --- tests/fate/dca.mak | 2 +- tests/fate/qoa.mak | 5 ++--- tests/fate/truehd.mak | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/fate/dca.mak b/tests/fate/dca.mak index 6e599a6bd6..c36f4fa918 100644 --- a/tests/fate/dca.mak +++ b/tests/fate/dca.mak @@ -85,4 +85,4 @@ fate-dca-core-bsf: REF = ca22b00d8c641cd168e2f7ca8d2f340e FATE_SAMPLES_FFMPEG += $(FATE_DCA-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_DCA_FFMPEG_FFPROBE-yes) -fate-dca: $(FATE_DCA-yes) $(FATE_DCA_FFMPEG_FFPROBE-yes) +fate-audio fate-dca: $(FATE_DCA-yes) $(FATE_DCA_FFMPEG_FFPROBE-yes) diff --git a/tests/fate/qoa.mak b/tests/fate/qoa.mak index f0868e7825..684ede578c 100644 --- a/tests/fate/qoa.mak +++ b/tests/fate/qoa.mak @@ -7,6 +7,5 @@ fate-qoa-278: CMD = framecrc -i $(TARGET_SAMPLES)/qoa/vibra_44_2_278.qoa FATE_QOA-$(call FRAMECRC, QOA, QOA) += fate-qoa-303 fate-qoa-303: CMD = framecrc -i $(TARGET_SAMPLES)/qoa/banjo_48_2_303.qoa -fate-qoa: fate-qoa-152 fate-qoa-278 fate-qoa-303 - -FATE_SAMPLES_AUDIO += $(FATE_QOA-yes) +FATE_SAMPLES_FFMPEG += $(FATE_QOA-yes) +fate-audio fate-qoa: fate-qoa-152 fate-qoa-278 fate-qoa-303 diff --git a/tests/fate/truehd.mak b/tests/fate/truehd.mak index b0bc86a965..544a8e969f 100644 --- a/tests/fate/truehd.mak +++ b/tests/fate/truehd.mak @@ -18,5 +18,5 @@ fate-truehd-mono1726: CMD = md5pipe -f truehd -i $(TARGET_SAMPLES)/truehd/ticket fate-truehd-mono1726: CMP = oneline fate-truehd-mono1726: REF = 9be9551fac418440bb02101bfdb11df9 -FATE_SAMPLES_AUDIO += $(FATE_TRUEHD-yes) -fate-truehd: $(FATE_TRUEHD-yes) +FATE_SAMPLES_FFMPEG += $(FATE_TRUEHD-yes) +fate-audio fate-truehd: $(FATE_TRUEHD-yes) -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
