hotfix: fix _fps attr.

cereja-project · Mar 24, 2022 · 445483c · 445483c
1 parent 7bb88d6
commit 445483c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/calango/__init__.py b/calango/__init__.py
@@ -26,5 +26,5 @@
 from .devices import Mouse
 from .media import Image, VideoWriter, Video
 
-VERSION = "2.1.1.final.0"
+VERSION = "2.1.2.final.0"
 __version__ = get_version_pep440_compliant(VERSION)
diff --git a/calango/media.py b/calango/media.py
@@ -554,8 +554,9 @@ def __init__(self, *args, fps=None, **kwargs):
         super().__init__(*args, **kwargs)
         if fps is not None:
             self.set(cv2.CAP_PROP_FPS, fps)
-        if self._is_webcam:
-            self._fps = 30.0
+        elif self.get(cv2.CAP_PROP_FPS) == 0:
+            self.set(cv2.CAP_PROP_FPS, 30)
+        self._fps = self.get(cv2.CAP_PROP_FPS)
         self._total_frames = -1 if self._is_webcam else int(self.get(cv2.CAP_PROP_FRAME_COUNT))
         self._width, self._height = int(self.get(cv2.CAP_PROP_FRAME_WIDTH)), int(self.get(cv2.CAP_PROP_FRAME_HEIGHT))
 
@@ -811,14 +812,9 @@ def __get_next_frame(self) -> Union[np.ndarray, Image, None]:
             self._t0 = time.time()
             self._fps_time = self._t0  # for fps on show
         _, image = self._cap.next_frame
-        if self._cap.is_stream and image is None:
-            image = Image.get_empty_image(
-                    (self.height, self.width, 3)) if self._last_frame is None else self._last_frame
-            image.center.draw_text('Streaming...', pos='center_bottom', font_scale=4)
-        else:
-            image = Image(image)
-            self._current_number_frame += 1
-            self._count_frames += 1  # for calculate fps correctly
+        image = Image(image)
+        self._current_number_frame += 1
+        self._count_frames += 1  # for calculate fps correctly
         if self.current_number_frame > self.total_frames:
             if isinstance(self._cap, cv2.VideoCapture):
                 self._cap.release()
@@ -901,8 +897,10 @@ def _show(self):
         try:
             while self.is_opened:
                 image = self.__get_next_frame()
-                if image is None:
-                    continue
+                if self._cap.is_stream and image is None:
+                    image = Image.get_empty_image(
+                            (self.height, self.width, 3)) if self._last_frame is None else self._last_frame
+                    image.center.draw_text('Buffering...', pos='center_bottom', font_scale=4)
                 cv2.imshow(self._cap.name, image.draw_text(self.video_info))
                 if self.is_break_view:
                     self._cap.stop()