Free Motion Capture for Everyone πβ¨
TypeScript
push before chat
Jon6bd40e1be57e
diff --cc jon_scratch/opencv_camera.pyindex 279d5b7a,23714a08..4082b0e2--- a/jon_scratch/opencv_camera.py+++ b/jon_scratch/opencv_camera.py@@@ -48,24 -54,21 +54,26 @@@ class OpenCVCamera(TweakedModel)self.opencv_video_capture_object.set(cv2.CAP_PROP_FRAME_WIDTH, self.resolution_width)self.opencv_video_capture_object.set(cv2.CAP_PROP_FRAME_HEIGHT, self.resolution_height)- self.opencv_video_capture_object.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc('M', 'J', 'P', 'G'))+ self.opencv_video_capture_object.set(cv2.CAP_PROP_FOURCC,+ cv2.VideoWriter_fourcc('M', 'J', 'P', 'G'))if success:++<<<<<<< HEAD+ logger.info('Camera found at port number {}'.format(self.port_number))+ self.name = 'Camera{}'.format(self.port_number)++=======+ logger.debug(f'Camera found at port number {self.port_number}')+ self.name = f'Camera {self.port_number}'++>>>>>>> 734b77bf722ff1013763105d94f9a579c75ce5d9return success- else:- # raise NoCameraAvailableException()- logger.error('Could not connect to a camera at port# {}'.format(self.port_number))- return success-- def get_next_frame(self):+ def get_next_frame(self):timestamp_ns_pre_grab = time.time_ns()- # Why grab not read? see -> https://stackoverflow.com/questions/57716962/difference-between-video-capture-read-and-grab+ # Why grab not read? see ->+ # https://stackoverflow.com/questions/57716962/difference-between-video-capture-read-and-grabgrab_success = self.opencv_video_capture_object.grab()timestamp_ns_post_grab = time.time_ns()- timestamp_ns = (timestamp_ns_pre_grab + timestamp_ns_post_grab)/2+ timestamp_ns = (timestamp_ns_pre_grab + timestamp_ns_post_grab) / 2if grab_success:success, image = self.opencv_video_capture_object.retrieve()