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

Add optional timeout argument to probe

Browse Source 
Popen.communicate() supports a timeout argument which is useful in case
there is a risk that the probe hangs.
This commit is contained in:
magnusvmt 2019-10-28 16:28:51 +01:00
parent 78fb6cf2f1
commit 82a00e4849
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg/_probe.py
View File

@ -4,7 +4,7 @@ from ._run import Error
from ._utils import convert_kwargs_to_cmd_line_args
def probe(filename, cmd='ffprobe', **kwargs):
def probe(filename, cmd='ffprobe', timeout=None, **kwargs):
"""Run ffprobe on the specified file and return a JSON representation of the output.
Raises:
@ -18,7 +18,7 @@ def probe(filename, cmd='ffprobe', **kwargs):
args += [filename]
p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = p.communicate()
out, err = p.communicate(timeout=timeout)
if p.returncode != 0:
raise Error('ffprobe', out, err)
return json.loads(out.decode('utf-8'))