Răsfoiți Sursa

Clamp the audio drain delay to 100 ms

Fixes https://github.com/libsdl-org/SDL/issues/9829
Sam Lantinga 4 luni în urmă
părinte
comite
0882623092
2 a modificat fișierele cu 10 adăugiri și 2 ștergeri
  1. 5 1
      src/audio/SDL_audio.c
  2. 5 1
      src/audio/alsa/SDL_alsa_audio.c

+ 5 - 1
src/audio/SDL_audio.c

@@ -1298,7 +1298,11 @@ void SDL_PlaybackAudioThreadShutdown(SDL_AudioDevice *device)
     const int frames = device->buffer_size / SDL_AUDIO_FRAMESIZE(device->spec);
     // Wait for the audio to drain if device didn't die.
     if (!SDL_GetAtomicInt(&device->zombie)) {
-        SDL_Delay(((frames * 1000) / device->spec.freq) * 2);
+        int delay = ((frames * 1000) / device->spec.freq) * 2;
+        if (delay > 100) {
+            delay = 100;
+        }
+        SDL_Delay(delay);
     }
     current_audio.impl.ThreadDeinit(device);
     SDL_AudioThreadFinalize(device);

+ 5 - 1
src/audio/alsa/SDL_alsa_audio.c

@@ -485,7 +485,11 @@ static void ALSA_CloseDevice(SDL_AudioDevice *device)
     if (device->hidden) {
         if (device->hidden->pcm) {
             // Wait for the submitted audio to drain. ALSA_snd_pcm_drop() can hang, so don't use that.
-            SDL_Delay(((device->sample_frames * 1000) / device->spec.freq) * 2);
+            int delay = ((device->sample_frames * 1000) / device->spec.freq) * 2;
+            if (delay > 100) {
+                delay = 100;
+            }
+            SDL_Delay(delay);
             ALSA_snd_pcm_close(device->hidden->pcm);
         }
         SDL_free(device->hidden->mixbuf);