python-aidot-cameras 0.5.1__tar.gz → 0.5.4__tar.gz

{python_aidot_cameras-0.5.1/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.5.1
+Version: 0.5.4
 Summary: Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)
 Author-email: cbrightly <chris.brightly@gmail.com>
 License-Expression: MIT

{python_aidot_cameras-0.5.1 → python_aidot_cameras-0.5.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.5.1"
+version = "0.5.4"
 description = "Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)"
 readme = "README.md"
 license = "MIT"

{python_aidot_cameras-0.5.1 → python_aidot_cameras-0.5.4}/src/aidot/device_client.py

@@ -2110,7 +2110,32 @@ def _dtls_av_mux_run(vq, aq, out_fileobj, progress, stop_flag) -> None:
         while True:
             fr = fifo.read(1024)   # AAC wants 1024-sample frames
             if fr is None:
-                break
+                # 160 PCMA samples → 960 resampled @ 48 kHz, but AAC needs 1024.
+                # Every ~17 packets (~340 ms) the FIFO falls 64 samples short
+                # and would skip an entire 21 ms frame — audible choppiness.
+                # Pad the leftover with silence so the frame is complete.
+                s = getattr(fifo, "samples", 0)
+                if s == 0:
+                    break
+                fr = fifo.read(s)
+                if fr is None or fr.samples == 0:
+                    break
+                if _np is not None:
+                    try:
+                        arr = fr.to_ndarray()
+                        pad_n = 1024 - arr.shape[1]
+                        if pad_n > 0:
+                            padded = _np.concatenate(
+                                [arr, _np.zeros((arr.shape[0], pad_n), dtype=arr.dtype)],
+                                axis=1,
+                            )
+                            pfr = av.AudioFrame.from_ndarray(
+                                padded, format="fltp", layout="mono"
+                            )
+                            pfr.sample_rate = 48000
+                            fr = pfr
+                    except Exception:
+                        break
             fr.pts = a_pts[0]
             fr.time_base = Fraction(1, 48000)
             a_pts[0] += fr.samples
@@ -2124,7 +2149,7 @@ def _dtls_av_mux_run(vq, aq, out_fileobj, progress, stop_flag) -> None:
     while not stop_flag.is_set():
         _flush_video()
         _flush_audio()
-        _t.sleep(0.02)
+        _t.sleep(0.005)  # 5 ms — processes audio within 5 ms of arrival vs 20 ms
     _flush_video()
     _flush_audio()
     try:
@@ -3433,7 +3458,7 @@ class DeviceClient(object):
             "MotionDetection_Enable", "1" if enabled else "0")
 
     async def async_set_floodlight(self, on: bool, brightness: int = 100) -> bool:
-        # Confirmed 2026-05-05: cameras with autoLightEnable=1 (PTZ, Deck) ignore
+        # Confirmed 2026-05-05: cameras with autoLightEnable=1 (A001064 PTZ, A000088) ignore
         # manual LightOnOff commands unless auto-light is disabled first.
         # Turning on: disable auto-light, set LightOnOff=1 (and optional Dimming).
         # Turning off: set LightOnOff=0 only (leave autoLightEnable as-is so the
@@ -4415,14 +4440,32 @@ class DeviceClient(object):
         import threading as _threading
         import queue as _queue
         serve_url = self._keepalive_rtsp_url
-        _MIN_DELAY, _MAX_DELAY = 5.0, 300.0
+        # APK parity: the official app gates re-connects to ~15 s (f0.java I1=15000)
+        # and never hammers.  We previously floored at 5 s and a partial-success →
+        # reset path could drop the effective spacing even lower, pounding a flaky
+        # A000088 camera fast enough to wedge its DTLS stack (ICE completes but DTLS
+        # never fires until a power-cycle).  Floor the backoff at the 15 s gate and,
+        # independently, enforce a hard minimum wall-clock spacing between OPEN
+        # attempts so no code path (reset bug, fast PC-death) can pound the camera.
+        _MIN_DELAY, _MAX_DELAY = 15.0, 300.0
+        _open_gate = float(os.environ.get("AIDOT_DTLS_RETRY_GATE_S", "15"))
         retry_delay = _MIN_DELAY
+        _last_open_at = 0.0  # monotonic of the previous open attempt (0 = none yet)
         loop = asyncio.get_running_loop()
         while self._streaming_active:
             # Thread-safe queues: taps run on the loop, the A/V mux in a thread.
             vq: "_queue.Queue" = _queue.Queue(maxsize=600)
             aq: "_queue.Queue" = _queue.Queue(maxsize=600)
             self._serve_ready.clear()  # fresh (cold) session: not ready until bound
+            # Hard inter-attempt gate (APK parity): never start an open within
+            # _open_gate seconds of the previous one, regardless of retry_delay.
+            _since_open = loop.time() - _last_open_at
+            if _last_open_at and _since_open < _open_gate:
+                try:
+                    await asyncio.sleep(_open_gate - _since_open)
+                except asyncio.CancelledError:
+                    return
+            _last_open_at = loop.time()
             try:
                 session = await self.async_open_webrtc_stream(on_frame=lambda _f: None)
             except asyncio.CancelledError:
@@ -4600,6 +4643,13 @@ class DeviceClient(object):
             return None
         cmd = [
             "ffmpeg", "-y", "-loglevel", "warning",
+            # Suppress input-side buffering: the PyAV mux already writes
+            # correctly-interleaved, timestamped MPEG-TS to the pipe every
+            # ~20ms.  Without +nobuffer ffmpeg's mpegts demuxer accumulates a
+            # read-ahead window (and the output mpegts muxer defaults to 700ms
+            # of A/V interleave delay) before flushing to go2rtc - exactly the
+            # bursty/choppy audio pattern.  Matches the SDES serve's approach.
+            "-fflags", "+nobuffer",
             "-i", "pipe:0",
             "-c", "copy", "-f", "mpegts", "-listen", "1", serve_url,
         ]
@@ -5363,7 +5413,7 @@ class DeviceClient(object):
         liveplay_resp_fut: asyncio.Future = loop.create_future()  # set on livePlayResp
         camera_reconnect_ev: asyncio.Event = asyncio.Event() # set when camera sends device/connect
         # Mutable flag: set True when setDevAttrNotif delivers sptPreconn:1.
-        # Confirmed 2026-05-02: both A000088 Deck and A001064 PTZ report
+        # Confirmed 2026-05-02: both A000088 and A001064 PTZ report
         # sptPreconn:1.  AVIO LIVING (SESSION_MODE_REQ=5376) must be sent
         # via the data channel to trigger streaming in PreCon cameras.
         _spt_preconn: list = [False]
@@ -5563,7 +5613,7 @@ class DeviceClient(object):
                 # and won't send its own binding requests.
                 _extract_cam_ip("setDevAttrNotif", inner, msg)
                 # Also capture sptPreconn (PreCon / PreConnect support flag).
-                # Confirmed 2026-05-02: both A001064 PTZ and A000088 Deck have
+                # Confirmed 2026-05-02: both A001064 PTZ and A000088 have
                 # sptPreconn:1.  Per BaseKVSCameraView.k():805-815, the official
                 # client sends AVIO LIVING (SESSION_MODE_REQ=5376) via the data
                 # channel only when isSupportPreCon() is true.  Set the flag
@@ -6312,7 +6362,7 @@ class DeviceClient(object):
 
             # AVIO LIVING (E_CMD_AVIO_CTRL_SESSION_MODE_REQ=5376) is sent
             # unconditionally when DC opens.  2026-05-03 testing confirmed:
-            # A000088 cameras (Deck + Bedroom M3 Pro) connect via DTLS,
+            # A000088 cameras connect via DTLS,
             # SCTP comes up, DC opens at t+1-2s - but camera tears down at
             # t+22s if LIVING is not sent.  This is the PreCon watchdog:
             # without LIVING the camera gives up waiting for a viewer.

{python_aidot_cameras-0.5.1 → python_aidot_cameras-0.5.4/src/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.5.1
+Version: 0.5.4
 Summary: Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)
 Author-email: cbrightly <chris.brightly@gmail.com>
 License-Expression: MIT