update 支持华为昇腾芯片解码

Author: jadehh

README.md

@@ -1,32 +1,6 @@
-##  python tools V1.0.1
-* 不使用第三方wheel包
-
-
-## 1.编写python文件
-
-## 2. 编写setup.py文件
-```Python
-from setuptools import setup, find_packages
-
-setup(
-    name="jade_tools",
-    version="0.1",
-    keywords=("pip", "jade_tools", ""),
-    description="jade_tools",
-    long_description="xxx",
-    license="MIT Licence",
-
-    url="https://jadehh@live.com",
-    author="opencv_tools",
-    author_email="jadehh@live.com",
-
-    packages=find_packages(),
-    include_package_data=True,
-    platforms="any",
-    install_requires=["numpy","pillow","imageio"]  # 这个项目需要的第三方库
-)
-```
-## ３．打包为wheel文件
+##  opencv_toolsV1.1.2
+* Opencv相关操作
+### 打包为wheel文件
 
 安装wheel
 ```bash
@@ -37,3 +11,6 @@ pip install wheel
 pip wheel --wheel-dir=./wheel_dir ./
 ```
 > wheel-dir 为wheel 输出文件夹，后面接项目文件夹（即包含setup.py的文件夹）
+
+### 更新日志
+* 支持华为Ascned解码

opencv_tools/jade_opencv_process.py

@@ -748,13 +748,14 @@ def PadImage(image,width=10):
 
 
 class VideoCaptureBaseProcess(threading.Thread):
-    def __init__(self,video_path,camera_type,use_gpu_decode,camera_reopen_times=30,JadeLog=None):
+    def __init__(self,video_path,camera_type,use_gpu_decode,camera_reopen_times=30,JadeLog=None,device=None):
         self.video_path = video_path
         self.history_status = self.check_video_path()
         self.camera_type = camera_type
         self.use_gpu_decode = use_gpu_decode
         self.camera_reopen_times = camera_reopen_times
         self.reopen_times = 0
+        self.device = device
         self.JadeLog = JadeLog
         super(VideoCaptureBaseProcess, self).__init__()
 
@@ -819,18 +820,39 @@ def open_gpu_capture(self):
 
     def opencv_cpu_capture(self):
         self.JadeLog.INFO("相机类型为:{},使用CPU解码,准备打开相机".format(self.camera_type))
-        self.capture = cv2.VideoCapture(self.video_path)
-        if self.capture.isOpened():
-            self.reopen_times = 0
-            self.JadeLog.INFO(
-                "相机类型为:{},相机打开成功,使用CPU对视频解码,相机地址为:{}".format(self.camera_type, self.video_path))
-            return True
+        if self.device == "Ascend":
+            from acllite import videocapture
+            self.capture = videocapture.VideoCapture(self.video_path)
         else:
-            self.reopen_times = self.reopen_times + 1
-            self.capture = None
-            self.JadeLog.ERROR("相机类型为:{},相机第{}次打开失败,相机地址为:{}".format(self.camera_type, self.reopen_times, self.video_path))
-            self.camera_abnormal(None)
-            return False
+            self.capture = cv2.VideoCapture(self.video_path)
+        if self.device == "Ascned":
+            ret,frame = self.capture.read()
+            if ret:
+                self.reopen_times = 0
+                self.JadeLog.INFO(
+                    "相机类型为:{},相机打开成功,使用CPU对视频解码,相机地址为:{}".format(self.camera_type, self.video_path))
+                return True
+            else:
+                self.reopen_times = self.reopen_times + 1
+                self.capture = None
+                self.JadeLog.ERROR(
+                    "相机类型为:{},相机第{}次打开失败,相机地址为:{}".format(self.camera_type, self.reopen_times, self.video_path))
+                self.camera_abnormal(None)
+                return False
+        else:
+            if self.capture.isOpened():
+                self.reopen_times = 0
+                self.JadeLog.INFO(
+                    "相机类型为:{},相机打开成功,使用CPU对视频解码,相机地址为:{}".format(self.camera_type, self.video_path))
+                return True
+            else:
+                self.reopen_times = self.reopen_times + 1
+                self.capture = None
+                self.JadeLog.ERROR(
+                    "相机类型为:{},相机第{}次打开失败,相机地址为:{}".format(self.camera_type, self.reopen_times, self.video_path))
+                self.camera_abnormal(None)
+                return False
+
 
     def judge_capture_reader(self):
         if self.use_gpu_decode:
@@ -848,7 +870,7 @@ def capture_reader(self):
                         else:
                             ret, frame = self.capture.read()
                         self.package_data(ret, frame)
-                        if ret is False:
+                        if ret is False or ret == 0 or frame is None:
                             self.JadeLog.WARNING(
                                 "相机类型为:{},相机中途断开,等待{}s,尝试重连".format(self.camera_type, self.camera_reopen_times))
                             time.sleep(self.camera_reopen_times)

setup.py

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