[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/26] usb-audio: do not count on avail bytes actuall
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 22/26] usb-audio: do not count on avail bytes actually available |
Date: |
Thu, 19 Sep 2019 10:36:25 +0200 |
From: Kővágó, Zoltán <address@hidden>
This assumption is no longer true when mixeng is turned off.
Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-audio.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index ae42e5a2f1d0..74c99b1f1204 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -319,30 +319,31 @@ static int streambuf_put(struct streambuf *buf, USBPacket
*p)
{
uint32_t free = buf->size - (buf->prod - buf->cons);
- if (!free) {
+ if (free < USBAUDIO_PACKET_SIZE) {
return 0;
}
if (p->iov.size != USBAUDIO_PACKET_SIZE) {
return 0;
}
- assert(free >= USBAUDIO_PACKET_SIZE);
+
usb_packet_copy(p, buf->data + (buf->prod % buf->size),
USBAUDIO_PACKET_SIZE);
buf->prod += USBAUDIO_PACKET_SIZE;
return USBAUDIO_PACKET_SIZE;
}
-static uint8_t *streambuf_get(struct streambuf *buf)
+static uint8_t *streambuf_get(struct streambuf *buf, size_t *len)
{
uint32_t used = buf->prod - buf->cons;
uint8_t *data;
if (!used) {
+ *len = 0;
return NULL;
}
- assert(used >= USBAUDIO_PACKET_SIZE);
data = buf->data + (buf->cons % buf->size);
- buf->cons += USBAUDIO_PACKET_SIZE;
+ *len = MIN(buf->prod - buf->cons,
+ buf->size - (buf->cons % buf->size));
return data;
}
@@ -374,16 +375,21 @@ static void output_callback(void *opaque, int avail)
USBAudioState *s = opaque;
uint8_t *data;
- for (;;) {
- if (avail < USBAUDIO_PACKET_SIZE) {
- return;
- }
- data = streambuf_get(&s->out.buf);
+ while (avail) {
+ size_t written, len;
+
+ data = streambuf_get(&s->out.buf, &len);
if (!data) {
return;
}
- AUD_write(s->out.voice, data, USBAUDIO_PACKET_SIZE);
- avail -= USBAUDIO_PACKET_SIZE;
+
+ written = AUD_write(s->out.voice, data, len);
+ avail -= written;
+ s->out.buf.cons += written;
+
+ if (written < len) {
+ return;
+ }
}
}
--
2.18.1
- [Qemu-devel] [PULL 00/26] Audio 20190919 patches, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 05/26] noaudio: port to the new audio backend api, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 08/26] sdlaudio: port to the new audio backend api, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 03/26] coreaudio: port to the new audio backend api, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 20/26] audio: basic support for multichannel audio, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 01/26] audio: api for mixeng code free backends, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 15/26] audio: add mixeng option (documentation), Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 17/26] paaudio: get/put_buffer functions, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 22/26] usb-audio: do not count on avail bytes actually available,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 11/26] audio: remove remains of the old backend api, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 18/26] audio: support more than two channels in volume setting, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 12/26] audio: unify input and output mixeng buffer management, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 02/26] alsaaudio: port to the new audio backend api, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 09/26] spiceaudio: port to the new audio backend api, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 16/26] audio: make mixeng optional, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 10/26] wavaudio: port to the new audio backend api, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 04/26] dsoundaudio: port to the new audio backend api, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 07/26] paaudio: port to the new audio backend api, Gerd Hoffmann, 2019/09/19
- [Qemu-devel] [PULL 25/26] audio: fix buffer-length typo in documentation, Gerd Hoffmann, 2019/09/19