Skip to content

Implement task_done calls after queue.wait_for #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Implement task_done calls after queue.wait_for #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions livekit-rtc/livekit/rtc/audio_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ async def capture_frame(self, frame: AudioFrame) -> None:
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.capture_audio_frame.async_id == resp.capture_audio_frame.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down
38 changes: 25 additions & 13 deletions livekit-rtc/livekit/rtc/audio_stream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ def __init__(
if noise_cancellation is not None:
self._audio_filter_module = noise_cancellation.module_id
self._audio_filter_options = noise_cancellation.options
self._task = self._loop.create_task(self._run())
self._task.add_done_callback(task_done_logger)

stream: Any = None
if "participant" in kwargs:
Expand All @@ -120,6 +118,9 @@ def __init__(
stream = self._create_owned_stream()
self._ffi_handle = FfiHandle(stream.handle.id)
self._info = stream.info

self._task = self._loop.create_task(self._run())
self._task.add_done_callback(task_done_logger)

@classmethod
def from_participant(
Expand Down Expand Up @@ -261,18 +262,29 @@ def _create_owned_stream_from_participant(
return resp.audio_stream_from_participant.stream

async def _run(self):
"""Run the audio stream.

This method is responsible for receiving audio frames from the audio stream and
putting them into the queue. It also handles the EOS event and unsubscribes from
the FFI queue.

It must be initialized after self._ffi_queue is subscribed.
"""
while True:
event = await self._ffi_queue.wait_for(self._is_event)
audio_event: proto_audio_frame.AudioStreamEvent = event.audio_stream_event

if audio_event.HasField("frame_received"):
owned_buffer_info = audio_event.frame_received.frame
frame = AudioFrame._from_owned_info(owned_buffer_info)
event = AudioFrameEvent(frame)
self._queue.put(event)
elif audio_event.HasField("eos"):
self._queue.put(None)
break
try:
event = await self._ffi_queue.wait_for(self._is_event)
audio_event: proto_audio_frame.AudioStreamEvent = event.audio_stream_event

if audio_event.HasField("frame_received"):
owned_buffer_info = audio_event.frame_received.frame
frame = AudioFrame._from_owned_info(owned_buffer_info)
event = AudioFrameEvent(frame)
self._queue.put(event)
elif audio_event.HasField("eos"):
self._queue.put(None)
break
finally:
self._ffi_queue.task_done()

FfiClient.instance.queue.unsubscribe(self._ffi_queue)

Expand Down
3 changes: 3 additions & 0 deletions livekit-rtc/livekit/rtc/data_stream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ async def _send_header(self):
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.send_stream_header.async_id == resp.send_stream_header.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand All @@ -206,6 +207,7 @@ async def _send_chunk(self, chunk: proto_DataStream.Chunk):
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.send_stream_chunk.async_id == resp.send_stream_chunk.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand All @@ -227,6 +229,7 @@ async def _send_trailer(self, trailer: proto_DataStream.Trailer):
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.send_stream_trailer.async_id == resp.send_stream_trailer.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down
7 changes: 7 additions & 0 deletions livekit-rtc/livekit/rtc/participant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ async def publish_data(
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.publish_data.async_id == resp.publish_data.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down Expand Up @@ -238,6 +239,7 @@ async def publish_dtmf(self, *, code: int, digit: str) -> None:
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.publish_sip_dtmf.async_id == resp.publish_sip_dtmf.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down Expand Up @@ -278,6 +280,7 @@ async def publish_transcription(self, transcription: Transcription) -> None:
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.publish_transcription.async_id == resp.publish_transcription.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down Expand Up @@ -321,6 +324,7 @@ async def perform_rpc(
cb = await queue.wait_for(
lambda e: (e.perform_rpc.async_id == resp.perform_rpc.async_id)
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down Expand Up @@ -494,6 +498,7 @@ async def set_metadata(self, metadata: str) -> None:
await queue.wait_for(
lambda e: e.set_local_metadata.async_id == resp.set_local_metadata.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand All @@ -516,6 +521,7 @@ async def set_name(self, name: str) -> None:
await queue.wait_for(
lambda e: e.set_local_name.async_id == resp.set_local_name.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down Expand Up @@ -546,6 +552,7 @@ async def set_attributes(self, attributes: dict[str, str]) -> None:
await queue.wait_for(
lambda e: e.set_local_attributes.async_id == resp.set_local_attributes.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down
3 changes: 3 additions & 0 deletions livekit-rtc/livekit/rtc/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ def on_participant_connected(participant):
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.connect.async_id == resp.connect.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down Expand Up @@ -428,6 +429,7 @@ async def get_rtc_stats(self) -> RtcStats:
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.get_session_stats.async_id == resp.get_session_stats.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down Expand Up @@ -475,6 +477,7 @@ async def disconnect(self) -> None:
try:
resp = FfiClient.instance.request(req)
await queue.wait_for(lambda e: e.disconnect.async_id == resp.disconnect.async_id)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down
1 change: 1 addition & 0 deletions livekit-rtc/livekit/rtc/track.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ async def get_stats(self) -> List[proto_stats.RtcStats]:
cb: proto_ffi.FfiEvent = await queue.wait_for(
lambda e: e.get_stats.async_id == resp.get_stats.async_id
)
queue.task_done()
finally:
FfiClient.instance.queue.unsubscribe(queue)

Expand Down
43 changes: 25 additions & 18 deletions livekit-rtc/livekit/rtc/video_stream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,12 @@ def _create_owned_stream_from_participant(
) -> Any:
req = proto_ffi.FfiRequest()
video_stream_from_participant = req.video_stream_from_participant
video_stream_from_participant.participant_handle = participant._ffi_handle.handle
video_stream_from_participant.type = proto_video_frame.VideoStreamType.VIDEO_STREAM_NATIVE
video_stream_from_participant.participant_handle = (
participant._ffi_handle.handle
)
video_stream_from_participant.type = (
proto_video_frame.VideoStreamType.VIDEO_STREAM_NATIVE
)
video_stream_from_participant.track_source = track_source
video_stream_from_participant.normalize_stride = True
if self._format is not None:
Expand All @@ -133,22 +137,25 @@ def _create_owned_stream_from_participant(

async def _run(self) -> None:
while True:
event = await self._ffi_queue.wait_for(self._is_event)
video_event = event.video_stream_event

if video_event.HasField("frame_received"):
owned_buffer_info = video_event.frame_received.buffer
frame = VideoFrame._from_owned_info(owned_buffer_info)

event = VideoFrameEvent(
frame=frame,
timestamp_us=video_event.frame_received.timestamp_us,
rotation=video_event.frame_received.rotation,
)

self._queue.put(event)
elif video_event.HasField("eos"):
break
try:
event = await self._ffi_queue.wait_for(self._is_event)
video_event = event.video_stream_event

if video_event.HasField("frame_received"):
owned_buffer_info = video_event.frame_received.buffer
frame = VideoFrame._from_owned_info(owned_buffer_info)

event = VideoFrameEvent(
frame=frame,
timestamp_us=video_event.frame_received.timestamp_us,
rotation=video_event.frame_received.rotation,
)

self._queue.put(event)
elif video_event.HasField("eos"):
break
finally:
self._ffi_queue.task_done()

FfiClient.instance.queue.unsubscribe(self._ffi_queue)

Expand Down
Loading