administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-03 09:45:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add ffprobe timeout and catch case where camera is disabled

Browse Source
This commit is contained in:
Nick Mowen 2022-12-13 15:27:22 -07:00
parent d17e33eddc
commit 69043b0c9e
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frigate/http.py
View File

@ -1178,6 +1178,11 @@ def ffprobe():
{"success": False, "message": f"{camera} is not a valid camera."}, "404" {"success": False, "message": f"{camera} is not a valid camera."}, "404"
) )
if not current_app.frigate_config.cameras[camera].enabled:
return jsonify(
{"success": False, "message": f"{camera} is not enabled."}, "404"
)
paths = map( paths = map(
lambda input: input.path, lambda input: input.path,
current_app.frigate_config.cameras[camera].ffmpeg.inputs, current_app.frigate_config.cameras[camera].ffmpeg.inputs,

2
frigate/util.py
View File

@ -883,6 +883,8 @@ def ffprobe_stream(path: str) -> sp.CompletedProcess:
clean_path = escape_special_characters(path) clean_path = escape_special_characters(path)
ffprobe_cmd = [ ffprobe_cmd = [
"ffprobe", "ffprobe",
"-timeout",
"1000000",
"-print_format", "-print_format",
"json", "json",
"-show_entries", "-show_entries",