update device类型统一使用ascend

Author: jadehh

README.md

@@ -1,4 +1,4 @@
-##  OpencvToolsV1.1.4
+##  OpencvToolsV1.1.5
 Opencv相关操作
 
 ### 打包为wheel文件
@@ -17,3 +17,4 @@ pip wheel --wheel-dir=./wheel_dir ./
 * 支持华为Ascend解码
 * 日志输出Ascend芯片解码
 * 优化Ascend芯片解码
+* device类型统一使用ascend

opencv_tools/jade_opencv_process.py

@@ -763,7 +763,7 @@ def download_frame(self,frame):
         if self.use_gpu_decode:
             frame = frame.download()
             frame = cv2.cvtColor(frame, cv2.COLOR_BGRA2BGR)
-        if self.device == "Ascend":
+        if self.device == "ascend":
             frame = self._dvpp.jpege(frame)
             frame = frame.jpeg_to_cv2()
         return frame
@@ -823,7 +823,7 @@ def open_gpu_capture(self):
             Exit(0)
 
     def opencv_cpu_capture(self):
-        if self.device == "Ascend":
+        if self.device == "ascend":
             from acllite import videocapture
             import acl
             ret = acl.rt.set_device(0)
@@ -833,7 +833,7 @@ def opencv_cpu_capture(self):
             self.capture = cv2.VideoCapture(self.video_path)
             self.JadeLog.INFO("相机类型为:{},使用CPU解码,准备打开相机".format(self.camera_type))
 
-        if self.device == "Ascend":
+        if self.device == "ascend":
             ret,frame = self.capture.read()
             if ret == 0 and frame is not None:
                 self.reopen_times = 0
@@ -877,7 +877,7 @@ def capture_reader(self):
                             ret, frame = self.capture.nextFrame()
                         else:
                             ret, frame = self.capture.read()
-                        if self.device == "Ascend":
+                        if self.device == "ascend":
                             if ret == 0:
                                 ret = True
                             else:
@@ -902,7 +902,7 @@ def capture_reader(self):
                 time.sleep(self.camera_reopen_times)
 
     def run(self):
-        if self.device == "Ascend":
+        if self.device == "ascend":
             import acl
             from acllite.acllite_imageproc import AclLiteImageProc
             ret = acl.rt.set_device(0)

setup.py

@@ -12,7 +12,7 @@
     find_packages("opencv_tools", pack_list)
     setup(
     name="opencv_tools",
-    version="1.1.4",
+    version="1.1.5",
     keywords=("pip", "opencv_tools", ""),
     description="opencv_tools",
     long_description="",