From patchwork Thu Jan 14 13:46:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 567468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 464591402E2 for ; Fri, 15 Jan 2016 01:05:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=gyouXaF/; dkim-atps=neutral Received: from localhost ([::1]:42690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiWm-0005of-4P for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2016 09:05:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEk-0001wR-HJ for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJiEj-0003cA-Is for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:50 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35759) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEj-0003bl-CY for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:49 -0500 Received: by mail-wm0-x244.google.com with SMTP id f206so43696675wmf.2 for ; Thu, 14 Jan 2016 05:46:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=X7pTD/Y8vHHFxH8KFJLRFJtzY8gkTxmm4cWvmeBPvPQ=; b=gyouXaF/JXdjQeXUB1bF/xm090Vt8WeaqucE++HvJshW/OhmdXKVQI/DRi2VoqQIW7 lmA7sm5L5AcnjJ40ffDUNXUt0Xg1mtNXyudzsBTjpG7ONAG4DhOZKztRb2OEJhcGx0Dl WQw7uTI87jvO6ORU8fsAqPtFTPXOcg3VGCO9nbx/d2WkJwu8a8q2GzjQ4o8isHcBLJpl 7i20Xih580w7j39CeZswpVFkeV3mP+I1oW5WrDVvskdPiD8h2EUCjuajih0Imqxsh43G j70CVwAzmaLgPOYNgvfKjymmv+mg2PEKXHXqujXI5QFQJEXTrqwl1ofLxywOmKSwPvvF EK6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=X7pTD/Y8vHHFxH8KFJLRFJtzY8gkTxmm4cWvmeBPvPQ=; b=jF6VSrn3SAzHvzdbdfMYXcJ8kjf6G54F6xIDOk3p/0YptjjTyJK3MaqAZ5tcpGT4GA 0AIdFgdjGalMAVyovf8aTXG79OPCL6P4BCTUWJQ5qMSNVlBwQei9N9dk9FQ8s/8pYM5T fb/7JDk1Yft+Wpgpj1yq976568cXCAP5aaWaVTJM0Rn2ZA0bR3oEF+GM09LmzY6xN99L BUHuZ+xxyrIO7TXQQgC30WVjdE3RCYWj8NgX2c09z9+4FIvW11poboUVnpRMXR+oEYte 0Z+Th3AW6y3iQPeelgNQuELcHEjv2QikNak28TPH23qc7qPsMhC8jUUrRG1hCknKMvL6 o0TA== X-Gm-Message-State: ALoCoQnVTRL82iXWFUUjaao1dmtrbdynslAtZmrrqM/ppBmQGPI1aeBBDHVJ99q1bdX3wphE9Fpwb5K1AtvkdrdbmA9meO2Sog== X-Received: by 10.28.15.210 with SMTP id 201mr30259465wmp.79.1452779208753; Thu, 14 Jan 2016 05:46:48 -0800 (PST) Received: from nullptr.home.dirty-ice.org (188-143-126-18.pool.digikabel.hu. [188.143.126.18]) by smtp.gmail.com with ESMTPSA id 79sm7398061wmo.7.2016.01.14.05.46.48 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 05:46:48 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2016 14:46:02 +0100 Message-Id: <9d2b319fe44c79c0456de4efe5287be707758557.1452776884.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 49/51] usb-audio: do not count on avail bytes actually available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This assumption is no longer true when mixeng is turned off. Signed-off-by: Kővágó, Zoltán --- 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 deb9032..8db4a57 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -317,27 +317,28 @@ 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; } - 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; } @@ -369,16 +370,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; + } } }