Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

call the restart function and handle errors better in the detection process

Browse Source
This commit is contained in:
Blake Blackshear 2020-03-01 18:42:52 -06:00
parent 2768e1dadb
commit c80137e059
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
detect_objects.py
View File

@ -76,6 +76,7 @@ class CameraWatchdog(threading.Thread):
if (self.tflite_process.detection_start.value > 0.0 and if (self.tflite_process.detection_start.value > 0.0 and
datetime.datetime.now().timestamp() - self.tflite_process.detection_start.value > 10): datetime.datetime.now().timestamp() - self.tflite_process.detection_start.value > 10):
print("Detection appears to be stuck. Restarting detection process") print("Detection appears to be stuck. Restarting detection process")
self.tflite_process.start_or_restart()
time.sleep(30) time.sleep(30)
for name, camera_process in self.camera_processes.items(): for name, camera_process in self.camera_processes.items():

11
frigate/edgetpu.py
View File

@ -71,16 +71,19 @@ def run_detector(detection_queue, avg_speed, start):
object_id_str = detection_queue.get() object_id_str = detection_queue.get()
object_id_hash = hashlib.sha1(str.encode(object_id_str)) object_id_hash = hashlib.sha1(str.encode(object_id_str))
object_id = plasma.ObjectID(object_id_hash.digest()) object_id = plasma.ObjectID(object_id_hash.digest())
object_id_out = plasma.ObjectID(hashlib.sha1(str.encode(f"out-{object_id_str}")).digest())
input_frame = plasma_client.get(object_id, timeout_ms=0) input_frame = plasma_client.get(object_id, timeout_ms=0)
start.value = datetime.datetime.now().timestamp() if input_frame is plasma.ObjectNotAvailable:
plasma_client.put(np.zeros((20,6), np.float32), object_id_out)
continue
# detect and put the output in the plasma store # detect and put the output in the plasma store
object_id_out = hashlib.sha1(str.encode(f"out-{object_id_str}")).digest() start.value = datetime.datetime.now().timestamp()
plasma_client.put(object_detector.detect_raw(input_frame), plasma.ObjectID(object_id_out)) plasma_client.put(object_detector.detect_raw(input_frame), object_id_out)
duration = datetime.datetime.now().timestamp()-start.value duration = datetime.datetime.now().timestamp()-start.value
start.value = 0.0 start.value = 0.0
avg_speed.value = (avg_speed.value*9 + duration)/10 avg_speed.value = (avg_speed.value*9 + duration)/10
class EdgeTPUProcess(): class EdgeTPUProcess():