From 956c46256cac34fd8fa12930eed8bebc824e322e Mon Sep 17 00:00:00 2001 From: Quinn McNamara Date: Mon, 23 Apr 2018 12:44:03 -0500 Subject: [PATCH] Removed Hz from audio_fps match in ffmpeg_parse_infos (#665) * removed Hz from audio_fps match in ffmpeg_parse_infos * added more tests for ffmpeg reader --- moviepy/video/io/ffmpeg_reader.py | 3 ++- tests/test_ffmpeg_reader.py | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/moviepy/video/io/ffmpeg_reader.py b/moviepy/video/io/ffmpeg_reader.py index 0a26a88aa..1086fe54e 100644 --- a/moviepy/video/io/ffmpeg_reader.py +++ b/moviepy/video/io/ffmpeg_reader.py @@ -385,7 +385,8 @@ def get_fps(): line = lines_audio[0] try: match = re.search(" [0-9]* Hz", line) - result['audio_fps'] = int(line[match.start()+1:match.end()]) + hz_string = line[match.start()+1:match.end()-3] # Removes the 'hz' from the end + result['audio_fps'] = int(hz_string) except: result['audio_fps'] = 'unknown' diff --git a/tests/test_ffmpeg_reader.py b/tests/test_ffmpeg_reader.py index 5f0d381e0..a46fce96b 100644 --- a/tests/test_ffmpeg_reader.py +++ b/tests/test_ffmpeg_reader.py @@ -21,6 +21,15 @@ def test_ffmpeg_parse_infos(): d=ffmpeg_parse_infos("media/pigs_in_a_polka.gif") assert d['video_size'] == [314, 273] assert d['duration'] == 3.0 + assert not d['audio_found'] + + d=ffmpeg_parse_infos("media/video_with_failing_audio.mp4") + assert d['audio_found'] + assert d['audio_fps'] == 44100 + + d=ffmpeg_parse_infos("media/crunching.mp3") + assert d['audio_found'] + assert d['audio_fps'] == 48000 if __name__ == '__main__':