From 463aa0a4ad1b6241924b1baf7d7be9aee900608a Mon Sep 17 00:00:00 2001 From: Rocky Cai Date: Tue, 17 Aug 2021 10:50:46 -0700 Subject: [PATCH] Support pipe input in ffprobe Usage: `ffmpeg.probe('pipe:', input=video_bytes)`. The API is similar to `fmpeg.run()`. https://github.com/kkroening/ffmpeg-python/tree/master/examples#tensorflow-streaming This is helpful when we want to probe the video bytes in a database. --- ffmpeg/_probe.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ffmpeg/_probe.py b/ffmpeg/_probe.py index 090d7ab..9444488 100644 --- a/ffmpeg/_probe.py +++ b/ffmpeg/_probe.py @@ -4,7 +4,7 @@ from ._run import Error 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. Raises: @@ -17,11 +17,10 @@ def probe(filename, cmd='ffprobe', timeout=None, **kwargs): args += convert_kwargs_to_cmd_line_args(kwargs) args += [filename] - p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - communicate_kwargs = {} - if timeout is not None: - communicate_kwargs['timeout'] = timeout - out, err = p.communicate(**communicate_kwargs) + p = subprocess.Popen( + args, stdin=None if input is None else subprocess.PIPE, + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + out, err = p.communicate(input=input, timeout=timeout) if p.returncode != 0: raise Error('ffprobe', out, err) return json.loads(out.decode('utf-8'))