From 750bf0e79a4b6d46b2a3f683a6321097cc7cc04e Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Tue, 14 Mar 2023 08:25:27 -0500 Subject: [PATCH] Revert "Update ffmpeg args with low risk improvements (#5519)" (#5715) This reverts commit 52459bf34865ecba2fc278cec201ca15b5208799. --- docs/docs/configuration/index.md | 4 ++-- frigate/config.py | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/docs/docs/configuration/index.md b/docs/docs/configuration/index.md index 8fce13baf..3f8b88351 100644 --- a/docs/docs/configuration/index.md +++ b/docs/docs/configuration/index.md @@ -165,7 +165,7 @@ birdseye: # More information about presets at https://docs.frigate.video/configuration/ffmpeg_presets ffmpeg: # Optional: global ffmpeg args (default: shown below) - global_args: -hide_banner -loglevel warning -threads 1 + global_args: -hide_banner -loglevel warning # Optional: global hwaccel args (default: shown below) # NOTE: See hardware acceleration docs for your specific device hwaccel_args: [] @@ -174,7 +174,7 @@ ffmpeg: # Optional: global output args output_args: # Optional: output args for detect streams (default: shown below) - detect: -threads 1 -f rawvideo -pix_fmt yuv420p + detect: -f rawvideo -pix_fmt yuv420p # Optional: output args for record streams (default: shown below) record: preset-record-generic # Optional: output args for rtmp streams (default: shown below) diff --git a/frigate/config.py b/frigate/config.py index 9a96b642a..f318c8346 100644 --- a/frigate/config.py +++ b/frigate/config.py @@ -395,16 +395,9 @@ class BirdseyeCameraConfig(BaseModel): ) -FFMPEG_GLOBAL_ARGS_DEFAULT = ["-hide_banner", "-loglevel", "warning", "-threads", "1"] +FFMPEG_GLOBAL_ARGS_DEFAULT = ["-hide_banner", "-loglevel", "warning"] FFMPEG_INPUT_ARGS_DEFAULT = "preset-rtsp-generic" -DETECT_FFMPEG_OUTPUT_ARGS_DEFAULT = [ - "-threads", - "1", - "-f", - "rawvideo", - "-pix_fmt", - "yuv420p", -] +DETECT_FFMPEG_OUTPUT_ARGS_DEFAULT = ["-f", "rawvideo", "-pix_fmt", "yuv420p"] RTMP_FFMPEG_OUTPUT_ARGS_DEFAULT = "preset-rtmp-generic" RECORD_FFMPEG_OUTPUT_ARGS_DEFAULT = "preset-record-generic"