opencv: fix frame import from buffer in new pipeline

koush · Mar 19, 2023 · 1006712 · 1006712
1 parent 965d5af
commit 1006712
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/plugins/opencv/package-lock.json b/plugins/opencv/package-lock.json
diff --git a/plugins/opencv/package.json b/plugins/opencv/package.json
@@ -36,5 +36,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.0.67"
+   "version": "0.0.68"
 }
diff --git a/plugins/opencv/src/opencv/__init__.py b/plugins/opencv/src/opencv/__init__.py
@@ -220,17 +220,18 @@ async def run_detection_videoframe(self, videoFrame: VideoFrame, detection_sessi
         if width <= 640 and height < 640:
             scale = 1
             resize = None
-        elif aspectRatio > 1:
-            scale = height / 300
-            resize = {
-                'height': 300,
-                'width': int(300 * aspectRatio)
-            }
         else:
-            scale = width / 300
+            if aspectRatio > 1:
+                scale = height / 300
+                height = 300
+                width = int(300 * aspectRatio)
+            else:
+                width = 300
+                height = int(300 / aspectRatio)
+                scale = width / 300
             resize = {
-                'width': 300,
-                'height': int(300 / aspectRatio)
+                'width': width,
+                'height': height,
             }
 
         buffer = await videoFrame.toBuffer({
@@ -239,7 +240,7 @@ async def run_detection_videoframe(self, videoFrame: VideoFrame, detection_sessi
 
         def convert_to_src_size(point, normalize = False):
             return point[0] * scale, point[1] * scale, True
-        mat = np.ndarray((videoFrame.height, videoFrame.width, self.pixelFormatChannelCount), buffer=buffer, dtype=np.uint8)
+        mat = np.ndarray((height, width, self.pixelFormatChannelCount), buffer=buffer, dtype=np.uint8)
         detections = self.detect(
             detection_session, mat, (width, height), convert_to_src_size)
         return detections