Update ffmpeg to 7 and update intel hwaccel docs

docker/main/install_deps.sh

@@ -40,25 +40,25 @@ apt-get -qq install --no-install-recommends --no-install-suggests -y \
 # btbn-ffmpeg -> amd64
 if [[ "${TARGETARCH}" == "amd64" ]]; then
  mkdir -p /usr/lib/ffmpeg/5.0
- mkdir -p /usr/lib/ffmpeg/6.0
+ mkdir -p /usr/lib/ffmpeg/7.0
  wget -qO btbn-ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2022-07-31-12-37/ffmpeg-n5.1-2-g915ef932a3-linux64-gpl-5.1.tar.xz"
  tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1
  rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/5.0/doc /usr/lib/ffmpeg/5.0/bin/ffplay
- wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-08-31-12-50/ffmpeg-n6.1.2-2-gb534cc666e-linux64-gpl-6.1.tar.xz"
- tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/6.0 --strip-components 1
- rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/6.0/doc /usr/lib/ffmpeg/6.0/bin/ffplay
+ wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-19-12-51/ffmpeg-n7.0.2-18-g3e6cec1286-linux64-gpl-7.0.tar.xz"
+ tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1
+ rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/7.0/doc /usr/lib/ffmpeg/7.0/bin/ffplay
 fi
 
 # ffmpeg -> arm64
 if [[ "${TARGETARCH}" == "arm64" ]]; then
  mkdir -p /usr/lib/ffmpeg/5.0
- mkdir -p /usr/lib/ffmpeg/6.0
+ mkdir -p /usr/lib/ffmpeg/7.0
  wget -qO btbn-ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2022-07-31-12-37/ffmpeg-n5.1-2-g915ef932a3-linuxarm64-gpl-5.1.tar.xz"
  tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1
  rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/5.0/doc /usr/lib/ffmpeg/5.0/bin/ffplay
- wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-08-31-12-50/ffmpeg-n6.1.2-2-gb534cc666e-linuxarm64-gpl-6.1.tar.xz"
- tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/6.0 --strip-components 1
- rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/6.0/doc /usr/lib/ffmpeg/6.0/bin/ffplay
+ wget -qO btbn-ffmpeg.tar.xz "hhttps://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-19-12-51/ffmpeg-n7.0.2-18-g3e6cec1286-linuxarm64-gpl-7.0.tar.xz"
+ tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1
+ rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/7.0/doc /usr/lib/ffmpeg/7.0/bin/ffplay
 fi
 
 # arch specific packages

docker/main/rootfs/usr/local/go2rtc/create_config.py

@@ -9,10 +9,12 @@
 import yaml
 
 sys.path.insert(0, "/opt/frigate")
-from frigate.const import BIRDSEYE_PIPE # noqa: E402
-from frigate.ffmpeg_presets import ( # noqa: E402
- parse_preset_hardware_acceleration_encode,
+from frigate.const import (
+ BIRDSEYE_PIPE,
+ DEFAULT_FFMPEG_VERSION,
+ INCLUDED_FFMPEG_VERSIONS,
 )
+from frigate.ffmpeg_presets import parse_preset_hardware_acceleration_encode
 
 sys.path.remove("/opt/frigate")
 
@@ -110,13 +112,11 @@
 path = config.get("ffmpeg", {}).get("path", "default")
 if path == "default":
  if shutil.which("ffmpeg") is None:
- ffmpeg_path = "/usr/lib/ffmpeg/6.0/bin/ffmpeg"
+ ffmpeg_path = f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"
  else:
  ffmpeg_path = "ffmpeg"
-elif path == "6.0":
- ffmpeg_path = "/usr/lib/ffmpeg/6.0/bin/ffmpeg"
-elif path == "5.0":
- ffmpeg_path = "/usr/lib/ffmpeg/5.0/bin/ffmpeg"
+elif path in INCLUDED_FFMPEG_VERSIONS:
+ ffmpeg_path = f"/usr/lib/ffmpeg/{path}/bin/ffmpeg"
 else:
  ffmpeg_path = f"{path}/bin/ffmpeg"
 

docker/rockchip/Dockerfile

@@ -24,3 +24,4 @@ RUN rm -rf /usr/lib/btbn-ffmpeg/bin/ffmpeg
 RUN rm -rf /usr/lib/btbn-ffmpeg/bin/ffprobe
 ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.1-5/ffmpeg /usr/lib/ffmpeg/6.0/bin/
 ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.1-5/ffprobe /usr/lib/ffmpeg/6.0/bin/
+ENV PATH="/usr/lib/ffmpeg/6.0/bin/:${PATH}"

docs/docs/configuration/hardware_acceleration.md

@@ -65,24 +65,31 @@ Or map in all the `/dev/video*` devices.
 
 ## Intel-based CPUs
 
-### Via VAAPI
+**Recommended hwaccel Preset**
 
-VAAPI supports automatic profile selection so it will work automatically with both H.264 and H.265 streams. VAAPI is recommended for all generations of Intel-based CPUs.
-
-```yaml
-ffmpeg:
- hwaccel_args: preset-vaapi
-```
+| CPU Generation | Intel Driver | Recommended Preset | Notes |
+| -------------- | ------------ | ------------------ | ----------------------------------- |
+| gen1 - gen7 | i965 | preset-vaapi | qsv is not supported |
+| gen8 - gen12 | iHD | preset-vaapi | preset-intel-qsv-* can also be used |
+| gen13+ | iHD / Xe | preset-intel-qsv-* | |
+| Intel Arc GPU | iHD / Xe | preset-intel-qsv-* | |
 
 :::note
 
-With some of the processors, like the J4125, the default driver `iHD` doesn't seem to work correctly for hardware acceleration. You may need to change the driver to `i965` by adding the following environment variable `LIBVA_DRIVER_NAME=i965` to your docker-compose file or [in the `frigate.yaml` for HA OS users](advanced.md#environment_vars).
+The default driver is `iHD`. You may need to change the driver to `i965` by adding the following environment variable `LIBVA_DRIVER_NAME=i965` to your docker-compose file or [in the `frigate.yaml` for HA OS users](advanced.md#environment_vars).
 
 :::
 
-### Via Quicksync (>=10th Generation only)
+### Via VAAPI
+
+VAAPI supports automatic profile selection so it will work automatically with both H.264 and H.265 streams.
+
+```yaml
+ffmpeg:
+ hwaccel_args: preset-vaapi
+```
 
-If VAAPI does not work for you, you can try QSV if your processor supports it. QSV must be set specifically based on the video encoding of the stream.
+### Via Quicksync
 
 #### H.264 streams
 

frigate/config.py

@@ -26,7 +26,9 @@
  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 @@
 
 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,7 +91,7 @@ def get_selected_gpu(self) -> str:
 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,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",