revert changes to audio mixer as we no longer need it to handle AudioFrameEvent

Author: chenosaurus

livekit-rtc/livekit/rtc/audio_mixer.py

@@ -4,7 +4,6 @@
 from dataclasses import dataclass
 from typing import AsyncIterator, Optional
 from .audio_frame import AudioFrame
-from .audio_stream import AudioFrameEvent
 from .log import logger
 
 _Stream = AsyncIterator[AudioFrame]
@@ -170,7 +169,7 @@ async def _mixer(self) -> None:
         await self._queue.put(None)
 
     async def _get_contribution(
-        self, stream: AsyncIterator[AudioFrame | AudioFrameEvent], buf: np.ndarray
+        self, stream: AsyncIterator[AudioFrame], buf: np.ndarray
     ) -> _Contribution:
         had_data = buf.shape[0] > 0
         exhausted = False
@@ -185,10 +184,6 @@ async def _get_contribution(
             except StopAsyncIteration:
                 exhausted = True
                 break
-            # AudioStream may yield either AudioFrame or AudioFrameEvent; unwrap if needed
-            if hasattr(frame, "frame"):
-                frame = frame.frame  # type: ignore[assignment]
-
             new_data = np.frombuffer(frame.data.tobytes(), dtype=np.int16).reshape(
                 -1, self._num_channels
             )
@@ -202,4 +197,4 @@ async def _get_contribution(
                 np.concatenate((buf, pad), axis=0),
                 np.empty((0, self._num_channels), dtype=np.int16),
             )
-        return _Contribution(stream, contrib, buf, had_data, exhausted)
+        return _Contribution(stream, contrib, buf, had_data, exhausted)

livekit-rtc/livekit/rtc/media_devices.py

@@ -19,7 +19,7 @@
 from typing import Any, Optional
 
 import numpy as np
-import sounddevice as sd
+import sounddevice as sd  # type: ignore[import-untyped]
 import threading
 
 from . import AudioSource