svn commit: r249830 - head/sys/dev/sound/usb

[Hans Petter Selasky]

Author: hselasky
Date: Wed Apr 24 06:05:33 2013
New Revision: 249830
URL: http://svnweb.freebsd.org/changeset/base/249830

Log:
  Fix playback for Focusrite Scarlett 2i2 USB recording interface.
  
  Submitted by:	Ed Maste, emaste @

Modified:
  head/sys/dev/sound/usb/uaudio.c

Modified: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c	Wed Apr 24 04:21:23 2013	(r249829)
+++ head/sys/dev/sound/usb/uaudio.c	Wed Apr 24 06:05:33 2013	(r249830)
@@ -1645,6 +1645,10 @@ uaudio_chan_fill_info_sub(struct uaudio_
 			bBitResolution = asf1d.v2->bBitResolution;
 			bSubslotSize = asf1d.v2->bSubslotSize;
 
+			/* Map 4-byte aligned 24-bit samples into 32-bit */
+			if (bBitResolution == 24 && bSubslotSize == 4)
+				bBitResolution = 32;
+
 			if (bBitResolution != (bSubslotSize * 8)) {
 				DPRINTF("Invalid bSubslotSize\n");
 				goto next_ep;