asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-09 17:55:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsaloop: libsamplerate requires specific formats, force them for slave mode

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2011-03-07 14:21:19 +01:00
parent cd26f244e7
commit 3853175d12
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
alsaloop/pcmjob.c
View file

@ -1238,8 +1238,8 @@ static int closeit(struct loopback_handle *lhandle)
static int init_handle(struct loopback_handle *lhandle, int alloc) static int init_handle(struct loopback_handle *lhandle, int alloc)
{ {
snd_pcm_uframes_t lat; snd_pcm_uframes_t lat;
lhandle->frame_size = (snd_pcm_format_width(lhandle->format) / 8) * lhandle->frame_size = (snd_pcm_format_physical_width(lhandle->format)
lhandle->channels; / 8) * lhandle->channels;
lhandle->sync_point = lhandle->rate * 15; /* every 15 seconds */ lhandle->sync_point = lhandle->rate * 15; /* every 15 seconds */
lat = lhandle->loopback->latency; lat = lhandle->loopback->latency;
if (lhandle->buffer_size > lat) if (lhandle->buffer_size > lat)
@ -1358,6 +1358,23 @@ static void lhandle_start(struct loopback_handle *lhandle)
lhandle->total_queued = 0; lhandle->total_queued = 0;
} }
static void fix_format(struct loopback *loop)
{
snd_pcm_format_t format = loop->capt->format;
if (loop->sync != SYNC_TYPE_SAMPLERATE)
return;
if (format == SND_PCM_FORMAT_S16 ||
format == SND_PCM_FORMAT_S32)
return;
if (snd_pcm_format_width(format) > 16)
format = SND_PCM_FORMAT_S32;
else
format = SND_PCM_FORMAT_S16;
loop->capt->format = format;
loop->play->format = format;
}
int pcmjob_start(struct loopback *loop) int pcmjob_start(struct loopback *loop)
{ {
snd_pcm_uframes_t count; snd_pcm_uframes_t count;
@ -1383,6 +1400,7 @@ int pcmjob_start(struct loopback *loop)
if (err < 0) if (err < 0)
goto __error; goto __error;
loop->play->format = loop->capt->format = err; loop->play->format = loop->capt->format = err;
fix_format(loop);
err = get_rate(loop->capt); err = get_rate(loop->capt);
if (err < 0) if (err < 0)
goto __error; goto __error;