Copy from pos

Author: Cuda-Chen

virtio-snd.c

@@ -547,6 +547,7 @@ static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
             "bps_rate %" PRIu32 " cnfa_period_bytes %" PRIu32
             " cnfa_period_frames %" PRIu32 "\n",
             bps_rate, cnfa_period_bytes, cnfa_period_frames);
+    uint32_t period_frames = period_bytes / VSND_CNFA_FRAME_SZ;
 
     /* The buffer size in frames when calling CNFAInit()
      * is actually period size (i.e., period size then divide
@@ -556,7 +557,7 @@ static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
         CNFAInit(NULL, "semu-virtio-snd", virtio_snd_cb, rate, 0, channels, 0,
                  cnfa_period_frames, NULL, NULL, &props->v);
     uint32_t sz = props->pp.buffer_bytes;
-    props->ring.buffer = (void *) malloc(sizeof(void) * sz);
+    props->ring.buffer = (void *) malloc(sizeof(*props->ring.buffer) * sz);
     props->ring.prod.head = 0;
     props->ring.prod.tail = 0;
     props->ring.cons.head = 0;
@@ -569,9 +570,10 @@ static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
     pthread_cond_init(&props->ring.readable, NULL);
     pthread_cond_init(&props->ring.writable, NULL);
     INIT_LIST_HEAD(&props->buf_queue_head);
-    props->immediate = (void *)malloc(sizeof(void) * cnfa_period_bytes);
+    props->immediate =
+        (void *) malloc(sizeof(*props->immediate) * cnfa_period_bytes);
 #if WRITEOUT
-    outfile = fopen("out_enque.bin", "wb");
+    outfile = fopen("out_deque.bin", "wb");
 #endif
 
     *plen = 0;
@@ -727,32 +729,34 @@ static void __virtio_snd_frame_dequeue(short *out,
     props->ring.cons.tail = cons_next;
 
     uint32_t written_bytes = 0;
-    memset(props->immediate, 0, sizeof(void) * n);
+    memset(props->immediate, 0, sizeof(*props->immediate) * n);
     while (!list_empty(&props->buf_queue_head) && written_bytes < n) {
         vsnd_buf_queue_node_t *node =
             list_first_entry(&props->buf_queue_head, vsnd_buf_queue_node_t, q);
         uint32_t left = n - written_bytes;
         uint32_t actual = node->len - node->pos;
-        uint32_t len = left < actual ? left : actual; /* Naive min implementation */
+        uint32_t len =
+            left < actual ? left : actual; /* Naive min implementation */
 
         fprintf(stderr,
-                "--- left %" PRIu32 " actual %" PRIu32 " len %" PRIu32 " written %" PRIu32 "\n",
-                left,
-                actual,
-                len,
-                written_bytes);
+                "--- left %" PRIu32 " actual %" PRIu32 " len %" PRIu32
+                " written %" PRIu32 " node->pos %" PRIu32 " node->len %" PRIu32
+                "\n",
+                left, actual, len, written_bytes, node->pos, node->len);
 
-        memcpy(
-                props->immediate + written_bytes,
-                node->addr,
-                len);
+        memcpy(props->immediate + written_bytes, node->addr + node->pos, len);
+
+#if WRITEOUT
+        fwrite(node->addr + node->pos, sizeof(void), len, outfile);
+#endif
 
         written_bytes += len;
         node->pos += len;
-        if(node->pos >= node->len)
+        if (node->pos >= node->len)
             list_del(&node->q);
     }
-    fprintf(stderr, "*** written %" PRIu32 " out n %" PRIu32 "\n", written_bytes, n);
+    fprintf(stderr, "*** written %" PRIu32 " out n %" PRIu32 "\n",
+            written_bytes, n);
     memcpy(out, props->immediate, n);
 
     props->ring.buf_ev_notity--;
@@ -956,9 +960,6 @@ static void __virtio_snd_frame_enqueue(void *payload,
     node->len = n;
     node->pos = 0;
     list_push(&node->q, &props->buf_queue_head);
-#if WRITEOUT
-    fwrite(node->addr, sizeof(void), node->len, outfile);
-#endif
 
     /*uint32_t period_bytes = props->pp.period_bytes;
     if (prod_next - cons_tail >= period_bytes) {