1414
1515from __future__ import annotations
1616
17- import time
1817import asyncio
18+ import threading
19+ import time
1920
2021from ._ffi_client import FfiHandle , FfiClient
2122from ._proto import audio_frame_pb2 as proto_audio_frame
@@ -73,6 +74,7 @@ def __init__(
7374 self ._last_capture = 0.0
7475 self ._q_size = 0.0
7576 self ._capture_gen = 0
77+ self ._lock = threading .Lock ()
7678 self ._join_handle : asyncio .TimerHandle | None = None
7779 self ._join_fut : asyncio .Future [None ] | None = None
7880
@@ -89,7 +91,8 @@ def num_channels(self) -> int:
8991 @property
9092 def queued_duration (self ) -> float :
9193 """The current duration (in seconds) of audio data queued for playback."""
92- return max (self ._q_size - time .monotonic () + self ._last_capture , 0.0 )
94+ with self ._lock :
95+ return max (self ._q_size - time .monotonic () + self ._last_capture , 0.0 )
9396
9497 def clear_queue (self ) -> None :
9598 """
@@ -103,7 +106,11 @@ def clear_queue(self) -> None:
103106 req = proto_ffi .FfiRequest ()
104107 req .clear_audio_buffer .source_handle = self ._ffi_handle .handle
105108 _ = FfiClient .instance .request (req )
106- self ._release_waiter_threadsafe (gen = self ._capture_gen )
109+ with self ._lock :
110+ self ._last_capture = 0.0
111+ self ._q_size = 0.0
112+ target_gen = self ._capture_gen
113+ self ._release_waiter_threadsafe (gen = target_gen )
107114
108115 def _get_loop (self ) -> asyncio .AbstractEventLoop :
109116 if self ._loop is None or self ._loop .is_closed ():
@@ -132,25 +139,27 @@ async def capture_frame(self, frame: AudioFrame) -> None:
132139
133140 loop = self ._get_loop ()
134141
135- self ._capture_gen += 1
136- current_gen = self ._capture_gen
142+ with self ._lock :
143+ self ._capture_gen += 1
144+ current_gen = self ._capture_gen
137145
138- now = time .monotonic ()
139- elapsed = 0.0 if self ._last_capture == 0.0 else now - self ._last_capture
140- self ._q_size += frame .samples_per_channel / self .sample_rate - elapsed
141- self ._last_capture = now
146+ now = time .monotonic ()
147+ elapsed = 0.0 if self ._last_capture == 0.0 else now - self ._last_capture
148+ self ._q_size += frame .samples_per_channel / self .sample_rate - elapsed
149+ self ._last_capture = now
150+ q_size = self ._q_size
142151
143- if self ._join_handle :
144- self ._join_handle .cancel ()
152+ if self ._join_handle :
153+ self ._join_handle .cancel ()
145154
146- if (
147- self ._join_fut is None
148- or self ._join_fut .get_loop () is not loop
149- or self ._join_fut .get_loop ().is_closed ()
150- ):
151- self ._join_fut = loop .create_future ()
155+ if (
156+ self ._join_fut is None
157+ or self ._join_fut .get_loop () is not loop
158+ or self ._join_fut .get_loop ().is_closed ()
159+ ):
160+ self ._join_fut = loop .create_future ()
152161
153- self ._join_handle = loop .call_later (self . _q_size , self ._release_waiter , current_gen )
162+ self ._join_handle = loop .call_later (q_size , self ._release_waiter , current_gen )
154163
155164 req = proto_ffi .FfiRequest ()
156165 req .capture_audio_frame .source_handle = self ._ffi_handle .handle
@@ -193,22 +202,23 @@ async def wait_for_playout(self) -> None:
193202 await asyncio .shield (self ._join_fut )
194203
195204 def _release_waiter (self , gen : int | None = None ) -> None :
196- if gen is not None and gen != self ._capture_gen :
197- return
205+ with self ._lock :
206+ if gen is not None and gen != self ._capture_gen :
207+ return
198208
199- if self ._join_handle is not None :
200- self ._join_handle .cancel ()
201- self ._join_handle = None
209+ if self ._join_handle is not None :
210+ self ._join_handle .cancel ()
211+ self ._join_handle = None
202212
203- if self ._join_fut is None :
204- return # could be None when clear_queue is called
213+ if self ._join_fut is None :
214+ return # could be None when clear_queue is called
205215
206- if not self ._join_fut .done ():
207- self ._join_fut .set_result (None )
216+ if not self ._join_fut .done ():
217+ self ._join_fut .set_result (None )
208218
209- self ._last_capture = 0.0
210- self ._q_size = 0.0
211- self ._join_fut = None
219+ self ._last_capture = 0.0
220+ self ._q_size = 0.0
221+ self ._join_fut = None
212222
213223 def _release_waiter_threadsafe (self , gen : int | None = None ) -> None :
214224 try :
0 commit comments