fix stream checks missing non-aac audio

The ffprobe API never asked ffprobe for codec_type, so the stream checks could only spot audio and video by codec name. G.711, Opus, and other non-AAC audio showed as no audio, and H.265 detect streams showed an unknown resolution. ffprobe_stream now requests codec_type, and the stream check matches tracks on it alone.
This commit is contained in:
Josh Hawkins
2026-11-18 15:30:09 -06:00
parent 313009aa11
commit 7208d7e810
3 changed files with 20 additions and 14 deletions
+17 -1
View File
@@ -1,11 +1,13 @@
"""Tests for credential scrubbing in the ffprobe API.""" """Tests for the ffprobe API."""
import unittest
from types import SimpleNamespace from types import SimpleNamespace
from unittest.mock import patch from unittest.mock import patch
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from frigate.test.http_api.base_http_test import AuthTestClient, BaseTestHttp from frigate.test.http_api.base_http_test import AuthTestClient, BaseTestHttp
from frigate.util.services import ffprobe_stream
class TestHttpFfprobe(BaseTestHttp): class TestHttpFfprobe(BaseTestHttp):
@@ -35,3 +37,17 @@ class TestHttpFfprobe(BaseTestHttp):
self.assertEqual(len(lines), 2) self.assertEqual(len(lines), 2)
self.assertNotIn("hunter2", " ".join(lines)) self.assertNotIn("hunter2", " ".join(lines))
self.assertEqual(lines[1], "rtsp://*:*@10.0.0.1:554/video: Connection refused") self.assertEqual(lines[1], "rtsp://*:*@10.0.0.1:554/video: Connection refused")
class TestFfprobeStream(unittest.TestCase):
def test_requests_codec_type(self):
ffmpeg = SimpleNamespace(ffprobe_path="ffprobe")
done = SimpleNamespace(returncode=0, stdout=b"{}", stderr=b"")
for detailed in (False, True):
with patch("frigate.util.services.sp.run", return_value=done) as run:
ffprobe_stream(ffmpeg, "rtsp://10.0.0.1/live", detailed=detailed)
cmd = run.call_args.args[0]
entries = cmd[cmd.index("-show_entries") + 1]
self.assertIn("codec_type", entries.removeprefix("stream=").split(","))
+1 -1
View File
@@ -1365,7 +1365,7 @@ def ffprobe_stream(ffmpeg, path: str, detailed: bool = False) -> sp.CompletedPro
clean_path = escape_special_characters(path) clean_path = escape_special_characters(path)
# Base entries that are always included # Base entries that are always included
stream_entries = "codec_long_name,width,height,bit_rate,duration,display_aspect_ratio,avg_frame_rate" stream_entries = "codec_type,codec_long_name,width,height,bit_rate,duration,display_aspect_ratio,avg_frame_rate"
# Additional detailed entries # Additional detailed entries
if detailed: if detailed:
+2 -12
View File
@@ -57,18 +57,8 @@ export function ffprobeToTestResult(
} }
const streams = entry.stdout?.streams ?? []; const streams = entry.stdout?.streams ?? [];
const videoStream = streams.find( const videoStream = streams.find((s) => s.codec_type === "video");
(s) => const audioStream = streams.find((s) => s.codec_type === "audio");
s.codec_type === "video" ||
s.codec_name?.includes("h264") ||
s.codec_name?.includes("h265"),
);
const audioStream = streams.find(
(s) =>
s.codec_type === "audio" ||
s.codec_name?.includes("aac") ||
s.codec_name?.includes("mp3"),
);
const resolution = videoStream const resolution = videoStream
? `${videoStream.width}x${videoStream.height}` ? `${videoStream.width}x${videoStream.height}`