From 1dc2260a70180b8eeebdaf93a163a35999882638 Mon Sep 17 00:00:00 2001 From: xiota Date: Sat, 10 Dec 2022 18:03:35 -0800 Subject: [PATCH] Fix ffmpeg/tests/test_ffmpeg.py: test_pipe() FFmpeg 5.x duplicates trimmed frames instead of removing them. --- ffmpeg/tests/test_ffmpeg.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 8dbc271a..3ced507d 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -688,8 +688,8 @@ def test_pipe(): width = 32 height = 32 frame_size = width * height * 3 # 3 bytes for rgb24 - frame_count = 10 - start_frame = 2 + frame_count = 15 + start_frame = 3 out = ( ffmpeg.input( @@ -716,7 +716,7 @@ def test_pipe(): '-i', 'pipe:0', '-filter_complex', - '[0]trim=start_frame=2[s0]', + '[0]trim=start_frame={}[s0]'.format(start_frame), '-map', '[s0]', '-f', @@ -739,8 +739,17 @@ def test_pipe(): p.stdin.close() out_data = p.stdout.read() - assert len(out_data) == frame_size * (frame_count - start_frame) - assert out_data == in_data[start_frame * frame_size :] + + if len(out_data) < len (in_data): + # ffmpeg 4.x removes trimmed frames + assert len(out_data) == frame_size * (frame_count - start_frame) + assert out_data == in_data[start_frame * frame_size :] + elif len(out_data) == len(in_data): + # ffmpeg 5.x duplicates trimmed frames + for fn in range(0, start_frame): + assert out_data[fn*frame_size] == in_data[start_frame * frame_size] + + assert out_data[start_frame * frame_size :] == in_data[start_frame * frame_size :] def test__probe():