Merge pull request #61 from kndt84/master

I tested. Your logic seems to work correctly. Thank you!!
PINTO0309 · Jan 7, 2020 · b5caa1c · b5caa1c
2 parents f9868b0 + 4dcb6d1
commit b5caa1c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/openvino_tiny-yolov3_MultiStick_test.py b/openvino_tiny-yolov3_MultiStick_test.py
@@ -266,8 +266,8 @@ def __init__(self, devid, frameBuffer, results, camera_width, camera_height, num
         self.skip_frame = 0
         self.roop_frame = 0
         self.vidfps = vidfps
-        self.new_w = int(camera_width * min(self.m_input_size/camera_width, self.m_input_size/camera_height))
-        self.new_h = int(camera_height * min(self.m_input_size/camera_width, self.m_input_size/camera_height))
+        self.new_w = int(camera_width * self.m_input_size/camera_width)
+        self.new_h = int(camera_height * self.m_input_size/camera_height)
 
     def image_preprocessing(self, color_image):
         resized_image = cv2.resize(color_image, (self.new_w, self.new_h), interpolation = cv2.INTER_CUBIC)

diff --git a/openvino_tiny-yolov3_test.py b/openvino_tiny-yolov3_test.py
@@ -153,8 +153,8 @@ def main_IE_infer():
     vidfps = 0
     skip_frame = 0
     elapsedTime = 0
-    new_w = int(camera_width * min(m_input_size/camera_width, m_input_size/camera_height))
-    new_h = int(camera_height * min(m_input_size/camera_width, m_input_size/camera_height))
+    new_w = int(camera_width * m_input_size/camera_width)
+    new_h = int(camera_height * m_input_size/camera_height)
 
     args = build_argparser().parse_args()
     #model_xml = "lrmodels/tiny-YoloV3/FP32/frozen_tiny_yolo_v3.xml" #<--- CPU

diff --git a/openvino_yolov3_MultiStick_test.py b/openvino_yolov3_MultiStick_test.py
@@ -266,8 +266,8 @@ def __init__(self, devid, frameBuffer, results, camera_width, camera_height, num
         self.skip_frame = 0
         self.roop_frame = 0
         self.vidfps = vidfps
-        self.new_w = int(camera_width * min(self.m_input_size/camera_width, self.m_input_size/camera_height))
-        self.new_h = int(camera_height * min(self.m_input_size/camera_width, self.m_input_size/camera_height))
+        self.new_w = int(camera_width * self.m_input_size/camera_width)
+        self.new_h = int(camera_height * self.m_input_size/camera_height)
 
     def image_preprocessing(self, color_image):
         resized_image = cv2.resize(color_image, (self.new_w, self.new_h), interpolation = cv2.INTER_CUBIC)

diff --git a/openvino_yolov3_test.py b/openvino_yolov3_test.py
@@ -153,8 +153,8 @@ def main_IE_infer():
     vidfps = 0
     skip_frame = 0
     elapsedTime = 0
-    new_w = int(camera_width * min(m_input_size/camera_width, m_input_size/camera_height))
-    new_h = int(camera_height * min(m_input_size/camera_width, m_input_size/camera_height))
+    new_w = int(camera_width * m_input_size/camera_width)
+    new_h = int(camera_height * m_input_size/camera_height)
 
     args = build_argparser().parse_args()
     model_xml = "lrmodels/YoloV3/FP32/frozen_yolo_v3.xml" #<--- CPU