mirrors/ffmpeg
0
0 Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-28 10:04:37 +08:00
Code Activity

tests/fate/seek: make HLS fixture independent of CPU count

Browse Source 
The HLS seek fixture leaves the MPEG-2 encoder thread count automatic.
On a single CPU, two sampled video packets have sizes 2289 and 3904
instead of the multithreaded reference's 2330 and 3860, failing FATE.

Pin the video encoder to one thread and update the two affected packet
sizes. Packet timestamps, positions, and seek results are unchanged.

Validated fate-seek-hls with freshly generated input three times each
under CPU affinity masks containing one, two, and eight CPUs. Before
this change the single-CPU runs reproduce the exact reported failure;
afterwards all nine runs pass with identical test output.

Fixes: #24579
Assisted-by: Fairy
This commit is contained in:
Michael Niedermayer authored and Kacper Michajłow committed 2026-10-22 19:51:06 +00:00
1 parent 9cda9b3286
commit 9a9b70bb8c
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/fate/seek.mak
+1 -1
View File
@@ -204,7 +204,7 @@ tests/data/hls-seek.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \
-f lavfi -i "testsrc2=size=128x72:rate=10:d=6" \
-f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=6" \
-map 0:v -map 1:a -c:v mpeg2video -bf 2 -g 15 -dct int -idct int -flags +bitexact -c:a mp2fixed \
-map 0:v -map 1:a -c:v mpeg2video -threads:v 1 -bf 2 -g 15 -dct int -idct int -flags +bitexact -c:a mp2fixed \
-f hls -hls_time 2 -hls_list_size 0 \
-var_stream_map "v:0,agroup:a a:0,agroup:a,default:yes" -master_pl_name hls-seek.m3u8 \
-hls_segment_filename $(TARGET_PATH)/tests/data/hls-seek-s%v-%d.ts \
tests/ref/seek/hls
+2 -2
View File
@@ -6,7 +6,7 @@ ret: 0 st: 1 flags:1 dts: 1.400000 pts: 1.500000 pos: 564 size: 3913
ret: 0 st: 0 flags:0 ts: 0.788333
ret: 0 st: 1 flags:1 dts: 1.400000 pts: 1.500000 pos: 564 size: 3913
ret: 0 st: 0 flags:1 ts: 1.682500
ret: 0 st: 1 flags:0 dts: 1.600000 pts: 1.600000 pos: 8836 size: 2330
ret: 0 st: 1 flags:0 dts: 1.600000 pts: 1.600000 pos: 8836 size: 2289
ret: 0 st: 1 flags:0 ts: 2.576667
ret: 0 st: 0 flags:1 dts: 2.586233 pts: 2.586233 pos: 55836 size: 1254
ret: 0 st: 1 flags:1 ts: 3.470833
@@ -40,7 +40,7 @@ ret: 0 st: 0 flags:1 dts: 3.108689 pts: 3.108689 pos: 82156 size: 1254
ret: 0 st:-1 flags:1 ts: 3.989173
ret: 0 st: 1 flags:1 dts: 1.400000 pts: 1.500000 pos: 564 size: 3913
ret: 0 st: 0 flags:0 ts: 4.883344
ret: 0 st: 1 flags:0 dts: 4.800000 pts: 5.100000 pos: 20492 size: 3860
ret: 0 st: 1 flags:0 dts: 4.800000 pts: 5.100000 pos: 20492 size: 3904
ret: 0 st: 0 flags:1 ts:-0.222489
ret: 0 st: 1 flags:1 dts: 1.400000 pts: 1.500000 pos: 564 size: 3913
ret: 0 st: 1 flags:0 ts: 0.671678