![Alan Stern](/assets/img/avatar_default.png)
This patch changes the way URBs are allocated and their sizes are determined for PCM playback in the snd-usb-audio driver. Currently the driver allocates too few URBs for endpoints that don't use implicit sync, making underruns more likely to occur. This may be a holdover from before I/O delays could be measured accurately; in any case, it is no longer necessary. The patch allocates as many URBs as possible, subject to four limitations: The total number of URBs for the endpoint is not allowed to exceed MAX_URBS (which the patch increases from 8 to 12). The total number of packets per URB is not allowed to exceed MAX_PACKS (or MAX_PACKS_HS for high-speed devices), which is decreased from 20 to 6. The total duration of queued data is not allowed to exceed MAX_QUEUE, which is decreased from 24 ms to 18 ms. The total number of ALSA frames in the output queue is not allowed to exceed the ALSA buffer size. The last requirement is the hardest to implement. Currently the number of URBs needed to fill a buffer cannot be determined in advance, because a buffer contains a fixed number of frames whereas the number of frames in an URB varies to match shifts in the device's clock rate. To solve this problem, the patch changes the logic for deciding how many packets an URB should contain. Rather than using as many as possible without exceeding an ALSA period boundary, now the driver uses only as many packets as needed to transfer a predetermined number of frames. As a result, unless the device's clock has an exceedingly variable rate, the number of URBs making up each period (and hence each buffer) will remain constant. The overall effect of the patch is that playback works better in low-latency settings. The user can still specify values for frames/period and periods/buffer that exceed the capabilities of the hardware, of course. But for values that are within those capabilities, the performance will be improved. For example, testing shows that a high-speed device can handle 32 frames/period and 3 periods/buffer at 48 KHz, whereas the current driver starts to get glitchy at 64 frames/period and 2 periods/buffer. A side effect of these changes is that the "nrpacks" module parameter is no longer used. The patch removes it. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> CC: Clemens Ladisch <clemens@ladisch.de> Tested-by: Daniel Mack <zonque@gmail.com> Tested-by: Eldad Zack <eldad@fogrefinery.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
109 lines
2.9 KiB
C
109 lines
2.9 KiB
C
#ifndef __USBAUDIO_H
|
|
#define __USBAUDIO_H
|
|
/*
|
|
* (Tentative) USB Audio Driver for ALSA
|
|
*
|
|
* Copyright (c) 2002 by Takashi Iwai <tiwai@suse.de>
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
/* handling of USB vendor/product ID pairs as 32-bit numbers */
|
|
#define USB_ID(vendor, product) (((vendor) << 16) | (product))
|
|
#define USB_ID_VENDOR(id) ((id) >> 16)
|
|
#define USB_ID_PRODUCT(id) ((u16)(id))
|
|
|
|
/*
|
|
*
|
|
*/
|
|
|
|
struct snd_usb_audio {
|
|
int index;
|
|
struct usb_device *dev;
|
|
struct snd_card *card;
|
|
struct usb_interface *pm_intf;
|
|
u32 usb_id;
|
|
struct mutex mutex;
|
|
struct rw_semaphore shutdown_rwsem;
|
|
unsigned int shutdown:1;
|
|
unsigned int probing:1;
|
|
unsigned int autosuspended:1;
|
|
unsigned int txfr_quirk:1; /* Subframe boundaries on transfers */
|
|
|
|
int num_interfaces;
|
|
int num_suspended_intf;
|
|
|
|
struct list_head pcm_list; /* list of pcm streams */
|
|
struct list_head ep_list; /* list of audio-related endpoints */
|
|
int pcm_devs;
|
|
|
|
struct list_head midi_list; /* list of midi interfaces */
|
|
|
|
struct list_head mixer_list; /* list of mixer interfaces */
|
|
|
|
int setup; /* from the 'device_setup' module param */
|
|
bool autoclock; /* from the 'autoclock' module param */
|
|
|
|
struct usb_host_interface *ctrl_intf; /* the audio control interface */
|
|
};
|
|
|
|
/*
|
|
* Information about devices with broken descriptors
|
|
*/
|
|
|
|
/* special values for .ifnum */
|
|
#define QUIRK_NO_INTERFACE -2
|
|
#define QUIRK_ANY_INTERFACE -1
|
|
|
|
enum quirk_type {
|
|
QUIRK_IGNORE_INTERFACE,
|
|
QUIRK_COMPOSITE,
|
|
QUIRK_AUTODETECT,
|
|
QUIRK_MIDI_STANDARD_INTERFACE,
|
|
QUIRK_MIDI_FIXED_ENDPOINT,
|
|
QUIRK_MIDI_YAMAHA,
|
|
QUIRK_MIDI_ROLAND,
|
|
QUIRK_MIDI_MIDIMAN,
|
|
QUIRK_MIDI_NOVATION,
|
|
QUIRK_MIDI_RAW_BYTES,
|
|
QUIRK_MIDI_EMAGIC,
|
|
QUIRK_MIDI_CME,
|
|
QUIRK_MIDI_AKAI,
|
|
QUIRK_MIDI_US122L,
|
|
QUIRK_MIDI_FTDI,
|
|
QUIRK_AUDIO_STANDARD_INTERFACE,
|
|
QUIRK_AUDIO_FIXED_ENDPOINT,
|
|
QUIRK_AUDIO_EDIROL_UAXX,
|
|
QUIRK_AUDIO_ALIGN_TRANSFER,
|
|
QUIRK_AUDIO_STANDARD_MIXER,
|
|
|
|
QUIRK_TYPE_COUNT
|
|
};
|
|
|
|
struct snd_usb_audio_quirk {
|
|
const char *vendor_name;
|
|
const char *product_name;
|
|
int16_t ifnum;
|
|
uint16_t type;
|
|
const void *data;
|
|
};
|
|
|
|
#define combine_word(s) ((*(s)) | ((unsigned int)(s)[1] << 8))
|
|
#define combine_triple(s) (combine_word(s) | ((unsigned int)(s)[2] << 16))
|
|
#define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24))
|
|
|
|
#endif /* __USBAUDIO_H */
|