Play Front_Center with repeating artifact

Author: Cuda-Chen

virtio-snd.c

@@ -272,6 +272,9 @@ typedef struct {
 #define VSND_RING_SZ_MASK 0x0FFFFFFFULL /* ring size mask */
 typedef struct {
     void *buffer;
+    pthread_cond_t readable, writable;
+    int buf_ev_notity;
+    pthread_mutex_t lock;
     struct prod {
         volatile uint32_t head; /* producer head */
         volatile uint32_t tail; /* producer tail */
@@ -298,9 +301,9 @@ typedef struct {
     // PCM frame ring buffer
     virtio_snd_ring_buffer_t ring;
 } virtio_snd_prop_t;
-#define VSND_COMPILER_BARRIER \
-    do {                      \
-        asm("" ::: "memory"); \
+#define VSND_COMPILER_BARRIER       \
+    do {                            \
+        asm("mfence" ::: "memory"); \
     } while (0)
 
 static virtio_snd_config_t vsnd_configs[VSND_DEV_CNT_MAX];
@@ -518,6 +521,9 @@ static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
     vsnd_props[stream_id].ring.cons.size = sz;
     vsnd_props[stream_id].ring.prod.mask = sz - 1;
     vsnd_props[stream_id].ring.cons.mask = sz - 1;
+    pthread_mutex_init(&vsnd_props[stream_id].ring.lock, NULL);
+    pthread_cond_init(&vsnd_props[stream_id].ring.readable, NULL);
+    pthread_cond_init(&vsnd_props[stream_id].ring.writable, NULL);
 
     *plen = 0;
     fprintf(stderr, "virtio_snd_read_pcm_prepare\n");
@@ -588,11 +594,15 @@ static void virtio_snd_read_pcm_release(const virtio_snd_pcm_hdr_t *query,
     }
 
     vsnd_props[stream_id].pp.hdr.hdr.code = VIRTIO_SND_R_PCM_RELEASE;
-    CNFAClose(vsnd_props[stream_id].audio_host);
-    fprintf(stderr, "pass CNFAclose\n");
 
     /* Tear down the PCM frames. */
     free(vsnd_props[stream_id].ring.buffer);
+    pthread_mutex_destroy(&vsnd_props[stream_id].ring.lock);
+    pthread_cond_destroy(&vsnd_props[stream_id].ring.readable);
+    pthread_cond_destroy(&vsnd_props[stream_id].ring.writable);
+
+    CNFAClose(vsnd_props[stream_id].audio_host);
+    fprintf(stderr, "pass CNFAclose\n");
 
     *plen = 0;
     fprintf(stderr, "virtio_snd_read_pcm_release\n");
@@ -610,6 +620,12 @@ static void __virtio_snd_frame_dequeue(short *out,
     uint32_t cons_next, entries;
     uint32_t mask = props->ring.cons.mask;
 
+    pthread_mutex_lock(&props->ring.lock);
+    while (props->ring.buf_ev_notity < 1) {
+        fprintf(stderr, "---wair in deque---\n");
+        pthread_cond_wait(&props->ring.readable, &props->ring.lock);
+    }
+
     cons_head = props->ring.cons.head;
     prod_tail = props->ring.prod.tail;
     /* The subtraction is done between two unsigned 32bits value
@@ -639,10 +655,16 @@ static void __virtio_snd_frame_dequeue(short *out,
     } else {
         memcpy(out, props->ring.buffer + idx, size - idx);
         memcpy(out + (size - idx), props->ring.buffer, n - (size - idx));
+        fprintf(stderr, "=== start %" PRIu32 " end %" PRIu32 "\n", size - idx,
+                n - (size - idx));
     }
     VSND_COMPILER_BARRIER;
 
     props->ring.cons.tail = cons_next;
+
+    props->ring.buf_ev_notity--;
+    pthread_cond_signal(&props->ring.writable);
+    pthread_mutex_unlock(&props->ring.lock);
 }
 static void virtio_snd_cb(struct CNFADriver *dev,
                           short *out,
@@ -656,7 +678,6 @@ static void virtio_snd_cb(struct CNFADriver *dev,
     uint32_t out_buf_sz = framesp * channels;
 
     pthread_mutex_lock(&virtio_snd_ctrl_mutex);
-
     while (v_ptr->guest_playing == 0) {
         fprintf(stderr, "wait ctrl cond\n");
         memset(out, 0, sizeof(*out) * out_buf_sz);
@@ -667,7 +688,8 @@ static void virtio_snd_cb(struct CNFADriver *dev,
     totalframesp += framesp;
 
     uint32_t id = v_ptr->stream_id;
-    fprintf(stderr, "start to play with out_buf_sz %" PRIu32 "\n", out_buf_sz);
+    // fprintf(stderr, "start to play with out_buf_sz %" PRIu32 "\n",
+    // out_buf_sz);
 
     /* TODO: add single consumer */
 #if 1
@@ -791,6 +813,12 @@ static void __virtio_snd_frame_enqueue(void *payload,
     virtio_snd_prop_t *props = &vsnd_props[stream_id];
     uint32_t mask = props->ring.prod.mask;
 
+    pthread_mutex_lock(&props->ring.lock);
+    while (props->ring.buf_ev_notity > 0) {
+        fprintf(stderr, "---wait for enque---\n");
+        pthread_cond_wait(&props->ring.writable, &props->ring.lock);
+    }
+
     prod_head = props->ring.prod.head;
     cons_tail = props->ring.cons.tail;
     /* The subtraction is done between two unsigned 32bits value
@@ -828,6 +856,10 @@ static void __virtio_snd_frame_enqueue(void *payload,
 
     /* Update prod_tail */
     props->ring.prod.tail = prod_next;
+
+    props->ring.buf_ev_notity++;
+    pthread_cond_signal(&props->ring.readable);
+    pthread_mutex_unlock(&props->ring.lock);
 }
 
 typedef struct {