uiprotect 6.3.1__tar.gz → 6.4.0__tar.gz

{uiprotect-6.3.1 → uiprotect-6.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 6.3.1
+Version: 6.4.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 Author: UI Protect Maintainers
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: aiofiles (>=24)

{uiprotect-6.3.1 → uiprotect-6.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "6.3.1"
+version = "6.4.0"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 readme = "README.md"
@@ -54,7 +54,7 @@ pytest-cov = ">=3,<6"
 aiosqlite = ">=0.20.0"
 asttokens = "^2.4.1"
 pytest-asyncio = ">=0.23.7,<0.25.0"
-pytest-benchmark = "^4.0.0"
+pytest-benchmark = ">=4,<6"
 pytest-sugar = "^1.0.0"
 pytest-timeout = "^2.3.1"
 pytest-xdist = "^3.6.1"

{uiprotect-6.3.1 → uiprotect-6.4.0}/src/uiprotect/data/devices.py

@@ -273,6 +273,7 @@ class CameraChannel(ProtectBaseObject):
 
     _rtsp_url: str | None = PrivateAttr(None)
     _rtsps_url: str | None = PrivateAttr(None)
+    _rtsps_no_srtp_url: str | None = PrivateAttr(None)
 
     @property
     def rtsp_url(self) -> str | None:
@@ -294,6 +295,16 @@ class CameraChannel(ProtectBaseObject):
         self._rtsps_url = f"rtsps://{self._api.connection_host}:{self._api.bootstrap.nvr.ports.rtsps}/{self.rtsp_alias}?enableSrtp"
         return self._rtsps_url
 
+    @property
+    def rtsps_no_srtp_url(self) -> str | None:
+        if not self.is_rtsp_enabled or self.rtsp_alias is None:
+            return None
+
+        if self._rtsps_no_srtp_url is not None:
+            return self._rtsps_no_srtp_url
+        self._rtsps_no_srtp_url = f"rtsps://{self._api.connection_host}:{self._api.bootstrap.nvr.ports.rtsps}/{self.rtsp_alias}"
+        return self._rtsps_no_srtp_url
+
     @property
     def is_package(self) -> bool:
         return self.fps <= 2

{uiprotect-6.3.1 → uiprotect-6.4.0}/src/uiprotect/stream.py

@@ -130,10 +130,6 @@ class TalkbackStream(FfmpegCommand):
         if len(input_args) > 0:
             input_args += " "
 
-        bitrate = camera.talkback_settings.bits_per_sample * 1000
-        # 8000 seems to result in best quality without overloading the camera
-        udp_bitrate = bitrate + 8000
-
         # vn = no video
         # acodec = audio codec to encode output in (aac)
         # ac = number of output channels (1)
@@ -143,8 +139,8 @@ class TalkbackStream(FfmpegCommand):
             "-loglevel info -hide_banner "
             f'{input_args}-i "{content_url}" -vn '
             f"-acodec {camera.talkback_settings.type_fmt.value} -ac {camera.talkback_settings.channels} "
-            f"-ar {camera.talkback_settings.sampling_rate} -b:a {bitrate} -map 0:a "
-            f'-f adts "udp://{camera.host}:{camera.talkback_settings.bind_port}?bitrate={udp_bitrate}"'
+            f"-ar {camera.talkback_settings.sampling_rate} -b:a {camera.talkback_settings.sampling_rate} -map 0:a "
+            f'-f adts "udp://{camera.host}:{camera.talkback_settings.bind_port}?bitrate={camera.talkback_settings.sampling_rate}"'
         )
 
         super().__init__(cmd, ffmpeg_path)