qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Volker Rümelin" <vr_qemu@t-online.de>,
	"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PULL 1/9] audio: handle buf == NULL in put_buffer_out()
Date: Wed, 23 Sep 2020 11:09:53 +0200	[thread overview]
Message-ID: <20200923091001.20814-2-kraxel@redhat.com> (raw)
In-Reply-To: <20200923091001.20814-1-kraxel@redhat.com>

From: Volker Rümelin <vr_qemu@t-online.de>

With the next patch all audio backends put_buffer_out() functions
have to handle the buf == NULL case, provided the get_buffer_out()
function may return buf = NULL and size > 0.

It turns out that all audio backends get_buffer_out() functions
either can't return buf = NULL or return buf = NULL and size = 0
at the same time. The only exception is the spiceaudio backend
where size may be uninitialized.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20200920171729.15861-1-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 audio/spiceaudio.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index b6b5da4812f2..c8d81ba44290 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -135,6 +135,7 @@ static void *line_out_get_buffer(HWVoiceOut *hw, size_t *size)
             (out->fsize - out->fpos) * hw->info.bytes_per_frame);
     } else {
         audio_rate_start(&out->rate);
+        *size = LINE_OUT_SAMPLES << 2;
     }
     return out->frame + out->fpos;
 }
@@ -143,12 +144,14 @@ static size_t line_out_put_buffer(HWVoiceOut *hw, void *buf, size_t size)
 {
     SpiceVoiceOut *out = container_of(hw, SpiceVoiceOut, hw);
 
-    assert(buf == out->frame + out->fpos && out->fpos <= out->fsize);
-    out->fpos += size >> 2;
+    if (buf) {
+        assert(buf == out->frame + out->fpos && out->fpos <= out->fsize);
+        out->fpos += size >> 2;
 
-    if (out->fpos == out->fsize) { /* buffer full */
-        spice_server_playback_put_samples(&out->sin, out->frame);
-        out->frame = NULL;
+        if (out->fpos == out->fsize) { /* buffer full */
+            spice_server_playback_put_samples(&out->sin, out->frame);
+            out->frame = NULL;
+        }
     }
 
     return size;
-- 
2.27.0



  reply	other threads:[~2020-09-23  9:12 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-23  9:09 [PULL 0/9] Audio 20200923 patches Gerd Hoffmann
2020-09-23  9:09 ` Gerd Hoffmann [this message]
2020-09-23  9:09 ` [PULL 2/9] audio/audio: fix video playback slowdown with spiceaudio Gerd Hoffmann
2020-09-23  9:09 ` [PULL 3/9] audio/spiceaudio: always rate limit playback stream Gerd Hoffmann
2020-09-23  9:09 ` [PULL 4/9] audio: align audio_generic_read with audio_pcm_hw_run_in Gerd Hoffmann
2020-09-23  9:09 ` [PULL 5/9] audio: remove unnecessary calls to put_buffer_in Gerd Hoffmann
2020-09-23  9:09 ` [PULL 6/9] audio: align audio_generic_write with audio_pcm_hw_run_out Gerd Hoffmann
2020-09-23  9:09 ` [PULL 7/9] audio: run downstream playback queue unconditionally Gerd Hoffmann
2020-09-23  9:10 ` [PULL 8/9] audio: remove qemu_spice_audio_init() Gerd Hoffmann
2020-09-23  9:10 ` [PULL 9/9] audio: build spiceaudio as module Gerd Hoffmann
2020-09-24 17:48 ` [PULL 0/9] Audio 20200923 patches Peter Maydell

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=20200923091001.20814-2-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=vr_qemu@t-online.de \
    /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).