Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Update ffmpeg args with low risk improvements (#5519)

Browse Source 
* Add threads 1 to input / output args

* Remove cuvid from hwaccel

* Update docs for new args

* Formatting
This commit is contained in:
Nicolas Mowen 2023-02-16 15:44:10 -07:00 committed by GitHub
parent 6cfa73a284
commit 52459bf348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/docs/configuration/index.md
View File

@ -148,7 +148,7 @@ birdseye:
# More information about presets at https://docs.frigate.video/configuration/ffmpeg_presets # More information about presets at https://docs.frigate.video/configuration/ffmpeg_presets
ffmpeg: ffmpeg:
# Optional: global ffmpeg args (default: shown below) # Optional: global ffmpeg args (default: shown below)
global_args: -hide_banner -loglevel warning global_args: -hide_banner -loglevel warning -threads 1
# Optional: global hwaccel args (default: shown below) # Optional: global hwaccel args (default: shown below)
# NOTE: See hardware acceleration docs for your specific device # NOTE: See hardware acceleration docs for your specific device
hwaccel_args: [] hwaccel_args: []
@ -157,7 +157,7 @@ ffmpeg:
# Optional: global output args # Optional: global output args
output_args: output_args:
# Optional: output args for detect streams (default: shown below) # Optional: output args for detect streams (default: shown below)
detect: -f rawvideo -pix_fmt yuv420p detect: -threads 1 -f rawvideo -pix_fmt yuv420p
# Optional: output args for record streams (default: shown below) # Optional: output args for record streams (default: shown below)
record: preset-record-generic record: preset-record-generic
# Optional: output args for rtmp streams (default: shown below) # Optional: output args for rtmp streams (default: shown below)

11
frigate/config.py
View File

@ -370,9 +370,16 @@ class BirdseyeCameraConfig(BaseModel):
) )
FFMPEG_GLOBAL_ARGS_DEFAULT = ["-hide_banner", "-loglevel", "warning"] FFMPEG_GLOBAL_ARGS_DEFAULT = ["-hide_banner", "-loglevel", "warning", "-threads", "1"]
FFMPEG_INPUT_ARGS_DEFAULT = "preset-rtsp-generic" FFMPEG_INPUT_ARGS_DEFAULT = "preset-rtsp-generic"
DETECT_FFMPEG_OUTPUT_ARGS_DEFAULT = ["-f", "rawvideo", "-pix_fmt", "yuv420p"] DETECT_FFMPEG_OUTPUT_ARGS_DEFAULT = [
"-threads",
"1",
"-f",
"rawvideo",
"-pix_fmt",
"yuv420p",
]
RTMP_FFMPEG_OUTPUT_ARGS_DEFAULT = "preset-rtmp-generic" RTMP_FFMPEG_OUTPUT_ARGS_DEFAULT = "preset-rtmp-generic"
RECORD_FFMPEG_OUTPUT_ARGS_DEFAULT = "preset-record-generic" RECORD_FFMPEG_OUTPUT_ARGS_DEFAULT = "preset-record-generic"

12
frigate/ffmpeg_presets.py
View File

@ -92,30 +92,18 @@ PRESETS_HW_ACCEL_DECODE = {
"cuda", "cuda",
"-hwaccel_output_format", "-hwaccel_output_format",
"cuda", "cuda",
"-extra_hw_frames",
"2",
"-c:v",
"h264_cuvid",
], ],
"preset-nvidia-h265": [ "preset-nvidia-h265": [
"-hwaccel", "-hwaccel",
"cuda", "cuda",
"-hwaccel_output_format", "-hwaccel_output_format",
"cuda", "cuda",
"-extra_hw_frames",
"2",
"-c:v",
"hevc_cuvid",
], ],
"preset-nvidia-mjpeg": [ "preset-nvidia-mjpeg": [
"-hwaccel", "-hwaccel",
"cuda", "cuda",
"-hwaccel_output_format", "-hwaccel_output_format",
"cuda", "cuda",
"-extra_hw_frames",
"2",
"-c:v",
"mjpeg_cuvid",
], ],
} }