mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-15 22:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Recover from -EPIPE in snd_pcm_avail()

Browse Source
This commit is contained in:
Sam Lantinga
2023-09-28 20:16:59 -07:00
parent 5be5000fa1
commit ba65ef5ce7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/audio/alsa/SDL_alsa_audio.c
View File

@@ -336,11 +336,16 @@ static void ALSA_WaitDevice(SDL_AudioDevice *device)
const snd_pcm_sframes_t needed = (snd_pcm_sframes_t)device->sample_frames; const snd_pcm_sframes_t needed = (snd_pcm_sframes_t)device->sample_frames;
while (!SDL_AtomicGet(&device->shutdown)) { while (!SDL_AtomicGet(&device->shutdown)) {
const snd_pcm_sframes_t rc = ALSA_snd_pcm_avail(device->hidden->pcm_handle); const snd_pcm_sframes_t rc = ALSA_snd_pcm_avail(device->hidden->pcm_handle);
if ((rc < 0) && (rc != -EAGAIN)) { if (rc < 0 && rc != -EAGAIN) {
/* Hmm, not much we can do - abort */ int status = rc;
fprintf(stderr, "ALSA snd_pcm_avail failed (unrecoverable): %s\n",
ALSA_snd_strerror(rc)); status = ALSA_snd_pcm_recover(device->hidden->pcm_handle, status, 0);
SDL_AudioDeviceDisconnected(device); if (status < 0) {
/* Hmm, not much we can do - abort */
fprintf(stderr, "ALSA snd_pcm_avail failed (unrecoverable): %s\n",
ALSA_snd_strerror(rc));
SDL_AudioDeviceDisconnected(device);
}
return; return;
} else if (rc < needed) { } else if (rc < needed) {
const Uint32 delay = ((needed - (SDL_max(rc, 0))) * 1000) / device->spec.freq; const Uint32 delay = ((needed - (SDL_max(rc, 0))) * 1000) / device->spec.freq;
@@ -363,7 +368,6 @@ static int ALSA_PlayDevice(SDL_AudioDevice *device, const Uint8 *buffer, int buf
while ((frames_left > 0) && !SDL_AtomicGet(&device->shutdown)) { while ((frames_left > 0) && !SDL_AtomicGet(&device->shutdown)) {
int status = ALSA_snd_pcm_writei(device->hidden->pcm_handle, int status = ALSA_snd_pcm_writei(device->hidden->pcm_handle,
sample_buf, frames_left); sample_buf, frames_left);
if (status < 0) { if (status < 0) {
if (status == -EAGAIN) { if (status == -EAGAIN) {
/* Apparently snd_pcm_recover() doesn't handle this case - /* Apparently snd_pcm_recover() doesn't handle this case -