From cda627be9ee88d7deee6ede49b11bf71cac2529f Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Tue, 10 Jan 2023 15:41:33 -0700 Subject: [PATCH] Show jsmpeg when restream is disabled --- web/src/routes/Camera.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/routes/Camera.jsx b/web/src/routes/Camera.jsx index 2b9a5e396..70f87d161 100644 --- a/web/src/routes/Camera.jsx +++ b/web/src/routes/Camera.jsx @@ -30,7 +30,7 @@ export default function Camera({ camera }) { ? Math.round(cameraConfig.restream.jsmpeg.height * (cameraConfig.detect.width / cameraConfig.detect.height)) : 0; const [viewSource, setViewSource, sourceIsLoaded] = usePersistence(`${camera}-source`, 'mse'); - const sourceValues = cameraConfig && cameraConfig.restream.enabled ? ['mse', 'webrtc', 'jsmpeg'] : ['mse']; + const sourceValues = cameraConfig && cameraConfig.restream.enabled ? ['mse', 'webrtc', 'jsmpeg'] : ['jsmpeg']; const [options, setOptions] = usePersistence(`${camera}-feed`, emptyObject); const handleSetOption = useCallback( @@ -98,7 +98,7 @@ export default function Camera({ camera }) { let player; if (viewMode === 'live') { - if (viewSource == 'mse') { + if (viewSource == 'mse' && cameraConfig.restream.enabled) { if (videojs.browser.IS_IOS) { player = ( @@ -116,7 +116,7 @@ export default function Camera({ camera }) { ); } - } else if (viewSource == 'webrtc') { + } else if (viewSource == 'webrtc' && cameraConfig.restream.enabled) { player = (