qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Volker Rümelin" <vr_qemu@t-online.de>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel <qemu-devel@nongnu.org>,
	"Zoltán Kővágó" <dirty.ice.hu@gmail.com>
Subject: [PATCH 4/9] audio: align audio_generic_read with audio_pcm_hw_run_in
Date: Sun, 20 Sep 2020 19:17:24 +0200	[thread overview]
Message-ID: <20200920171729.15861-4-vr_qemu@t-online.de> (raw)
In-Reply-To: <84f1c61a-8399-c75e-96c2-febfc2dd5fab@t-online.de>

The function audio_generic_read should work exactly like
audio_pcm_hw_run_in. It's a very similar function working
on a different buffer.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
 audio/audio.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c
index ba52259050..f1f0d72389 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1495,12 +1495,23 @@ size_t audio_generic_write(HWVoiceOut *hw, void *buf, size_t size)
 
 size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size)
 {
-    void *src = hw->pcm_ops->get_buffer_in(hw, &size);
+    size_t total = 0;
 
-    memcpy(buf, src, size);
-    hw->pcm_ops->put_buffer_in(hw, src, size);
+    while (total < size) {
+        size_t src_size = size - total;
+        void *src = hw->pcm_ops->get_buffer_in(hw, &src_size);
 
-    return size;
+        if (src_size == 0) {
+            hw->pcm_ops->put_buffer_in(hw, src, src_size);
+            break;
+        }
+
+        memcpy((char *)buf + total, src, src_size);
+        hw->pcm_ops->put_buffer_in(hw, src, src_size);
+        total += src_size;
+    }
+
+    return total;
 }
 
 static int audio_driver_init(AudioState *s, struct audio_driver *drv,
-- 
2.26.2



  parent reply	other threads:[~2020-09-20 17:23 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-20 17:14 [PATCH 0/9] Audio fixes and improvements Volker Rümelin
2020-09-20 17:17 ` [PATCH 1/9] audio: handle buf == NULL in put_buffer_out() Volker Rümelin
2020-09-20 17:17 ` [PATCH 2/9] audio/audio: fix video playback slowdown with spiceaudio Volker Rümelin
2020-09-20 17:17 ` [PATCH 3/9] audio/spiceaudio: always rate limit playback stream Volker Rümelin
2020-09-20 17:17 ` Volker Rümelin [this message]
2020-09-20 17:17 ` [PATCH 5/9] audio: remove unnecessary calls to put_buffer_in Volker Rümelin
2020-09-20 17:17 ` [PATCH 6/9] audio: align audio_generic_write with audio_pcm_hw_run_out Volker Rümelin
2020-09-20 17:17 ` [PATCH 7/9] audio: run downstream playback queue unconditionally Volker Rümelin
2020-09-20 17:17 ` [PATCH 8/9] audio: restore mixing-engine playback buffer size Volker Rümelin
2020-09-23  6:36   ` Gerd Hoffmann
2020-09-24 17:42     ` Volker Rümelin
2020-09-20 17:17 ` [PATCH 9/9] audio: revert tests for pcm_ops table Volker Rümelin
2020-09-23  9:07 ` [PATCH 0/9] Audio fixes and improvements Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200920171729.15861-4-vr_qemu@t-online.de \
    --to=vr_qemu@t-online.de \
    --cc=dirty.ice.hu@gmail.com \
    --cc=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).