details: http://freenginx.org/hg/nginx-tests/rev/570d0c2667b8
branches:
changeset: 2003:570d0c2667b8
user: Maxim Dounin <mdou...@mdounin.ru>
date: Fri Feb 07 04:25:03 2025 +0300
description:
Tests: adjusted mp4 tests to use libopenh264 encoder if available.
Instead of specifically requesting libx264, the h264 codec is now requested,
so the default encoder for the codec will be used. Notably, this ensures
that tests will properly work on Fedora, where libopenh264 is used instead
of libx264.
diffstat:
mp4.t | 8 ++++----
mp4_ssi.t | 6 +++---
mp4_start_key_frame.t | 6 +++---
range_mp4.t | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
diffs (81 lines):
diff --git a/mp4.t b/mp4.t
--- a/mp4.t
+++ b/mp4.t
@@ -51,18 +51,18 @@ EOF
plan(skip_all => 'no lavfi')
unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`;
-plan(skip_all => 'no libx264')
- unless grep /libx264/, `ffmpeg -loglevel quiet -encoders`;
+plan(skip_all => 'no libx264 or libopenh264')
+ unless grep /libx264|libopenh264/, `ffmpeg -loglevel quiet -encoders`;
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 h264 '
. "${\($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 h264 '
. '-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
--- a/mp4_ssi.t
+++ b/mp4_ssi.t
@@ -52,12 +52,12 @@ EOF
plan(skip_all => 'no lavfi')
unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`;
-plan(skip_all => 'no libx264')
- unless grep /libx264/, `ffmpeg -loglevel quiet -encoders`;
+plan(skip_all => 'no libx264 or libopenh264')
+ unless grep /libx264|libopenh264/, `ffmpeg -loglevel quiet -encoders`;
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 h264 '
. "${\($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
--- a/mp4_start_key_frame.t
+++ b/mp4_start_key_frame.t
@@ -56,11 +56,11 @@ EOF
plan(skip_all => 'no lavfi')
unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`;
-plan(skip_all => 'no libx264')
- unless grep /libx264/, `ffmpeg -loglevel quiet -encoders`;
+plan(skip_all => 'no libx264 or libopenh264')
+ unless grep /libx264|libopenh264/, `ffmpeg -loglevel quiet -encoders`;
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 h264 '
. "${\($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
--- a/range_mp4.t
+++ b/range_mp4.t
@@ -49,11 +49,11 @@ EOF
plan(skip_all => 'no lavfi')
unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`;
-plan(skip_all => 'no libx264')
- unless grep /libx264/, `ffmpeg -loglevel quiet -encoders`;
+plan(skip_all => 'no libx264 or libopenh264')
+ unless grep /libx264|libopenh264/, `ffmpeg -loglevel quiet -encoders`;
system('ffmpeg -nostdin -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 h264 ${\($t->testdir())}/test.mp4") == 0
or die "Can't create mp4 file: $!";
$t->run()->plan(13);
