[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 09/10] usbaudio: change playback counters to 64 bit
From: |
Kővágó, Zoltán |
Subject: |
[PATCH v6 09/10] usbaudio: change playback counters to 64 bit |
Date: |
Sun, 13 Oct 2019 21:58:06 +0200 |
With stereo playback, they need about 375 minutes of continuous audio
playback to overflow, which is usually not a problem (as stopping and
later resuming playback resets the counters). But with 7.1 audio, they
only need about 95 minutes to overflow.
After the overflow, the buf->prod % USBAUDIO_PACKET_SIZE(channels)
assertion no longer holds true, which will result in overflowing the
buffer. With 64 bit variables, it would take about 762000 years to
overflow.
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
hw/usb/dev-audio.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index e42bdfbdc1..ea604bbb8e 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -578,9 +578,9 @@ static const USBDesc desc_audio_multi = {
struct streambuf {
uint8_t *data;
- uint32_t size;
- uint32_t prod;
- uint32_t cons;
+ size_t size;
+ uint64_t prod;
+ uint64_t cons;
};
static void streambuf_init(struct streambuf *buf, uint32_t size,
@@ -601,7 +601,7 @@ static void streambuf_fini(struct streambuf *buf)
static int streambuf_put(struct streambuf *buf, USBPacket *p, uint32_t
channels)
{
- uint32_t free = buf->size - (buf->prod - buf->cons);
+ int64_t free = buf->size - (buf->prod - buf->cons);
if (free < USBAUDIO_PACKET_SIZE(channels)) {
return 0;
@@ -610,6 +610,8 @@ static int streambuf_put(struct streambuf *buf, USBPacket
*p, uint32_t channels)
return 0;
}
+ /* can happen if prod overflows */
+ assert(buf->prod % USBAUDIO_PACKET_SIZE(channels) == 0);
usb_packet_copy(p, buf->data + (buf->prod % buf->size),
USBAUDIO_PACKET_SIZE(channels));
buf->prod += USBAUDIO_PACKET_SIZE(channels);
@@ -618,10 +620,10 @@ static int streambuf_put(struct streambuf *buf, USBPacket
*p, uint32_t channels)
static uint8_t *streambuf_get(struct streambuf *buf, size_t *len)
{
- uint32_t used = buf->prod - buf->cons;
+ int64_t used = buf->prod - buf->cons;
uint8_t *data;
- if (!used) {
+ if (used <= 0) {
*len = 0;
return NULL;
}
--
2.23.0
- [PATCH v6 00/10] Audio: Mixeng-free 5.1/7.1 audio support, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 02/10] audio: make mixeng optional, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 03/10] paaudio: get/put_buffer functions, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 01/10] audio: add mixing-engine option (documentation), Kővágó, Zoltán, 2019/10/13
- [PATCH v6 06/10] audio: basic support for multichannel audio, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 04/10] audio: support more than two channels in volume setting, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 07/10] usb-audio: do not count on avail bytes actually available, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 09/10] usbaudio: change playback counters to 64 bit,
Kővágó, Zoltán <=
- [PATCH v6 10/10] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 05/10] audio: replace shift in audio_pcm_info with bytes_per_frame, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 08/10] usb-audio: support more than two channels of audio, Kővágó, Zoltán, 2019/10/13