PR #20960 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20960 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20960.patch
>From 8030577241e9439a1ee94c7b9bf1d3d205878d1f Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Tue, 18 Nov 2025 00:41:12 -0300 Subject: [PATCH 1/2] tests/fate/ffmpeg: remove max_muxing_queue_size option from fate-ffmpeg-attached_pics It's a no-op given that the CLI will only look at that value after the size threshold is reached, which is by default about 50mb, way bigger than the output of this test. Instead disable lavf's max_interleave_delta, which has a default of about 1 second worth of packets. This lets us remove the hardcoded threads values as the output frame order will no longer change based on it (lavf's generic muxer code will no longer drain buffered frames after 1 second worth of audio is reached before it ever sees a video frame, which used to happen when enabling multi threaded encoding). Signed-off-by: James Almer <[email protected]> --- tests/fate/ffmpeg.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 57028a7936..270c99d857 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -7,7 +7,7 @@ fate-ffmpeg-filter_complex_audio: CMD = framecrc -auto_conversion_filters -filte # Ticket 6375, use case of NoX FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MOV, PNG ALAC, ARESAMPLE_FILTER) += fate-ffmpeg-attached_pics -fate-ffmpeg-attached_pics: CMD = threads=2 framecrc -i $(TARGET_SAMPLES)/lossless-audio/inside.m4a -threads 1 -max_muxing_queue_size 16 -af aresample +fate-ffmpeg-attached_pics: CMD = framecrc -i $(TARGET_SAMPLES)/lossless-audio/inside.m4a -max_interleave_delta 0 -af aresample FATE_SAMPLES_FFMPEG-$(call FILTERDEMDEC, COLORKEY OVERLAY SCALE, MPEGPS IMAGE_PPM_PIPE, CAVS PPM, CAVSVIDEO_PARSER) += fate-ffmpeg-filter_colorkey fate-ffmpeg-filter_colorkey: tests/data/filtergraphs/colorkey -- 2.49.1 >From b80d92f29441c91edfe65c79f2fd54d93ab11fb4 Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Tue, 18 Nov 2025 00:43:23 -0300 Subject: [PATCH 2/2] tests/fate-run: pass threads argument to tests using certain pseudo muxers --- tests/fate-run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 6d1fe1185c..210fcc2eb5 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -162,15 +162,15 @@ ffprobe_demux(){ } framecrc(){ - ffmpeg "$@" -bitexact -f framecrc - + ffmpeg "$@" -bitexact -threads $threads -f framecrc - } ffmetadata(){ - ffmpeg "$@" -bitexact -f ffmetadata - + ffmpeg "$@" -bitexact -threads $threads -f ffmetadata - } framemd5(){ - ffmpeg "$@" -bitexact -f framemd5 - + ffmpeg "$@" -bitexact -threads $threads -f framemd5 - } crc(){ -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
