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
Zulko · Apr 23, 2018 · 956c462 · 956c462
1 parent a354ba3
commit 956c462
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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__':