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>,
	"Markus Armbruster" <armbru@redhat.com>
Subject: [PULL 14/30] paaudio: wait for PA_STREAM_READY in qpa_write()
Date: Fri, 15 Jan 2021 14:21:30 +0100	[thread overview]
Message-ID: <20210115132146.1443592-15-kraxel@redhat.com> (raw)
In-Reply-To: <20210115132146.1443592-1-kraxel@redhat.com>

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

Don't call pa_stream_writable_size() in qpa_write() before the
playback stream is ready. This prevents a lot of the following
pulseaudio error messages.

pulseaudio: pa_stream_writable_size failed
pulseaudio: Reason: Bad state

To reproduce start qemu with
-parallel none -device gus,audiodev=audio0
-audiodev pa,id=audio0,out.mixing-engine=off

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de
Message-Id: <20210110100239.27588-14-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 audio/paaudio.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/audio/paaudio.c b/audio/paaudio.c
index 229bcfcae838..1a7252b16d6d 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -269,6 +269,11 @@ static size_t qpa_write(HWVoiceOut *hw, void *data, size_t length)
 
     CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail,
                     "pa_threaded_mainloop_lock failed\n");
+    if (pa_stream_get_state(p->stream) != PA_STREAM_READY) {
+        /* wait for stream to become ready */
+        l = 0;
+        goto unlock;
+    }
 
     l = pa_stream_writable_size(p->stream);
 
@@ -282,6 +287,7 @@ static size_t qpa_write(HWVoiceOut *hw, void *data, size_t length)
     r = pa_stream_write(p->stream, data, l, NULL, 0LL, PA_SEEK_RELATIVE);
     CHECK_SUCCESS_GOTO(c, r >= 0, unlock_and_fail, "pa_stream_write failed\n");
 
+unlock:
     pa_threaded_mainloop_unlock(c->mainloop);
     return l;
 
-- 
2.29.2



  parent reply	other threads:[~2021-01-15 14:07 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-15 13:21 [PULL 00/30] Audio 20210115 patches Gerd Hoffmann
2021-01-15 13:21 ` [PULL 01/30] sdlaudio: remove leftover SDL1.2 code Gerd Hoffmann
2021-01-15 13:21 ` [PULL 02/30] audio: fix bit-rotted code Gerd Hoffmann
2021-01-15 13:21 ` [PULL 03/30] sdlaudio: add -audiodev sdl,out.buffer-count option Gerd Hoffmann
2021-01-15 13:21 ` [PULL 04/30] sdlaudio: don't start playback in init routine Gerd Hoffmann
2021-01-15 13:21 ` [PULL 05/30] sdlaudio: always clear the sample buffer Gerd Hoffmann
2021-01-15 13:21 ` [PULL 06/30] sdlaudio: fill remaining sample buffer with silence Gerd Hoffmann
2021-01-15 13:21 ` [PULL 07/30] sdlaudio: replace legacy functions with modern ones Gerd Hoffmann
2021-01-15 13:21 ` [PULL 08/30] audio: split pcm_ops function get_buffer_in Gerd Hoffmann
2021-01-15 13:21 ` [PULL 09/30] sdlaudio: add recording functions Gerd Hoffmann
2021-01-15 13:21 ` [PULL 10/30] audio: break generic buffer dependency on mixing-engine Gerd Hoffmann
2021-01-15 13:21 ` [PULL 11/30] sdlaudio: enable (in|out).mixing-engine=off Gerd Hoffmann
2021-01-15 13:21 ` [PULL 12/30] audio: remove remaining unused plive code Gerd Hoffmann
2021-01-15 13:21 ` [PULL 13/30] paaudio: avoid to clip samples multiple times Gerd Hoffmann
2021-01-15 13:21 ` Gerd Hoffmann [this message]
2021-01-15 13:21 ` [PULL 15/30] paaudio: wait until the playback stream is ready Gerd Hoffmann
2021-01-15 13:21 ` [PULL 16/30] paaudio: remove unneeded code Gerd Hoffmann
2021-01-15 13:21 ` [PULL 17/30] paaudio: comment bugs in functions qpa_init_* Gerd Hoffmann
2021-01-15 13:21 ` [PULL 18/30] paaudio: limit minreq to 75% of audio timer_rate Gerd Hoffmann
2021-01-15 13:21 ` [PULL 19/30] paaudio: send recorded data in smaller chunks Gerd Hoffmann
2021-01-15 13:21 ` [PULL 20/30] dsoundaudio: replace GetForegroundWindow() Gerd Hoffmann
2021-01-15 13:21 ` [PULL 21/30] dsoundaudio: rename dsound_open() Gerd Hoffmann
2021-01-15 13:21 ` [PULL 22/30] dsoundaudio: enable f32 audio sample format Gerd Hoffmann
2021-01-15 13:21 ` [PULL 23/30] dsoundaudio: fix log message Gerd Hoffmann
2021-01-15 13:21 ` [PULL 24/30] audio: Add braces for statements/fix braces' position Gerd Hoffmann
2021-01-15 13:21 ` [PULL 25/30] audio: Add spaces around operator/delete redundant spaces Gerd Hoffmann
2021-01-15 13:21 ` [PULL 26/30] audio: foo* bar" should be "foo *bar" Gerd Hoffmann
2021-01-15 13:21 ` [PULL 27/30] audio: Fix lines over 90 characters Gerd Hoffmann
2021-01-15 13:21 ` [PULL 28/30] audio: Don't use '%#' in format strings Gerd Hoffmann
2021-01-15 13:21 ` [PULL 29/30] audio: Suspect code indent for conditional statements Gerd Hoffmann
2021-01-15 13:21 ` [PULL 30/30] audio: space prohibited between function name and parenthesis'(' Gerd Hoffmann
2021-01-15 14:24 ` [PULL 00/30] Audio 20210115 patches no-reply
2021-01-16 12:56 ` 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=20210115132146.1443592-15-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=armbru@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).