AerialX/openal-soft-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the buffer size so ALSA doesn't multiply by the number of periods

Browse Source
This commit is contained in:
Chris Robinson 2008-01-06 00:18:06 -08:00
parent 017fc93307
commit dd60366aec
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Alc/alsa.c
View File

@ -396,7 +396,7 @@ open_alsa:
periods = GetConfigValueInt("alsa", "periods", 4); periods = GetConfigValueInt("alsa", "periods", 4);
if((int)periods <= 0) if((int)periods <= 0)
periods = 4; periods = 4;
bufferSizeInFrames = device->UpdateFreq; bufferSizeInFrames = device->UpdateFreq / periods;
psnd_pcm_hw_params_malloc(&p); psnd_pcm_hw_params_malloc(&p);
#define ok(func, str) (i=(func),((i<0)?(err=(str)),0:1)) #define ok(func, str) (i=(func),((i<0)?(err=(str)),0:1))
@ -438,9 +438,9 @@ open_alsa:
psnd_pcm_hw_params_free(p); psnd_pcm_hw_params_free(p);
device->MaxNoOfSources = 256; device->MaxNoOfSources = 256;
device->UpdateFreq = bufferSizeInFrames; device->UpdateFreq = bufferSizeInFrames * periods;
data->size = psnd_pcm_frames_to_bytes(data->pcmHandle, bufferSizeInFrames); data->size = psnd_pcm_frames_to_bytes(data->pcmHandle, device->UpdateFreq);
if(access == SND_PCM_ACCESS_RW_INTERLEAVED) if(access == SND_PCM_ACCESS_RW_INTERLEAVED)
{ {
data->buffer = malloc(data->size); data->buffer = malloc(data->size);
@ -512,7 +512,7 @@ static ALCboolean alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceNam
snd_pcm_format_t alsaFormat; snd_pcm_format_t alsaFormat;
snd_pcm_hw_params_t *p; snd_pcm_hw_params_t *p;
unsigned int periods = 4; unsigned int periods = 4;
snd_pcm_uframes_t bufferSizeInFrames = SampleSize; snd_pcm_uframes_t bufferSizeInFrames;
alsa_data *data; alsa_data *data;
char driver[64]; char driver[64];
char *err; char *err;
@ -575,6 +575,8 @@ open_alsa:
AL_PRINT("Unknown format?! %x\n", format); AL_PRINT("Unknown format?! %x\n", format);
} }
bufferSizeInFrames = SampleSize / periods;
psnd_pcm_hw_params_malloc(&p); psnd_pcm_hw_params_malloc(&p);
#define ok(func, str) (i=(func),((i<0)?(err=(str)),0:1)) #define ok(func, str) (i=(func),((i<0)?(err=(str)),0:1))
/* start with the largest configuration space possible */ /* start with the largest configuration space possible */