blacklight/platypush
1
0
Fork 0
forked from platypush/platypush
Code Issues Pull requests Projects Releases Packages Wiki Activity

Few fixes in camera plugin

Browse source
This commit is contained in:
Fabio Manganiello 2019-03-17 02:06:47 +01:00
parent 9ed4ad6d85
commit f95f52df19
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
platypush/plugins/camera/__init__.py
View file

@ -162,7 +162,8 @@ class CameraPlugin(Plugin):
if device_id in self._is_recording: if device_id in self._is_recording:
self._is_recording[device_id].clear() self._is_recording[device_id].clear()
if wait_thread_termination and device_id in self._recording_threads: if device_id in self._recording_threads:
if wait_thread_termination:
self.logger.info('A recording thread is running, waiting for termination') self.logger.info('A recording thread is running, waiting for termination')
if self._recording_threads[device_id].is_alive(): if self._recording_threads[device_id].is_alive():
self._recording_threads[device_id].join() self._recording_threads[device_id].join()
@ -172,10 +173,10 @@ class CameraPlugin(Plugin):
self._devices[device_id].release() self._devices[device_id].release()
del self._devices[device_id] del self._devices[device_id]
self.fire_event(CameraRecordingStoppedEvent(device_id=device_id)) self.fire_event(CameraRecordingStoppedEvent(device_id=device_id))
self.logger.info("Device {} released".format(device_id))
if device_id in self._recording_info: if device_id in self._recording_info:
del self._recording_info[device_id] del self._recording_info[device_id]
self.logger.info("Device {} released".format(device_id))
def _store_frame_to_file(self, frame, frames_dir, image_file): def _store_frame_to_file(self, frame, frames_dir, image_file):
@ -282,8 +283,8 @@ class CameraPlugin(Plugin):
frame = cv2.cvtColor(frame, color_transform) frame = cv2.cvtColor(frame, color_transform)
if rotate: if rotate:
if not rotation_matrix:
rows, cols = frame.shape rows, cols = frame.shape
if not rotation_matrix:
rotation_matrix = cv2.getRotationMatrix2D( rotation_matrix = cv2.getRotationMatrix2D(
(cols/2, rows/2), rotate, 1) (cols/2, rows/2), rotate, 1)
@ -296,7 +297,7 @@ class CameraPlugin(Plugin):
scale_x = scale_x or 1 scale_x = scale_x or 1
scale_y = scale_y or 1 scale_y = scale_y or 1
frame = cv2.resize(frame, None, fx=scale_x, fy=scale_y, frame = cv2.resize(frame, None, fx=scale_x, fy=scale_y,
interpolation = cv.INTER_CUBIC) interpolation = cv2.INTER_CUBIC)
self._store_frame_to_file(frame=frame, frames_dir=frames_dir, self._store_frame_to_file(frame=frame, frames_dir=frames_dir,
image_file=image_file) image_file=image_file)