mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
make oss sample spec configurable
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@77 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
74bbf31c37
commit
554b01b6b3
6 changed files with 108 additions and 37 deletions
|
|
@ -62,27 +62,39 @@ fail:
|
|||
}
|
||||
|
||||
int pa_oss_auto_format(int fd, struct pa_sample_spec *ss) {
|
||||
int format, channels, speed;
|
||||
int format, channels, speed, reqformat;
|
||||
static const int format_trans[] = {
|
||||
[PA_SAMPLE_U8] = AFMT_U8,
|
||||
[PA_SAMPLE_ALAW] = AFMT_A_LAW,
|
||||
[PA_SAMPLE_ULAW] = AFMT_MU_LAW,
|
||||
[PA_SAMPLE_S16LE] = AFMT_S16_LE,
|
||||
[PA_SAMPLE_S16BE] = AFMT_S16_BE,
|
||||
[PA_SAMPLE_FLOAT32LE] = AFMT_QUERY, /* not supported */
|
||||
[PA_SAMPLE_FLOAT32BE] = AFMT_QUERY, /* not supported */
|
||||
};
|
||||
|
||||
assert(fd >= 0 && ss);
|
||||
|
||||
format = AFMT_S16_NE;
|
||||
if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_S16_NE) {
|
||||
int f = AFMT_S16_NE == AFMT_S16_LE ? AFMT_S16_BE : AFMT_S16_LE;
|
||||
format = f;
|
||||
if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != f) {
|
||||
format = AFMT_U8;
|
||||
if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_U8) {
|
||||
fprintf(stderr, "SNDCTL_DSP_SETFMT: %s\n", format != AFMT_U8 ? "No supported sample format" : strerror(errno));
|
||||
return -1;
|
||||
|
||||
reqformat = format = format_trans[ss->format];
|
||||
if (reqformat == AFMT_QUERY || ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != reqformat) {
|
||||
format = AFMT_S16_NE;
|
||||
if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_S16_NE) {
|
||||
int f = AFMT_S16_NE == AFMT_S16_LE ? AFMT_S16_BE : AFMT_S16_LE;
|
||||
format = f;
|
||||
if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != f) {
|
||||
format = AFMT_U8;
|
||||
if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) < 0 || format != AFMT_U8) {
|
||||
fprintf(stderr, "SNDCTL_DSP_SETFMT: %s\n", format != AFMT_U8 ? "No supported sample format" : strerror(errno));
|
||||
return -1;
|
||||
} else
|
||||
ss->format = PA_SAMPLE_U8;
|
||||
} else
|
||||
ss->format = PA_SAMPLE_U8;
|
||||
ss->format = f == AFMT_S16_LE ? PA_SAMPLE_S16LE : PA_SAMPLE_S16BE;
|
||||
} else
|
||||
ss->format = f == AFMT_S16_LE ? PA_SAMPLE_S16LE : PA_SAMPLE_S16BE;
|
||||
} else
|
||||
ss->format = PA_SAMPLE_S16NE;
|
||||
ss->format = PA_SAMPLE_S16NE;
|
||||
}
|
||||
|
||||
channels = 2;
|
||||
channels = ss->channels;
|
||||
if (ioctl(fd, SNDCTL_DSP_CHANNELS, &channels) < 0) {
|
||||
fprintf(stderr, "SNDCTL_DSP_CHANNELS: %s\n", strerror(errno));
|
||||
return -1;
|
||||
|
|
@ -90,7 +102,7 @@ int pa_oss_auto_format(int fd, struct pa_sample_spec *ss) {
|
|||
assert(channels);
|
||||
ss->channels = channels;
|
||||
|
||||
speed = 44100;
|
||||
speed = ss->rate;
|
||||
if (ioctl(fd, SNDCTL_DSP_SPEED, &speed) < 0) {
|
||||
fprintf(stderr, "SNDCTL_DSP_SPEED: %s\n", strerror(errno));
|
||||
return -1;
|
||||
|
|
@ -100,3 +112,27 @@ int pa_oss_auto_format(int fd, struct pa_sample_spec *ss) {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int log2(int v) {
|
||||
int k = 0;
|
||||
|
||||
for (;;) {
|
||||
v >>= 1;
|
||||
if (!v) break;
|
||||
k++;
|
||||
}
|
||||
|
||||
return k;
|
||||
}
|
||||
|
||||
int pa_oss_set_fragments(int fd, int nfrags, int frag_size) {
|
||||
int arg;
|
||||
arg = ((int) nfrags << 16) | log2(frag_size);
|
||||
|
||||
if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &arg) < 0) {
|
||||
fprintf(stderr, "SNDCTL_DSP_SETFRAGMENT: %s\n", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue