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 <qemu-devel@nongnu.org>, "Zoltán Kővágó" <dirty.ice.hu@gmail.com>
Subject: [PATCH 05/23] sdlaudio: always clear the sample buffer
Date: Sun, 10 Jan 2021 11:02:21 +0100	[thread overview]
Message-ID: <20210110100239.27588-5-vr_qemu@t-online.de> (raw)
In-Reply-To: <9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de>

Always fill the remaining audio callback buffer with silence.
SDL 2.0 doesn't initialize the audio callback buffer. This was
an incompatible change compared to SDL 1.2. For reference read
the SDL 1.2 to 2.0 migration guide.

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

diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 68126a99ab..79eed23849 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -211,27 +211,26 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len)
     SDLAudioState *s = &glob_sdl;
     HWVoiceOut *hw = &sdl->hw;
 
-    if (s->exit) {
-        return;
-    }
+    if (!s->exit) {
 
-    /* dolog("callback: len=%d avail=%zu\n", len, hw->pending_emul); */
+        /* dolog("callback: len=%d avail=%zu\n", len, hw->pending_emul); */
 
-    while (hw->pending_emul && len) {
-        size_t write_len;
-        ssize_t start = ((ssize_t) hw->pos_emul) - hw->pending_emul;
-        if (start < 0) {
-            start += hw->size_emul;
-        }
-        assert(start >= 0 && start < hw->size_emul);
+        while (hw->pending_emul && len) {
+            size_t write_len;
+            ssize_t start = (ssize_t)hw->pos_emul - hw->pending_emul;
+            if (start < 0) {
+                start += hw->size_emul;
+            }
+            assert(start >= 0 && start < hw->size_emul);
 
-        write_len = MIN(MIN(hw->pending_emul, len),
-                        hw->size_emul - start);
+            write_len = MIN(MIN(hw->pending_emul, len),
+                            hw->size_emul - start);
 
-        memcpy(buf, hw->buf_emul + start, write_len);
-        hw->pending_emul -= write_len;
-        len -= write_len;
-        buf += write_len;
+            memcpy(buf, hw->buf_emul + start, write_len);
+            hw->pending_emul -= write_len;
+            len -= write_len;
+            buf += write_len;
+        }
     }
 
     /* clear remaining buffer that we couldn't fill with data */
-- 
2.26.2



  parent reply	other threads:[~2021-01-10 10:08 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-10 10:01 [PATCH 00/23] next round of audio patches Volker Rümelin
2021-01-10 10:02 ` [PATCH 01/23] sdlaudio: remove leftover SDL1.2 code Volker Rümelin
2021-01-14 15:28   ` Thomas Huth
2021-01-10 10:02 ` [PATCH 02/23] audio: fix bit-rotted code Volker Rümelin
2021-01-14 14:32   ` Gerd Hoffmann
2021-01-31 17:13     ` Volker Rümelin
2021-01-10 10:02 ` [PATCH 03/23] sdlaudio: add -audiodev sdl,out.buffer-count option Volker Rümelin
2021-01-14 14:27   ` [PATCH 03/23] sdlaudio: add -audiodev sdl, out.buffer-count option Gerd Hoffmann
2021-01-31 17:30     ` Volker Rümelin
2021-01-15  8:39   ` Markus Armbruster
2021-01-10 10:02 ` [PATCH 04/23] sdlaudio: don't start playback in init routine Volker Rümelin
2021-01-15  6:28   ` Thomas Huth
2021-01-10 10:02 ` Volker Rümelin [this message]
2021-01-15  6:31   ` [PATCH 05/23] sdlaudio: always clear the sample buffer Thomas Huth
2021-01-10 10:02 ` [PATCH 06/23] sdlaudio: fill remaining sample buffer with silence Volker Rümelin
2021-01-14 16:58   ` Thomas Huth
2021-01-17  9:41     ` Volker Rümelin
2021-01-10 10:02 ` [PATCH 07/23] sdlaudio: replace legacy functions with modern ones Volker Rümelin
2021-01-15  7:04   ` Thomas Huth
2021-01-10 10:02 ` [PATCH 08/23] audio: split pcm_ops function get_buffer_in Volker Rümelin
2021-01-10 10:02 ` [PATCH 09/23] sdlaudio: add recording functions Volker Rümelin
2021-01-10 10:02 ` [PATCH 10/23] audio: break generic buffer dependency on mixing-engine Volker Rümelin
2021-01-10 10:02 ` [PATCH 11/23] sdlaudio: enable (in|out).mixing-engine=off Volker Rümelin
2021-01-10 10:02 ` [PATCH 12/23] audio: remove remaining unused plive code Volker Rümelin
2021-01-10 10:02 ` [PATCH 13/23] paaudio: avoid to clip samples multiple times Volker Rümelin
2021-01-10 10:02 ` [PATCH 14/23] paaudio: wait for PA_STREAM_READY in qpa_write() Volker Rümelin
2021-01-10 10:02 ` [PATCH 15/23] paaudio: wait until the playback stream is ready Volker Rümelin
2021-01-10 10:02 ` [PATCH 16/23] paaudio: remove unneeded code Volker Rümelin
2021-01-10 10:02 ` [PATCH 17/23] paaudio: comment bugs in functions qpa_init_* Volker Rümelin
2021-01-10 10:02 ` [PATCH 18/23] paaudio: limit minreq to 75% of audio timer_rate Volker Rümelin
2021-01-10 10:02 ` [PATCH 19/23] paaudio: send recorded data in smaller chunks Volker Rümelin
2021-01-10 10:02 ` [PATCH 20/23] dsoundaudio: replace GetForegroundWindow() Volker Rümelin
2021-01-10 10:02 ` [PATCH 21/23] dsoundaudio: rename dsound_open() Volker Rümelin
2021-01-10 10:02 ` [PATCH 22/23] dsoundaudio: enable f32 audio sample format Volker Rümelin
2021-01-10 10:02 ` [PATCH 23/23] dsoundaudio: fix log message Volker Rümelin
2021-01-10 10:24 ` [PATCH 00/23] next round of audio patches no-reply
2021-01-10 23:09   ` Volker Rümelin
2021-01-14 14:36 ` 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=20210110100239.27588-5-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).