mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-07 03:35:26 +03:00
birdseye mse
This commit is contained in:
parent
53292d9d0c
commit
abdf30dc47
@ -2,6 +2,7 @@ import WebRtcPlayer from "./WebRTCPlayer";
|
||||
import { BirdseyeConfig } from "@/types/frigateConfig";
|
||||
import ActivityIndicator from "../ui/activity-indicator";
|
||||
import JSMpegPlayer from "./JSMpegPlayer";
|
||||
import MSEPlayer from "./MsePlayer";
|
||||
|
||||
type LivePlayerProps = {
|
||||
birdseyeConfig: BirdseyeConfig;
|
||||
@ -19,7 +20,20 @@ export default function BirdseyeLivePlayer({
|
||||
</div>
|
||||
);
|
||||
} else if (liveMode == "mse") {
|
||||
return <div className="max-w-5xl">Not yet implemented</div>;
|
||||
if ("MediaSource" in window || "ManagedMediaSource" in window) {
|
||||
return (
|
||||
<div className="max-w-5xl">
|
||||
<MSEPlayer camera="birdseye" />
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<div className="w-5xl text-center text-sm">
|
||||
MSE is only supported on iOS 17.1+. You'll need to update if available
|
||||
or use jsmpeg / webRTC streams. See the docs for more info.
|
||||
</div>
|
||||
);
|
||||
}
|
||||
} else if (liveMode == "jsmpeg") {
|
||||
return (
|
||||
<div className={`max-w-[${birdseyeConfig.width}px]`}>
|
||||
|
||||
@ -67,15 +67,7 @@ export default function LivePlayer({
|
||||
if ("MediaSource" in window || "ManagedMediaSource" in window) {
|
||||
return (
|
||||
<div className="max-w-5xl">
|
||||
<MSEPlayer
|
||||
src={
|
||||
new URL(
|
||||
`${baseUrl.replace(/^http/, "ws")}live/webrtc/api/ws?src=${
|
||||
cameraConfig.live.stream_name
|
||||
}`
|
||||
)
|
||||
}
|
||||
/>
|
||||
<MSEPlayer camera={cameraConfig.live.stream_name} />
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
import { baseUrl } from "@/api/baseUrl";
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
|
||||
type MSEPlayerProps = {
|
||||
src: URL;
|
||||
camera: string;
|
||||
};
|
||||
|
||||
function MSEPlayer({ src }: MSEPlayerProps) {
|
||||
function MSEPlayer({ camera }: MSEPlayerProps) {
|
||||
let connectTS: number = 0;
|
||||
|
||||
const RECONNECT_TIMEOUT: number = 30000;
|
||||
@ -33,16 +34,9 @@ function MSEPlayer({ src }: MSEPlayerProps) {
|
||||
const msRef = useRef<MediaSource | null>(null);
|
||||
|
||||
const wsURL = useMemo(() => {
|
||||
let updatedSrc = src.toString();
|
||||
|
||||
if (updatedSrc.startsWith("http")) {
|
||||
updatedSrc = `ws${updatedSrc.substring(4)}`;
|
||||
} else if (updatedSrc.startsWith("/")) {
|
||||
updatedSrc = `ws${location.origin.substring(4)}${src}`;
|
||||
}
|
||||
|
||||
return updatedSrc;
|
||||
}, [src]);
|
||||
console.log(camera);
|
||||
return `${baseUrl.replace(/^http/, "ws")}live/webrtc/api/ws?src=${camera}`;
|
||||
}, [camera]);
|
||||
|
||||
const play = () => {
|
||||
const currentVideo = videoRef.current;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user