Merge branch 'dev' of github.com:jorhelp/Ingram into dev

utils/camera.py

@@ -1,6 +1,5 @@
 """Some tools about camera"""
 import os
-import sys
 import rtsp
 import requests
 import argparse
@@ -47,10 +46,14 @@ def snapshot_rtsp(ip, port, user, passwd, sv_path):
     """get snapshot through rtsp"""
     with rtsp.Client(rtsp_server_uri=f"rtsp://{user}:{passwd}@{ip}:554", verbose=False) as client:
         while client.isOpened():
-            img = client.read(raw=True)
-            if not img is None:
+            img_bgr = client.read(raw=True)
+            if not img_bgr is None:
+                img_rgb = img_bgr.copy()
+                img_rgb[:,:,0] = img_bgr[:,:,2]
+                img_rgb[:,:,1] = img_bgr[:,:,1]
+                img_rgb[:,:,2] = img_bgr[:,:,0]
                 name = f"{ip}:{port}-{user}-{passwd}.jpg"
-                img = Image.fromarray(img)
+                img = Image.fromarray(img_rgb)
                 img.save(os.path.join(sv_path, name))
                 break
 
@@ -59,10 +62,14 @@ def snapshot_rtsp_hb(ip, port, user, passwd, sv_path):
     """get hb-tech/hikvision snapshot through rtsp (multiplay, get channel 0)"""
     with rtsp.Client(rtsp_server_uri=f"rtsp://{user}:{passwd}@{ip}:554/h264/ch0/main/av_stream", verbose=False) as client:
         while client.isOpened():
-            img = client.read(raw=True)
-            if not img is None:
+            img_bgr = client.read(raw=True)
+            if not img_bgr is None:
+                img_rgb = img_bgr.copy()
+                img_rgb[:,:,0] = img_bgr[:,:,2]
+                img_rgb[:,:,1] = img_bgr[:,:,1]
+                img_rgb[:,:,2] = img_bgr[:,:,0]
                 name = f"{ip}:{port}-{user}-{passwd}.jpg"
-                img = Image.fromarray(img)
+                img = Image.fromarray(img_rgb)
                 img.save(os.path.join(sv_path, name))
                 break