Added username and password for RTSP

Author: yushulx

examples/official/ip_camera/gui_client/barcode_scanner.py

@@ -4,15 +4,35 @@
 Integrates Dynamsoft Capture Vision Bundle for real-time barcode detection.
 """
 
+import os
+import sys
 import queue
 import threading
 import time
 from typing import List, Optional
 from PySide6.QtCore import QObject, Signal, QTimer
 
+# Add Dynamsoft library path to DLL search path (for PyInstaller packaging)
+def _add_dynamsoft_to_dll_path():
+    """Add dynamsoft library directory to DLL search path"""
+    if hasattr(sys, '_MEIPASS'):
+        # Temporary directory after PyInstaller packaging
+        dcvb_path = os.path.join(sys._MEIPASS, 'dynamsoft_capture_vision_bundle')
+        if os.path.exists(dcvb_path):
+            # Windows: Add DLL search path
+            try:
+                os.add_dll_directory(dcvb_path)
+                # Also add to PATH environment variable (some DLLs may need this)
+                os.environ['PATH'] = dcvb_path + os.pathsep + os.environ.get('PATH', '')
+            except Exception as e:
+                print(f"Warning: Failed to add DLL directory: {e}")
+
+# Call before importing Dynamsoft
+_add_dynamsoft_to_dll_path()
+
 from dynamsoft_capture_vision_bundle import (
-    LicenseManager, CaptureVisionRouter, ImageSourceAdapter, 
-    CapturedResultReceiver, EnumErrorCode, EnumPresetTemplate, 
+    LicenseManager, CaptureVisionRouter, ImageSourceAdapter,
+    CapturedResultReceiver, EnumErrorCode, EnumPresetTemplate,
     EnumCapturedResultItemType
 )
 from utils import convertMat2ImageData
@@ -84,23 +104,49 @@ def __init__(self, parent=None):
         # Initialize license
         self._initialize_license()
 
-    def _initialize_license(self):
+    def _initialize_license(self, license_key=None):
         """Initialize Dynamsoft license"""
         try:
-            license_key = "DLS2eyJoYW5kc2hha2VDb2RlIjoiMjAwMDAxLTE2NDk4Mjk3OTI2MzUiLCJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSIsInNlc3Npb25QYXNzd29yZCI6IndTcGR6Vm05WDJrcEQ5YUoifQ=="
+            # Use provided key or load from config
+            if not license_key:
+                license_key = self._load_license_from_config()
 
+            if not license_key:
+                self.error_occurred.emit("No license key found. Please configure it in config.json")
+                return
+
             error_code, error_msg = LicenseManager.init_license(license_key)
-            
+
             if error_code != EnumErrorCode.EC_OK and error_code != EnumErrorCode.EC_LICENSE_CACHE_USED:
                 self.error_occurred.emit(f"License initialization failed: {error_msg}")
                 return
-            
+
             self.is_initialized = True
             self._setup_scanner()
-            
+
         except Exception as e:
             self.error_occurred.emit(f"Failed to initialize barcode scanner: {str(e)}")
 
+    def _load_license_from_config(self):
+        """Load license key from config.json"""
+        import os
+        import json
+        
+        try:
+            config_path = os.path.join(os.path.dirname(__file__), 'config.json')
+            if os.path.exists(config_path):
+                with open(config_path, 'r') as f:
+                    config = json.load(f)
+                    # Check multiple possible keys for compatibility
+                    license_key = (config.get('dynamsoft_license') or 
+                                  config.get('license_key') or 
+                                  config.get('barcode', {}).get('license_key'))
+                    return license_key
+        except Exception as e:
+            print(f"Error loading license from config: {e}")
+        
+        return None
+    
     def _setup_scanner(self):
         """Setup Dynamsoft Capture Vision components"""
         try:

examples/official/ip_camera/gui_client/config.json

@@ -35,5 +35,6 @@
   "start_fullscreen": false,
   "theme": 0,
   "user_agent": "IP-Camera-GUI-Client/1.0",
-  "video_fit_mode": 0
+  "video_fit_mode": 0,
+  "dynamsoft_license": "DLS2eyJoYW5kc2hha2VDb2RlIjoiMjAwMDAxLTE2NDk4Mjk3OTI2MzUiLCJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSIsInNlc3Npb25QYXNzd29yZCI6IndTcGR6Vm05WDJrcEQ5YUoifQ=="
 }

examples/official/ip_camera/gui_client/dialogs.py

@@ -52,7 +52,7 @@ def __init__(self, parent=None):
         super().__init__(parent)
         self.setWindowTitle("Connect to IP Camera")
         self.setModal(True)
-        self.resize(400, 250)
+        self.resize(420, 320)
 
         self.setup_ui()
 
@@ -122,7 +122,21 @@ def setup_quick_connect_form(self, layout):
         self.path_edit.setText("/video_feed")
         self.path_edit.textChanged.connect(self.update_url_preview)
         form_layout.addRow("Stream Path:", self.path_edit)
-        
+
+        # RTSP credentials (username / password)
+        self.rtsp_username_label = QLabel("Username (RTSP):")
+        self.rtsp_username_edit = QLineEdit()
+        self.rtsp_username_edit.setPlaceholderText("Leave blank if not required")
+        self.rtsp_username_edit.textChanged.connect(self.update_url_preview)
+        form_layout.addRow(self.rtsp_username_label, self.rtsp_username_edit)
+
+        self.rtsp_password_label = QLabel("Password (RTSP):")
+        self.rtsp_password_edit = QLineEdit()
+        self.rtsp_password_edit.setPlaceholderText("Leave blank if not required")
+        self.rtsp_password_edit.setEchoMode(QLineEdit.Password)
+        self.rtsp_password_edit.textChanged.connect(self.update_url_preview)
+        form_layout.addRow(self.rtsp_password_label, self.rtsp_password_edit)
+
         # URL preview
         self.url_preview = QLabel()
         self.url_preview.setStyleSheet("""
@@ -138,21 +152,27 @@ def setup_quick_connect_form(self, layout):
 
         layout.addLayout(form_layout)
 
-        # Update preview initially
+        # Update preview initially (also sets visibility of credential fields)
         self.on_protocol_changed()
         self.update_url_preview()
 
     def on_protocol_changed(self):
         """Handle protocol change"""
         is_rtsp = "RTSP" in self.stream_protocol_combo.currentText()
-        
+
         if is_rtsp:
             self.port_spinbox.setValue(554)  # Default RTSP port
             self.path_edit.setText("/stream")
         else:
             self.port_spinbox.setValue(5000)  # Default HTTP port
             self.path_edit.setText("/video_feed")
-            
+
+        # Show/hide credential fields based on protocol
+        self.rtsp_username_label.setVisible(is_rtsp)
+        self.rtsp_username_edit.setVisible(is_rtsp)
+        self.rtsp_password_label.setVisible(is_rtsp)
+        self.rtsp_password_edit.setVisible(is_rtsp)
+
         self.update_url_preview()
 
 
@@ -161,17 +181,26 @@ def update_url_preview(self):
         ip = self.ip_edit.text() or "0.0.0.0"
         port = self.port_spinbox.value()
         path = self.path_edit.text() or "/"
-        
+
         if not path.startswith('/'):
             path = '/' + path
-        
+
         is_rtsp = "RTSP" in self.stream_protocol_combo.currentText()
-        
+
         if is_rtsp:
-            url = f"rtsp://{ip}:{port}{path}"
+            username = self.rtsp_username_edit.text().strip()
+            password = self.rtsp_password_edit.text()
+            if username:
+                # Embed credentials in the URL: rtsp://user:pass@host:port/path
+                from urllib.parse import quote
+                encoded_user = quote(username, safe='')
+                encoded_pass = quote(password, safe='')
+                url = f"rtsp://{encoded_user}:{encoded_pass}@{ip}:{port}{path}"
+            else:
+                url = f"rtsp://{ip}:{port}{path}"
         else:
             url = f"http://{ip}:{port}{path}"
-            
+
         self.url_preview.setText(url)
 
     def get_current_url(self):

examples/official/ip_camera/gui_client/requirements.txt

@@ -3,3 +3,4 @@ requests==2.31.0
 opencv-python==4.8.1.78
 numpy>=1.21.0,<2.0.0
 dynamsoft-capture-vision-bundle>=3.0.6000
+pyinstaller>=6.0.0