Mercurial > hg > nginx-tests
changeset 1268:1923461981c9
Tests: prevent broken terminal after tc[gs]etattr ffmpeg race.
Running multiple ffmpeg processes could lead to save/restore
of the already alternated terminal state.
| author | Sergey Kandaurov <pluknet@nginx.com> |
|---|---|
| date | Thu, 11 Jan 2018 19:23:45 +0300 |
| parents | f94e79aad895 |
| children | a32ef40ab48a |
| files | mp4.t mp4_ssi.t range_mp4.t |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mp4.t +++ b/mp4.t @@ -53,13 +53,13 @@ EOF plan(skip_all => 'no lavfi') unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`; -system('ffmpeg -loglevel quiet -y ' +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 ' . "${\($t->testdir())}/test.mp4") == 0 or die "Can't create mp4 file: $!"; -system('ffmpeg -loglevel quiet -y ' +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 '
--- a/mp4_ssi.t +++ b/mp4_ssi.t @@ -52,7 +52,7 @@ EOF plan(skip_all => 'no lavfi') unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`; -system('ffmpeg -loglevel quiet -y ' +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 '
--- a/range_mp4.t +++ b/range_mp4.t @@ -48,7 +48,7 @@ http { EOF plan(skip_all => 'no lavfi') - unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`; + unless grep /lavfi/, `ffmpeg -nostdin -loglevel quiet -formats`; 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