administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-03 17:55:21 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix webui checks

Browse Source
This commit is contained in:
Nick Mowen 2023-01-15 18:07:03 -07:00
parent 868c947f74
commit 975b0a4ff1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/routes/Birdseye.jsx
View File

@ -36,7 +36,7 @@ export default function Birdseye() {
</Fragment> </Fragment>
); );
} }
} else if (viewSource == 'webrtc' && config.restream.birdseye) { } else if (viewSource == 'webrtc' && config.birdseye.restream) {
player = ( player = (
<Fragment> <Fragment>
<div className="max-w-5xl"> <div className="max-w-5xl">
@ -61,7 +61,7 @@ export default function Birdseye() {
Birdseye Birdseye
</Heading> </Heading>
{config.restream.birdseye && ( {config.birdseye.restream && (
<select <select
className="basis-1/8 cursor-pointer rounded dark:bg-slate-800" className="basis-1/8 cursor-pointer rounded dark:bg-slate-800"
value={viewSource} value={viewSource}

12
web/src/routes/Camera.jsx
View File

@ -23,6 +23,7 @@ export default function Camera({ camera }) {
const apiHost = useApiHost(); const apiHost = useApiHost();
const [showSettings, setShowSettings] = useState(false); const [showSettings, setShowSettings] = useState(false);
const [viewMode, setViewMode] = useState('live'); const [viewMode, setViewMode] = useState('live');
const restreamEnabled = config?.restream && Object.keys(config.restream).includes(camera);
const cameraConfig = config?.cameras[camera]; const cameraConfig = config?.cameras[camera];
const jsmpegWidth = cameraConfig const jsmpegWidth = cameraConfig
@ -32,8 +33,7 @@ export default function Camera({ camera }) {
`${camera}-source`, `${camera}-source`,
getDefaultLiveMode(config, cameraConfig) getDefaultLiveMode(config, cameraConfig)
); );
const sourceValues = const sourceValues = restreamEnabled ? ['mse', 'webrtc', 'jsmpeg'] : ['jsmpeg'];
config?.restream && Object.keys(config.restream).includes(camera) ? ['mse', 'webrtc', 'jsmpeg'] : ['jsmpeg'];
const [options, setOptions] = usePersistence(`${camera}-feed`, emptyObject); const [options, setOptions] = usePersistence(`${camera}-feed`, emptyObject);
const handleSetOption = useCallback( const handleSetOption = useCallback(
@ -107,7 +107,7 @@ export default function Camera({ camera }) {
let player; let player;
if (viewMode === 'live') { if (viewMode === 'live') {
if (viewSource == 'mse' && cameraConfig.restream.enabled) { if (viewSource == 'mse' && restreamEnabled) {
if ('MediaSource' in window) { if ('MediaSource' in window) {
player = ( player = (
<Fragment> <Fragment>
@ -125,7 +125,7 @@ export default function Camera({ camera }) {
</Fragment> </Fragment>
); );
} }
} else if (viewSource == 'webrtc' && cameraConfig.restream.enabled) { } else if (viewSource == 'webrtc' && restreamEnabled) {
player = ( player = (
<Fragment> <Fragment>
<div className="max-w-5xl"> <div className="max-w-5xl">
@ -201,9 +201,9 @@ export default function Camera({ camera }) {
); );
} }
function getDefaultLiveMode(config, cameraConfig) { function getDefaultLiveMode(config, cameraConfig, restreamEnabled) {
if (cameraConfig) { if (cameraConfig) {
if (cameraConfig.restream.enabled) { if (restreamEnabled) {
return config.ui.live_mode; return config.ui.live_mode;
} }