homesec 1.1.2__py3-none-any.whl → 1.2.0__py3-none-any.whl

homesec/models/source.py

@@ -30,6 +30,7 @@ class RTSPSourceConfig(BaseModel):
     heartbeat_s: float = 30.0
     rtsp_connect_timeout_s: float = 2.0
     rtsp_io_timeout_s: float = 2.0
+    ffmpeg_flags: list[str] = Field(default_factory=list)
 
 
 class LocalFolderSourceConfig(BaseModel):

homesec/sources/rtsp.py

@@ -219,6 +219,7 @@ class RTSPSource(ThreadedClipSource):
         self.reconnect_backoff_s = float(config.reconnect_backoff_s)
         self.rtsp_connect_timeout_s = float(config.rtsp_connect_timeout_s)
         self.rtsp_io_timeout_s = float(config.rtsp_io_timeout_s)
+        self.ffmpeg_flags = list(config.ffmpeg_flags)
 
         if config.disable_hwaccel:
             logger.info("Hardware acceleration manually disabled")
@@ -551,9 +552,31 @@ class RTSPSource(ThreadedClipSource):
             "-f",
             "mp4",
             "-y",
-            str(output_file),
         ]
 
+        user_flags = self.ffmpeg_flags
+
+        # Naive check to see if user overrode defaults
+        # If user supplies ANY -loglevel, we don't add ours.
+        # If user supplies ANY -fflags, we don't add ours (to avoid concatenation complexity).
+        # This allows full user control.
+        has_loglevel = any(x == "-loglevel" for x in user_flags)
+        if not has_loglevel:
+            cmd.extend(["-loglevel", "warning"])
+
+        has_fflags = any(x == "-fflags" for x in user_flags)
+        if not has_fflags:
+            cmd.extend(["-fflags", "+genpts+igndts"])
+
+        has_fps_mode = any(x == "-fps_mode" or x == "-vsync" for x in user_flags)
+        if not has_fps_mode:
+            cmd.extend(["-vsync", "0"])
+
+        # Add user flags last so they can potentially override or add to the above
+        cmd.extend(user_flags)
+
+        cmd.extend([str(output_file)])
+
         safe_cmd = list(cmd)
         try:
             idx = safe_cmd.index("-i")
@@ -753,6 +776,7 @@ class RTSPSource(ThreadedClipSource):
 
         cmd = ["ffmpeg"]
 
+        # 1. Global Flags (Hardware Acceleration)
         if self.hwaccel_config.is_available and not self._hwaccel_failed:
             hwaccel = self.hwaccel_config.hwaccel
             if hwaccel is not None:
@@ -762,6 +786,23 @@ class RTSPSource(ThreadedClipSource):
         elif self._hwaccel_failed:
             logger.info("Hardware acceleration disabled due to previous failures")
 
+        # 2. Global Flags (Robustness & Logging)
+        user_flags = self.ffmpeg_flags
+
+        has_loglevel = any(x == "-loglevel" for x in user_flags)
+        if not has_loglevel:
+            cmd.extend(["-loglevel", "warning"])
+
+        has_fflags = any(x == "-fflags" for x in user_flags)
+        if not has_fflags:
+            cmd.extend(["-fflags", "+genpts+igndts"])
+
+        # Add all user flags to global scope.
+        # Users who want input-specific flags (before -i) must rely on ffmpeg parsing them correctly
+        # or we would need a more complex config structure.
+        # For now, most robustness flags (-re, -rtsp_transport, etc) work as global or are handled below.
+        cmd.extend(user_flags)
+
         base_input_args = [
             "-rtsp_transport",
             "tcp",
@@ -778,11 +819,10 @@ class RTSPSource(ThreadedClipSource):
         ]
 
         timeout_us_connect = str(int(max(0.1, self.rtsp_connect_timeout_s) * 1_000_000))
-        timeout_us_io = str(int(max(0.1, self.rtsp_io_timeout_s) * 1_000_000))
         attempts: list[tuple[str, list[str]]] = [
             (
-                "stimeout+rw_timeout",
-                ["-stimeout", timeout_us_connect, "-rw_timeout", timeout_us_io] + base_input_args,
+                "stimeout",
+                ["-stimeout", timeout_us_connect] + base_input_args,
             ),
             ("stimeout", ["-stimeout", timeout_us_connect] + base_input_args),
             ("no_timeouts", base_input_args),
@@ -790,6 +830,7 @@ class RTSPSource(ThreadedClipSource):
 
         process: subprocess.Popen[bytes] | None = None
         stderr_file: Any | None = None
+
         for label, extra_args in attempts:
             cmd_attempt = list(cmd) + extra_args
             logger.debug("Starting frame pipeline (%s), logging to: %s", label, stderr_log)

{homesec-1.1.2.dist-info → homesec-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: homesec
-Version: 1.1.2
+Version: 1.2.0
 Summary: Pluggable async home security camera pipeline with detection, VLM analysis, and alerts.
 Project-URL: Homepage, https://github.com/lan17/homesec
 Project-URL: Source, https://github.com/lan17/homesec

{homesec-1.1.2.dist-info → homesec-1.2.0.dist-info}/RECORD

@@ -20,7 +20,7 @@ homesec/models/config.py,sha256=Z70xKrbDHi96j8IoRXPBw7DYAI7sjHR4M6nqReHTNds,1418
 homesec/models/enums.py,sha256=WQk1PvYnJd5iaz51P5GM3XayqCf0VpQnLYmSuw1hrZk,3293
 homesec/models/events.py,sha256=sgPDCSp9w60VUKKREYxNBZaxrFWW_bYyLwMFGHBawjk,4942
 homesec/models/filter.py,sha256=6NS1rBI2zmrswK9NtMn0vZlbwbeMGCPuLCDKP9XWN0I,2259
-homesec/models/source.py,sha256=PDtANsPaVzLz_VvR3cFVkQcfvema-7TrcuTY8a-gVq0,2309
+homesec/models/source.py,sha256=F8ksGrOa09bxx5IEgQmxPWJNWOm8zvFLsRJxihJTlM4,2367
 homesec/models/storage.py,sha256=63wyHdDt3QrfdsP0SmhrxtOeWRllZ1O2GPrA4jI7XmU,235
 homesec/models/vlm.py,sha256=Uk6TPwqbKxzyAsOlBSzZru74nKjp2-LLyzIp5b3wM_c,3293
 homesec/pipeline/__init__.py,sha256=kiQLECc6JIPmeIdBJrVpTApPs0GBAgWoZ1kU4XZyJVY,214
@@ -53,7 +53,7 @@ homesec/sources/__init__.py,sha256=wuCtiF44ceo7n3wJN51VHHcDavko3ubUDICtFbWmaRI,5
 homesec/sources/base.py,sha256=dKTxJxcDwJtykWDN3WYzkW5mtkRqlOJxJLWcLy82_Zo,7582
 homesec/sources/ftp.py,sha256=ynIPbgcbIi1jub8yr4H1259Y1HbNM42RFDBBivXD4mg,7308
 homesec/sources/local_folder.py,sha256=eW7ghgRsqTnZ5ZMPbsXh9ntqfue1UeM29ZpvRvLthPA,8461
-homesec/sources/rtsp.py,sha256=3TOFDfIqadH3-DepB1xgv6mtOd0h-FYppZXBXSTBBi0,47304
+homesec/sources/rtsp.py,sha256=T_DoAExu58pukRDjPNZ7wELDIebbQpVFrg29L9xACa8,48866
 homesec/state/__init__.py,sha256=Evt1jqTebmpJD1NUzNh3vwt5pbjDlLjQ0DgMCSAZOuM,255
 homesec/state/postgres.py,sha256=I-cXqW5cgz-hpaHc0JIv3DnIBTmGxE28P8ZxBAGabSw,17765
 homesec/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -61,8 +61,8 @@ homesec/telemetry/db_log_handler.py,sha256=KM8g4kcOyPzFJbpGxpSzecx_hrEWY0YfpoIKy
 homesec/telemetry/postgres_settings.py,sha256=EVD2_oi_KReFJvQmXxW026aurl_YD-KexT7rkbGQPHc,1198
 homesec/telemetry/db/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 homesec/telemetry/db/log_table.py,sha256=wcZLwRht7FMa0z2gf37f_RxdVTNIdDiK4i_N3c_ibwg,473
-homesec-1.1.2.dist-info/METADATA,sha256=hdgJS5FnVtvipMsjSCaG_f9T2s_QLEdePmTDrcQF9yI,23274
-homesec-1.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-homesec-1.1.2.dist-info/entry_points.txt,sha256=8ocCj_fP1qxIuL-DVDAUiaUbEdTMX_kg_BzVrJsbQYg,45
-homesec-1.1.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-homesec-1.1.2.dist-info/RECORD,,
+homesec-1.2.0.dist-info/METADATA,sha256=0N3Lg00FUl57PUV4VWe_vbIfQDOq-xib2wnkSU6dQS4,23274
+homesec-1.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+homesec-1.2.0.dist-info/entry_points.txt,sha256=8ocCj_fP1qxIuL-DVDAUiaUbEdTMX_kg_BzVrJsbQYg,45
+homesec-1.2.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+homesec-1.2.0.dist-info/RECORD,,