Skip to content

Commit

Permalink
call the restart function and handle errors better in the detection p…
Browse files Browse the repository at this point in the history
…rocess
  • Loading branch information
blakeblackshear committed Mar 2, 2020
1 parent 04ef6ac commit 0f66a8c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions detect_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def run(self):
if (self.tflite_process.detection_start.value > 0.0 and
datetime.datetime.now().timestamp() - self.tflite_process.detection_start.value > 10):
print("Detection appears to be stuck. Restarting detection process")
self.tflite_process.start_or_restart()
time.sleep(30)

for name, camera_process in self.camera_processes.items():
Expand Down
11 changes: 7 additions & 4 deletions frigate/edgetpu.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,19 @@ def run_detector(detection_queue, avg_speed, start):
object_id_str = detection_queue.get()
object_id_hash = hashlib.sha1(str.encode(object_id_str))
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)

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
object_id_out = hashlib.sha1(str.encode(f"out-{object_id_str}")).digest()
plasma_client.put(object_detector.detect_raw(input_frame), plasma.ObjectID(object_id_out))

start.value = datetime.datetime.now().timestamp()
plasma_client.put(object_detector.detect_raw(input_frame), object_id_out)
duration = datetime.datetime.now().timestamp()-start.value
start.value = 0.0

avg_speed.value = (avg_speed.value*9 + duration)/10

class EdgeTPUProcess():
Expand Down

0 comments on commit 0f66a8c

Please sign in to comment.