Browse Source

remove sharedarray references

Blake Blackshear 5 years ago
parent
commit
6de8e3bd1f
4 changed files with 2 additions and 10 deletions
  1. 0 1
      Dockerfile
  2. 0 1
      frigate/edgetpu.py
  3. 0 1
      frigate/object_processing.py
  4. 2 7
      frigate/video.py

+ 0 - 1
Dockerfile

@@ -25,7 +25,6 @@ RUN apt -qq update && apt -qq install --no-install-recommends -y \
         imutils \
         scipy \
     && python3.7 -m pip install -U \
-        SharedArray \
         Flask \
         paho-mqtt \
         PyYAML \

+ 0 - 1
frigate/edgetpu.py

@@ -3,7 +3,6 @@ import datetime
 import hashlib
 import multiprocessing as mp
 import numpy as np
-import SharedArray as sa
 import pyarrow.plasma as plasma
 import tflite_runtime.interpreter as tflite
 from tflite_runtime.interpreter import load_delegate

+ 0 - 1
frigate/object_processing.py

@@ -8,7 +8,6 @@ import numpy as np
 from collections import Counter, defaultdict
 import itertools
 import pyarrow.plasma as plasma
-import SharedArray as sa
 import matplotlib.pyplot as plt
 from frigate.util import draw_box_with_label
 from frigate.edgetpu import load_labels

+ 2 - 7
frigate/video.py

@@ -10,7 +10,6 @@ import subprocess as sp
 import numpy as np
 import hashlib
 import pyarrow.plasma as plasma
-import SharedArray as sa
 import copy
 import itertools
 import json
@@ -109,6 +108,7 @@ def start_or_restart_ffmpeg(ffmpeg_cmd, frame_size, pid, ffmpeg_process=None):
             print("FFmpeg didnt exit. Force killing...")
             ffmpeg_process.kill()
             ffmpeg_process.communicate()
+        ffmpeg_process = None
 
     print("Creating ffmpeg process...")
     print(" ".join(ffmpeg_cmd))
@@ -158,12 +158,7 @@ def track_camera(name, config, ffmpeg_global_config, global_objects_config, dete
 
     frame_size = frame_shape[0] * frame_shape[1] * frame_shape[2]
 
-    try:
-        sa.delete(name)
-    except:
-        pass
-
-    frame = sa.create(name, shape=frame_shape, dtype=np.uint8)
+    frame = np.zeros(frame_shape, np.uint8)
 
     # load in the mask for object detection
     if 'mask' in config: