me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Report thread running so Pa_StartStream can return prior to PaStreamCallback

Browse source 
StartStream() calls WaitForSingleObject(stream->hThreadStart, 60*1000)
but it will not be able to return until X number of PaStreamCallback
have been performed by ProcessOutputBuffer().

The above behaviour will cause a deadlock if the user supplied
PaStreamCallback tries to access a shared lock currently held by the
function calling Pa_StartStream().

Also it's a bit weird that you start receiving PaStreamCallbacks
before Pa_StartStream() is able to complete.
This commit is contained in:
Bjørn Damstedt Rasmussen 2020-12-29 07:31:58 +01:00
commit 2d8c7eb0f7
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/hostapi/wasapi/pa_win_wasapi.c
View file

@ -5890,6 +5890,12 @@ PA_THREAD_FUNC ProcThreadEvent(void *param)
goto thread_error; goto thread_error;
} }
// Signal: stream running
stream->running = TRUE;
// Notify: thread started
SetEvent(stream->hThreadStart);
// Initialize event & start INPUT stream // Initialize event & start INPUT stream
if (stream->in.clientProc) if (stream->in.clientProc)
{ {
@ -5940,12 +5946,6 @@ PA_THREAD_FUNC ProcThreadEvent(void *param)
} }
// Signal: stream running
stream->running = TRUE;
// Notify: thread started
SetEvent(stream->hThreadStart);
// Notify: state // Notify: state
NotifyStateChanged(stream, paWasapiStreamStateThreadStart, ERROR_SUCCESS); NotifyStateChanged(stream, paWasapiStreamStateThreadStart, ERROR_SUCCESS);
@ -6171,6 +6171,12 @@ PA_THREAD_FUNC ProcThreadPoll(void *param)
// Boost thread priority // Boost thread priority
PaWasapi_ThreadPriorityBoost((void **)&stream->hAvTask, stream->nThreadPriority); PaWasapi_ThreadPriorityBoost((void **)&stream->hAvTask, stream->nThreadPriority);
// Signal: stream running
stream->running = TRUE;
// Notify: thread started
SetEvent(stream->hThreadStart);
// Initialize event & start INPUT stream // Initialize event & start INPUT stream
if (stream->in.clientProc) if (stream->in.clientProc)
{ {
@ -6238,12 +6244,6 @@ PA_THREAD_FUNC ProcThreadPoll(void *param)
} }
} }
// Signal: stream running
stream->running = TRUE;
// Notify: thread started
SetEvent(stream->hThreadStart);
// Notify: state // Notify: state
NotifyStateChanged(stream, paWasapiStreamStateThreadStart, ERROR_SUCCESS); NotifyStateChanged(stream, paWasapiStreamStateThreadStart, ERROR_SUCCESS);