From owner-p4-projects@FreeBSD.ORG  Tue Nov 25 15:17:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 093311065676; Tue, 25 Nov 2008 15:17:57 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0F1E1065670
	for <perforce@FreeBSD.org>; Tue, 25 Nov 2008 15:17:56 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B5D7A8FC13
	for <perforce@FreeBSD.org>; Tue, 25 Nov 2008 15:17:56 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPFHuCg066917
	for <perforce@FreeBSD.org>; Tue, 25 Nov 2008 15:17:56 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPFHucA066915
	for perforce@freebsd.org; Tue, 25 Nov 2008 15:17:56 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 25 Nov 2008 15:17:56 GMT
Message-Id: <200811251517.mAPFHucA066915@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 153528 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Nov 2008 15:17:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=153528

Change 153528 by hselasky@hselasky_laptop001 on 2008/11/25 15:16:56

	
	Make sure that the blocksize is a factor of the number of bytes
	we insert per isochronous frame.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#18 (text+ko) ====

@@ -1067,6 +1067,10 @@
 					sample_size = ((chan->p_asf1d->bNrChannels *
 					    chan->p_asf1d->bBitResolution) / 8);
 
+					/*
+					 * NOTE: "chan->bytes_per_frame"
+					 * should not be zero!
+					 */
 					chan->bytes_per_frame = ((rate / fps) * sample_size);
 
 					if (sc->sc_sndstat_valid) {
@@ -1432,6 +1436,16 @@
 
 	RANGE(blocksize, 128, max / 2);
 
+	/*
+	 * Make sure that the blocksize is a factor of the number of bytes
+	 * we insert per isochronous frame.
+	 */
+	blocksize += (ch->bytes_per_frame - blocksize) % ch->bytes_per_frame;
+	if (blocksize > (max / 2)) {
+		/* should not happen */
+		DPRINTFN(0, "blocksize overflow!\n");
+		blocksize = (max / 2);
+	}
 	blockcount = max / blocksize;
 	RANGE(blockcount, 2, 512);