@@ -53,17 +53,12 @@ def __init__(
5353 """
5454 self ._sample_rate = sample_rate
5555 self ._num_channels = num_channels
56-
57- if loop is not None :
58- self ._loop = loop
59- else :
56+ self ._loop : asyncio .AbstractEventLoop | None = loop
57+ if self ._loop is None :
6058 try :
6159 self ._loop = asyncio .get_running_loop ()
6260 except RuntimeError :
63- try :
64- self ._loop = asyncio .get_event_loop ()
65- except RuntimeError :
66- self ._loop = asyncio .new_event_loop ()
61+ self ._loop = None
6762
6863 req = proto_ffi .FfiRequest ()
6964 req .new_audio_source .type = proto_audio_frame .AudioSourceType .AUDIO_SOURCE_NATIVE
@@ -107,7 +102,12 @@ def clear_queue(self) -> None:
107102 req = proto_ffi .FfiRequest ()
108103 req .clear_audio_buffer .source_handle = self ._ffi_handle .handle
109104 _ = FfiClient .instance .request (req )
110- self ._release_waiter ()
105+ self ._release_waiter_threadsafe ()
106+
107+ def _get_loop (self ) -> asyncio .AbstractEventLoop :
108+ if self ._loop is None or self ._loop .is_closed ():
109+ self ._loop = asyncio .get_running_loop ()
110+ return self ._loop
111111
112112 async def capture_frame (self , frame : AudioFrame ) -> None :
113113 """
@@ -129,6 +129,8 @@ async def capture_frame(self, frame: AudioFrame) -> None:
129129 if frame .samples_per_channel == 0 or getattr (self ._ffi_handle , "disposed" , False ):
130130 return
131131
132+ loop = self ._get_loop ()
133+
132134 now = time .monotonic ()
133135 elapsed = 0.0 if self ._last_capture == 0.0 else now - self ._last_capture
134136 self ._q_size += frame .samples_per_channel / self .sample_rate - elapsed
@@ -137,16 +139,20 @@ async def capture_frame(self, frame: AudioFrame) -> None:
137139 if self ._join_handle :
138140 self ._join_handle .cancel ()
139141
140- if self ._join_fut is None :
141- self ._join_fut = self ._loop .create_future ()
142+ if (
143+ self ._join_fut is None
144+ or self ._join_fut .get_loop () is not loop
145+ or self ._join_fut .get_loop ().is_closed ()
146+ ):
147+ self ._join_fut = loop .create_future ()
142148
143- self ._join_handle = self . _loop .call_later (self ._q_size , self ._release_waiter )
149+ self ._join_handle = loop .call_later (self ._q_size , self ._release_waiter )
144150
145151 req = proto_ffi .FfiRequest ()
146152 req .capture_audio_frame .source_handle = self ._ffi_handle .handle
147153 req .capture_audio_frame .buffer .CopyFrom (frame ._proto_info ())
148154
149- queue = FfiClient .instance .queue .subscribe (loop = self . _loop )
155+ queue = FfiClient .instance .queue .subscribe (loop = loop )
150156 try :
151157 resp = FfiClient .instance .request (req )
152158 cb : proto_ffi .FfiEvent = await queue .wait_for (
@@ -187,23 +193,23 @@ def _release_waiter(self) -> None:
187193 self ._q_size = 0.0
188194 self ._join_fut = None
189195
190- def close (self ) -> None :
191- """Close the audio source.
192-
193- This method cleans up resources associated with the audio source.
194- """
196+ def _release_waiter_threadsafe (self ) -> None :
195197 try :
196198 running_loop = asyncio .get_running_loop ()
197199 except RuntimeError :
198200 running_loop = None
199201
200- if running_loop is self ._loop :
201- self ._release_waiter ()
202- elif self ._loop .is_running ():
202+ if self ._loop is not None and self ._loop .is_running () and running_loop is not self ._loop :
203203 self ._loop .call_soon_threadsafe (self ._release_waiter )
204204 else :
205205 self ._release_waiter ()
206206
207+ def close (self ) -> None :
208+ """Close the audio source.
209+
210+ This method cleans up resources associated with the audio source.
211+ """
212+ self ._release_waiter_threadsafe ()
207213 self ._ffi_handle .dispose ()
208214
209215 async def aclose (self ) -> None :
0 commit comments