nedo-vision-worker 1.2.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

nedo_vision_worker/__init__.py

@@ -6,5 +6,5 @@ A library for running worker agents in the Nedo Vision platform.
 
 from .worker_service import WorkerService
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 __all__ = ["WorkerService"] 

nedo_vision_worker/cli.py

@@ -49,7 +49,7 @@ Examples:
         parser.add_argument(
             "--version",
             action="version",
-            version="nedo-vision-worker 1.2.0"
+            version="nedo-vision-worker 1.2.1"
         )
         
         subparsers = parser.add_subparsers(

nedo_vision_worker/services/VideoStreamClient.py

@@ -8,6 +8,7 @@ import fractions
 from urllib.parse import urlparse
 from .GrpcClientBase import GrpcClientBase
 from .SharedDirectDeviceClient import SharedDirectDeviceClient
+from ..util.FFmpegUtil import get_rtsp_ffmpeg_options, get_rtsp_probe_options
 from ..protos.VisionWorkerService_pb2_grpc import VideoStreamServiceStub
 from ..protos.VisionWorkerService_pb2 import VideoFrame
 
@@ -47,8 +48,10 @@ class VideoStreamClient(GrpcClientBase):
             ]
 
             if stream_type == "rtsp":
-                probe_cmd.insert(1, "-rtsp_transport")
-                probe_cmd.insert(2, "tcp")
+                probe_options = get_rtsp_probe_options()
+                # Insert options at the beginning (after ffprobe)
+                for i, option in enumerate(probe_options):
+                    probe_cmd.insert(1 + i, option)
 
             result = subprocess.run(probe_cmd, capture_output=True, text=True)
             probe_data = json.loads(result.stdout)
@@ -97,10 +100,8 @@ class VideoStreamClient(GrpcClientBase):
                 logging.error(f"Failed to create ffmpeg input for direct device: {e}")
                 return
         elif stream_type == "rtsp":
-            ffmpeg_input = (
-                ffmpeg
-                .input(url, rtsp_transport="tcp", fflags="nobuffer", timeout="5000000")
-            )
+            rtsp_options = get_rtsp_ffmpeg_options()
+            ffmpeg_input = ffmpeg.input(url, **rtsp_options)
         elif stream_type == "hls":
             ffmpeg_input = (
                 ffmpeg
@@ -148,8 +149,13 @@ class VideoStreamClient(GrpcClientBase):
             if stream_type == "direct":
                 self.shared_device_client.release_device_access(url)
             
-            stderr_output = process.stderr.read().decode()
-            logging.error(f"FFmpeg stderr: {stderr_output}")
+            try:
+                stderr_output = process.stderr.read().decode()
+                if stderr_output.strip():  # Only log if there's actual error content
+                    logging.error(f"FFmpeg stderr for {stream_type} stream: {stderr_output}")
+            except Exception as e:
+                logging.warning(f"Could not read FFmpeg stderr: {e}")
+            
             process.terminate()
             process.wait()
 

nedo_vision_worker/services/WorkerSourcePipelineClient.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from ..database.DatabaseManager import _get_storage_paths
 from ..repositories.WorkerSourcePipelineDebugRepository import WorkerSourcePipelineDebugRepository
 from ..repositories.WorkerSourcePipelineDetectionRepository import WorkerSourcePipelineDetectionRepository
+from ..util.FFmpegUtil import get_rtsp_ffmpeg_options, get_stream_timeout_duration
 from .GrpcClientBase import GrpcClientBase
 from .SharedDirectDeviceClient import SharedDirectDeviceClient
 from ..protos.WorkerSourcePipelineService_pb2_grpc import WorkerSourcePipelineServiceStub
@@ -194,10 +195,8 @@ class WorkerSourcePipelineClient(GrpcClientBase):
                 logging.error(f"Error setting up direct device {device_index}: {e}")
                 return None
         elif stream_type == "rtsp":
-            ffmpeg_input = (
-                ffmpeg
-                .input(url, rtsp_transport="tcp", fflags="nobuffer", timeout="5000000")
-            )
+            rtsp_options = get_rtsp_ffmpeg_options()
+            ffmpeg_input = ffmpeg.input(url, **rtsp_options)
         elif stream_type == "hls":
             ffmpeg_input = (
                 ffmpeg
@@ -246,11 +245,13 @@ class WorkerSourcePipelineClient(GrpcClientBase):
             )
             
         try:    
-            stdout, stderr = process.communicate(timeout=15)
+            # Use appropriate timeout for different stream types
+            timeout_duration = get_stream_timeout_duration(stream_type)
+            stdout, stderr = process.communicate(timeout=timeout_duration)
             
             if process.returncode != 0:
                 error_msg = stderr.decode('utf-8', errors='ignore')
-                logging.error(f"FFmpeg error: {error_msg}")
+                logging.error(f"FFmpeg error for {stream_type} stream: {error_msg}")
                 return None
             
             if not stdout:

nedo_vision_worker/util/FFmpegUtil.py

@@ -0,0 +1,124 @@
+"""
+FFmpeg utilities for Jetson compatibility and RTSP stream handling.
+
+This module provides common FFmpeg configurations and utilities that work
+reliably on Jetson devices with FFmpeg 4.4.1 and newer versions.
+"""
+
+import logging
+import subprocess
+import re
+from typing import Dict, Any, Tuple
+
+
+def get_ffmpeg_version() -> Tuple[int, int, int]:
+    """
+    Get the FFmpeg version as a tuple of (major, minor, patch).
+    
+    Returns:
+        Tuple[int, int, int]: Version tuple (major, minor, patch)
+    """
+    try:
+        result = subprocess.run(['ffmpeg', '-version'], capture_output=True, text=True, timeout=5)
+        if result.returncode == 0:
+            # Extract version from output like "ffmpeg version n7.1.1" or "ffmpeg version 4.4.1"
+            match = re.search(r'ffmpeg version n?(\d+)\.(\d+)\.(\d+)', result.stdout)
+            if match:
+                return (int(match.group(1)), int(match.group(2)), int(match.group(3)))
+    except Exception as e:
+        logging.warning(f"Could not determine FFmpeg version: {e}")
+    
+    # Default to a reasonable version if detection fails
+    return (4, 4, 1)
+
+
+def get_rtsp_ffmpeg_options() -> Dict[str, Any]:
+    """
+    Get FFmpeg options optimized for RTSP streams with version compatibility.
+    
+    These options work across different FFmpeg versions:
+    - FFmpeg 4.4.x: Uses stimeout
+    - FFmpeg 5.x+: Uses timeout 
+    - FFmpeg 7.x+: Uses timeout
+    
+    Returns:
+        Dict[str, Any]: FFmpeg input options for RTSP streams
+    """
+    version = get_ffmpeg_version()
+    major, minor, patch = version
+    
+    # Base options that work across all versions
+    options = {
+        "rtsp_transport": "tcp",
+        "fflags": "nobuffer+genpts", 
+        "max_delay": "5000000",  # Max buffering delay
+        "buffer_size": "1024000",  # Input buffer size
+        "avoid_negative_ts": "make_zero"  # Handle timestamp issues
+    }
+    
+    # Add version-specific timeout option
+    if major == 4 and minor == 4:
+        # FFmpeg 4.4.x uses stimeout
+        options["stimeout"] = "5000000"
+        logging.debug("Using stimeout for FFmpeg 4.4.x")
+    else:
+        # FFmpeg 5.x+ uses timeout (microseconds)
+        options["timeout"] = "5000000"
+        logging.debug(f"Using timeout for FFmpeg {major}.{minor}.{patch}")
+    
+    return options
+
+
+def get_rtsp_probe_options() -> list:
+    """
+    Get ffprobe command line options for RTSP streams with version compatibility.
+    
+    Returns:
+        list: Command line options to insert into ffprobe command
+    """
+    version = get_ffmpeg_version()
+    major, minor, patch = version
+    
+    base_options = ["-rtsp_transport", "tcp"]
+    
+    # Add version-specific timeout option
+    if major == 4 and minor == 4:
+        # FFmpeg 4.4.x uses stimeout
+        return base_options + ["-stimeout", "5000000"]
+    else:
+        # FFmpeg 5.x+ uses timeout
+        return base_options + ["-timeout", "5000000"]
+
+
+def log_ffmpeg_version_info():
+    """Log information about FFmpeg compatibility."""
+    version = get_ffmpeg_version()
+    major, minor, patch = version
+    
+    logging.info(f"Detected FFmpeg version: {major}.{minor}.{patch}")
+    
+    if major == 4 and minor == 4:
+        logging.info("Using 'stimeout' parameter for FFmpeg 4.4.x compatibility")
+    else:
+        logging.info(f"Using 'timeout' parameter for FFmpeg {major}.{minor}.{patch}")
+    
+    logging.info("RTSP configuration optimized for embedded devices")
+
+
+def get_stream_timeout_duration(stream_type: str) -> int:
+    """
+    Get appropriate timeout duration for different stream types.
+    
+    Args:
+        stream_type (str): Type of stream (rtsp, hls, direct, etc.)
+        
+    Returns:
+        int: Timeout duration in seconds
+    """
+    timeouts = {
+        "rtsp": 30,     # RTSP streams may take longer to connect
+        "hls": 20,      # HLS streams need time for manifest download
+        "direct": 10,   # Direct device access should be faster
+        "video_file": 5 # Local files should be very fast
+    }
+    return timeouts.get(stream_type, 15)  # Default 15 seconds

nedo_vision_worker/util/VideoProbeUtil.py

@@ -8,6 +8,7 @@ import sys
 import platform
 from pathlib import Path
 from urllib.parse import urlparse
+from .FFmpegUtil import get_rtsp_probe_options
 
 
 try:
@@ -289,8 +290,10 @@ class VideoProbeUtil:
                "-show_entries", "stream=width,height,avg_frame_rate", "-of", "json"]
         
         if stream_type == "rtsp":
-            cmd.insert(1, "-rtsp_transport")
-            cmd.insert(2, "tcp")
+            probe_options = get_rtsp_probe_options()
+            # Insert options at the beginning (after ffprobe)
+            for i, option in enumerate(probe_options):
+                cmd.insert(1 + i, option)
         
         cmd.append(video_url)
 

{nedo_vision_worker-1.2.0.dist-info → nedo_vision_worker-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker
-Version: 1.2.0
+Version: 1.2.1
 Summary: Nedo Vision Worker Service Library for AI Vision Processing
 Author-email: Willy Achmat Fauzi <willy.achmat@gmail.com>
 Maintainer-email: Willy Achmat Fauzi <willy.achmat@gmail.com>

{nedo_vision_worker-1.2.0.dist-info → nedo_vision_worker-1.2.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-nedo_vision_worker/__init__.py,sha256=8AbQ3PK5CGdbnFRLBVzw8dcVQNHlNS_bBiqyygqIJ-Q,203
-nedo_vision_worker/cli.py,sha256=d7oDe3wJMfXd-ddStnyFASkLU0F3VemFsD9i0K7CYqU,7457
+nedo_vision_worker/__init__.py,sha256=OuQTi_CjaQDpS1kVellEttgj1dkluSOCwxE0teArbyY,203
+nedo_vision_worker/cli.py,sha256=ddWspJmSgVkcUYvRdkvTtMNuMTDvNCqLLuMVU9KE3Ik,7457
 nedo_vision_worker/doctor.py,sha256=uZ-NM_PfaTG5CG5OWFnl7cEsOTBWMGXNuKWuTV07deg,47228
 nedo_vision_worker/worker_service.py,sha256=rXUVmyxcJPGhQEZ4UQvjQS5UqlnLBYudHQZCj0dQDxo,10421
 nedo_vision_worker/config/ConfigurationManager.py,sha256=QrQaQ9Cdjpkcr2JE_miyrWJIZmMgZwJYBz-wE45Zzes,8011
@@ -63,18 +63,19 @@ nedo_vision_worker/services/SharedVideoStreamServer.py,sha256=WMKVxkzMoyfbgYiJ0f
 nedo_vision_worker/services/SystemUsageClient.py,sha256=PbRuwDWKnMarcnkGtOKfYB5nA-3DeKv7V5_hZr8EDEo,3200
 nedo_vision_worker/services/SystemWideDeviceCoordinator.py,sha256=9zBJMCbTMZS7gwN67rFpoUiTr82El2rpIO7DKFzeMjM,9417
 nedo_vision_worker/services/VideoSharingDaemon.py,sha256=hYMjUIKNUVT1qSxuUuHN-7Bd85MDkxfqslxDLe2PBYQ,29721
-nedo_vision_worker/services/VideoStreamClient.py,sha256=jSStEGjIHId4GseL-eE7FNGYU1CXgLaSjOm5CFVliPE,6828
+nedo_vision_worker/services/VideoStreamClient.py,sha256=QSgUV3LijYrNdnBG1ylABOdUaSatQamfXaqJhAiol9M,7260
 nedo_vision_worker/services/WorkerSourceClient.py,sha256=vDZeCuHL5QQ2-knZ4TOSA59jzmbbThGIwFKKLEZ72Ws,9198
-nedo_vision_worker/services/WorkerSourcePipelineClient.py,sha256=rkKTPDWDgXhutMTqo_qvGvx1uVkhHcgi-3mJMywub8s,17705
+nedo_vision_worker/services/WorkerSourcePipelineClient.py,sha256=amhZOua0lmlWl7ZkU-SSbT2E1Y5D-uKde9bDCVxOqM4,17924
 nedo_vision_worker/services/WorkerSourceUpdater.py,sha256=MsUsKL75sXj2odCcbupkFDW0KXg9LSu6-67iMWpYkHs,7679
 nedo_vision_worker/services/WorkerStatusClient.py,sha256=7kC5EZjEBwWtHOE6UQ29OPCpYnv_6HSuH7Tc0alK_2Q,2531
 nedo_vision_worker/services/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
+nedo_vision_worker/util/FFmpegUtil.py,sha256=_TRA_Q2CAKatrbhOMKG5Uhhk6FrMJ6sbwMnd0Qwq0co,4086
 nedo_vision_worker/util/HardwareID.py,sha256=rSW8-6stm7rjXEdkYGqXMUn56gyw62YiWnSwZQVCCLM,4315
 nedo_vision_worker/util/ImageUploader.py,sha256=2xipN3fwpKgFmbvoGIdElpGn5ARJyrgR4dXtbRf73hw,3764
 nedo_vision_worker/util/Networking.py,sha256=uOtL8HkKZXJp02ZZIHWYMAvAsaYb7BsAPTncfdvJx2c,3241
 nedo_vision_worker/util/PlatformDetector.py,sha256=-iLPrKs7hp_oltkCI3hESJQkC2uRyu1-8mAbZrvgWx0,1501
 nedo_vision_worker/util/SystemMonitor.py,sha256=2MWYaEXoL91UANT_-SuDWrFMq1ajPorh8co6Py9PV_c,11300
-nedo_vision_worker/util/VideoProbeUtil.py,sha256=whgvZvSeO5y7IG3E1mxn5KRKYqxyrGtLJowV3nHgwYA,13181
+nedo_vision_worker/util/VideoProbeUtil.py,sha256=1ViUjt6NSMilquapHf6XC0h93OwhA40LwGSnYOtpMh0,13362
 nedo_vision_worker/util/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker/worker/CoreActionWorker.py,sha256=lb7zPY3yui6I3F4rX4Ii7JwpWZahLEO72rh3iWOgFmg,5441
 nedo_vision_worker/worker/DataSenderWorker.py,sha256=o32MT28EqYwAPmd9NKhX3rfNlDKekNOI2n8mZ6s8CpU,7162
@@ -90,8 +91,8 @@ nedo_vision_worker/worker/SystemUsageManager.py,sha256=StutV4UyLUfduYfK20de4SbPd
 nedo_vision_worker/worker/VideoStreamWorker.py,sha256=5n6v1PNO7IB-jj_McALLkUP-cBjJoIEw4UiSAs3vTb0,7606
 nedo_vision_worker/worker/WorkerManager.py,sha256=T0vMfhOd7YesgQ9o2w6soeJ6n9chUAcuwcGe7p31xr0,5298
 nedo_vision_worker/worker/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker-1.2.0.dist-info/METADATA,sha256=uj39xqzh3cXjTI02_xRZpZVPieB8PjqLUxIOvEbT12M,14591
-nedo_vision_worker-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nedo_vision_worker-1.2.0.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
-nedo_vision_worker-1.2.0.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
-nedo_vision_worker-1.2.0.dist-info/RECORD,,
+nedo_vision_worker-1.2.1.dist-info/METADATA,sha256=GUzjnngaGQ7i48oY3BMpdPB701o8_n2LxwlayNJb3uw,14591
+nedo_vision_worker-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nedo_vision_worker-1.2.1.dist-info/entry_points.txt,sha256=LrglS-8nCi8C_PL_pa6uxdgCe879hBETHDVXAckvs-8,60
+nedo_vision_worker-1.2.1.dist-info/top_level.txt,sha256=vgilhlkyD34YsEKkaBabmhIpcKSvF3XpzD2By68L-XI,19
+nedo_vision_worker-1.2.1.dist-info/RECORD,,