python-aidot-cameras 0.7.30__tar.gz → 0.7.31__tar.gz

{python_aidot_cameras-0.7.30/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.7.31}/PKG-INFO

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

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

{python_aidot_cameras-0.7.30 → python_aidot_cameras-0.7.31}/src/aidot/camera/sdes.py

@@ -173,6 +173,11 @@ class SdesSession:
                     if not self._talk_state.get("speaker_on"):
                         break
                     await asyncio.sleep(0.02)
+                # speaker_on flips once the bridge SENDS SPEAKERSTOP(849); give the
+                # camera a brief window to PROCESS it over the still-live SCTP before
+                # we tear down, so its talk channel is actually freed (avoids the
+                # next session getting 851 "mic occupied").
+                await asyncio.sleep(0.3)
             self._talk_state["stop"] = True
             self._talk_state["provider"] = None
         self._proc.terminate()

{python_aidot_cameras-0.7.30 → python_aidot_cameras-0.7.31}/src/aidot/camera/webrtc.py

@@ -91,6 +91,7 @@ class WebRTCSession:
             return False
         # IOTYPE_USER_IPCAM_SPEAKERSTART = 848 (AVIOCTRLDEFs.java), 8-byte channel=0 payload.
         self._avio_cmd(848, b"\x00" * 8)
+        self._talk_holder["was_active"] = True  # ensure stop() releases the speaker
         return True
 
     async def async_stop_talk(self) -> bool:
@@ -111,6 +112,22 @@ class WebRTCSession:
 
     async def stop(self) -> None:
         """Tear down the stream: close peer connection and MQTT session."""
+        # If two-way talk was active this session, RELEASE the camera speaker
+        # before closing the PeerConnection: send SPEAKERSTOP(849), idle the track,
+        # and give the SCTP DataChannel a brief flush window so the camera actually
+        # processes the release.  Otherwise the camera keeps its talk channel bound
+        # to this (now-dead) connection and the next app/HA push-to-talk gets 851
+        # "mic occupied".  Idempotent (harmless if the speaker was already closed).
+        if self.talk_supported and self._talk_holder.get("was_active"):
+            try:
+                self._avio_cmd(849, b"\x00" * 8)
+                if self._audio_sender is not None:
+                    self._audio_sender.replaceTrack(None)
+                self._talk_holder["provider"] = None
+                self._talk_holder["was_active"] = False
+                await asyncio.sleep(0.4)   # let the DataChannel deliver SPEAKERSTOP
+            except Exception:
+                _LOGGER.debug("camera %s: swallowed exception", 'stop', exc_info=True)
         for task in self._track_tasks:
             task.cancel()
         if self._recorder is not None:

{python_aidot_cameras-0.7.30 → python_aidot_cameras-0.7.31/src/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.7.30
+Version: 0.7.31
 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