[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/6] paaudio: try to drain the recording stream
From: |
Gerd Hoffmann |
Subject: |
[PULL 4/6] paaudio: try to drain the recording stream |
Date: |
Mon, 6 Jan 2020 13:52:34 +0100 |
From: Volker RĂ¼melin <address@hidden>
There is no guarantee a single call to pa_stream_peek every
timer_period microseconds can read a recording stream faster
than the data gets produced at the source. Let qpa_read try to
drain the recording stream.
To reproduce the problem:
Start qemu with -audiodev pa,id=audio0,in.mixing-engine=off
On the host connect the qemu recording stream to the monitor of
a hardware output device. While the problem can also be seen
with a hardware input device, it's obvious with the monitor of
a hardware output device.
In the guest start audio recording with audacity and notice the
slow recording data rate.
Signed-off-by: Volker RĂ¼melin <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
audio/paaudio.c | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 7db1dc15f09e..b23274550e1c 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -156,34 +156,43 @@ static size_t qpa_read(HWVoiceIn *hw, void *data, size_t
length)
{
PAVoiceIn *p = (PAVoiceIn *) hw;
PAConnection *c = p->g->conn;
- size_t l;
- int r;
+ size_t total = 0;
pa_threaded_mainloop_lock(c->mainloop);
CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail,
"pa_threaded_mainloop_lock failed\n");
- if (!p->read_length) {
- r = pa_stream_peek(p->stream, &p->read_data, &p->read_length);
- CHECK_SUCCESS_GOTO(c, r == 0, unlock_and_fail,
- "pa_stream_peek failed\n");
- }
+ while (total < length) {
+ size_t l;
+ int r;
- l = MIN(p->read_length, length);
- memcpy(data, p->read_data, l);
+ if (!p->read_length) {
+ r = pa_stream_peek(p->stream, &p->read_data, &p->read_length);
+ CHECK_SUCCESS_GOTO(c, r == 0, unlock_and_fail,
+ "pa_stream_peek failed\n");
+ if (!p->read_length) {
+ /* buffer is empty */
+ break;
+ }
+ }
- p->read_data += l;
- p->read_length -= l;
+ l = MIN(p->read_length, length - total);
+ memcpy((char *)data + total, p->read_data, l);
- if (!p->read_length) {
- r = pa_stream_drop(p->stream);
- CHECK_SUCCESS_GOTO(c, r == 0, unlock_and_fail,
- "pa_stream_drop failed\n");
+ p->read_data += l;
+ p->read_length -= l;
+ total += l;
+
+ if (!p->read_length) {
+ r = pa_stream_drop(p->stream);
+ CHECK_SUCCESS_GOTO(c, r == 0, unlock_and_fail,
+ "pa_stream_drop failed\n");
+ }
}
pa_threaded_mainloop_unlock(c->mainloop);
- return l;
+ return total;
unlock_and_fail:
pa_threaded_mainloop_unlock(c->mainloop);
--
2.18.1
- [PULL 0/6] Audio 20200106 patches, Gerd Hoffmann, 2020/01/06
- [PULL 2/6] hda-codec: fix recording rate control, Gerd Hoffmann, 2020/01/06
- [PULL 4/6] paaudio: try to drain the recording stream,
Gerd Hoffmann <=
- [PULL 1/6] hda-codec: fix playback rate control, Gerd Hoffmann, 2020/01/06
- [PULL 5/6] paaudio: wait until the recording stream is ready, Gerd Hoffmann, 2020/01/06
- [PULL 6/6] audio: fix integer overflow, Gerd Hoffmann, 2020/01/06
- [PULL 3/6] paaudio: drop recording stream in qpa_fini_in, Gerd Hoffmann, 2020/01/06
- Re: [PULL 0/6] Audio 20200106 patches, Peter Maydell, 2020/01/06