From 70a8ac1f358ea313fc7c6e1cf690eb813d1d3532 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Fri, 13 Jan 2023 13:08:30 -0700 Subject: [PATCH] Clean up camera default values --- web/src/routes/Camera.jsx | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/web/src/routes/Camera.jsx b/web/src/routes/Camera.jsx index 1a0a42791..550daf105 100644 --- a/web/src/routes/Camera.jsx +++ b/web/src/routes/Camera.jsx @@ -29,7 +29,10 @@ export default function Camera({ camera }) { const jsmpegWidth = cameraConfig ? Math.round(cameraConfig.restream.jsmpeg.height * (cameraConfig.detect.width / cameraConfig.detect.height)) : 0; - const [viewSource, setViewSource, sourceIsLoaded] = usePersistence(`${camera}-source`, 'mse'); + const [viewSource, setViewSource, sourceIsLoaded] = usePersistence( + `${camera}-source`, + getDefaultLiveMode(config, cameraConfig) + ); const sourceValues = cameraConfig && cameraConfig.restream.enabled ? ['mse', 'webrtc', 'jsmpeg'] : ['jsmpeg']; const [options, setOptions] = usePersistence(`${camera}-feed`, emptyObject); @@ -77,7 +80,13 @@ export default function Camera({ camera }) { labelPosition="after" /> - + ); } + +function getDefaultLiveMode(config, cameraConfig) { + if (cameraConfig) { + if (cameraConfig.restream.enabled) { + return config.ui.live_mode; + } + + return 'jsmpeg'; + } + + return undefined; +}