lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] pcm-oss - Add bugg-yptr option

Browse Source 
Documentation,ALSA<-OSS emulation
Added 'buggy-ptr' proc option to switch the behavior of GETOPTR ioctl.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2005-09-08 13:48:34 +02:00
committed by Jaroslav Kysela
parent f328385309
commit 10f69f9e42
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/sound/alsa/ALSA-Configuration.txt
View File

@@ -1592,6 +1592,8 @@ Proc interfaces (/proc/asound)
- whole-frag write only whole fragments (optimization affecting - whole-frag write only whole fragments (optimization affecting
playback only) playback only)
- no-silence do not fill silence ahead to avoid clicks - no-silence do not fill silence ahead to avoid clicks
- buggy-ptr Returns the whitespace blocks in GETOPTR ioctl
instead of filled blocks
Example: echo "x11amp 128 16384" > /proc/asound/card0/pcm0p/oss Example: echo "x11amp 128 16384" > /proc/asound/card0/pcm0p/oss
echo "squake 0 0 disable" > /proc/asound/card0/pcm0c/oss echo "squake 0 0 disable" > /proc/asound/card0/pcm0c/oss

3
include/sound/pcm_oss.h
View File

@@ -32,7 +32,8 @@ struct _snd_pcm_oss_setup {
block:1, block:1,
nonblock:1, nonblock:1,
partialfrag:1, partialfrag:1,
nosilence:1; nosilence:1,
buggyptr:1;
unsigned int periods; unsigned int periods;
unsigned int period_size; unsigned int period_size;
snd_pcm_oss_setup_t *next; snd_pcm_oss_setup_t *next;

8
sound/core/oss/pcm_oss.c
View File

@@ -1543,7 +1543,11 @@ static int snd_pcm_oss_get_ptr(snd_pcm_oss_file_t *pcm_oss_file, int stream, str
} else { } else {
delay = snd_pcm_oss_bytes(substream, delay); delay = snd_pcm_oss_bytes(substream, delay);
if (stream == SNDRV_PCM_STREAM_PLAYBACK) { if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
info.blocks = (runtime->oss.buffer_bytes - delay - fixup) / runtime->oss.period_bytes; snd_pcm_oss_setup_t *setup = substream->oss.setup;
if (setup && setup->buggyptr)
info.blocks = (runtime->oss.buffer_bytes - delay - fixup) / runtime->oss.period_bytes;
else
info.blocks = (delay + fixup) / runtime->oss.period_bytes;
info.bytes = (runtime->oss.bytes - delay) & INT_MAX; info.bytes = (runtime->oss.bytes - delay) & INT_MAX;
} else { } else {
delay += fixup; delay += fixup;
@@ -2350,6 +2354,8 @@ static void snd_pcm_oss_proc_write(snd_info_entry_t *entry,
template.partialfrag = 1; template.partialfrag = 1;
} else if (!strcmp(str, "no-silence")) { } else if (!strcmp(str, "no-silence")) {
template.nosilence = 1; template.nosilence = 1;
} else if (!strcmp(str, "buggy-ptr")) {
template.buggyptr = 1;
} }
} while (*str); } while (*str);
if (setup == NULL) { if (setup == NULL) {