From 35288ecf75d026f610f4b45e29f115261b22ec9c Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Sun, 13 Nov 2022 14:44:20 -0700 Subject: [PATCH] Fix naming --- frigate/http.py | 14 +++++++------- frigate/util.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frigate/http.py b/frigate/http.py index 966421926..5e0032c65 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -31,7 +31,7 @@ from frigate.const import CLIPS_DIR from frigate.models import Event, Recordings from frigate.object_processing import TrackedObject from frigate.stats import stats_snapshot -from frigate.util import clean_camera_user_pass, ffprobe_stream, vainfo +from frigate.util import clean_camera_user_pass, ffprobe_stream, vainfo_hwaccel from frigate.version import VERSION logger = logging.getLogger(__name__) @@ -1001,15 +1001,15 @@ def ffprobe(): @bp.route("/vainfo", methods=["GET"]) def vainfo(): - vainfo_output = vainfo() + vainfo = vainfo_hwaccel() return jsonify( { - "return_code": vainfo_output.returncode, - "stderr": json.loads(vainfo_output.stderr.decode("unicode_escape").strip()) - if vainfo_output.stderr.decode() + "return_code": vainfo.returncode, + "stderr": json.loads(vainfo.stderr.decode("unicode_escape").strip()) + if vainfo.stderr.decode() else {}, - "stdout": json.loads(vainfo_output.stdout.decode("unicode_escape").strip()) - if vainfo_output.stdout.decode() + "stdout": json.loads(vainfo.stdout.decode("unicode_escape").strip()) + if vainfo.stdout.decode() else {}, } ) diff --git a/frigate/util.py b/frigate/util.py index dc983d578..0a5ef6a39 100755 --- a/frigate/util.py +++ b/frigate/util.py @@ -880,7 +880,7 @@ def ffprobe_stream(path: str) -> sp.CompletedProcess: return sp.run(ffprobe_cmd, capture_output=True) -def vainfo() -> sp.CompletedProcess: +def vainfo_hwaccel() -> sp.CompletedProcess: """Run vainfo.""" ffprobe_cmd = ["vainfo"] return sp.run(ffprobe_cmd, capture_output=True)