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

Merge 463aa0a4ad1b6241924b1baf7d7be9aee900608a into df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6

Browse Source
This commit is contained in:
Rocky Cai 2022-07-11 16:48:05 -07:00 committed by GitHub
commit acdd32ffb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ffmpeg/_probe.py
View File

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