mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

when the requested sample format is not available for OSS devices, print a nice warning and take what we can get instead

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1219 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-08-12 15:09:49 +00:00
parent 0547b0fd4a
commit fbeeb8b70d
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/oss-util.c
View file

@ -98,6 +98,8 @@ fail:
int pa_oss_auto_format(int fd, pa_sample_spec *ss) { int pa_oss_auto_format(int fd, pa_sample_spec *ss) {
int format, channels, speed, reqformat; int format, channels, speed, reqformat;
pa_sample_format_t orig_format;
static const int format_trans[PA_SAMPLE_MAX] = { static const int format_trans[PA_SAMPLE_MAX] = {
[PA_SAMPLE_U8] = AFMT_U8, [PA_SAMPLE_U8] = AFMT_U8,
[PA_SAMPLE_ALAW] = AFMT_A_LAW, [PA_SAMPLE_ALAW] = AFMT_A_LAW,
@ -110,6 +112,8 @@ int pa_oss_auto_format(int fd, pa_sample_spec *ss) {
assert(fd >= 0 && ss); assert(fd >= 0 && ss);
orig_format = ss->format;
reqformat = format = format_trans[ss->format]; reqformat = format = format_trans[ss->format];
if (reqformat == AFMT_QUERY || ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != reqformat) { if (reqformat == AFMT_QUERY || ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != reqformat) {
format = AFMT_S16_NE; format = AFMT_S16_NE;
@ -129,21 +133,37 @@ int pa_oss_auto_format(int fd, pa_sample_spec *ss) {
ss->format = PA_SAMPLE_S16NE; ss->format = PA_SAMPLE_S16NE;
} }
if (orig_format != ss->format)
pa_log_warn(__FILE__": device doesn't support sample format %s, changed to %s.",
pa_sample_format_to_string(orig_format),
pa_sample_format_to_string(ss->format));
channels = ss->channels; channels = ss->channels;
if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) < 0) { if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) < 0) {
pa_log(__FILE__": SNDCTL_DSP_CHANNELS: %s", pa_cstrerror(errno)); pa_log(__FILE__": SNDCTL_DSP_CHANNELS: %s", pa_cstrerror(errno));
return -1; return -1;
} }
assert(channels); assert(channels > 0);
if (ss->channels != channels) {
pa_log_warn(__FILE__": device doesn't support %i channels, using %i channels.", ss->channels, channels);
ss->channels = channels; ss->channels = channels;
}
speed = ss->rate; speed = ss->rate;
if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) < 0) { if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) < 0) {
pa_log(__FILE__": SNDCTL_DSP_SPEED: %s", pa_cstrerror(errno)); pa_log(__FILE__": SNDCTL_DSP_SPEED: %s", pa_cstrerror(errno));
return -1; return -1;
} }
assert(speed); assert(speed > 0);
if (ss->rate != (unsigned) speed) {
pa_log_warn(__FILE__": device doesn't support %i Hz, changed to %i Hz.", ss->rate, speed);
/* If the sample rate deviates too much, we need to resample */
if (speed < ss->rate*.95 || speed > ss->rate*1.05)
ss->rate = speed; ss->rate = speed;
}
return 0; return 0;
} }