From 4f8ec1aa1117544975896fc4b3703c9b8236d2ad Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Wed, 19 Nov 2025 10:17:59 -0700 Subject: [PATCH] Tests: use h264 encoder in mp4 tests with newer ffmpeg. --- mp4.t | 9 +++++++-- mp4_ssi.t | 6 +++++- mp4_start_key_frame.t | 6 +++++- range_mp4.t | 5 ++++- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/mp4.t b/mp4.t index 88ca1e9c..c8206a28 100644 --- a/mp4.t +++ b/mp4.t @@ -51,16 +51,21 @@ EOF plan(skip_all => 'no lavfi') unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`; + +my $encoder = (grep /libx264/, `ffmpeg -loglevel quiet -formats`) ? "libx264" : "h264"; + system('ffmpeg -nostdin -loglevel quiet -y ' . '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 ' . '-f lavfi -i testsrc=duration=20:size=320x200:rate=15 ' - . '-map 0:0 -map 1:0 -pix_fmt yuv420p -g 15 -c:v libx264 ' + . '-map 0:0 -map 1:0 -pix_fmt yuv420p -g 15 -c:v ' + . "$encoder " . "${\($t->testdir())}/test.mp4") == 0 or die "Can't create mp4 file: $!"; system('ffmpeg -nostdin -loglevel quiet -y ' . '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 ' . '-f lavfi -i testsrc=duration=20:size=320x200:rate=15 ' - . '-map 0:0 -map 1:0 -pix_fmt yuv420p -g 15 -c:v libx264 ' + . '-map 0:0 -map 1:0 -pix_fmt yuv420p -g 15 -c:v ' + . "$encoder " . '-movflags +faststart ' . "${\($t->testdir())}/no_mdat.mp4") == 0 or die "Can't create mp4 file: $!"; diff --git a/mp4_ssi.t b/mp4_ssi.t index d41fe372..bb9284a6 100644 --- a/mp4_ssi.t +++ b/mp4_ssi.t @@ -52,10 +52,14 @@ EOF plan(skip_all => 'no lavfi') unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`; + +my $encoder = (grep /libx264/, `ffmpeg -loglevel quiet -formats`) ? "libx264" : "h264"; + system('ffmpeg -nostdin -loglevel quiet -y ' . '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 ' . '-f lavfi -i testsrc=duration=20:size=320x200:rate=15 ' - . '-map 0:0 -map 1:0 -pix_fmt yuv420p -g 15 -c:v libx264 ' + . '-map 0:0 -map 1:0 -pix_fmt yuv420p -g 15 -c:v ' + . "$encoder " . "${\($t->testdir())}/ssi.mp4") == 0 or die "Can't create mp4 file: $!"; diff --git a/mp4_start_key_frame.t b/mp4_start_key_frame.t index 45d1e0e7..1b2d1d6b 100644 --- a/mp4_start_key_frame.t +++ b/mp4_start_key_frame.t @@ -56,9 +56,13 @@ EOF plan(skip_all => 'no lavfi') unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`; + +my $encoder = (grep /libx264/, `ffmpeg -loglevel quiet -formats`) ? "libx264" : "h264"; + system('ffmpeg -nostdin -loglevel quiet -y ' . '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 ' - . '-pix_fmt yuv420p -g 15 -c:v libx264 ' + . '-pix_fmt yuv420p -g 15 -c:v ' + . "$encoder " . "${\($t->testdir())}/test.mp4") == 0 or die "Can't create mp4 file: $!"; $t->run()->plan(4); diff --git a/range_mp4.t b/range_mp4.t index 7c87a616..b49bd454 100644 --- a/range_mp4.t +++ b/range_mp4.t @@ -49,9 +49,12 @@ EOF plan(skip_all => 'no lavfi') unless grep /lavfi/, `ffmpeg -nostdin -loglevel quiet -formats`; + +my $encoder = (grep /libx264/, `ffmpeg -loglevel quiet -formats`) ? "libx264" : "h264"; + system('ffmpeg -loglevel quiet -y ' . '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 ' - . "-pix_fmt yuv420p -c:v libx264 ${\($t->testdir())}/test.mp4") == 0 + . "-pix_fmt yuv420p -c:v $encoder ${\($t->testdir())}/test.mp4") == 0 or die "Can't create mp4 file: $!"; $t->run()->plan(13);