nedo-vision-worker-core 0.3.9__tar.gz → 0.4.1__tar.gz

{nedo_vision_worker_core-0.3.9 → nedo_vision_worker_core-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker-core
-Version: 0.3.9
+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.3.9 → nedo_vision_worker_core-0.4.1}/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.3.9"
+__version__ = "0.4.1"
 __all__ = [
     "CoreService", 
-    "DetectionType", 
+    "DetectionType",
     "CallbackTrigger", 
     "DetectionData",
     "IntervalMetadata",

{nedo_vision_worker_core-0.3.9 → nedo_vision_worker_core-0.4.1}/nedo_vision_worker_core/ai/FrameDrawer.py

@@ -3,12 +3,16 @@ import cv2
 import logging
 import os
 from pathlib import Path
+import threading
 
 import numpy as np
 from ..util.DrawingUtils import DrawingUtils
 
 class FrameDrawer:
     """Handles frame processing by drawing objects, annotations, and managing icons."""
+    
+    # Share the same lock as DrawingUtils for consistent locking
+    _cv_lock = DrawingUtils._cv_lock
 
     def __init__(self):
         self.icons = {}
@@ -67,7 +71,8 @@ class FrameDrawer:
                 (int(x * width), int(y * height)) for (x, y) in normalized_points
             ]
             if len(points) >= 3:
-                cv2.polylines(frame, [np.array(points, np.int32)], isClosed=True, color=color, thickness=2)
+                with self._cv_lock:
+                    cv2.polylines(frame, [np.array(points, np.int32)], isClosed=True, color=color, thickness=2)
 
     def draw_frame(self, frame, tracked_objects, with_trails=False, trail_length=10):
         current_ids = set()
@@ -83,7 +88,9 @@ class FrameDrawer:
             attributes = obj.get("attributes", [])
             labels = [attr.get("label") for attr in attributes]
             (color, flag) = self._get_color_from_labels(labels)
-            DrawingUtils.draw_bbox_info(frame, bbox, (color, flag), f"{track_id}", self.location_name, f"{obj.get('confidence', 0):.2f}")
+            
+            with self._cv_lock:
+                DrawingUtils.draw_bbox_info(frame, bbox, (color, flag), f"{track_id}", self.location_name, f"{obj.get('confidence', 0):.2f}")
 
             # Trailing
             if with_trails:
@@ -109,26 +116,28 @@ class FrameDrawer:
                 num_points = len(points)
 
                 # Draw faded trail
-                for i in range(1, num_points):
-                    cv2.line(frame, points[i-1], points[i], color, 1)
+                with self._cv_lock:
+                    for i in range(1, num_points):
+                        cv2.line(frame, points[i-1], points[i], color, 1)
 
                 current_ids.add(track_id)
 
-            DrawingUtils.draw_main_bbox(frame, bbox, (color, flag))
+            with self._cv_lock:
+                DrawingUtils.draw_main_bbox(frame, bbox, (color, flag))
 
-            for attr in attributes:
-                attr_bbox = attr.get("bbox", [])         
-                if len(attr_bbox) != 4:
-                    continue
+                for attr in attributes:
+                    attr_bbox = attr.get("bbox", [])         
+                    if len(attr_bbox) != 4:
+                        continue
 
-                attr_label = attr.get("label", "")
-                DrawingUtils.draw_inner_box(frame, attr_bbox, self._get_color(attr_label))
+                    attr_label = attr.get("label", "")
+                    DrawingUtils.draw_inner_box(frame, attr_bbox, self._get_color(attr_label))
 
-            icon_x = x1
-            for (label, icon) in self.icons.items():
-                if label in labels:
-                    DrawingUtils.draw_alpha_overlay(frame, icon, icon_x, y1 - 25)
-                    icon_x += 25
+                icon_x = x1
+                for (label, icon) in self.icons.items():
+                    if label in labels:
+                        DrawingUtils.draw_alpha_overlay(frame, icon, icon_x, y1 - 25)
+                        icon_x += 25
 
         # Cleanup trails for objects that disappeared
         if with_trails and hasattr(self, "trails"):

{nedo_vision_worker_core-0.3.9 → nedo_vision_worker_core-0.4.1}/nedo_vision_worker_core/ai/VideoDebugger.py

@@ -22,43 +22,49 @@ class VideoDebugger:
         window_name = f"Pipeline {pipeline_id} - {worker_source_id}"
         
         try:
-            with self.lock:
-                if window_name not in self.fps_tracker:
-                    self.fps_tracker[window_name] = {"start_time": time.time(), "frame_count": 0}
-
-                self.fps_tracker[window_name]["frame_count"] += 1
-                elapsed_time = time.time() - self.fps_tracker[window_name]["start_time"]
-                fps = self.fps_tracker[window_name]["frame_count"] / max(elapsed_time, 1e-5)
-
-                cv2.putText(frame, f"FPS: {fps:.2f}", (10, 20), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 255, 255), 1)
+            # Serialize ALL OpenCV operations to prevent segfaults
+            with self._cv_lock:
+                with self.lock:
+                    if window_name not in self.fps_tracker:
+                        self.fps_tracker[window_name] = {"start_time": time.time(), "frame_count": 0}
 
-                if window_name not in self.windows:
-                    self.windows[window_name] = True
+                    self.fps_tracker[window_name]["frame_count"] += 1
+                    elapsed_time = time.time() - self.fps_tracker[window_name]["start_time"]
+                    fps = self.fps_tracker[window_name]["frame_count"] / max(elapsed_time, 1e-5)
 
-            # Serialize cv2 calls to prevent segfaults
-            with self._cv_lock:
+                    if window_name not in self.windows:
+                        self.windows[window_name] = True
+                
+                # Make a copy to avoid modifying the original frame from multiple threads
+                display_frame = frame.copy()
+                
                 try:
-                    cv2.imshow(window_name, frame)
+                    cv2.putText(display_frame, f"FPS: {fps:.2f}", (10, 20), cv2.FONT_HERSHEY_SIMPLEX, 0.5, (0, 255, 255), 1)
+                    cv2.imshow(window_name, display_frame)
                     key = cv2.waitKey(1) & 0xFF
                     
                     if key == ord('q'):
-                        self.close_window(window_name)
+                        self._close_window_unsafe(window_name)
                 except Exception as e:
                     logging.error(f"Error displaying frame for {window_name}: {e}")
                     
         except Exception as e:
             logging.error(f"Error in show_frame for {window_name}: {e}")
 
+    def _close_window_unsafe(self, window_name):
+        """Close window without acquiring locks (called when already locked)."""
+        if window_name in self.windows:
+            try:
+                cv2.destroyWindow(window_name)
+            except Exception as e:
+                logging.error(f"Error closing window {window_name}: {e}")
+            del self.windows[window_name]
+
     def close_window(self, window_name):
         """Close specific window."""
-        with self.lock:
-            if window_name in self.windows:
-                with self._cv_lock:
-                    try:
-                        cv2.destroyWindow(window_name)
-                    except Exception as e:
-                        logging.error(f"Error closing window {window_name}: {e}")
-                del self.windows[window_name]
+        with self._cv_lock:
+            with self.lock:
+                self._close_window_unsafe(window_name)
     
     def is_window_open(self, pipeline_id):
         """Check if a window is open for a given pipeline."""

{nedo_vision_worker_core-0.3.9 → nedo_vision_worker_core-0.4.1}/nedo_vision_worker_core/pipeline/PipelineProcessor.py

@@ -176,6 +176,7 @@ class PipelineProcessor:
 
         target_render_fps = 25.0
         target_frame_time = 1.0 / target_render_fps
+        last_preview_check = 0
 
         try:
             while self.running:
@@ -186,22 +187,24 @@ class PipelineProcessor:
                 if frame is None:
                     if not self._handle_frame_failure(video_manager, worker_source_id):
                         break
-                    # no frame this tick—just continue (the streamer will repeat last good frame)
                     time.sleep(0.04)
                     continue
                     
-                # successful frame
                 self.consecutive_frame_failures = 0
-                self.last_successful_frame_time = time.time()
+                self.last_successful_frame_time = loop_start
                 self.frame_counter += 1
 
-                should_draw = self.rtmp_streaming_active or self.debug_flag or self.video_debugger.is_window_open(pipeline_id)
+                # Check preview status less frequently
+                if loop_start - last_preview_check >= self.preview_check_interval:
+                    self._check_and_update_rtmp_streaming()
+                    last_preview_check = loop_start
+
+                should_draw = self.rtmp_streaming_active or self.debug_flag
                 
                 if should_draw:
-                    # draw annotations
                     try:
-                        self.frame_drawer.draw_polygons(frame)
-                        frame_to_draw = frame.copy() if self.debug_flag else frame
+                        frame_to_draw = frame.copy()
+                        self.frame_drawer.draw_polygons(frame_to_draw)
                         drawn_frame = self.frame_drawer.draw_frame(
                             frame_to_draw,
                             self.tracked_objects_render,
@@ -214,26 +217,19 @@ class PipelineProcessor:
                 else:
                     drawn_frame = frame
 
-                # debug snapshot if requested
                 if self.debug_flag:
                     tracked_objects_render = self._process_frame(frame)
                     try:
+                        debug_frame = frame.copy()
                         self.debug_repo.update_debug_entries_by_pipeline_id(
                             self.pipeline_id,
-                            self.frame_drawer.draw_frame(frame, tracked_objects_render),
+                            self.frame_drawer.draw_frame(debug_frame, tracked_objects_render),
                             tracked_objects_render
                         )
                     except Exception as e:
                         logging.warning(f"Debug save failed: {e}")
                     self.debug_flag = False
 
-                # Check if RTMP streaming should be active based on preview requests
-                current_time = time.time()
-                if current_time - self.last_preview_check_time >= self.preview_check_interval:
-                    self._check_and_update_rtmp_streaming()
-                    self.last_preview_check_time = current_time
-
-                # Push frame to RTMP stream if preview is active
                 if self.rtmp_streaming_active:
                     if self.rtmp_streamer is None:
                         try:
@@ -254,35 +250,19 @@ class PipelineProcessor:
                                 except Exception:
                                     pass
                                 self.rtmp_streamer = None
-                else:
-                    # Stop RTMP streaming if preview is no longer active
-                    if self.rtmp_streamer is not None:
-                        try:
-                            logging.info(f"🛑 Stopping RTMP streamer for pipeline {pipeline_id} (preview expired)")
-                            self.rtmp_streamer.stop_stream()
-                        except Exception as e:
-                            logging.error(f"❌ Error stopping RTMP streamer: {e}")
-                        finally:
-                            self.rtmp_streamer = None
-
-                # feed detection worker with latest-only behavior
-                if self.detection_thread and self.detection_thread.is_alive():
+                elif self.rtmp_streamer is not None:
                     try:
-                        self.frame_queue.put_nowait(frame)
-                    except queue.Full:
-                        try:
-                            _ = self.frame_queue.get_nowait()
-                        except queue.Empty:
-                            pass
-                        try:
-                            self.frame_queue.put_nowait(frame)
-                        except queue.Full:
-                            pass
+                        logging.info(f"🛑 Stopping RTMP streamer for pipeline {pipeline_id} (preview expired)")
+                        self.rtmp_streamer.stop_stream()
+                    except Exception as e:
+                        logging.error(f"❌ Error stopping RTMP streamer: {e}")
+                    finally:
+                        self.rtmp_streamer = None
 
-                try:
-                    self.video_debugger.show_frame(pipeline_id, worker_source_id, drawn_frame)
-                except Exception as e:
-                    logging.error(f"⚠️ Failed to render frame for pipeline {pipeline_id}: {e}")
+                # 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)
@@ -328,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:
@@ -353,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:
@@ -384,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-0.3.9 → nedo_vision_worker_core-0.4.1}/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.3.9 → nedo_vision_worker_core-0.4.1}/nedo_vision_worker_core/util/DrawingUtils.py

@@ -2,8 +2,12 @@ import math
 import cv2
 import numpy as np
 import os
+import threading
 
 class DrawingUtils:
+    # Global lock for all OpenCV drawing operations to prevent segfaults
+    _cv_lock = threading.Lock()
+    
     _color_map = {
         True: "blue",
         False: "red",

{nedo_vision_worker_core-0.3.9 → nedo_vision_worker_core-0.4.1}/nedo_vision_worker_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedo-vision-worker-core
-Version: 0.3.9
+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>