更新UCD-API库及文档

UniTAP/dev/ports/modules/capturer/video/video_capturer.py

@@ -52,6 +52,36 @@ class VideoCapturer:
         """
         return self.__max_stream_number
 
+    def start(self, frames_count: int = 0, sec: int = 0, capture_type: CaptureConfig.Type = CaptureConfig.Type.LIVE):
+        """
+        Start capturing. Possible some variants of capturing:
+        - Capture with fixed frames count (will be captured fixed frames count and capturing will be stopped).
+        - Capture with fixed time (capturing will be continued fixed seconds and capturing will be stopped).
+        - Capture without parameters - Live capturing (for getting frames you need to use functions `pop_element` and
+        `pop_all_elements`)
+
+        All results can be obtained using the function `capture_result`.
+
+        Args:
+            frames_count (int)
+            sec (int)
+            type (CaptureConfig.Type)
+        """
+
+        config = CaptureConfig()
+        config.video = True
+        config.type = capture_type
+
+        self.__capturer.start_capture(config)
+
+        self.capture_result.clear()
+        self.capture_result.start_capture_time = time.time()
+
+        if frames_count > 0:
+            self.capture_result.buffer.extend(self.__capturer.capture_video_by_n_frames(frames_count, capture_type))
+        elif sec > 0:
+            self.capture_result.buffer.extend(self.__capturer.capture_video_by_n_sec(sec))
+
     def stop(self):
         """
         Stop capture video.
@@ -127,8 +157,8 @@ class VideoCapturerDP(VideoCapturer):
         super().__init__(capturer, max_stream_number)
         self.__capturer = capturer
 
-    def start(self, frames_count: int = 0, sec: int = 0, stream_number: int = 0,
-              capture_type: CaptureConfig.Type = CaptureConfig.Type.LIVE):
+    def start(self, frames_count: int = 0, sec: int = 0, capture_type: CaptureConfig.Type = CaptureConfig.Type.LIVE,
+              stream_number: int = 0):
         """
         Start capturing. Possible some variants of capturing:
         - Capture with fixed frames count (will be captured fixed frames count and capturing will be stopped).
@@ -150,21 +180,7 @@ class VideoCapturerDP(VideoCapturer):
                               f"{', '.join([str(i) for i in range(self.max_stream_number)])}")
 
         self.__capturer.set_video_stream_number(stream_number)
-
-        config = CaptureConfig()
-        config.video = True
-        config.type = capture_type
-
-        self.__capturer.start_capture(config)
-
-        self.capture_result.clear()
-        self.capture_result.start_capture_time = time.time()
-
-        if frames_count > 0:
-                self.capture_result.buffer.extend(self.__capturer.capture_video_by_n_frames(frames_count, capture_type))
-        elif sec > 0:
-            self.capture_result.buffer.extend(self.__capturer.capture_video_by_n_sec(sec))
-
+        super().start(frames_count, sec, capture_type)
 
     def get_buffer_capacity(self, stream_number: int = 0):
         return self.__capturer.get_buffer_capacity(stream_number)
@@ -182,43 +198,5 @@ class VideoCapturerHDMI(VideoCapturer):
         super().__init__(capturer, max_stream_number)
         self.__capturer = capturer
 
-    def start(self, frames_count: int = 0, sec: int = 0, stream_number: int = 0):
-        """
-        Start capturing. Possible some variants of capturing:
-        - Capture with fixed frames count (will be captured fixed frames count and capturing will be stopped).
-        - Capture with fixed time (capturing will be continued fixed seconds and capturing will be stopped).
-        - Capture without parameters - Live capturing (for getting frames you need to use functions `pop_element` and
-        `pop_all_elements`)
-
-        All results can be obtained using the function `capture_result`.
-
-        Args:
-            frames_count (int)
-            sec (int)
-            stream_number (int)
-        """
-
-        if stream_number >= self.max_stream_number:
-            assert ValueError(f"Incorrect index of stream. Value must be from available options: "
-                              f"{', '.join([str(i) for i in range(self.max_stream_number)])}")
-
-        config = CaptureConfig()
-        config.video = True
-        config.type = CaptureConfig.Type.LIVE
-
-        self.__capturer.start_capture(config)
-
-        self.capture_result.clear()
-        self.capture_result.start_capture_time = time.time()
-
-        if frames_count > 0:
-            if frames_count > 1:
-                self.capture_result.buffer.extend(self.__capturer.capture_video_by_n_frames(frames_count))
-            else:
-                self.capture_result.buffer.extend(self.__capturer.capture_video_by_n_frames(frames_count))
-        elif sec > 0:
-            self.capture_result.buffer.extend(self.__capturer.capture_video_by_n_sec(sec))
-
-
     def get_buffer_capacity(self):
         return self.__capturer.get_buffer_capacity()