From: Jaechul Lee <jcsing.lee@samsung.com>
Date: Wed, 8 Sep 2021 04:49:32 +0000 (+0900)
Subject: tizenaudio-sink2/source2: Fix frames_to_write calculation
X-Git-Tag: submit/tizen/20210924.075945~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a9800395039ec6f9f11ddac6d2e8d9dfaad8307;p=platform%2Fcore%2Fmultimedia%2Fpulseaudio-modules-tizen.git

tizenaudio-sink2/source2: Fix frames_to_write calculation

[Version] 13.0.74
[Issue Type] Bug fix

Change-Id: Ida9fcab0c380fc71125f64dc90d8a186840f40ae
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
---

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 2092eeb..39724b8 100644
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          13.0.73
+Version:          13.0.74
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
diff --git a/src/module-tizenaudio-sink.c b/src/module-tizenaudio-sink.c
index 62a12d5..de01053 100644
--- a/src/module-tizenaudio-sink.c
+++ b/src/module-tizenaudio-sink.c
@@ -430,7 +430,7 @@ static int process_render(struct userdata *u, pa_usec_t now) {
             /* Write pcm every 10ms */
             frames_to_write = pa_usec_to_bytes((10 * PA_USEC_PER_MSEC), &u->sink->sample_spec) / frame_size;
 #else
-            frames_to_write = (u->frag_size / u->nfrags);
+            frames_to_write = u->frag_size / frame_size;
 #endif
             if (frames_to_write > avail)
                 break;
diff --git a/src/module-tizenaudio-sink2.c b/src/module-tizenaudio-sink2.c
index e4e61e9..fe064fb 100644
--- a/src/module-tizenaudio-sink2.c
+++ b/src/module-tizenaudio-sink2.c
@@ -312,7 +312,7 @@ do_nothing:
 static int process_render(struct userdata *u) {
     void *p;
     size_t frame_size = pa_frame_size(&u->sink->sample_spec);
-    size_t frames_to_write = u->frag_size / u->nfrags;
+    size_t frames_to_write = u->frag_size / frame_size;
     uint32_t avail = 0;
     pa_memchunk chunk;
 
@@ -324,7 +324,7 @@ static int process_render(struct userdata *u) {
         return 0;
     }
 
-    pa_sink_render_full(u->sink, frames_to_write * frame_size, &chunk);
+    pa_sink_render_full(u->sink, u->frag_size, &chunk);
     p = pa_memblock_acquire(chunk.memblock);
 
     if (pa_hal_interface_pcm_write(u->hal_interface, u->pcm_handle, (const char*)p + chunk.index, (uint32_t)frames_to_write)) {
diff --git a/src/module-tizenaudio-source2.c b/src/module-tizenaudio-source2.c
index 333bdbb..55bc60a 100644
--- a/src/module-tizenaudio-source2.c
+++ b/src/module-tizenaudio-source2.c
@@ -275,7 +275,7 @@ static int source_process_msg(
 static int process_render(struct userdata *u) {
     void *p;
     size_t frame_size = pa_frame_size(&u->source->sample_spec);
-    size_t frames_to_read = u->frag_size / u->nfrags;
+    size_t frames_to_read = u->frag_size / frame_size;
     uint32_t avail = 0;
     pa_memchunk chunk;
 
@@ -289,7 +289,7 @@ static int process_render(struct userdata *u) {
         return 0;
     }
 
-    chunk.length = frames_to_read * frame_size;
+    chunk.length = u->frag_size;
     chunk.memblock = pa_memblock_new(u->core->mempool, chunk.length);
 
     p = pa_memblock_acquire(chunk.memblock);