Compare commits

...

3 Commits

Author SHA1 Message Date
Nicolas Mowen
c4a53ae9ae Don't hide downlaod button when there is no review item 2025-06-23 16:38:29 -06:00
Nicolas Mowen
8c2fe78783 Ensure that best object is only set when the snapshot is actually updated. 2025-06-23 16:27:23 -06:00
Josh Hawkins
48963618be Additional onvif debug logs in get_camera_status 2025-06-23 15:57:03 -05:00
4 changed files with 52 additions and 36 deletions

View File

@ -291,11 +291,9 @@ class CameraState:
new_obj.thumbnail_data = thumbnail_data
tracked_objects[id].thumbnail_data = thumbnail_data
object_type = new_obj.obj_data["label"]
self.best_objects[object_type] = new_obj
# call event handlers
for c in self.callbacks["snapshot"]:
c(self.name, self.best_objects[object_type], frame_name)
self.send_mqtt_snapshot(new_obj, object_type)
for c in self.callbacks["start"]:
c(self.name, new_obj, frame_name)
@ -417,13 +415,9 @@ class CameraState:
or (now - current_best.thumbnail_data["frame_time"])
> self.camera_config.best_image_timeout
):
self.best_objects[object_type] = obj
for c in self.callbacks["snapshot"]:
c(self.name, self.best_objects[object_type], frame_name)
self.send_mqtt_snapshot(obj, object_type)
else:
self.best_objects[object_type] = obj
for c in self.callbacks["snapshot"]:
c(self.name, self.best_objects[object_type], frame_name)
self.send_mqtt_snapshot(obj, object_type)
for c in self.callbacks["camera_activity"]:
c(self.name, camera_activity)
@ -472,6 +466,20 @@ class CameraState:
self.previous_frame_id = frame_name
def send_mqtt_snapshot(self, new_obj: TrackedObject, object_type: str) -> None:
for c in self.callbacks["snapshot"]:
updated = c(self.name, new_obj)
# if the snapshot was not updated, then this object is not a best object
# but all new objects should be considered the next best object
# so we remove the label from the best objects
if updated:
self.best_objects[object_type] = new_obj
else:
if object_type in self.best_objects:
self.best_objects.pop(object_type)
break
def save_manual_event_image(
self,
frame: np.ndarray | None,

View File

@ -792,6 +792,10 @@ class OnvifController:
)
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():

View File

@ -156,7 +156,7 @@ class TrackedObjectProcessor(threading.Thread):
)
)
def snapshot(camera, obj: TrackedObject, frame_name: str):
def snapshot(camera: str, obj: TrackedObject) -> bool:
mqtt_config: CameraMqttConfig = self.config.cameras[camera].mqtt
if mqtt_config.enabled and self.should_mqtt_snapshot(camera, obj):
jpg_bytes = obj.get_img_bytes(
@ -189,6 +189,10 @@ class TrackedObjectProcessor(threading.Thread):
retain=True,
)
return True
return False
def camera_activity(camera, activity):
last_activity = self.camera_activity.get(camera)

View File

@ -1242,13 +1242,13 @@ export function VideoTab({ search }: VideoTabProps) {
<>
<span tabIndex={0} className="sr-only" />
<GenericVideoPlayer source={source}>
{reviewItem && (
<div
className={cn(
"absolute top-2 z-10 flex items-center gap-2",
isIOS ? "right-8" : "right-2",
)}
>
<div
className={cn(
"absolute top-2 z-10 flex items-center gap-2",
isIOS ? "right-8" : "right-2",
)}
>
{reviewItem && (
<Tooltip>
<TooltipTrigger>
<Chip
@ -1271,25 +1271,25 @@ export function VideoTab({ search }: VideoTabProps) {
</TooltipContent>
</TooltipPortal>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<a
download
href={`${baseUrl}api/${search.camera}/${clipTimeRange}/clip.mp4`}
>
<Chip className="cursor-pointer rounded-md bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500">
<FaDownload className="size-4 text-white" />
</Chip>
</a>
</TooltipTrigger>
<TooltipPortal>
<TooltipContent>
{t("button.download", { ns: "common" })}
</TooltipContent>
</TooltipPortal>
</Tooltip>
</div>
)}
)}
<Tooltip>
<TooltipTrigger asChild>
<a
download
href={`${baseUrl}api/${search.camera}/${clipTimeRange}/clip.mp4`}
>
<Chip className="cursor-pointer rounded-md bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500">
<FaDownload className="size-4 text-white" />
</Chip>
</a>
</TooltipTrigger>
<TooltipPortal>
<TooltipContent>
{t("button.download", { ns: "common" })}
</TooltipContent>
</TooltipPortal>
</Tooltip>
</div>
</GenericVideoPlayer>
</>
);