From e6e9c7111efaa688debdbd93d321dc276a059e26 Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Fri, 13 Oct 2023 14:39:40 -0600
Subject: [PATCH] Fix forcing rtsp for audio process

---
 frigate/events/audio.py   | 21 ++++++++++++---------
 frigate/ffmpeg_presets.py |  7 -------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/frigate/events/audio.py b/frigate/events/audio.py
index 50e1d9ab0..b547f6b32 100644
--- a/frigate/events/audio.py
+++ b/frigate/events/audio.py
@@ -14,7 +14,7 @@ import requests
 from setproctitle import setproctitle
 
 from frigate.comms.inter_process import InterProcessCommunicator
-from frigate.config import CameraConfig, FrigateConfig
+from frigate.config import CameraConfig, CameraInput, FfmpegConfig, FrigateConfig
 from frigate.const import (
     AUDIO_DURATION,
     AUDIO_FORMAT,
@@ -39,11 +39,18 @@ except ModuleNotFoundError:
 logger = logging.getLogger(__name__)
 
 
-def get_ffmpeg_command(input_args: list[str], input_path: str) -> list[str]:
+def get_ffmpeg_command(ffmpeg: FfmpegConfig) -> list[str]:
+    ffmpeg_input: CameraInput = [i for i in ffmpeg.inputs if "audio" in i.roles][0]
+    input_args = get_ffmpeg_arg_list(ffmpeg.global_args) + (
+        parse_preset_input(ffmpeg_input.input_args, 1)
+        or ffmpeg_input.input_args
+        or parse_preset_input(ffmpeg.input_args, 1)
+        or ffmpeg.input_args
+    )
     return get_ffmpeg_arg_list(
-        f"ffmpeg {{}} -i {{}} -f {AUDIO_FORMAT} -ar {AUDIO_SAMPLE_RATE} -ac 1 -y {{}}".format(
+        f"ffmpeg -vn {{}} -i {{}} -f {AUDIO_FORMAT} -ar {AUDIO_SAMPLE_RATE} -ac 1 -y {{}}".format(
             " ".join(input_args),
-            input_path,
+            ffmpeg_input.path,
             "pipe:",
         )
     )
@@ -173,11 +180,7 @@ class AudioEventMaintainer(threading.Thread):
         self.shape = (int(round(AUDIO_DURATION * AUDIO_SAMPLE_RATE)),)
         self.chunk_size = int(round(AUDIO_DURATION * AUDIO_SAMPLE_RATE * 2))
         self.logger = logging.getLogger(f"audio.{self.config.name}")
-        self.ffmpeg_cmd = get_ffmpeg_command(
-            get_ffmpeg_arg_list(self.config.ffmpeg.global_args)
-            + parse_preset_input("preset-rtsp-audio-only", 1),
-            [i.path for i in self.config.ffmpeg.inputs if "audio" in i.roles][0],
-        )
+        self.ffmpeg_cmd = get_ffmpeg_command(self.config.ffmpeg)
         self.logpipe = LogPipe(f"ffmpeg.{self.config.name}.audio")
         self.audio_listener = None
 
diff --git a/frigate/ffmpeg_presets.py b/frigate/ffmpeg_presets.py
index a477c0404..fad68a670 100644
--- a/frigate/ffmpeg_presets.py
+++ b/frigate/ffmpeg_presets.py
@@ -256,13 +256,6 @@ PRESETS_INPUT = {
         "-use_wallclock_as_timestamps",
         "1",
     ],
-    "preset-rtsp-audio-only": [
-        "-rtsp_transport",
-        "tcp",
-        TIMEOUT_PARAM,
-        "5000000",
-        "-vn",
-    ],
     "preset-rtsp-restream": _user_agent_args
     + [
         "-rtsp_transport",