ALSA: snd-usb-caiaq: fix reported elapsed periods
Reset the internal period position counter upon stream startup. This fixes initial aplay underruns and problems related to latency picky applications such as pulseaudio. Bumped the version number to 1.3.14. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
936e7d0339
Коммит
a9b487fa1e
|
@ -195,11 +195,14 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
|
||||||
|
|
||||||
debug("%s(%p)\n", __func__, substream);
|
debug("%s(%p)\n", __func__, substream);
|
||||||
|
|
||||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||||
|
dev->period_out_count[index] = BYTES_PER_SAMPLE + 1;
|
||||||
dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1;
|
dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1;
|
||||||
else
|
} else {
|
||||||
|
dev->period_in_count[index] = BYTES_PER_SAMPLE;
|
||||||
dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE;
|
dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE;
|
||||||
|
}
|
||||||
|
|
||||||
if (dev->streaming)
|
if (dev->streaming)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -300,8 +303,7 @@ static void check_for_elapsed_periods(struct snd_usb_caiaqdev *dev,
|
||||||
if (!sub)
|
if (!sub)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
pb = frames_to_bytes(sub->runtime,
|
pb = snd_pcm_lib_period_bytes(sub);
|
||||||
sub->runtime->period_size);
|
|
||||||
cnt = (sub->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
|
cnt = (sub->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
|
||||||
&dev->period_out_count[stream] :
|
&dev->period_out_count[stream] :
|
||||||
&dev->period_in_count[stream];
|
&dev->period_in_count[stream];
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
|
||||||
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
|
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
|
||||||
MODULE_DESCRIPTION("caiaq USB audio, version 1.3.13");
|
MODULE_DESCRIPTION("caiaq USB audio, version 1.3.14");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
|
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
|
||||||
"{Native Instruments, RigKontrol3},"
|
"{Native Instruments, RigKontrol3},"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче