Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion getstream/video/rtc/connection_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ def __init__(
create: bool = True,
subscription_config: Optional[SubscriptionConfig] = None,
max_join_retries: int = 3,
drain_video_frames: bool = False,
**kwargs: Any,
):
super().__init__()
Expand Down Expand Up @@ -90,7 +91,9 @@ def __init__(
self._subscription_manager: SubscriptionManager = SubscriptionManager(
self, subscription_config
)
self._peer_manager: PeerConnectionManager = PeerConnectionManager(self)
self._peer_manager: PeerConnectionManager = PeerConnectionManager(
self, drain_video_frames=drain_video_frames
)

self.recording_manager = self._recording_manager
self.participants_state = self._participants_state
Expand Down
18 changes: 16 additions & 2 deletions getstream/video/rtc/pc.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import Any, Optional

import aiortc
from aiortc.contrib.media import MediaRelay
from aiortc.contrib.media import MediaBlackhole, MediaRelay
from aiortc.mediastreams import MediaStreamTrack
from aiortc.rtcrtpparameters import RTCRtpCodecCapability
from aiortc.rtcrtpsender import RTCRtpSender
Expand Down Expand Up @@ -131,15 +131,19 @@ def __init__(
self,
connection,
configuration: aiortc.RTCConfiguration,
drain_video_frames: bool = False,
) -> None:
logger.info(
f"creating subscriber peer connection with configuration: {configuration}"
)
super().__init__(configuration)
self.connection = connection
self._drain_video_frames = drain_video_frames

self.track_map = {} # track_id -> (MediaRelay, original_track)
self.video_frame_trackers = {} # track_id -> VideoFrameTracker
self._video_blackhole: Optional[MediaBlackhole] = None
self._video_drain_task: Optional[asyncio.Task] = None

@self.on("track")
async def on_track(track: aiortc.mediastreams.MediaStreamTrack):
Expand Down Expand Up @@ -177,7 +181,17 @@ def _emit_pcm(pcm: PcmData):
handler = AudioTrackHandler(relay.subscribe(tracked_track), _emit_pcm)
asyncio.create_task(handler.start())

self.emit("track_added", relay.subscribe(tracked_track), user)
proxy = relay.subscribe(tracked_track)

# Drain unconsumed video frames to prevent unbounded queue growth
# in RTCRtpReceiver (aiortc issue #554)
if track.kind == "video" and self._drain_video_frames:
blackhole = MediaBlackhole()
blackhole.addTrack(proxy)
self._video_blackhole = blackhole
self._video_drain_task = asyncio.create_task(blackhole.start())

self.emit("track_added", proxy, user)

@self.on("icegatheringstatechange")
def on_icegatheringstatechange():
Expand Down
4 changes: 3 additions & 1 deletion getstream/video/rtc/peer_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
class PeerConnectionManager:
"""Manages WebRTC peer connections for publishing and subscribing."""

def __init__(self, connection_manager):
def __init__(self, connection_manager, drain_video_frames: bool = False):
self.connection_manager = connection_manager
self._drain_video_frames = drain_video_frames
self.publisher_pc: Optional[PublisherPeerConnection] = None
self.subscriber_pc: Optional[SubscriberPeerConnection] = None
self.publisher_negotiation_lock = asyncio.Lock()
Expand All @@ -47,6 +48,7 @@ async def setup_subscriber(self):
self.subscriber_pc = SubscriberPeerConnection(
connection=self.connection_manager,
configuration=self._build_rtc_configuration(),
drain_video_frames=self._drain_video_frames,
)

# Trace create event
Expand Down