python-aidot-cameras 0.5.7__tar.gz → 0.5.9__tar.gz

{python_aidot_cameras-0.5.7/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.5.7
+Version: 0.5.9
 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.7 → python_aidot_cameras-0.5.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.5.7"
+version = "0.5.9"
 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.7 → python_aidot_cameras-0.5.9}/src/aidot/device_client.py

@@ -1984,6 +1984,105 @@ def _get_stream_slots() -> "asyncio.Semaphore":
     return _STREAM_SLOTS
 
 
+# Where captured SPS/PPS are cached.  Override with AIDOT_SPROP_DIR so HA can
+# point it at persistent storage (the core container's ~ is ephemeral; without a
+# persistent dir the cache simply re-bootstraps from the first stream each boot).
+_SPROP_DIR = os.environ.get("AIDOT_SPROP_DIR") or os.path.join(
+    os.path.expanduser("~"), ".config", "aidot", "sprop")
+
+
+def _extract_param_sets_from_rtp(pkt: bytes) -> dict:
+    """Pull H.264 SPS (NAL type 7) / PPS (type 8) out of one RTP packet.
+
+    Handles single-NAL-unit packets and STAP-A (type 24) aggregation - SPS/PPS
+    are small and the camera sends them either as their own packets or in a
+    STAP-A at the head of an IDR.  FU-A fragments are ignored (param sets are not
+    fragmented in practice).  Returns ``{7: sps_bytes, 8: pps_bytes}`` for those
+    found (each value is the NAL unit *including* its header byte).  Pure /
+    unit-testable: parses the RTP header length defensively."""
+    if len(pkt) < 13:
+        return {}
+    cc = pkt[0] & 0x0F
+    ext = (pkt[0] >> 4) & 0x01
+    off = 12 + 4 * cc
+    if ext and len(pkt) >= off + 4:
+        ext_words = int.from_bytes(pkt[off + 2:off + 4], "big")
+        off += 4 + 4 * ext_words
+    payload = pkt[off:]
+    if not payload:
+        return {}
+    out: dict = {}
+    ntype = payload[0] & 0x1F
+    if ntype == 24:  # STAP-A: [hdr] then [ (size16)(nal) ]...
+        i = 1
+        while i + 2 <= len(payload):
+            size = int.from_bytes(payload[i:i + 2], "big")
+            i += 2
+            nal = payload[i:i + size]
+            i += size
+            if nal:
+                t = nal[0] & 0x1F
+                if t in (7, 8):
+                    out[t] = nal
+    elif ntype in (7, 8):  # single NAL unit packet
+        out[ntype] = payload
+    return out
+
+
+def _build_sprop(sps: bytes, pps: bytes) -> str:
+    """``sprop-parameter-sets`` value: base64(SPS NAL),base64(PPS NAL)."""
+    import base64 as _b64
+    return _b64.b64encode(sps).decode() + "," + _b64.b64encode(pps).decode()
+
+
+def _sprop_cache_path(devid: str) -> str:
+    return os.path.join(_SPROP_DIR, f"{devid}.sprop")
+
+
+def _load_sprop(devid: str) -> "Optional[str]":
+    """Cached ``sprop-parameter-sets`` for ``devid`` (captured from a prior
+    stream), or None.  Fail-safe: any error -> None (SDP omits sprop = today's
+    behaviour)."""
+    try:
+        with open(_sprop_cache_path(devid), "r") as fh:
+            s = fh.read().strip()
+        return s or None
+    except OSError:
+        return None
+
+
+def _save_sprop(devid: str, sprop: str) -> None:
+    """Persist the ``sprop-parameter-sets`` string for ``devid`` (best-effort)."""
+    try:
+        os.makedirs(_SPROP_DIR, exist_ok=True)
+        tmp = _sprop_cache_path(devid) + ".tmp"
+        with open(tmp, "w") as fh:
+            fh.write(sprop)
+        os.replace(tmp, _sprop_cache_path(devid))
+    except OSError as exc:
+        # Surface (don't swallow): if the cache dir isn't writable the whole
+        # sprop feature is silently inert.  AIDOT_SPROP_DIR can redirect it.
+        _LOGGER.warning("sprop cache write failed (%s): %s — set AIDOT_SPROP_DIR "
+                        "to a writable path", _SPROP_DIR, exc)
+
+
+def _inject_sprop(sdp: str, devid: str) -> str:
+    """Append the cached ``sprop-parameter-sets`` to the ffmpeg-input SDP's
+    ``a=fmtp:96`` line so ffmpeg inits the H.264 decoder out-of-band (robust to
+    in-band SPS loss).  No-op if nothing is cached yet or sprop is already
+    present.  Applied at every ffmpeg-input SDP write so both the serve path and
+    the snapshot/file path benefit."""
+    sprop = _load_sprop(devid)
+    if not sprop or "sprop-parameter-sets=" in sdp:
+        return sdp
+    out = []
+    for ln in sdp.split("\r\n"):
+        if ln.startswith("a=fmtp:96") and "sprop-parameter-sets" not in ln:
+            ln = ln + ";sprop-parameter-sets=" + sprop
+        out.append(ln)
+    return "\r\n".join(out)
+
+
 def _dtls_av_mux_run(vq, aq, out_fileobj, progress, stop_flag) -> None:
     """Mux tapped video (H.264 copy) + audio (PCMA->AAC) to ``out_fileobj`` as
     RTP-timestamped MPEG-TS.  Runs in a worker thread; the serve's ffmpeg reads
@@ -9224,7 +9323,7 @@ class DeviceClient(object):
         )
 
         sdp_path = await asyncio.get_running_loop().run_in_executor(
-            None, _make_sdp_tempfile, ffmpeg_sdp)
+            None, _make_sdp_tempfile, _inject_sprop(ffmpeg_sdp, self.device_id))
 
         # --- Send webrtcReq BEFORE releasing reservation sockets ------------- #
         # ICE cameras (e.g. LK.IPC.A001064) send STUN binding requests to our
@@ -10178,7 +10277,7 @@ class DeviceClient(object):
                 )
             try:
                 await asyncio.get_running_loop().run_in_executor(
-                    None, _write_text_file, sdp_path, _updated_sdp)
+                    None, _write_text_file, sdp_path, _inject_sprop(_updated_sdp, self.device_id))
             except Exception as _sdp_exc:
                 _LOGGER.warning("_open_sdes_stream: could not rewrite SDP: %s", _sdp_exc)
 
@@ -10423,6 +10522,7 @@ class DeviceClient(object):
         # TUTK cameras use plain RTP/AVP (no SRTP): the bridge synthesizes
         # standard RTP packets from TUTK SFrames and forwards without crypto.
         _ts_br = int(time.time())
+        # (Out-of-band SPS/PPS is injected at the write below via _inject_sprop.)
         if _use_plain_rtp:
             _br_sdp = (
                 "v=0\r\n"
@@ -10467,7 +10567,7 @@ class DeviceClient(object):
             )
         try:
             await asyncio.get_running_loop().run_in_executor(
-                None, _write_text_file, sdp_path, _br_sdp)
+                None, _write_text_file, sdp_path, _inject_sprop(_br_sdp, self.device_id))
         except Exception as _br_sdp_exc:
             _LOGGER.warning("bridge: could not rewrite SDP: %s", _br_sdp_exc)
 
@@ -11548,6 +11648,26 @@ class DeviceClient(object):
                                                 f" ssrc=0x{_ssrc_d:08x}"
                                                 f" pt={_pt}"
                                             )
+                            # Capture this camera's SPS/PPS once so future streams
+                            # can inject sprop-parameter-sets (out-of-band decoder
+                            # init, robust to in-band SPS loss).  Parses only until
+                            # both are seen; then _sprop_done short-circuits.
+                            if (_kind == "video"
+                                    and not getattr(_bridge_fn, "_sprop_done", False)):
+                                _ps = _extract_param_sets_from_rtp(_fwd_pkt)
+                                if _ps:
+                                    _psc = getattr(_bridge_fn, "_ps_cache", None)
+                                    if _psc is None:
+                                        _psc = {}
+                                        _bridge_fn._ps_cache = _psc
+                                    _psc.update(_ps)
+                                    if 7 in _psc and 8 in _psc:
+                                        _sprop_new = _build_sprop(_psc[7], _psc[8])
+                                        if _sprop_new != _load_sprop(self.device_id):
+                                            _save_sprop(self.device_id, _sprop_new)
+                                            _status("bridge: cached sprop-parameter"
+                                                    f"-sets for {self.device_id}")
+                                        _bridge_fn._sprop_done = True
                             # Rebase RTP timestamps to start near 0.  Camera picks a
                             # random starting timestamp (RFC 3550 §5.1); the 90 kHz
                             # video clock can be near 2^32 and wraps, producing huge
@@ -11981,8 +12101,13 @@ class DeviceClient(object):
                             "a=rtcp-mux\r\n"
                         )
                         try:
+                            # Re-apply the cached sprop-parameter-sets here too:
+                            # this serve-restart rewrite is the SDP the keepalive
+                            # ffmpeg actually reads on every watchdog cycle, so
+                            # without this the out-of-band SPS is lost on restart
+                            # (the failure persisted live even for cached cameras).
                             with open(sdp_path, "w") as _f2:
-                                _f2.write(_new_sdp)
+                                _f2.write(_inject_sprop(_new_sdp, self.device_id))
                         except Exception as _sdp_exc2:
                             _LOGGER.warning("could not rewrite SDP for restart: %s", _sdp_exc2)
                         proc = subprocess.Popen(

{python_aidot_cameras-0.5.7 → python_aidot_cameras-0.5.9/src/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.5.7
+Version: 0.5.9
 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.7 → python_aidot_cameras-0.5.9}/src/python_aidot_cameras.egg-info/SOURCES.txt

@@ -18,6 +18,8 @@ src/python_aidot_cameras.egg-info/top_level.txt
 tests/test_alarm_event.py
 tests/test_highport_nomination.py
 tests/test_motion_poll.py
+tests/test_no_undefined_names.py
+tests/test_sdes_sprop.py
 tests/test_sdes_talk.py
 tests/test_sdes_watchdog.py
 tests/test_speak.py

python_aidot_cameras-0.5.9/tests/test_no_undefined_names.py

@@ -0,0 +1,44 @@
+"""Guard against NameError-class regressions in device_client.py.
+
+`ast.parse`/`py_compile` only catch syntax errors, not undefined names used at
+runtime (e.g. a variable referenced in one method but defined only in another).
+That class of bug shipped once (0.5.5/0.5.6: `_fast_connect` referenced in
+`_open_sdes_stream` but defined only in `_async_open_webrtc_stream_impl`,
+breaking every SDES camera open). This test runs pyflakes and fails on any
+undefined name except a small allowlist of intentional closure patterns.
+"""
+
+import pathlib
+import subprocess
+import sys
+
+import pytest
+
+_SRC = (
+    pathlib.Path(__file__).resolve().parent.parent
+    / "src" / "aidot" / "device_client.py"
+)
+
+# Names pyflakes can't resolve because they're bound in an inner runtime scope
+# (closure) and referenced from a sibling scope; verified working in production
+# and already marked `# noqa: F821` in the source.
+_ALLOWLIST = {"_enc_c8_sctp"}
+
+
+def test_device_client_has_no_undefined_names():
+    try:
+        proc = subprocess.run(
+            [sys.executable, "-m", "pyflakes", str(_SRC)],
+            capture_output=True, text=True,
+        )
+    except FileNotFoundError:  # pragma: no cover
+        pytest.skip("pyflakes not available")
+    if "No module named pyflakes" in proc.stderr:  # pragma: no cover
+        pytest.skip("pyflakes not installed")
+
+    undefined = [
+        line for line in proc.stdout.splitlines()
+        if "undefined name" in line
+        and not any(name in line for name in _ALLOWLIST)
+    ]
+    assert not undefined, "Undefined names (NameError risk):\n" + "\n".join(undefined)

python_aidot_cameras-0.5.9/tests/test_sdes_sprop.py

@@ -0,0 +1,111 @@
+"""Unit tests for the SDES out-of-band SPS/PPS (sprop-parameter-sets) helpers.
+
+A lost in-band SPS wedges ffmpeg ("could not find codec parameters"); injecting
+the camera's SPS/PPS into the ffmpeg SDP as sprop-parameter-sets initializes the
+decoder out-of-band so the loss no longer matters. These pure helpers capture
+the param sets from RTP, format the sprop value, and cache it per camera.
+"""
+import os
+import sys
+import tempfile
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+import aidot.device_client as dc
+from aidot.device_client import (
+    _extract_param_sets_from_rtp,
+    _build_sprop,
+    _load_sprop,
+    _save_sprop,
+)
+
+# Real Driveway (A001513) parameter sets captured live 2026-06-08.
+SPS = bytes.fromhex("27640033ad00ce8050079a6a020203e0000003002000000303c6f207d00bbffff814")
+PPS = bytes.fromhex("28ee3cb0")
+SPROP = "J2QAM60AzoBQB5pqAgID4AAAAwAgAAADA8byB9ALv//4FA==,KO48sA=="
+
+RTP = b"\x80\x60\x00\x01\x00\x00\x00\x00\x12\x34\x56\x78"  # V2, no CC/ext, 12B
+
+
+# ---- _build_sprop ----------------------------------------------------------
+
+def test_build_sprop_matches_live_vector():
+    assert _build_sprop(SPS, PPS) == SPROP
+
+
+# ---- _extract_param_sets_from_rtp -----------------------------------------
+
+def test_single_nal_sps():
+    assert _extract_param_sets_from_rtp(RTP + SPS) == {7: SPS}
+
+
+def test_single_nal_pps():
+    assert _extract_param_sets_from_rtp(RTP + PPS) == {8: PPS}
+
+
+def test_stap_a_carries_both():
+    stap = bytes([0x78])  # 0x78 & 0x1f == 24 (STAP-A)
+    stap += len(SPS).to_bytes(2, "big") + SPS
+    stap += len(PPS).to_bytes(2, "big") + PPS
+    assert _extract_param_sets_from_rtp(RTP + stap) == {7: SPS, 8: PPS}
+
+
+def test_slice_packet_yields_nothing():
+    # NAL type 1 (non-IDR slice) - not a parameter set
+    assert _extract_param_sets_from_rtp(RTP + bytes([0x61, 0x00, 0x11])) == {}
+
+
+def test_short_or_empty_packet_safe():
+    assert _extract_param_sets_from_rtp(b"") == {}
+    assert _extract_param_sets_from_rtp(b"\x80\x60\x00") == {}
+    assert _extract_param_sets_from_rtp(RTP) == {}  # header only, no payload
+
+
+def test_csrc_header_offset_handled():
+    # CC=2 -> 12 + 8 bytes of CSRC before the payload
+    hdr = b"\x82\x60\x00\x01\x00\x00\x00\x00\x12\x34\x56\x78" + b"\xaa\xaa\xaa\xaa\xbb\xbb\xbb\xbb"
+    assert _extract_param_sets_from_rtp(hdr + SPS) == {7: SPS}
+
+
+# ---- cache roundtrip -------------------------------------------------------
+
+def test_cache_roundtrip(monkeypatch):
+    d = tempfile.mkdtemp()
+    monkeypatch.setattr(dc, "_SPROP_DIR", d)
+    devid = "abc123"
+    assert _load_sprop(devid) is None          # nothing cached yet
+    _save_sprop(devid, SPROP)
+    assert _load_sprop(devid) == SPROP          # persists + reads back
+
+
+def test_load_missing_is_none(monkeypatch):
+    monkeypatch.setattr(dc, "_SPROP_DIR", "/nonexistent/path/xyz")
+    assert _load_sprop("whatever") is None      # fail-safe, no raise
+
+
+if __name__ == "__main__":
+    import traceback
+
+    class _MP:  # tiny monkeypatch shim so this runs without pytest
+        def __init__(self): self._undo = []
+        def setattr(self, obj, name, val):
+            self._undo.append((obj, name, getattr(obj, name)))
+            setattr(obj, name, val)
+        def undo(self):
+            for obj, name, val in reversed(self._undo):
+                setattr(obj, name, val)
+
+    _fail = 0
+    for _k, _v in sorted(globals().items()):
+        if _k.startswith("test_"):
+            mp = _MP()
+            try:
+                _v(mp) if "monkeypatch" in _v.__code__.co_varnames else _v()
+                print(f"PASS {_k}")
+            except Exception:
+                _fail += 1
+                print(f"FAIL {_k}")
+                traceback.print_exc()
+            finally:
+                mp.undo()
+    raise SystemExit(1 if _fail else 0)