mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-11-17 19:13:02 +03:00
hold the last frame on screen when the live mode changes
Turning on two-way talk while watching MSE switched the player to WebRTC and showed a buffering spinner until WebRTC played. The frame capture now runs on a mode change as well as a stream change, so the outgoing frame stays up until the new player plays.
This commit is contained in:
@@ -238,20 +238,20 @@ export default function LivePlayer({
|
|||||||
cameraActive,
|
cameraActive,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setLiveReady(false);
|
|
||||||
}, [preferredLiveMode]);
|
|
||||||
|
|
||||||
const [key, setKey] = useState(0);
|
const [key, setKey] = useState(0);
|
||||||
|
|
||||||
// the stream is part of the MSE and WebRTC keys, so a stream change
|
// a stream or mode change remounts the player in the same render, and the
|
||||||
// remounts them in the same render and the new player is hidden until it
|
// new player is hidden until it plays. jsmpeg plays the camera, not the
|
||||||
// plays. jsmpeg plays the camera, not the stream, and keeps playing
|
// stream, so a stream change alone keeps it playing
|
||||||
const [renderedStream, setRenderedStream] = useState(streamName);
|
const [renderedPlayer, setRenderedPlayer] = useState({
|
||||||
|
stream: streamName,
|
||||||
|
mode: preferredLiveMode,
|
||||||
|
});
|
||||||
const [switchFrame, setSwitchFrame] = useState<HTMLCanvasElement>();
|
const [switchFrame, setSwitchFrame] = useState<HTMLCanvasElement>();
|
||||||
if (renderedStream !== streamName) {
|
const modeChanged = renderedPlayer.mode !== preferredLiveMode;
|
||||||
setRenderedStream(streamName);
|
if (modeChanged || renderedPlayer.stream !== streamName) {
|
||||||
if (preferredLiveMode !== "jsmpeg") {
|
setRenderedPlayer({ stream: streamName, mode: preferredLiveMode });
|
||||||
|
if (modeChanged || preferredLiveMode !== "jsmpeg") {
|
||||||
setLiveReady(false);
|
setLiveReady(false);
|
||||||
|
|
||||||
// the old video is still in the DOM until this render commits, so its
|
// the old video is still in the DOM until this render commits, so its
|
||||||
|
|||||||
Reference in New Issue
Block a user