blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-04-05 04:22:51 +08:00
Code Issues Projects Releases Wiki Activity

Fix probe exception handling and add test

Browse Source
This commit is contained in:
Karl Kroening 2018-01-27 22:51:05 -08:00
parent 24e737f78e
commit 2fff94af6c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg/_probe.py
View File

@ -19,10 +19,11 @@ def probe(filename):
p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate()
if p.returncode != 0:
raise ExecException(err)
raise ProbeException(err)
return json.loads(out.decode('utf-8'))
__all__ = [
'probe',
'ProbeException',
]

8
ffmpeg/tests/test_ffmpeg.py
View File

@ -16,6 +16,7 @@ TEST_INPUT_FILE1 = os.path.join(SAMPLE_DATA_DIR, 'in1.mp4')
TEST_OVERLAY_FILE = os.path.join(SAMPLE_DATA_DIR, 'overlay.png')
TEST_OUTPUT_FILE1 = os.path.join(SAMPLE_DATA_DIR, 'out1.mp4')
TEST_OUTPUT_FILE2 = os.path.join(SAMPLE_DATA_DIR, 'out2.mp4')
BOGUS_INPUT_FILE = os.path.join(SAMPLE_DATA_DIR, 'bogus')
subprocess.check_call(['ffmpeg', '-version'])
@ -359,3 +360,10 @@ def test_ffprobe():
data = ffmpeg.probe(TEST_INPUT_FILE1)
assert set(data.keys()) == {'format', 'streams'}
assert data['format']['duration'] == '7.036000'
def test_ffprobe_exception():
with pytest.raises(ffmpeg.ProbeException) as excinfo:
ffmpeg.probe(BOGUS_INPUT_FILE)
assert excinfo.value.message == 'ffprobe error'
assert 'No such file or directory' in excinfo.value.stderr_output