From f294ec1ca1558c0e36d5992d0bbda5df0f89a7b0 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Thu, 10 Nov 2022 06:40:42 -0700 Subject: [PATCH] Return full output of ffprobe process --- frigate/http.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/frigate/http.py b/frigate/http.py index 932bee229..02bdf45eb 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -624,31 +624,31 @@ def ffprobe(camera_name): if len(config.ffmpeg.inputs) > 1: # user has multiple streams - output = "" + output = [] for input in config.ffmpeg.inputs: - output += f"{input.roles}\n" ffprobe = ffprobe_stream(input.path) - - if ffprobe: - output += f"{ffprobe}\n" - else: - output += "error getting stream\n" + output.append( + { + "input_roles": input.roles, + "return_code": ffprobe.returncode, + "stderr": ffprobe.stderr, + "stdout": ffprobe.stdout, + } + ) return jsonify(output, "200") else: # user has single stream ffprobe = ffprobe_stream(config.ffmpeg.inputs[0].path) - if not ffprobe: - return jsonify( - { - "success": False, - "message": f"ffprobe unable to get info for {camera_name}", - }, - "500", - ) - else: - return jsonify(ffprobe, "200") + return jsonify( + { + "input_roles": config.ffmpeg.inputs[0].roles, + "return_code": ffprobe.returncode, + "stderr": ffprobe.stderr, + "stdout": ffprobe.stdout, + } + ) @bp.route("/")