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

alsa:

Browse source 
- fixed callback thread to exit normally if error condition was satisfied during stream processing (OnExit wasn't called), it was possible cause of crash if error happened inside the thread
- modified processing thread to timeout during poll() within around 2 seconds instead of 64 milliseconds, this will help to fix problems on systems with low processing power and possible CPU overloading, like portable ARM devices
- timeout of poll() will not cause stream to stop but will cause Alsa stream restart, poll timeout will now set 'xrun' event to 1
This commit is contained in:
dmitrykos 2011-02-09 08:53:50 +00:00
commit 4318a7556b
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/hostapi/alsa/pa_linux_alsa.c
View file

@ -3098,13 +3098,13 @@ static PaError PaAlsaStream_WaitForFrames( PaAlsaStream *self, unsigned long *fr
{ {
/* Suspended, paused or failed device can provide 0 poll results. To avoid deadloop in such situation /* Suspended, paused or failed device can provide 0 poll results. To avoid deadloop in such situation
* we simply run counter 'timeouts' which detects 0 poll result and accumulates. As soon as 64 timouts * we simply run counter 'timeouts' which detects 0 poll result and accumulates. As soon as 2048 timouts (around 2 seconds)
* are achieved we simply fail function with paTimedOut to notify waiting methods that device is not capable * are achieved we simply fail function with paTimedOut to notify waiting methods that device is not capable
* of providing audio data anymore and needs some corresponding recovery action. * of providing audio data anymore and needs some corresponding recovery action.
* Note that 'timeouts' is reset to 0 if poll() managed to return non 0 results. * Note that 'timeouts' is reset to 0 if poll() managed to return non 0 results.
*/ */
/*PA_DEBUG(( "%s: poll == 0 results, timed out, %d times left\n", __FUNCTION__, 64 - timeouts ));*/ /*PA_DEBUG(( "%s: poll == 0 results, timed out, %d times left\n", __FUNCTION__, 2048 - timeouts ));*/
++ timeouts; ++ timeouts;
if (timeouts > 1) /* sometimes device times out, but normally once, so we do not sleep any time */ if (timeouts > 1) /* sometimes device times out, but normally once, so we do not sleep any time */
@ -3112,12 +3112,13 @@ static PaError PaAlsaStream_WaitForFrames( PaAlsaStream *self, unsigned long *fr
Pa_Sleep( 1 ); /* avoid hot loop */ Pa_Sleep( 1 ); /* avoid hot loop */
} }
/* not else ! */ /* not else ! */
if (timeouts >= 64) /* audio device not working, shall return error to notify waiters */ if (timeouts >= 2048) /* audio device not working, shall return error to notify waiters */
{ {
*framesAvail = 0; /* no frames available for processing */ *framesAvail = 0; /* no frames available for processing */
xrun = 1; /* try recovering device */
PA_DEBUG(( "%s: poll timed out, returning error\n", __FUNCTION__, timeouts )); PA_DEBUG(( "%s: poll timed out\n", __FUNCTION__, timeouts ));
PA_ENSURE( paTimedOut ); goto end;/*PA_ENSURE( paTimedOut );*/
} }
} }
else else
@ -3614,13 +3615,15 @@ static void *CallbackThreadFunc( void *userData )
} }
} }
end:
/* Match pthread_cleanup_push */ /* Match pthread_cleanup_push */
pthread_cleanup_pop( 1 ); pthread_cleanup_pop( 1 );
end:
PA_DEBUG(( "%s: Thread %d exiting\n ", __FUNCTION__, pthread_self() )); PA_DEBUG(( "%s: Thread %d exiting\n ", __FUNCTION__, pthread_self() ));
PaUnixThreading_EXIT( result ); PaUnixThreading_EXIT( result );
error: error:
PA_DEBUG(( "%s: Thread %d is canceled due to error %d\n ", __FUNCTION__, pthread_self(), result ));
goto end; goto end;
} }