nedo-vision-worker-core 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

nedo_vision_worker_core/__init__.py

@@ -7,10 +7,10 @@ A library for running AI vision processing and detection in the Nedo Vision plat
 from .core_service import CoreService
 from .callbacks import DetectionType, CallbackTrigger, DetectionData, IntervalMetadata
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 __all__ = [
     "CoreService", 
-    "DetectionType", 
+    "DetectionType",
     "CallbackTrigger", 
     "DetectionData",
     "IntervalMetadata",

nedo_vision_worker_core/pipeline/PipelineProcessor.py

@@ -259,9 +259,10 @@ class PipelineProcessor:
                     finally:
                         self.rtmp_streamer = None
 
-                # Simplified queue feeding - avoid expensive try-except
-                if not self.frame_queue.full():
-                    self.frame_queue.put_nowait(frame)
+                # Only feed frames to detection queue if detection processor is active
+                if self.detection_processor is not None:
+                    if not self.frame_queue.full():
+                        self.frame_queue.put_nowait(frame)
                 
                 loop_elapsed = time.time() - loop_start
                 sleep_time = max(0.001, target_frame_time - loop_elapsed)
@@ -307,7 +308,13 @@ class PipelineProcessor:
 
         while self.running:
             try:
-                frame = self.frame_queue.get(block=True, timeout=1)
+                # Calculate how long to wait for next detection
+                current_time = time.time()
+                time_since_last_detection = current_time - last_detection_time
+                time_until_next_detection = max(0.1, self.detection_interval - time_since_last_detection)
+                
+                # Wait for frame with timeout aligned to detection interval
+                frame = self.frame_queue.get(block=True, timeout=time_until_next_detection)
                 
                 # Check for poison pill (None = stop signal)
                 if frame is None:
@@ -332,9 +339,14 @@ class PipelineProcessor:
                 except queue.Empty:
                     pass
 
-                # Respect detection interval
+                # Respect detection interval - skip if too soon
                 if (current_time - last_detection_time) < self.detection_interval:
+                    # Sleep the remaining time instead of busy-waiting
+                    remaining_time = self.detection_interval - (current_time - last_detection_time)
+                    if remaining_time > 0.01:
+                        time.sleep(remaining_time)
                     continue
+                
                 last_detection_time = current_time
 
                 if self.detection_processor is None or frame is None or frame.size == 0:
@@ -363,6 +375,7 @@ class PipelineProcessor:
                     )
 
             except queue.Empty:
+                # Timeout occurred - this is normal, just continue to next iteration
                 pass
             except Exception as e:
                 logging.error(f"❌ Error in detection thread for pipeline {pipeline_id}: {e}", exc_info=True)

nedo_vision_worker_core/streams/RTMPStreamer.py

@@ -307,6 +307,7 @@ class RTMPStreamer:
                 if not self.is_active():
                     raise BrokenPipeError("FFmpeg process is not active")
                 self._ffmpeg_process.stdin.write(frame.tobytes())
+                self._ffmpeg_process.stdin.flush()  # Ensure data is sent immediately
             except (BrokenPipeError, OSError) as e:
                 
                 # Check if this failure was from a HW encoder
@@ -356,23 +357,20 @@ class RTMPStreamer:
             '-framerate', str(self.fps), '-i', '-',
         ]
         
+        # Add encoder and encoder-specific parameters
         cmd.extend(encoder_args)
         
+        # Common video parameters
         cmd.extend([
-            '-profile:v', 'main', '-pix_fmt', 'yuv420p',
+            '-pix_fmt', 'yuv420p',
             '-b:v', f"{self.bitrate}k", '-maxrate', f"{self.bitrate}k", '-bufsize', f"{self.bitrate*2}k",
             '-g', str(self.fps * 2), '-keyint_min', str(self.fps),
-            '-force_key_frames', 'expr:gte(t,n_forced*1)', '-an',
-            '-flvflags', 'no_duration_filesize', '-f', 'flv', self.rtmp_url,
+            '-force_key_frames', 'expr:gte(t,n_forced*1)', 
+            '-an',  # No audio
+            '-flvflags', 'no_duration_filesize', 
+            '-f', 'flv', self.rtmp_url,
         ])
         
-        if encoder_name == "libx264":
-            cmd.extend([
-                "-preset", "ultrafast",
-                "-tune", "zerolatency",
-                "-x264-params", "open_gop=0:aud=1:repeat-headers=1:nal-hrd=cbr",
-            ])
-        
         return cmd, encoder_name
 
     def _select_ffmpeg_encoder(self, force_cpu: bool = False) -> Tuple[List[str], str]:
@@ -381,26 +379,74 @@ class RTMPStreamer:
         Will force CPU if force_cpu is True.
         """
         if force_cpu:
-            return ["-c:v", "libx264"], "libx264"
+            return [
+                "-c:v", "libx264",
+                "-preset", "ultrafast",
+                "-tune", "zerolatency",
+                "-profile:v", "main",
+            ], "libx264"
         
         force_encoder = os.environ.get("RTMP_ENCODER", "").lower()
         
         if force_encoder == "cpu" or force_encoder == "libx264":
-            return ["-c:v", "libx264"], "libx264"
+            return [
+                "-c:v", "libx264",
+                "-preset", "ultrafast",
+                "-tune", "zerolatency",
+                "-profile:v", "main",
+            ], "libx264"
         elif force_encoder == "nvenc":
-            return ["-c:v", "h264_nvenc", "-preset", "llhp"], "h264_nvenc"
+            return [
+                "-c:v", "h264_nvenc",
+                "-preset", "p1",  # p1 = fastest, p7 = slowest
+                "-tune", "ull",  # ultra-low latency
+                "-rc:v", "cbr",  # constant bitrate for streaming
+                "-rc-lookahead", "0",  # disable lookahead for lower latency
+                "-delay", "0",  # zero delay
+                "-zerolatency", "1",  # enable zero latency mode
+                "-profile:v", "main",
+                "-gpu", "0",  # Use first GPU
+            ], "h264_nvenc"
         
         if self._platform.is_jetson():
-            # Jetson-specific encoder
-            return ["-c:v", "h264_omx"], "h264_omx"
+            # Jetson-specific encoder with optimizations
+            return [
+                "-c:v", "h264_nvenc",
+                "-preset", "p1",
+                "-tune", "ull",
+                "-rc:v", "cbr",
+                "-rc-lookahead", "0",
+                "-delay", "0",
+                "-zerolatency", "1",
+                "-profile:v", "main",
+            ], "h264_nvenc"
 
         if sys.platform == "darwin": 
-            return ["-c:v", "h264_videotoolbox"], "h264_videotoolbox"
+            return [
+                "-c:v", "h264_videotoolbox",
+                "-profile:v", "main",
+                "-realtime", "1",
+            ], "h264_videotoolbox"
         
         has_nvidia = (os.environ.get("NVIDIA_VISIBLE_DEVICES") is not None or 
                       os.path.exists("/proc/driver/nvidia/version"))
         
         if has_nvidia:
-            return ["-c:v", "h264_nvenc", "-preset", "llhp"], "h264_nvenc"
+            return [
+                "-c:v", "h264_nvenc",
+                "-preset", "p1",  # p1 = fastest preset
+                "-tune", "ull",  # ultra-low latency
+                "-rc:v", "cbr",  # constant bitrate
+                "-rc-lookahead", "0",  # disable lookahead
+                "-delay", "0",  # zero delay
+                "-zerolatency", "1",  # zero latency mode
+                "-profile:v", "main",
+                "-gpu", "0",  # Use first GPU
+            ], "h264_nvenc"
         
-        return ["-c:v", "libx264"], "libx264"
+        return [
+            "-c:v", "libx264",
+            "-preset", "ultrafast",
+            "-tune", "zerolatency",
+            "-profile:v", "main",
+        ], "libx264"

{nedo_vision_worker_core-0.4.0.dist-info → nedo_vision_worker_core-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker-core
-Version: 0.4.0
+Version: 0.4.1
 Summary: Nedo Vision Worker Core 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_core-0.4.0.dist-info → nedo_vision_worker_core-0.4.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-nedo_vision_worker_core/__init__.py,sha256=_NVuaujglbPX63LBohmNR6a1n7ctmMl97EsX9LBIVHA,1924
+nedo_vision_worker_core/__init__.py,sha256=PMh9hXyCQ2JPaLxq5mFDqRZonzYLfZnwwtGukl0GVBM,1923
 nedo_vision_worker_core/cli.py,sha256=8YuKWsIgICUYXE_QtwyU3WzGhVjTWiAo5uzpFOmjNc8,5766
 nedo_vision_worker_core/core_service.py,sha256=q8-GuGW_l5l6wTWQDqc7BDdhM7zKC-mMLZ5wIHu9xV0,11628
 nedo_vision_worker_core/doctor.py,sha256=K_-hVV2-mdEefZ4Cfu5hMCiOxBiI1aXY8VtkkpK80Lc,10651
@@ -61,7 +61,7 @@ nedo_vision_worker_core/pipeline/ModelManager.py,sha256=2DoQiIdF-PAqU7nT_u6bj-DY
 nedo_vision_worker_core/pipeline/PipelineConfigManager.py,sha256=X55i9GyXcW9ylO6cj2UMAZFSxxPViacL4H4DZl60CAY,1157
 nedo_vision_worker_core/pipeline/PipelineManager.py,sha256=3I9UBJu_rRfTEctwj8i4hO4MHjpBtYpfh-rIi64qgEw,7638
 nedo_vision_worker_core/pipeline/PipelinePrepocessor.py,sha256=cCiVSHHqsKCtKYURdYoEjHJX2GnT6zd8kQ6ZukjQ3V0,1271
-nedo_vision_worker_core/pipeline/PipelineProcessor.py,sha256=FYpZw2vRRuweJ798gRhygOfF7cCJbKRApwZ52kxSEEM,33478
+nedo_vision_worker_core/pipeline/PipelineProcessor.py,sha256=qjAviYziFX9zJbRDIx7me94ZEccA1r53bunuDySTPhQ,34356
 nedo_vision_worker_core/pipeline/PipelineSyncThread.py,sha256=HkW6wj0eDr6M1K3Y25IlB2V6tpIZsKA34AM49AXvcQk,8707
 nedo_vision_worker_core/pipeline/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 nedo_vision_worker_core/preprocessing/ImageResizer.py,sha256=RvOazxe6dJQuiy0ZH4lIGbdFfiu0FLUVCHoMvxkDNT4,1324
@@ -80,7 +80,7 @@ nedo_vision_worker_core/repositories/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8
 nedo_vision_worker_core/services/SharedVideoStreamServer.py,sha256=rhCineMKPG3GQbrMHlSHP4xhXaGZ6Rn1oqIajW5xpaY,9827
 nedo_vision_worker_core/services/VideoSharingDaemon.py,sha256=iY6afEKTOsphfHvmZTL0grezka2DS9DDq-1EIpVMy0Y,28524
 nedo_vision_worker_core/services/VideoSharingDaemonManager.py,sha256=sc8VZo5iwoOdR8uTiel5BKz6-eZ7wwLy3IwV_3tsAu0,10340
-nedo_vision_worker_core/streams/RTMPStreamer.py,sha256=0eThAwEyOg1ZuO0zbIvdqOICGQDRoOPxEcOBQtskM7A,17110
+nedo_vision_worker_core/streams/RTMPStreamer.py,sha256=X6QL84VdjKd995BwpcvD99sCBJGxj4MXWI0q9zo5Izw,18761
 nedo_vision_worker_core/streams/SharedVideoDeviceManager.py,sha256=vSslwxbhKH6FPndR1HcSFIVWtF-iiOQMlSa4VvFa6M4,16265
 nedo_vision_worker_core/streams/StreamSyncThread.py,sha256=ETT0N_P90ksn6Q5pb7NvMadqCuoicz_g52lcDkHIp88,5382
 nedo_vision_worker_core/streams/VideoStream.py,sha256=nGtJ4FAZ1Ek-8hVRopEt0bLWLpa10OtyUwdDEuXLObQ,13343
@@ -98,8 +98,8 @@ nedo_vision_worker_core/util/PipelinePreviewChecker.py,sha256=XxlSMlrDlRrzfV8_Y-
 nedo_vision_worker_core/util/PlatformDetector.py,sha256=GGL8UfeMQITR22EMYIRWnuOEnSqo7Dr5mb0PaFrl8AM,3006
 nedo_vision_worker_core/util/TablePrinter.py,sha256=wzLGgb1GFMeIbAP6HmKcZD33j4D-IlyqlyeR7C5yD7w,1137
 nedo_vision_worker_core/util/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-nedo_vision_worker_core-0.4.0.dist-info/METADATA,sha256=xzaULdQDUdB5jKhmotw2EL4Ua4LJlQ0kExewX2JfUn8,14426
-nedo_vision_worker_core-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nedo_vision_worker_core-0.4.0.dist-info/entry_points.txt,sha256=pIPafsvPnBw-fpBKBmc1NQCQ6PQY3ad8mZ6mn8_p5FI,70
-nedo_vision_worker_core-0.4.0.dist-info/top_level.txt,sha256=y8kusXjVYqtG8MSHYWTrk8bRrvjOrphKXYyzu943TTQ,24
-nedo_vision_worker_core-0.4.0.dist-info/RECORD,,
+nedo_vision_worker_core-0.4.1.dist-info/METADATA,sha256=eVzhZ0Gwb-Rd1lIasDKRUrGAfrDzqPgiTfR54rg6Vl8,14426
+nedo_vision_worker_core-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nedo_vision_worker_core-0.4.1.dist-info/entry_points.txt,sha256=pIPafsvPnBw-fpBKBmc1NQCQ6PQY3ad8mZ6mn8_p5FI,70
+nedo_vision_worker_core-0.4.1.dist-info/top_level.txt,sha256=y8kusXjVYqtG8MSHYWTrk8bRrvjOrphKXYyzu943TTQ,24
+nedo_vision_worker_core-0.4.1.dist-info/RECORD,,