Remove useless skip feature in audio buffer

After the refactor from the previous commit, sc_audiobuf_read() is never
called with a NULL destination (used to skip samples).

app/src/audio_player.c

@@ -66,8 +66,6 @@ static void SDLCALL
 sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
     struct sc_audio_player *ap = userdata;
 
-    // This callback is called with the lock used by SDL_LockAudioDevice()
-
     assert(len_int > 0);
     size_t len = len_int;
     uint32_t count = TO_SAMPLES(len);
@@ -181,29 +179,19 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
     if (written < samples) {
         uint32_t remaining = samples - written;
 
-        // All samples that could be written without locking have been written,
+        assert(remaining <= cap);
-        // now we need to lock to drop/consume old samples
+        skipped_samples = sc_audiobuf_truncate(&ap->buf, cap - remaining);
-        SDL_LockAudioDevice(ap->device);
 
-        // Retry with the lock
+        LOGW("Audio buffer full, %" PRIu32 " samples dropped", skipped_samples);
-        written += sc_audiobuf_write(&ap->buf,
-                                     swr_buf + TO_BYTES(written),
-                                     remaining);
-        if (written < samples) {
-            remaining = samples - written;
-            // Still insufficient, drop old samples to make space
-            skipped_samples = sc_audiobuf_read(&ap->buf, NULL, remaining);
-            assert(skipped_samples == remaining);
 
-            // Now there is enough space
+        // Now there is enough space
-            uint32_t w = sc_audiobuf_write(&ap->buf,
+        uint32_t w = sc_audiobuf_write(&ap->buf,
-                                           swr_buf + TO_BYTES(written),
+                                       swr_buf + TO_BYTES(written),
-                                           remaining);
+                                       remaining);
-            assert(w == remaining);
+        assert(w == remaining);
-            (void) w;
+        (void) w;
-        }
 
-        SDL_UnlockAudioDevice(ap->device);
+        written = samples;
     }
 
     uint32_t underflow = 0;
@@ -225,30 +213,22 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
 
     uint32_t can_read = sc_audiobuf_can_read(&ap->buf);
     if (can_read > max_buffered_samples) {
-        uint32_t skip_samples = 0;
+        uint32_t skipped = sc_audiobuf_truncate(&ap->buf, max_buffered_samples);
+        assert(skipped);
 
-        SDL_LockAudioDevice(ap->device);
+        if (played) {
-        can_read = sc_audiobuf_can_read(&ap->buf);
+            LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
-        if (can_read > max_buffered_samples) {
+                 " samples", skipped);
-            skip_samples = can_read - max_buffered_samples;
-            uint32_t r = sc_audiobuf_read(&ap->buf, NULL, skip_samples);
-            assert(r == skip_samples);
-            (void) r;
-            skipped_samples += skip_samples;
-        }
-        SDL_UnlockAudioDevice(ap->device);
-
-        if (skip_samples) {
-            if (played) {
-                LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
-                     " samples", skip_samples);
 #ifndef SC_AUDIO_PLAYER_NDEBUG
-            } else {
+        } else {
-                LOGD("[Audio] Playback not started, skipping %" PRIu32
+            LOGD("[Audio] Playback not started, skipping %" PRIu32 " samples",
-                     " samples", skip_samples);
+                 skipped);
 #endif
-            }
         }
+
+        skipped_samples += skipped;
+
+        can_read = sc_audiobuf_can_read(&ap->buf);
     }
 
     atomic_store_explicit(&ap->received, true, memory_order_relaxed);
@@ -408,7 +388,7 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
     // Use a ring-buffer of the target buffering size plus 1 second between the
     // producer and the consumer. It's too big on purpose, to guarantee that
     // the producer and the consumer will be able to access it in parallel
-    // without locking.
+    // without dropping samples.
     uint32_t audiobuf_samples = ap->target_buffering + ap->sample_rate;
 
     size_t sample_size = ap->nb_channels * ap->out_bytes_per_sample;

app/src/util/audiobuf.c

@@ -37,10 +37,10 @@ sc_audiobuf_read(struct sc_audiobuf *buf, void *to_, uint32_t samples_count) {
     assert(samples_count);
 
     uint8_t *to = to_;
+    assert(to);
 
-    // Only the reader thread can write tail without synchronization, so
+    // The tail cursor may be updated by the writer thread to drop samples
-    // memory_order_relaxed is sufficient
+    uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_acquire);
-    uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_relaxed);
 
     // The head cursor is updated after the data is written to the array
     uint32_t head = atomic_load_explicit(&buf->head, memory_order_acquire);
@@ -50,21 +50,19 @@ sc_audiobuf_read(struct sc_audiobuf *buf, void *to_, uint32_t samples_count) {
         samples_count = can_read;
     }
 
-    if (to) {
+    uint32_t right_count = buf->alloc_size - tail;
-        uint32_t right_count = buf->alloc_size - tail;
+    if (right_count > samples_count) {
-        if (right_count > samples_count) {
+        right_count = samples_count;
-            right_count = samples_count;
+    }
-        }
+    memcpy(to,
-        memcpy(to,
+           buf->data + (tail * buf->sample_size),
-               buf->data + (tail * buf->sample_size),
+           right_count * buf->sample_size);
-               right_count * buf->sample_size);
 
-        if (samples_count > right_count) {
+    if (samples_count > right_count) {
-            uint32_t left_count = samples_count - right_count;
+        uint32_t left_count = samples_count - right_count;
-            memcpy(to + (right_count * buf->sample_size),
+        memcpy(to + (right_count * buf->sample_size),
-                   buf->data,
+               buf->data,
-                   left_count * buf->sample_size);
+               left_count * buf->sample_size);
-        }
     }
 
     uint32_t new_tail = (tail + samples_count) % buf->alloc_size;
@@ -110,3 +108,27 @@ sc_audiobuf_write(struct sc_audiobuf *buf, const void *from_,
 
     return samples_count;
 }
+
+uint32_t
+sc_audiobuf_truncate(struct sc_audiobuf *buf, uint32_t samples_limit) {
+    for (;;) {
+        // Only the writer thread can write head, so memory_order_relaxed is
+        // sufficient
+        uint32_t head = atomic_load_explicit(&buf->head, memory_order_relaxed);
+
+        // The tail cursor is updated after the data is consumed by the reader
+        uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_acquire);
+
+        uint32_t can_read = (buf->alloc_size + head - tail) % buf->alloc_size;
+        if (can_read <= samples_limit) {
+            // Nothing to truncate
+            return 0;
+        }
+
+        uint32_t skip = can_read - samples_limit;
+        uint32_t new_tail = (tail + skip) % buf->alloc_size;
+        if (atomic_compare_exchange_weak(&buf->tail, &tail, new_tail)) {
+            return skip;
+        }
+    }
+}

app/src/util/audiobuf.h

@@ -49,6 +49,16 @@ uint32_t
 sc_audiobuf_write(struct sc_audiobuf *buf, const void *from,
                   uint32_t samples_count);
 
+/**
+ * Drop old samples to keep at most sample_limit samples
+ *
+ * Must be called by the writer thread.
+ *
+ * \return the number of samples dropped
+ */
+uint32_t
+sc_audiobuf_truncate(struct sc_audiobuf *buf, uint32_t samples_limit);
+
 static inline uint32_t
 sc_audiobuf_capacity(struct sc_audiobuf *buf) {
     assert(buf->alloc_size);