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

add support for ffmpeg hwaccel params and better mask handling

Browse Source
This commit is contained in:
blakeblackshear 2019-07-13 07:40:14 -05:00 committed by Blake Blackshear
parent a770ab7f69
commit 436b876b24
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frigate/video.py
View File

@ -13,13 +13,15 @@ from . objects import ObjectCleaner, BestPersonFrame
from . mqtt import MqttObjectPublisher from . mqtt import MqttObjectPublisher
# fetch the frames as fast a possible and store current frame in a shared memory array # fetch the frames as fast a possible and store current frame in a shared memory array
def fetch_frames(shared_arr, shared_frame_time, frame_lock, frame_ready, frame_shape, rtsp_url, take_frame=1): def fetch_frames(shared_arr, shared_frame_time, frame_lock, frame_ready, frame_shape, rtsp_url, take_frame=1, ffmpeg_hwaccel_args=[]):
# convert shared memory array into numpy and shape into image array # convert shared memory array into numpy and shape into image array
arr = tonumpyarray(shared_arr).reshape(frame_shape) arr = tonumpyarray(shared_arr).reshape(frame_shape)
frame_size = frame_shape[0] * frame_shape[1] * frame_shape[2] frame_size = frame_shape[0] * frame_shape[1] * frame_shape[2]
ffmpeg_cmd = ['ffmpeg', ffmpeg_global_args = [
'-hide_banner', '-loglevel', 'panic', '-hide_banner', '-loglevel', 'panic'
]
ffmpeg_input_args = [
'-avoid_negative_ts', 'make_zero', '-avoid_negative_ts', 'make_zero',
'-fflags', 'nobuffer', '-fflags', 'nobuffer',
'-flags', 'low_delay', '-flags', 'low_delay',
@ -27,11 +29,19 @@ def fetch_frames(shared_arr, shared_frame_time, frame_lock, frame_ready, frame_s
'-fflags', '+genpts', '-fflags', '+genpts',
'-rtsp_transport', 'tcp', '-rtsp_transport', 'tcp',
'-stimeout', '5000000', '-stimeout', '5000000',
'-use_wallclock_as_timestamps', '1', '-use_wallclock_as_timestamps', '1'
'-i', rtsp_url, ]
ffmpeg_cmd = (['ffmpeg'] +
ffmpeg_global_args +
ffmpeg_hwaccel_args +
ffmpeg_input_args +
['-i', rtsp_url,
'-f', 'rawvideo', '-f', 'rawvideo',
'-pix_fmt', 'rgb24', '-pix_fmt', 'rgb24',
'pipe:'] 'pipe:'])
print(" ".join(ffmpeg_cmd))
pipe = sp.Popen(ffmpeg_cmd, stdout = sp.PIPE, bufsize=frame_size) pipe = sp.Popen(ffmpeg_cmd, stdout = sp.PIPE, bufsize=frame_size)
@ -130,6 +140,7 @@ class Camera:
self.recent_frames = {} self.recent_frames = {}
self.rtsp_url = get_rtsp_url(self.config['rtsp']) self.rtsp_url = get_rtsp_url(self.config['rtsp'])
self.take_frame = self.config.get('take_frame', 1) self.take_frame = self.config.get('take_frame', 1)
self.ffmpeg_hwaccel_args = self.config.get('ffmpeg_hwaccel_args', [])
self.regions = self.config['regions'] self.regions = self.config['regions']
self.frame_shape = get_frame_shape(self.rtsp_url) self.frame_shape = get_frame_shape(self.rtsp_url)
self.mqtt_client = mqtt_client self.mqtt_client = mqtt_client
@ -195,7 +206,8 @@ class Camera:
# load in the mask for person detection # load in the mask for person detection
if 'mask' in self.config: if 'mask' in self.config:
self.mask = cv2.imread("/config/{}".format(self.config['mask']), cv2.IMREAD_GRAYSCALE) self.mask = cv2.imread("/config/{}".format(self.config['mask']), cv2.IMREAD_GRAYSCALE)
else:
if self.mask is None:
self.mask = np.zeros((self.frame_shape[0], self.frame_shape[1], 1), np.uint8) self.mask = np.zeros((self.frame_shape[0], self.frame_shape[1], 1), np.uint8)
self.mask[:] = 255 self.mask[:] = 255
@ -211,7 +223,7 @@ class Camera:
print("Creating a new capture process...") print("Creating a new capture process...")
self.capture_process = mp.Process(target=fetch_frames, args=(self.shared_frame_array, self.capture_process = mp.Process(target=fetch_frames, args=(self.shared_frame_array,
self.shared_frame_time, self.frame_lock, self.frame_ready, self.frame_shape, self.shared_frame_time, self.frame_lock, self.frame_ready, self.frame_shape,
self.rtsp_url, self.take_frame)) self.rtsp_url, self.take_frame, self.ffmpeg_hwaccel_args))
self.capture_process.daemon = True self.capture_process.daemon = True
print("Starting a new capture process...") print("Starting a new capture process...")
self.capture_process.start() self.capture_process.start()