Try smaller audio puffer, if default size fails.

This commit is contained in:
Johns 2015-03-10 10:14:37 +01:00
parent a36221dea7
commit ca0181b1b1
2 changed files with 21 additions and 12 deletions

View File

@ -1,6 +1,7 @@
User johns User johns
Date: Date:
Try smaller audio puffer, if default size fails.
Fix bug: center cut-out didn't use cut off pixels. Fix bug: center cut-out didn't use cut off pixels.
Fix bug #2058: support for Make.plgcfg. Fix bug #2058: support for Make.plgcfg.
Fix for compile with vdr 2.1.10, for older vdr versions. Fix for compile with vdr 2.1.10, for older vdr versions.

32
audio.c
View File

@ -1237,21 +1237,29 @@ static int AlsaSetup(int *freq, int *channels, int passthrough)
AlsaUseMmap ? SND_PCM_ACCESS_MMAP_INTERLEAVED : AlsaUseMmap ? SND_PCM_ACCESS_MMAP_INTERLEAVED :
SND_PCM_ACCESS_RW_INTERLEAVED, *channels, *freq, 1, SND_PCM_ACCESS_RW_INTERLEAVED, *channels, *freq, 1,
96 * 1000))) { 96 * 1000))) {
// try reduced buffer size (needed for sunxi)
// FIXME: alternativ make this configurable
if ((err =
snd_pcm_set_params(AlsaPCMHandle, SND_PCM_FORMAT_S16,
AlsaUseMmap ? SND_PCM_ACCESS_MMAP_INTERLEAVED :
SND_PCM_ACCESS_RW_INTERLEAVED, *channels, *freq, 1,
72 * 1000))) {
/* /*
if ( err == -EBADFD ) { if ( err == -EBADFD ) {
snd_pcm_close(AlsaPCMHandle); snd_pcm_close(AlsaPCMHandle);
AlsaPCMHandle = NULL; AlsaPCMHandle = NULL;
continue; continue;
} }
*/ */
if (!AudioDoingInit) { if (!AudioDoingInit) {
Error(_("audio/alsa: set params error: %s\n"), Error(_("audio/alsa: set params error: %s\n"),
snd_strerror(err)); snd_strerror(err));
}
// FIXME: must stop sound, AudioChannels ... invalid
return -1;
} }
// FIXME: must stop sound, AudioChannels ... invalid
return -1;
} }
break; break;
} }