mic: fix resampling, apple drivers

Author: warmenhoven

audio/audio_driver.c

@@ -2509,7 +2509,7 @@ static size_t microphone_driver_flush(
    { /* If the mic's native rate is practically the same as the requested one... */
 
       /* ...then skip the resampler, since it'll produce (more or less) identical results. */
-      frames_to_enqueue = MIN(FIFO_WRITE_AVAIL(microphone->outgoing_samples), resampler_data.input_frames);
+      frames_to_enqueue = MIN(FIFO_WRITE_AVAIL(microphone->outgoing_samples) / sizeof(int16_t), resampler_data.input_frames);
 
       /* If this mic provides floating-point samples... */
       if (microphone->flags & MICROPHONE_FLAG_USE_FLOAT)
@@ -2520,7 +2520,7 @@ static size_t microphone_driver_flush(
       else
          fifo_write(microphone->outgoing_samples, mic_st->input_frames, frames_to_enqueue * sizeof(int16_t));
 
-      return resampler_data.input_frames;
+      return frames_to_enqueue;
    }
    /* Couldn't take the fast path, so let's resample the mic input */
 
@@ -2548,9 +2548,9 @@ static size_t microphone_driver_flush(
    /* Finally, we convert the audio back to 16-bit ints, as the mic interface requires. */
    convert_float_to_s16(mic_st->final_frames, mic_st->resampled_mono_frames, resampler_data.output_frames);
 
-   frames_to_enqueue = MIN(FIFO_WRITE_AVAIL(microphone->outgoing_samples), resampler_data.output_frames);
+   frames_to_enqueue = MIN(FIFO_WRITE_AVAIL(microphone->outgoing_samples) / sizeof(int16_t), resampler_data.output_frames);
    fifo_write(microphone->outgoing_samples, mic_st->final_frames, frames_to_enqueue * sizeof(int16_t));
-   return resampler_data.output_frames;
+   return frames_to_enqueue;
 }
 
 int microphone_driver_read(retro_microphone_t *microphone, int16_t* frames, size_t num_frames)
@@ -2587,9 +2587,10 @@ int microphone_driver_read(retro_microphone_t *microphone, int16_t* frames, size
       || is_fastforward
       || is_slowmo
       || is_rewind
+      || core_paused
       )
    { /* If the microphone is pending, suspended, or disabled...
-        ...or if the core is in fast-forward, slow-mo, or rewind...*/
+        ...or if the core is paused, in fast-forward, slow-mo, or rewind...*/
       memset(frames, 0, num_frames * sizeof(*frames));
       return (int)num_frames;
       /* ...then copy silence to the provided buffer. Not an error if the mic is pending,
@@ -2612,25 +2613,32 @@ int microphone_driver_read(retro_microphone_t *microphone, int16_t* frames, size
       return -1;
    }
 
-   /* If the core asked for more frames than we can fit... */
-   if (num_frames > microphone->outgoing_samples->size)
+   /* If the core asked for more frames than the FIFO can hold... */
+   if (num_frames * sizeof(int16_t) > microphone->outgoing_samples->size - 1)
       return -1;
 
    retro_assert(mic_st->input_frames != NULL);
 
-   while (FIFO_READ_AVAIL(microphone->outgoing_samples) < num_frames * sizeof(int16_t))
-   { /* Until we can give the core the frames it asked for... */
-      size_t frames_to_read = MIN(AUDIO_CHUNK_SIZE_NONBLOCKING, frames_remaining);
-      size_t frames_read    = 0;
-
-      /* If the game is running and the mic driver is active... */
-      if (!core_paused)
-         frames_read = microphone_driver_flush(mic_st, microphone, frames_to_read);
-
-      /* Otherwise, advance the counters. We're not gonna get new data,
-       * but we still need to finish this loop */
-      frames_remaining -= frames_read;
-   } /* If the queue already has enough samples to give, the loop will be skipped */
+   {
+      unsigned stall_count = 0;
+      while (FIFO_READ_AVAIL(microphone->outgoing_samples) < num_frames * sizeof(int16_t))
+      { /* Until we can give the core the frames it asked for... */
+         size_t frames_to_read = MIN(AUDIO_CHUNK_SIZE_NONBLOCKING, frames_remaining);
+         size_t frames_read    = microphone_driver_flush(
+               mic_st, microphone, frames_to_read);
+         if (frames_read == 0)
+         {
+            if (++stall_count > 512)
+            { /* Driver isn't providing data; return silence */
+               memset(frames, 0, num_frames * sizeof(int16_t));
+               return (int)num_frames;
+            }
+         }
+         else
+            stall_count = 0;
+         frames_remaining -= frames_read;
+      } /* If the queue already has enough samples to give, the loop will be skipped */
+   }
 
    fifo_read(microphone->outgoing_samples, frames, num_frames * sizeof(int16_t));
    return (int)num_frames;