mirror of
				https://github.com/blakeblackshear/frigate.git
				synced 2025-10-27 10:52:11 +01:00 
			
		
		
		
	remove sharedarray references
This commit is contained in:
		
							parent
							
								
									3a9781c4f8
								
							
						
					
					
						commit
						6de8e3bd1f
					
				@ -25,7 +25,6 @@ RUN apt -qq update && apt -qq install --no-install-recommends -y \
 | 
				
			|||||||
        imutils \
 | 
					        imutils \
 | 
				
			||||||
        scipy \
 | 
					        scipy \
 | 
				
			||||||
    && python3.7 -m pip install -U \
 | 
					    && python3.7 -m pip install -U \
 | 
				
			||||||
        SharedArray \
 | 
					 | 
				
			||||||
        Flask \
 | 
					        Flask \
 | 
				
			||||||
        paho-mqtt \
 | 
					        paho-mqtt \
 | 
				
			||||||
        PyYAML \
 | 
					        PyYAML \
 | 
				
			||||||
 | 
				
			|||||||
@ -3,7 +3,6 @@ import datetime
 | 
				
			|||||||
import hashlib
 | 
					import hashlib
 | 
				
			||||||
import multiprocessing as mp
 | 
					import multiprocessing as mp
 | 
				
			||||||
import numpy as np
 | 
					import numpy as np
 | 
				
			||||||
import SharedArray as sa
 | 
					 | 
				
			||||||
import pyarrow.plasma as plasma
 | 
					import pyarrow.plasma as plasma
 | 
				
			||||||
import tflite_runtime.interpreter as tflite
 | 
					import tflite_runtime.interpreter as tflite
 | 
				
			||||||
from tflite_runtime.interpreter import load_delegate
 | 
					from tflite_runtime.interpreter import load_delegate
 | 
				
			||||||
 | 
				
			|||||||
@ -8,7 +8,6 @@ import numpy as np
 | 
				
			|||||||
from collections import Counter, defaultdict
 | 
					from collections import Counter, defaultdict
 | 
				
			||||||
import itertools
 | 
					import itertools
 | 
				
			||||||
import pyarrow.plasma as plasma
 | 
					import pyarrow.plasma as plasma
 | 
				
			||||||
import SharedArray as sa
 | 
					 | 
				
			||||||
import matplotlib.pyplot as plt
 | 
					import matplotlib.pyplot as plt
 | 
				
			||||||
from frigate.util import draw_box_with_label
 | 
					from frigate.util import draw_box_with_label
 | 
				
			||||||
from frigate.edgetpu import load_labels
 | 
					from frigate.edgetpu import load_labels
 | 
				
			||||||
 | 
				
			|||||||
@ -10,7 +10,6 @@ import subprocess as sp
 | 
				
			|||||||
import numpy as np
 | 
					import numpy as np
 | 
				
			||||||
import hashlib
 | 
					import hashlib
 | 
				
			||||||
import pyarrow.plasma as plasma
 | 
					import pyarrow.plasma as plasma
 | 
				
			||||||
import SharedArray as sa
 | 
					 | 
				
			||||||
import copy
 | 
					import copy
 | 
				
			||||||
import itertools
 | 
					import itertools
 | 
				
			||||||
import json
 | 
					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...")
 | 
					            print("FFmpeg didnt exit. Force killing...")
 | 
				
			||||||
            ffmpeg_process.kill()
 | 
					            ffmpeg_process.kill()
 | 
				
			||||||
            ffmpeg_process.communicate()
 | 
					            ffmpeg_process.communicate()
 | 
				
			||||||
 | 
					        ffmpeg_process = None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    print("Creating ffmpeg process...")
 | 
					    print("Creating ffmpeg process...")
 | 
				
			||||||
    print(" ".join(ffmpeg_cmd))
 | 
					    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]
 | 
					    frame_size = frame_shape[0] * frame_shape[1] * frame_shape[2]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    try:
 | 
					    frame = np.zeros(frame_shape, np.uint8)
 | 
				
			||||||
        sa.delete(name)
 | 
					 | 
				
			||||||
    except:
 | 
					 | 
				
			||||||
        pass
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    frame = sa.create(name, shape=frame_shape, dtype=np.uint8)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # load in the mask for object detection
 | 
					    # load in the mask for object detection
 | 
				
			||||||
    if 'mask' in config:
 | 
					    if 'mask' in config:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user