administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-04-05 14:47:40 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix ffmpeg presets

Browse Source
This commit is contained in:
Nicolas Mowen 2026-03-25 17:01:59 -06:00
parent f358813d43
commit f11e26ec6b
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frigate/ffmpeg_presets.py
View File

@ -3,7 +3,7 @@
import logging import logging
import os import os
from enum import Enum from enum import Enum
from typing import Any from typing import Any, Optional
from frigate.const import ( from frigate.const import (
FFMPEG_HVC1_ARGS, FFMPEG_HVC1_ARGS,
@ -215,7 +215,7 @@ def parse_preset_hardware_acceleration_decode(
width: int, width: int,
height: int, height: int,
gpu: int, gpu: int,
) -> list[str]: ) -> Optional[list[str]]:
"""Return the correct preset if in preset format otherwise return None.""" """Return the correct preset if in preset format otherwise return None."""
if not isinstance(arg, str): if not isinstance(arg, str):
return None return None
@ -242,9 +242,9 @@ def parse_preset_hardware_acceleration_scale(
else: else:
scale = PRESETS_HW_ACCEL_SCALE.get(arg, PRESETS_HW_ACCEL_SCALE["default"]) scale = PRESETS_HW_ACCEL_SCALE.get(arg, PRESETS_HW_ACCEL_SCALE["default"])
scale = scale.format(fps, width, height).split(" ") scale_args = scale.format(fps, width, height).split(" ")
scale.extend(detect_args) scale_args.extend(detect_args)
return scale return scale_args
class EncodeTypeEnum(str, Enum): class EncodeTypeEnum(str, Enum):
@ -420,7 +420,7 @@ PRESETS_INPUT = {
} }
def parse_preset_input(arg: Any, detect_fps: int) -> list[str]: def parse_preset_input(arg: Any, detect_fps: int) -> Optional[list[str]]:
"""Return the correct preset if in preset format otherwise return None.""" """Return the correct preset if in preset format otherwise return None."""
if not isinstance(arg, str): if not isinstance(arg, str):
return None return None
@ -530,7 +530,7 @@ PRESETS_RECORD_OUTPUT = {
} }
def parse_preset_output_record(arg: Any, force_record_hvc1: bool) -> list[str]: def parse_preset_output_record(arg: Any, force_record_hvc1: bool) -> Optional[list[str]]:
"""Return the correct preset if in preset format otherwise return None.""" """Return the correct preset if in preset format otherwise return None."""
if not isinstance(arg, str): if not isinstance(arg, str):
return None return None

3
frigate/mypy.ini
View File

@ -60,9 +60,6 @@ ignore_errors = true
[mypy-frigate.events.*] [mypy-frigate.events.*]
ignore_errors = true ignore_errors = true
[mypy-frigate.ffmpeg_presets]
ignore_errors = true
[mypy-frigate.http] [mypy-frigate.http]
ignore_errors = true ignore_errors = true