streamlit-webrtc 0.49.4__py3-none-any.whl → 0.50.1__py3-none-any.whl

streamlit_webrtc/__init__.py

@@ -23,7 +23,7 @@ from .config import (
     VideoHTMLAttributes,
 )
 from .factory import create_mix_track, create_process_track, create_video_source_track
-from .mix import MixerCallback
+from .mix import MediaStreamMixTrack, MixerCallback
 from .source import VideoSourceCallback, VideoSourceTrack
 from .webrtc import (
     AudioProcessorBase,
@@ -77,6 +77,7 @@ __all__ = [
     "create_process_track",
     "create_mix_track",
     "MixerCallback",
+    "MediaStreamMixTrack",
     "WebRtcStreamerContext",
     "WebRtcStreamerState",
     "DEFAULT_AUDIO_HTML_ATTRS",

streamlit_webrtc/factory.py

@@ -1,7 +1,6 @@
-from typing import Literal, Optional, Union, overload
+from typing import Literal, Optional, Type, Union, overload
 
 import streamlit as st
-from aiortc import MediaStreamTrack
 
 from .eventloop import get_global_event_loop, loop_context
 from .mix import MediaStreamMixTrack, MixerCallback
@@ -33,7 +32,7 @@ _PROCESSOR_TRACK_CACHE_KEY_PREFIX = "__PROCESSOR_TRACK_CACHE__"
 
 def _get_track_class(
     kind: Literal["video", "audio"], async_processing: bool
-) -> MediaStreamTrack:
+) -> Union[Type[MediaProcessTrack], Type[AsyncMediaProcessTrack]]:
     if kind == "video":
         if async_processing:
             return AsyncVideoProcessTrack

streamlit_webrtc/mix.py

@@ -8,12 +8,14 @@ import time
 import traceback
 import weakref
 from collections import OrderedDict
-from typing import Callable, Generic, List, NamedTuple, Optional, Union
+from typing import Callable, Generic, List, NamedTuple, Optional, Union, cast
 
 import av
 from aiortc import MediaStreamTrack
 from aiortc.contrib.media import RelayStreamTrack
 from aiortc.mediastreams import MediaStreamError
+from av.frame import Frame
+from av.packet import Packet
 
 from .eventloop import get_global_event_loop, loop_context
 from .models import FrameT
@@ -37,12 +39,11 @@ VIDEO_TIME_BASE = fractions.Fraction(1, VIDEO_CLOCK_RATE)
 
 
 MixerCallback = Callable[[List[FrameT]], FrameT]
-Frame = Union[av.VideoFrame, av.AudioFrame]
 
 
 class InputQueueItem(NamedTuple):
-    source_track_id: int
-    frame: Optional[Frame]
+    source_track_id: str
+    frame: Optional[Union[Frame, Packet]]
 
 
 async def input_track_coro(
@@ -99,10 +100,10 @@ async def mix_coro(mix_track: "MediaStreamMixTrack"):
             if output_frame.pts is None and output_frame.time_base is None:
                 timestamp = time.monotonic() - started_at
                 if isinstance(output_frame, av.VideoFrame):
-                    output_frame.pts = timestamp * VIDEO_CLOCK_RATE
+                    output_frame.pts = int(timestamp * VIDEO_CLOCK_RATE)
                     output_frame.time_base = VIDEO_TIME_BASE
                 elif isinstance(output_frame, av.AudioFrame):
-                    output_frame.pts = timestamp * AUDIO_SAMPLE_RATE
+                    output_frame.pts = int(timestamp * AUDIO_SAMPLE_RATE)
                     output_frame.time_base = AUDIO_TIME_BASE
 
         except Exception:
@@ -128,7 +129,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
     _input_queue: asyncio.Queue
     _queue: "asyncio.Queue[Optional[Frame]]"
     _latest_frames_map: (
-        "weakref.WeakKeyDictionary[RelayStreamTrack, Union[Frame, None]]"
+        "weakref.WeakKeyDictionary[RelayStreamTrack, Union[Frame, Packet, None]]"
     )
     _latest_frames_updated_event: asyncio.Event
 
@@ -146,7 +147,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
         mixer_output_interval: float = 1 / 30,
     ) -> None:
         self.kind = kind
-        self._mixer_callback = mixer_callback
+        self._mixer_callback: MixerCallback[FrameT] = mixer_callback
         self._mixer_callback_lock = threading.Lock()
 
         self.mixer_output_interval = mixer_output_interval
@@ -210,7 +211,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
 
             relay = get_global_relay()
             with loop_context(self._loop):
-                input_proxy = relay.subscribe(input_track)
+                input_proxy = cast(RelayStreamTrack, relay.subscribe(input_track))
 
             self._input_proxies[input_track] = input_proxy
 
@@ -223,7 +224,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
         )
         self._input_tasks[input_proxy] = task
 
-        input_proxy.on("ended")(functools.partial(self.remove_input_proxy, input_proxy))
+        input_proxy.on("ended", functools.partial(self.remove_input_proxy, input_proxy))
 
     def remove_input_proxy(self, input_proxy: RelayStreamTrack) -> None:
         LOGGER.debug("Remove a relay track %s from %s", input_proxy, self)
@@ -241,13 +242,13 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
         task.cancel()
 
     def _set_latest_frame(
-        self, input_proxy: RelayStreamTrack, frame: Union[Frame, None]
+        self, input_proxy: RelayStreamTrack, frame: Union[Frame, Packet, None]
     ):
         # TODO: Lock here to make these 2 lines atomic
         self._latest_frames_map[input_proxy] = frame
         self._latest_frames_updated_event.set()
 
-    async def _get_latest_frames(self) -> List[Frame]:
+    async def _get_latest_frames(self) -> List[Union[Frame, Packet]]:
         # TODO: Lock here to make these 2 lines atomic
         await self._latest_frames_updated_event.wait()
         self._latest_frames_updated_event.clear()
@@ -257,8 +258,7 @@ class MediaStreamMixTrack(MediaStreamTrack, Generic[FrameT]):
                 self._latest_frames_map.get(proxy)
                 for proxy in self._input_proxies.values()
             ]
-        latest_frames = [f for f in latest_frames if f is not None]
-        return latest_frames
+        return [f for f in latest_frames if f is not None]
 
     async def recv(self):
         if self.readyState != "live":

streamlit_webrtc/process.py

@@ -25,11 +25,12 @@ class MediaProcessTrack(MediaStreamTrack, Generic[ProcessorT, FrameT]):
         self.track = track
         self.processor: ProcessorT = processor
 
-        @self.track.on("ended")
         def on_input_track_ended():
             logger.debug("Input track %s ended. Stop self %s", self.track, self)
             self.stop()
 
+        self.track.on("ended", on_input_track_ended)
+
     async def recv(self):
         if self.readyState != "live":
             raise MediaStreamError
@@ -98,11 +99,12 @@ class AsyncMediaProcessTrack(MediaStreamTrack, Generic[ProcessorT, FrameT]):
         )
         self._thread.start()
 
-        @self.track.on("ended")
         def on_input_track_ended():
             logger.debug("Input track %s ended. Stop self %s", self.track, self)
             self.stop()
 
+        self.track.on("ended", on_input_track_ended)
+
     def _run_worker_thread(self):
         try:
             self._worker_thread()
@@ -114,7 +116,7 @@ class AsyncMediaProcessTrack(MediaStreamTrack, Generic[ProcessorT, FrameT]):
                 for tbline in tb.rstrip().splitlines():
                     logger.error(tbline.rstrip())
 
-    async def _fallback_recv_queued(self, frames: List[FrameT]) -> FrameT:
+    async def _fallback_recv_queued(self, frames: List[FrameT]) -> List[FrameT]:
         """
         Used as a fallback when the processor does not have its own `recv_queued`.
         """
@@ -126,7 +128,7 @@ class AsyncMediaProcessTrack(MediaStreamTrack, Generic[ProcessorT, FrameT]):
         if self.processor.recv:
             return [self.processor.recv(frames[-1])]
 
-        return frames[-1]
+        return [frames[-1]]
 
     def _worker_thread(self) -> None:
         loop = asyncio.new_event_loop()

streamlit_webrtc/webrtc.py

@@ -93,7 +93,7 @@ async def _process_offer_coro(
 
     if mode == WebRtcMode.SENDRECV:
 
-        @pc.on("track")
+        @pc.on("track")  # type: ignore
         def on_track(input_track: MediaStreamTrack):
             logger.info("Track %s received", input_track.kind)
 
@@ -164,7 +164,7 @@ async def _process_offer_coro(
             elif output_track.kind == "audio":
                 on_track_created("output:audio", output_track)
 
-            @input_track.on("ended")
+            @input_track.on("ended")  # type: ignore
             async def on_ended():
                 logger.info("Track %s ended", input_track.kind)
                 if in_recorder:
@@ -174,7 +174,7 @@ async def _process_offer_coro(
 
     elif mode == WebRtcMode.SENDONLY:
 
-        @pc.on("track")
+        @pc.on("track")  # type: ignore
         def on_track(input_track: MediaStreamTrack):
             logger.info("Track %s received", input_track.kind)
 
@@ -183,6 +183,8 @@ async def _process_offer_coro(
             elif input_track.kind == "audio":
                 on_track_created("input:audio", input_track)
 
+            output_track: MediaStreamTrack
+
             if input_track.kind == "audio":
                 if audio_receiver:
                     if audio_processor:
@@ -224,7 +226,7 @@ async def _process_offer_coro(
                 logger.info("Track %s is added to in_recorder", input_track.kind)
                 in_recorder.addTrack(relay.subscribe(input_track))
 
-            @input_track.on("ended")
+            @input_track.on("ended")  # type: ignore
             async def on_ended():
                 logger.info("Track %s ended", input_track.kind)
                 if video_receiver:
@@ -237,7 +239,7 @@ async def _process_offer_coro(
     await pc.setRemoteDescription(offer)
     if mode == WebRtcMode.RECVONLY:
         for t in pc.getTransceivers():
-            output_track = None
+            output_track: Optional[MediaStreamTrack] = None
             if t.kind == "audio":
                 if source_audio_track:
                     if audio_processor:
@@ -393,8 +395,8 @@ class WebRtcWorker(Generic[VideoProcessorT, AudioProcessorT]):
         self._output_video_track: Optional[MediaStreamTrack] = None
         self._output_audio_track: Optional[MediaStreamTrack] = None
         self._player: Optional[MediaPlayer] = None
-        self._relayed_source_video_track: Optional[MediaRelay] = None
-        self._relayed_source_audio_track: Optional[MediaRelay] = None
+        self._relayed_source_video_track: Optional[MediaStreamTrack] = None
+        self._relayed_source_audio_track: Optional[MediaStreamTrack] = None
 
         self._session_shutdown_observer = SessionShutdownObserver(self.stop)
 
@@ -510,7 +512,7 @@ class WebRtcWorker(Generic[VideoProcessorT, AudioProcessorT]):
                 )
                 source_video_track = self._relayed_source_video_track
 
-        @self.pc.on("iceconnectionstatechange")
+        @self.pc.on("iceconnectionstatechange")  # type: ignore
         async def on_iceconnectionstatechange():
             logger.info("ICE connection state is %s", self.pc.iceConnectionState)
             iceConnectionState = self.pc.iceConnectionState

{streamlit_webrtc-0.49.4.dist-info → streamlit_webrtc-0.50.1.dist-info}/METADATA

@@ -1,22 +1,15 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: streamlit-webrtc
-Version: 0.49.4
+Version: 0.50.1
 Summary: Real-time video and audio processing on Streamlit
-License: MIT
-Author: Yuichiro Tachibana (Tsuchiya)
-Author-email: t.yic.yt@gmail.com
-Requires-Python: >=3.9, !=2.7.*, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*, !=3.7.*, !=3.8.*
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: aiortc (>=1.9.0,<2.0.0)
-Requires-Dist: packaging (>=20.0)
-Requires-Dist: streamlit (>=0.84.1)
 Project-URL: Repository, https://github.com/whitphx/streamlit-webrtc
+Author-email: "Yuichiro Tachibana (Tsuchiya)" <t.yic.yt@gmail.com>
+License-Expression: MIT
+License-File: LICENSE
+Requires-Python: !=3.9.7,>=3.9
+Requires-Dist: aiortc>=1.9.0
+Requires-Dist: packaging>=20.0
+Requires-Dist: streamlit>=0.84.1
 Description-Content-Type: text/markdown
 
 # streamlit-webrtc
@@ -353,4 +346,3 @@ See the samples in [app.py](./app.py) for their usage.
 <a href="https://www.buymeacoffee.com/whitphx" target="_blank" rel="noreferrer"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" width="180" height="50" ></a>
 
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/whitphx?label=Sponsor%20me%20on%20GitHub%20Sponsors&style=social)](https://github.com/sponsors/whitphx)
-

{streamlit_webrtc-0.49.4.dist-info → streamlit_webrtc-0.50.1.dist-info}/RECORD

@@ -1,15 +1,13 @@
-streamlit_webrtc/__init__.py,sha256=q5YB2Sx6amHctUMrZ76UqLgB5mrdR6ArRDK6eiKyKBo,2254
+streamlit_webrtc/__init__.py,sha256=gjCUIHnoLESCSGGwvRMzUHfr8NoVw70oJJtxk6iLVss,2302
 streamlit_webrtc/_compat.py,sha256=43RUwFoGdRBq8EkOdf6inWkl-qogs5lF8tc-sYrVd1s,4128
 streamlit_webrtc/component.py,sha256=cwjP0-4vJSUisSKKeOrc8V3AJvYabF22QxLNsKeO2oI,24181
 streamlit_webrtc/components_callbacks.py,sha256=tdrj2TlV8qcexFEdjm4PVkz8JwHffo4A8imoXOtjNHA,2401
 streamlit_webrtc/config.py,sha256=Yoppkv0aHFEpHp5IWPgy3tbohAsm-FGEtoH5Zbgwltw,4114
 streamlit_webrtc/eventloop.py,sha256=AFmxGlRRxVdl0cTS9pKpRZR2Mnq6v6DgudVZZ425IVw,1333
-streamlit_webrtc/factory.py,sha256=XeHefJ6d_aHE7Oy_oqz5dWsfVKuVxjtifilvs4cMBWs,6806
-streamlit_webrtc/frontend/dist/assets/index-1ywg1u80.js,sha256=6DS5LiYVHfQac1QqoUOdw2ALfo86UUrpvdn4Cdz-GaY,582648
-streamlit_webrtc/frontend/dist/index.html,sha256=1iOx-PsDxdqWKzx6SFPeQH17DsdM8NJSkfOm-XjFl5Q,527
-streamlit_webrtc/mix.py,sha256=Cd1a3bmJdCY_5Ita-bvW0Y5a0ydLHBANojBOqJ1Govo,8692
+streamlit_webrtc/factory.py,sha256=T35kCwNU8Vm4KL6KJ5HbNVtaouNw13Ilew49XSnm6X8,6820
+streamlit_webrtc/mix.py,sha256=Uh9gJviP3VLxwBQ-i3RftJ8GQ5qDPGqJKgm2M-vQYo4,8775
 streamlit_webrtc/models.py,sha256=3sKVjCFgX-eQ7nlMHGWxzR9ohdstxUSZaiOHjyDAHVQ,6308
-streamlit_webrtc/process.py,sha256=rBxrWFVc-3RUaeOsx-34G5hj49Tl5acYNIn11s8YWqo,7826
+streamlit_webrtc/process.py,sha256=i1bSoyIAccKCKmYGnrYLq0ElPFND_5SsY1u91NY-B48,7878
 streamlit_webrtc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 streamlit_webrtc/receive.py,sha256=gzv1uZDTAlxJ0hyJ5LweTr0lVuoisrH5xRevGnYkWwo,2922
 streamlit_webrtc/relay.py,sha256=2K2h0uNz50ARUOScYZPYlEmZb0uAi0agaYxI9z3mLeI,896
@@ -17,8 +15,10 @@ streamlit_webrtc/server.py,sha256=5o9E2MRIPoS18lfGPJkyhbd23RWyTwblNVVuAA2kKrA,14
 streamlit_webrtc/session_info.py,sha256=pg_2RFexR18UfwpZT5ENcPfedEiWuAxBuXc2RRuFCaE,2341
 streamlit_webrtc/shutdown.py,sha256=rbWMhOIrbOBZDlqqBTzCfs4MuHQ0UEhljkNvvXoeTz0,2171
 streamlit_webrtc/source.py,sha256=haPqMZ50Xh8tg7Z1yN8Frfk8v7D3oOuKteaD59asbzs,2263
-streamlit_webrtc/webrtc.py,sha256=grVZTC1wnL8ZpPO0vjABarvAzXzinTAWSSND-SdTAzc,27064
-streamlit_webrtc-0.49.4.dist-info/LICENSE,sha256=pwccNHVA7r4rYofGlMU10aKEU90GLUlQr8uY80PR0NQ,1081
-streamlit_webrtc-0.49.4.dist-info/METADATA,sha256=ksnZBxMGHj7LhqDxmA2Rfkk3_lO-jYyCbjg7FN7yQoE,19063
-streamlit_webrtc-0.49.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-streamlit_webrtc-0.49.4.dist-info/RECORD,,
+streamlit_webrtc/webrtc.py,sha256=uRJpQhDEk47tYKg14ljIhUXPgGWQbnEmZ_Uh4Jo8ePg,27228
+streamlit_webrtc/frontend/dist/index.html,sha256=1iOx-PsDxdqWKzx6SFPeQH17DsdM8NJSkfOm-XjFl5Q,527
+streamlit_webrtc/frontend/dist/assets/index-1ywg1u80.js,sha256=6DS5LiYVHfQac1QqoUOdw2ALfo86UUrpvdn4Cdz-GaY,582648
+streamlit_webrtc-0.50.1.dist-info/METADATA,sha256=4CPxm-P-TqNZc3SPXlZH6zdFPa_Srh1RmMAEvbBl9qQ,18640
+streamlit_webrtc-0.50.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+streamlit_webrtc-0.50.1.dist-info/licenses/LICENSE,sha256=pwccNHVA7r4rYofGlMU10aKEU90GLUlQr8uY80PR0NQ,1081
+streamlit_webrtc-0.50.1.dist-info/RECORD,,

{streamlit_webrtc-0.49.4.dist-info → streamlit_webrtc-0.50.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.1
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any