From 3a4b358ea71083ca52dde4771d57c5d8fe59dd37 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Sat, 22 Oct 2022 07:18:26 -0600 Subject: [PATCH] Remove live source --- frigate/config.py | 10 ---------- web/src/routes/Camera.jsx | 5 +++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/frigate/config.py b/frigate/config.py index f71afc5d3..eaed45b7d 100644 --- a/frigate/config.py +++ b/frigate/config.py @@ -522,21 +522,11 @@ class JsmpegStreamConfig(FrigateBaseModel): quality: int = Field(default=8, ge=1, le=31, title="Live camera view quality.") -class BaseStreamConfig(FrigateBaseModel): - height: int = Field(default=720, title="Live camera view height.") - - class RestreamConfig(FrigateBaseModel): enabled: bool = Field(default=True, title="Restreaming enabled.") jsmpeg: JsmpegStreamConfig = Field( default_factory=JsmpegStreamConfig, title="Jsmpeg Stream Configuration." ) - mp4: BaseStreamConfig = Field( - default_factory=BaseStreamConfig, title="MP4 Stream Configuration." - ) - webrtc: BaseStreamConfig = Field( - default_factory=BaseStreamConfig, title="Webrtc Stream Configuration." - ) class CameraUiConfig(FrigateBaseModel): diff --git a/web/src/routes/Camera.jsx b/web/src/routes/Camera.jsx index 714139811..af7858c85 100644 --- a/web/src/routes/Camera.jsx +++ b/web/src/routes/Camera.jsx @@ -23,6 +23,7 @@ export default function Camera({ camera }) { const apiHost = useApiHost(); const [showSettings, setShowSettings] = useState(false); const [viewMode, setViewMode] = useState('live'); + const [viewSource, setViewSource] = useState('webrtc'); const cameraConfig = config?.cameras[camera]; const liveWidth = cameraConfig @@ -95,7 +96,7 @@ export default function Camera({ camera }) { let player; if (viewMode === 'live') { - if (cameraConfig.live.source == 'mp4') { + if (viewSource == 'mp4') { player = (
@@ -119,7 +120,7 @@ export default function Camera({ camera }) {
); - } else if (cameraConfig.live.source == 'webrtc') { + } else if (viewSource == 'webrtc') { player = (