Update ffmpeg to 7 and update intel hwaccel docs (#13834)

* Update ffmpeg to 7 and update intel hwaccel docs

* Formatting

* Redo early gen naming

* Add gamma back in

* Fix table

* Add link to intel docs

* Add hwaccel arg for disabling gamma

* Formatting

* Fix tests

* Formatting

* Fix nvidia

frigate/config.py

@@ -26,7 +26,9 @@ from frigate.const import (
     CACHE_DIR,
     CACHE_SEGMENT_FORMAT,
     DEFAULT_DB_PATH,
+    DEFAULT_FFMPEG_VERSION,
     FREQUENCY_STATS_POINTS,
+    INCLUDED_FFMPEG_VERSIONS,
     MAX_PRE_CAPTURE,
     REGEX_CAMERA_NAME,
     YAML_EXT,
@@ -896,27 +898,23 @@ class FfmpegConfig(FrigateBaseModel):
     def ffmpeg_path(self) -> str:
         if self.path == "default":
             if shutil.which("ffmpeg") is None:
-                return "/usr/lib/ffmpeg/6.0/bin/ffmpeg"
+                return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"
             else:
                 return "ffmpeg"
-        elif self.path == "6.0":
-            return "/usr/lib/ffmpeg/6.0/bin/ffmpeg"
-        elif self.path == "5.0":
-            return "/usr/lib/ffmpeg/5.0/bin/ffmpeg"
+        elif self.path in INCLUDED_FFMPEG_VERSIONS:
+            return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg"
         else:
             return f"{self.path}/bin/ffmpeg"
 
     @property
     def ffprobe_path(self) -> str:
         if self.path == "default":
-            if int(os.getenv("LIBAVFORMAT_VERSION_MAJOR", "59")) >= 59:
-                return "/usr/lib/ffmpeg/6.0/bin/ffprobe"
+            if shutil.which("ffprobe") is None:
+                return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe"
             else:
                 return "ffprobe"
-        elif self.path == "6.0":
-            return "/usr/lib/ffmpeg/6.0/bin/ffprobe"
-        elif self.path == "5.0":
-            return "/usr/lib/ffmpeg/5.0/bin/ffprobe"
+        elif self.path in INCLUDED_FFMPEG_VERSIONS:
+            return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe"
         else:
             return f"{self.path}/bin/ffprobe"
 

frigate/const.py

@@ -43,8 +43,10 @@ AUDIO_MIN_CONFIDENCE = 0.5
 
 MAX_WAL_SIZE = 10  # MB
 
-# Ffmpeg Presets
+# Ffmpeg constants
 
+DEFAULT_FFMPEG_VERSION = "7.0"
+INCLUDED_FFMPEG_VERSIONS = ["7.0", "5.0"]
 FFMPEG_HWACCEL_NVIDIA = "preset-nvidia"
 FFMPEG_HWACCEL_VAAPI = "preset-vaapi"
 FFMPEG_HWACCEL_VULKAN = "preset-vulkan"

frigate/ffmpeg_presets.py

@@ -91,10 +91,10 @@ PRESETS_HW_ACCEL_DECODE["preset-nvidia-mjpeg"] = PRESETS_HW_ACCEL_DECODE[
 PRESETS_HW_ACCEL_SCALE = {
     "preset-rpi-64-h264": "-r {0} -vf fps={0},scale={1}:{2}",
     "preset-rpi-64-h265": "-r {0} -vf fps={0},scale={1}:{2}",
-    FFMPEG_HWACCEL_VAAPI: "-r {0} -vf fps={0},scale_vaapi=w={1}:h={2}:format=nv12,hwdownload,format=nv12,format=yuv420p",
+    FFMPEG_HWACCEL_VAAPI: "-r {0} -vf fps={0},scale_vaapi=w={1}:h={2},hwdownload,format=nv12,eq=gamma=1.05",
     "preset-intel-qsv-h264": "-r {0} -vf vpp_qsv=framerate={0}:w={1}:h={2}:format=nv12,hwdownload,format=nv12,format=yuv420p",
     "preset-intel-qsv-h265": "-r {0} -vf vpp_qsv=framerate={0}:w={1}:h={2}:format=nv12,hwdownload,format=nv12,format=yuv420p",
-    FFMPEG_HWACCEL_NVIDIA: "-r {0} -vf fps={0},scale_cuda=w={1}:h={2}:format=nv12,hwdownload,format=nv12,format=yuv420p",
+    FFMPEG_HWACCEL_NVIDIA: "-r {0} -vf fps={0},scale_cuda=w={1}:h={2},hwdownload,format=nv12,eq=gamma=1.05",
     "preset-jetson-h264": "-r {0}",  # scaled in decoder
     "preset-jetson-h265": "-r {0}",  # scaled in decoder
     "preset-rk-h264": "-r {0} -vf scale_rkrga=w={1}:h={2}:format=yuv420p:force_original_aspect_ratio=0,hwmap=mode=read,format=yuv420p",
@@ -185,6 +185,15 @@ def parse_preset_hardware_acceleration_scale(
     else:
         scale = PRESETS_HW_ACCEL_SCALE.get(arg, PRESETS_HW_ACCEL_SCALE["default"])
 
+    if (
+        ",hwdownload,format=nv12,eq=gamma=1.05" in scale
+        and os.environ.get("FFMPEG_DISABLE_GAMMA_EQUALIZER") is not None
+    ):
+        scale.replace(
+            ",hwdownload,format=nv12,eq=gamma=1.05",
+            ":format=nv12,hwdownload,format=nv12,format=yuv420p",
+        )
+
     scale = scale.format(fps, width, height).split(" ")
     scale.extend(detect_args)
     return scale

frigate/test/test_ffmpeg_presets.py

@@ -78,7 +78,7 @@ class TestFfmpegPresets(unittest.TestCase):
             " ".join(frigate_config.cameras["back"].ffmpeg_cmds[0]["cmd"])
         )
         assert (
-            "fps=10,scale_cuda=w=2560:h=1920:format=nv12,hwdownload,format=nv12,format=yuv420p"
+            "fps=10,scale_cuda=w=2560:h=1920,hwdownload,format=nv12,eq=gamma=1.05"
             in (" ".join(frigate_config.cameras["back"].ffmpeg_cmds[0]["cmd"]))
         )