mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-09-29 11:26:49 +03:00
Live streaming tech selection (#24374)
* allow users to select live streaming technology * fix webrtc being downgraded to mse on load `useUserPersistence` seeds state with the default and loads asynchronously, so the first render always used `mse` instead of the saved choice, and `useWebRTCGloballyAvailable` reports `checking` until the probe settles and re-enters that state on every consumer mount, so a saved `webrtc` was rewritten to `mse` even after the probe had already passed. On Safari the MSE player then timed out and latched the jsmpeg fallback. A pending probe now counts as available, the player waits on `autoLive` until the stored preferences load, and `handleError` gates on the mode in use since the fallback flag no longer implies webrtc is untried. A rejected IndexedDB read also resolves `loaded` now, so a blocked store can't leave the player waiting forever. * add support for configurable ICE servers in WebRTC player * add mic error state, fix dialog overwriting saved choice and dashboard ignoring stream * tweaks
This commit is contained in:
@@ -4,11 +4,42 @@ import useSWR from "swr";
|
||||
import { LivePlayerMode } from "@/types/live";
|
||||
import useDeferredStreamMetadata from "./use-deferred-stream-metadata";
|
||||
import { detectCameraAudioFeatures } from "@/utils/cameraUtil";
|
||||
import {
|
||||
evaluateStreamWebRTCAvailability,
|
||||
useWebRTCGloballyAvailable,
|
||||
} from "./use-webrtc-availability";
|
||||
|
||||
// Shared by the initial computation and the context-menu "Reset" so the two
|
||||
// can't diverge.
|
||||
function resolveLiveMode(
|
||||
isRestreamed: boolean,
|
||||
mseSupported: boolean,
|
||||
webRTCAvailable: boolean,
|
||||
requested: LivePlayerMode | undefined,
|
||||
): LivePlayerMode {
|
||||
let mode: LivePlayerMode;
|
||||
if (!mseSupported) {
|
||||
mode = isRestreamed && webRTCAvailable ? "webrtc" : "jsmpeg";
|
||||
} else {
|
||||
mode = isRestreamed ? "mse" : "jsmpeg";
|
||||
}
|
||||
|
||||
if (requested === "jsmpeg") {
|
||||
mode = "jsmpeg";
|
||||
} else if (requested === "webrtc" && isRestreamed && webRTCAvailable) {
|
||||
mode = "webrtc";
|
||||
} else if (requested === "mse" && mseSupported && isRestreamed) {
|
||||
mode = "mse";
|
||||
}
|
||||
|
||||
return mode;
|
||||
}
|
||||
|
||||
export default function useCameraLiveMode(
|
||||
cameras: CameraConfig[],
|
||||
windowVisible: boolean,
|
||||
activeStreams?: { [cameraName: string]: string },
|
||||
preferredModes?: { [cameraName: string]: LivePlayerMode | undefined },
|
||||
) {
|
||||
const { data: config } = useSWR<FrigateConfig>("config");
|
||||
|
||||
@@ -46,6 +77,25 @@ export default function useCameraLiveMode(
|
||||
// Fetch stream metadata with deferred loading (doesn't block initial render)
|
||||
const streamMetadata = useDeferredStreamMetadata(restreamedStreamNames);
|
||||
|
||||
const { globallyAvailable, globalReason } = useWebRTCGloballyAvailable();
|
||||
|
||||
// "checking" counts as usable because the probe re-enters it on every mount,
|
||||
// and treating it as unavailable would downgrade a saved WebRTC choice.
|
||||
const webRTCUsableStates = useMemo(() => {
|
||||
const states: { [cameraName: string]: boolean } = {};
|
||||
cameras.forEach((camera) => {
|
||||
const streamName =
|
||||
activeStreams?.[camera.name] ?? Object.values(camera.live.streams)[0];
|
||||
const { available, reason } = evaluateStreamWebRTCAvailability({
|
||||
globallyAvailable,
|
||||
globalReason,
|
||||
metadata: streamMetadata[streamName],
|
||||
});
|
||||
states[camera.name] = available || reason === "checking";
|
||||
});
|
||||
return states;
|
||||
}, [cameras, activeStreams, globallyAvailable, globalReason, streamMetadata]);
|
||||
|
||||
// Compute live mode states
|
||||
const [preferredLiveModes, setPreferredLiveModes] = useState<{
|
||||
[key: string]: LivePlayerMode;
|
||||
@@ -81,11 +131,14 @@ export default function useCameraLiveMode(
|
||||
|
||||
newIsRestreamedStates[camera.name] = isRestreamed ?? false;
|
||||
|
||||
if (!mseSupported) {
|
||||
newPreferredLiveModes[camera.name] = isRestreamed ? "webrtc" : "jsmpeg";
|
||||
} else {
|
||||
newPreferredLiveModes[camera.name] = isRestreamed ? "mse" : "jsmpeg";
|
||||
}
|
||||
// Auto-selected default, overridden by the user's per-camera choice when viable
|
||||
// Runtime fallback (player errors) still adjusts the mode on top of this base
|
||||
newPreferredLiveModes[camera.name] = resolveLiveMode(
|
||||
!!isRestreamed,
|
||||
mseSupported,
|
||||
webRTCUsableStates[camera.name] ?? false,
|
||||
preferredModes?.[camera.name],
|
||||
);
|
||||
|
||||
// Check each stream for audio support
|
||||
if (isRestreamed) {
|
||||
@@ -108,7 +161,15 @@ export default function useCameraLiveMode(
|
||||
setPreferredLiveModes(newPreferredLiveModes);
|
||||
setIsRestreamedStates(newIsRestreamedStates);
|
||||
setSupportsAudioOutputStates(newSupportsAudioOutputStates);
|
||||
}, [activeStreams, cameras, config, windowVisible, streamMetadata]);
|
||||
}, [
|
||||
activeStreams,
|
||||
cameras,
|
||||
config,
|
||||
windowVisible,
|
||||
streamMetadata,
|
||||
webRTCUsableStates,
|
||||
preferredModes,
|
||||
]);
|
||||
|
||||
const resetPreferredLiveMode = useCallback(
|
||||
(cameraName: string) => {
|
||||
@@ -124,19 +185,17 @@ export default function useCameraLiveMode(
|
||||
config &&
|
||||
Object.keys(config.go2rtc.streams || {}).includes(selectedStreamName);
|
||||
|
||||
setPreferredLiveModes((prevModes) => {
|
||||
const newModes = { ...prevModes };
|
||||
|
||||
if (!mseSupported) {
|
||||
newModes[cameraName] = isRestreamed ? "webrtc" : "jsmpeg";
|
||||
} else {
|
||||
newModes[cameraName] = isRestreamed ? "mse" : "jsmpeg";
|
||||
}
|
||||
|
||||
return newModes;
|
||||
});
|
||||
setPreferredLiveModes((prevModes) => ({
|
||||
...prevModes,
|
||||
[cameraName]: resolveLiveMode(
|
||||
!!isRestreamed,
|
||||
mseSupported,
|
||||
webRTCUsableStates[cameraName] ?? false,
|
||||
preferredModes?.[cameraName],
|
||||
),
|
||||
}));
|
||||
},
|
||||
[activeStreams, cameras, config],
|
||||
[activeStreams, cameras, config, webRTCUsableStates, preferredModes],
|
||||
);
|
||||
|
||||
return {
|
||||
@@ -146,5 +205,6 @@ export default function useCameraLiveMode(
|
||||
isRestreamedStates,
|
||||
supportsAudioOutputStates,
|
||||
streamMetadata,
|
||||
webRTCUsableStates,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user