Fix stream stats display (#19874)

* Fix stats calculations and labels

* fix linter from complaining

* fix mse calc

* label

frigate/ptz/autotrack.py

@@ -1462,7 +1462,7 @@ class PtzAutoTracker:
         if not self.autotracker_init[camera]:
             self._autotracker_setup(self.config.cameras[camera], camera)
         # regularly update camera status
-        if not self.ptz_metrics[camera].motor_stopped.is_set():
+        while not self.ptz_metrics[camera].motor_stopped.is_set():
             await self.onvif.get_camera_status(camera)
 
         # return to preset if tracking is over
@@ -1491,7 +1491,7 @@ class PtzAutoTracker:
             )
 
             # update stored zoom level from preset
-            if not self.ptz_metrics[camera].motor_stopped.is_set():
+            while not self.ptz_metrics[camera].motor_stopped.is_set():
                 await self.onvif.get_camera_status(camera)
 
             self.ptz_metrics[camera].tracking_active.clear()

frigate/ptz/onvif.py

@@ -48,6 +48,8 @@ class OnvifController:
         self.config = config
         self.ptz_metrics = ptz_metrics
 
+        self.status_locks: dict[str, asyncio.Lock] = {}
+
         # Create a dedicated event loop and run it in a separate thread
         self.loop = asyncio.new_event_loop()
         self.loop_thread = threading.Thread(target=self._run_event_loop, daemon=True)
@@ -59,6 +61,7 @@ class OnvifController:
                 continue
             if cam.onvif.host:
                 self.camera_configs[cam_name] = cam
+                self.status_locks[cam_name] = asyncio.Lock()
 
         asyncio.run_coroutine_threadsafe(self._init_cameras(), self.loop)
 
@@ -764,105 +767,110 @@ class OnvifController:
             return False
 
     async def get_camera_status(self, camera_name: str) -> None:
-        if camera_name not in self.cams.keys():
-            logger.error(f"ONVIF is not configured for {camera_name}")
-            return
-
-        if not self.cams[camera_name]["init"]:
-            if not await self._init_onvif(camera_name):
+        async with self.status_locks[camera_name]:
+            if camera_name not in self.cams.keys():
+                logger.error(f"ONVIF is not configured for {camera_name}")
                 return
 
-        status_request = self.cams[camera_name]["status_request"]
-        try:
-            status = await self.cams[camera_name]["ptz"].GetStatus(status_request)
-        except Exception:
-            pass  # We're unsupported, that'll be reported in the next check.
+            if not self.cams[camera_name]["init"]:
+                if not await self._init_onvif(camera_name):
+                    return
 
-        try:
-            pan_tilt_status = getattr(status.MoveStatus, "PanTilt", None)
-            zoom_status = getattr(status.MoveStatus, "Zoom", None)
+            status_request = self.cams[camera_name]["status_request"]
+            try:
+                status = await self.cams[camera_name]["ptz"].GetStatus(status_request)
+            except Exception:
+                pass  # We're unsupported, that'll be reported in the next check.
 
-            # if it's not an attribute, see if MoveStatus even exists in the status result
-            if pan_tilt_status is None:
-                pan_tilt_status = getattr(status, "MoveStatus", None)
+            try:
+                pan_tilt_status = getattr(status.MoveStatus, "PanTilt", None)
+                zoom_status = getattr(status.MoveStatus, "Zoom", None)
 
-                # we're unsupported
-                if pan_tilt_status is None or pan_tilt_status not in [
-                    "IDLE",
-                    "MOVING",
-                ]:
-                    raise Exception
-        except Exception:
-            logger.warning(
-                f"Camera {camera_name} does not support the ONVIF GetStatus method. Autotracking will not function correctly and must be disabled in your config."
+                # if it's not an attribute, see if MoveStatus even exists in the status result
+                if pan_tilt_status is None:
+                    pan_tilt_status = getattr(status, "MoveStatus", None)
+
+                    # we're unsupported
+                    if pan_tilt_status is None or pan_tilt_status not in [
+                        "IDLE",
+                        "MOVING",
+                    ]:
+                        raise Exception
+            except Exception:
+                logger.warning(
+                    f"Camera {camera_name} does not support the ONVIF GetStatus method. Autotracking will not function correctly and must be disabled in your config."
+                )
+                return
+
+            logger.debug(
+                f"{camera_name}: Pan/tilt status: {pan_tilt_status}, Zoom status: {zoom_status}"
             )
-            return
 
-        logger.debug(
-            f"{camera_name}: Pan/tilt status: {pan_tilt_status}, Zoom status: {zoom_status}"
-        )
+            if pan_tilt_status == "IDLE" and (
+                zoom_status is None or zoom_status == "IDLE"
+            ):
+                self.cams[camera_name]["active"] = False
+                if not self.ptz_metrics[camera_name].motor_stopped.is_set():
+                    self.ptz_metrics[camera_name].motor_stopped.set()
 
-        if pan_tilt_status == "IDLE" and (zoom_status is None or zoom_status == "IDLE"):
-            self.cams[camera_name]["active"] = False
-            if not self.ptz_metrics[camera_name].motor_stopped.is_set():
-                self.ptz_metrics[camera_name].motor_stopped.set()
+                    logger.debug(
+                        f"{camera_name}: PTZ stop time: {self.ptz_metrics[camera_name].frame_time.value}"
+                    )
 
+                    self.ptz_metrics[camera_name].stop_time.value = self.ptz_metrics[
+                        camera_name
+                    ].frame_time.value
+            else:
+                self.cams[camera_name]["active"] = True
+                if self.ptz_metrics[camera_name].motor_stopped.is_set():
+                    self.ptz_metrics[camera_name].motor_stopped.clear()
+
+                    logger.debug(
+                        f"{camera_name}: PTZ start time: {self.ptz_metrics[camera_name].frame_time.value}"
+                    )
+
+                    self.ptz_metrics[camera_name].start_time.value = self.ptz_metrics[
+                        camera_name
+                    ].frame_time.value
+                    self.ptz_metrics[camera_name].stop_time.value = 0
+
+            if (
+                self.config.cameras[camera_name].onvif.autotracking.zooming
+                != ZoomingModeEnum.disabled
+            ):
+                # store absolute zoom level as 0 to 1 interpolated from the values of the camera
+                self.ptz_metrics[camera_name].zoom_level.value = numpy.interp(
+                    round(status.Position.Zoom.x, 2),
+                    [
+                        self.cams[camera_name]["absolute_zoom_range"]["XRange"]["Min"],
+                        self.cams[camera_name]["absolute_zoom_range"]["XRange"]["Max"],
+                    ],
+                    [0, 1],
+                )
                 logger.debug(
-                    f"{camera_name}: PTZ stop time: {self.ptz_metrics[camera_name].frame_time.value}"
+                    f"{camera_name}: Camera zoom level: {self.ptz_metrics[camera_name].zoom_level.value}"
                 )
 
+            # some hikvision cams won't update MoveStatus, so warn if it hasn't changed
+            if (
+                not self.ptz_metrics[camera_name].motor_stopped.is_set()
+                and not self.ptz_metrics[camera_name].reset.is_set()
+                and self.ptz_metrics[camera_name].start_time.value != 0
+                and self.ptz_metrics[camera_name].frame_time.value
+                > (self.ptz_metrics[camera_name].start_time.value + 10)
+                and self.ptz_metrics[camera_name].stop_time.value == 0
+            ):
+                logger.debug(
+                    f"Start time: {self.ptz_metrics[camera_name].start_time.value}, Stop time: {self.ptz_metrics[camera_name].stop_time.value}, Frame time: {self.ptz_metrics[camera_name].frame_time.value}"
+                )
+                # set the stop time so we don't come back into this again and spam the logs
                 self.ptz_metrics[camera_name].stop_time.value = self.ptz_metrics[
                     camera_name
                 ].frame_time.value
-        else:
-            self.cams[camera_name]["active"] = True
-            if self.ptz_metrics[camera_name].motor_stopped.is_set():
-                self.ptz_metrics[camera_name].motor_stopped.clear()
-
-                logger.debug(
-                    f"{camera_name}: PTZ start time: {self.ptz_metrics[camera_name].frame_time.value}"
+                logger.warning(
+                    f"Camera {camera_name} is still in ONVIF 'MOVING' status."
                 )
 
-                self.ptz_metrics[camera_name].start_time.value = self.ptz_metrics[
-                    camera_name
-                ].frame_time.value
-                self.ptz_metrics[camera_name].stop_time.value = 0
-
-        if (
-            self.config.cameras[camera_name].onvif.autotracking.zooming
-            != ZoomingModeEnum.disabled
-        ):
-            # store absolute zoom level as 0 to 1 interpolated from the values of the camera
-            self.ptz_metrics[camera_name].zoom_level.value = numpy.interp(
-                round(status.Position.Zoom.x, 2),
-                [
-                    self.cams[camera_name]["absolute_zoom_range"]["XRange"]["Min"],
-                    self.cams[camera_name]["absolute_zoom_range"]["XRange"]["Max"],
-                ],
-                [0, 1],
-            )
-            logger.debug(
-                f"{camera_name}: Camera zoom level: {self.ptz_metrics[camera_name].zoom_level.value}"
-            )
-
-        # some hikvision cams won't update MoveStatus, so warn if it hasn't changed
-        if (
-            not self.ptz_metrics[camera_name].motor_stopped.is_set()
-            and not self.ptz_metrics[camera_name].reset.is_set()
-            and self.ptz_metrics[camera_name].start_time.value != 0
-            and self.ptz_metrics[camera_name].frame_time.value
-            > (self.ptz_metrics[camera_name].start_time.value + 10)
-            and self.ptz_metrics[camera_name].stop_time.value == 0
-        ):
-            logger.debug(
-                f"Start time: {self.ptz_metrics[camera_name].start_time.value}, Stop time: {self.ptz_metrics[camera_name].stop_time.value}, Frame time: {self.ptz_metrics[camera_name].frame_time.value}"
-            )
-            # set the stop time so we don't come back into this again and spam the logs
-            self.ptz_metrics[camera_name].stop_time.value = self.ptz_metrics[
-                camera_name
-            ].frame_time.value
-            logger.warning(f"Camera {camera_name} is still in ONVIF 'MOVING' status.")
-
     def close(self) -> None:
         """Gracefully shut down the ONVIF controller."""
         if not hasattr(self, "loop") or self.loop.is_closed():

web/src/components/player/JSMpegPlayer.tsx

@@ -164,7 +164,7 @@ export default function JSMpegPlayer({
         statsIntervalRef.current = setInterval(() => {
           const currentTimestamp = Date.now();
           const timeDiff = (currentTimestamp - lastTimestampRef.current) / 1000; // in seconds
-          const bitrate = (bytesReceivedRef.current * 8) / timeDiff / 1000; // in kbps
+          const bitrate = bytesReceivedRef.current / timeDiff / 1000; // in kBps
 
           setStats?.({
             streamType: "jsmpeg",

web/src/components/player/LivePlayer.tsx

@@ -80,7 +80,7 @@ export default function LivePlayer({
 
   const [stats, setStats] = useState<PlayerStatsType>({
     streamType: "-",
-    bandwidth: 0, // in kbps
+    bandwidth: 0, // in kBps
     latency: undefined, // in seconds
     totalFrames: 0,
     droppedFrames: undefined,

web/src/components/player/MsePlayer.tsx

@@ -338,7 +338,7 @@ function MSEPlayer({
           // console.debug("VideoRTC.buffer", b.byteLength, bufLen);
         } else {
           try {
-            sb?.appendBuffer(data);
+            sb?.appendBuffer(data as ArrayBuffer);
           } catch (e) {
             // no-op
           }
@@ -592,7 +592,7 @@ function MSEPlayer({
         const now = Date.now();
         const bytesLoaded = totalBytesLoaded.current;
         const timeElapsed = (now - lastTimestamp) / 1000; // seconds
-        const bandwidth = (bytesLoaded - lastLoadedBytes) / timeElapsed / 1024; // kbps
+        const bandwidth = (bytesLoaded - lastLoadedBytes) / timeElapsed / 1000; // kBps
 
         lastLoadedBytes = bytesLoaded;
         lastTimestamp = now;

web/src/components/player/PlayerStats.tsx

@@ -17,7 +17,7 @@ export function PlayerStats({ stats, minimal }: PlayerStatsProps) {
       </p>
       <p>
         <span className="text-white/70">{t("stats.bandwidth.title")}</span>{" "}
-        <span className="text-white">{stats.bandwidth.toFixed(2)} kbps</span>
+        <span className="text-white">{stats.bandwidth.toFixed(2)} kBps</span>
       </p>
       {stats.latency != undefined && (
         <p>
@@ -66,7 +66,7 @@ export function PlayerStats({ stats, minimal }: PlayerStatsProps) {
       </div>
       <div className="flex flex-col items-center gap-1">
         <span className="text-white/70">{t("stats.bandwidth.short")}</span>{" "}
-        <span className="text-white">{stats.bandwidth.toFixed(2)} kbps</span>
+        <span className="text-white">{stats.bandwidth.toFixed(2)} kBps</span>
       </div>
       {stats.latency != undefined && (
         <div className="hidden flex-col items-center gap-1 md:flex">

web/src/components/player/WebRTCPlayer.tsx

@@ -266,7 +266,7 @@ export default function WebRtcPlayer({
         const bitrate =
           timeDiff > 0
             ? (bytesReceived - lastBytesReceived) / timeDiff / 1000
-            : 0; // in kbps
+            : 0; // in kBps
 
         setStats?.({
           streamType: "WebRTC",