kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/audio/linux-c7-alsa-plugins-oss/files/patch-oss-pcm_oss.c
Tijl Coosemans 77a7978c6a Rewrite the port so we build our own Linux package from the upstream 
.src.rpm with patches derived from the audio/alsa-plugins port.  This
should improve sound output from Linux programs.

CFLAGS contains -nostdinc -isystem ... because gcc searches
/usr/local/include before /usr/include otherwise and picks up headers from
/usr/local/include/alsa instead of /compat/linux/usr/include/alsa.

PR:		240043
2019-09-08 20:47:57 +00:00

673 lines
18 KiB
C
Raw Blame History

--- oss/pcm_oss.c.orig 2018-04-03 07:01:38 UTC
+++ oss/pcm_oss.c
@@ -24,15 +24,48 @@
#include <alsa/pcm_external.h>
#include <linux/soundcard.h>
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+
+#ifdef FREEBSD_OSS
+#define AFMT_S32_LE 0x00001000 /* Little endian signed 32-bit */
+#define AFMT_S32_BE 0x00002000 /* Big endian signed 32-bit */
+#define AFMT_U32_LE 0x00004000 /* Little endian unsigned 32-bit */
+#define AFMT_U32_BE 0x00008000 /* Big endian unsigned 32-bit */
+#define AFMT_S24_LE 0x00010000 /* Little endian signed 24-bit */
+#define AFMT_S24_BE 0x00020000 /* Big endian signed 24-bit */
+#define AFMT_U24_LE 0x00040000 /* Little endian unsigned 24-bit */
+#define AFMT_U24_BE 0x00080000 /* Big endian unsigned 24-bit */
+
+#define FREEBSD_OSS_RATE_MIN 1
+#define FREEBSD_OSS_RATE_MAX 384000
+
+#define FREEBSD_OSS_CHANNELS_MIN 1
+#define FREEBSD_OSS_CHANNELS_MAX 8
+
+#define FREEBSD_OSS_BUFSZ_MAX 131072
+#define FREEBSD_OSS_BLKCNT_MIN 2
+#define FREEBSD_OSS_BLKSZ_MIN 16 /* (FREEBSD_OSS_CHANNELS_MAX * 4) */
+
+#define FREEBSD_OSS_BUFSZ_MIN (FREEBSD_OSS_BLKCNT_MIN * FREEBSD_OSS_BLKSZ_MIN)
+#define FREEBSD_OSS_BLKCNT_MAX (FREEBSD_OSS_BUFSZ_MAX / FREEBSD_OSS_BUFSZ_MIN)
+#define FREEBSD_OSS_BLKSZ_MAX (FREEBSD_OSS_BUFSZ_MAX / FREEBSD_OSS_BLKCNT_MIN)
+#endif
+
typedef struct snd_pcm_oss {
snd_pcm_ioplug_t io;
char *device;
int fd;
+#ifdef FREEBSD_OSS
+ int bufsz, ptr, ptr_align, last_bytes;
+#else
int fragment_set;
int caps;
+#endif
int format;
+#ifndef FREEBSD_OSS
unsigned int period_shift;
unsigned int periods;
+#endif
unsigned int frame_bytes;
} snd_pcm_oss_t;
@@ -49,8 +82,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i
buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;
size *= oss->frame_bytes;
result = write(oss->fd, buf, size);
- if (result <= 0)
- return result;
+#ifdef FREEBSD_OSS
+ if (result == -1) {
+ if (errno == EAGAIN)
+ return 0;
+ else
+ return -errno;
+ }
+#else
+ if (result <= 0) {
+ if (result == -EAGAIN)
+ return 0;
+ else
+ return result;
+ }
+#endif
return result / oss->frame_bytes;
}
@@ -67,14 +113,88 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io
buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;
size *= oss->frame_bytes;
result = read(oss->fd, buf, size);
- if (result <= 0)
- return result;
+#ifdef FREEBSD_OSS
+ if (result == -1) {
+ if (errno == EAGAIN)
+ return 0;
+ else
+ return -errno;
+ }
+#else
+ if (result <= 0) {
+ if (result == -EAGAIN)
+ return 0;
+ else
+ return result;
+ }
+#endif
return result / oss->frame_bytes;
}
static snd_pcm_sframes_t oss_pointer(snd_pcm_ioplug_t *io)
{
+#ifdef FREEBSD_OSS
snd_pcm_oss_t *oss = io->private_data;
+#ifdef FREEBSD_OSS_USE_IO_PTR
+ struct count_info ci;
+#endif
+ audio_buf_info bi;
+
+ if (io->state != SND_PCM_STATE_RUNNING)
+ return 0;
+
+ if (io->state == SND_PCM_STATE_XRUN)
+ return -EPIPE;
+
+#ifdef FREEBSD_OSS_USE_IO_PTR
+ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
+ SNDCTL_DSP_GETOPTR : SNDCTL_DSP_GETIPTR, &ci) < 0)
+ return -EINVAL;
+
+ if (ci.ptr == oss->last_bytes &&
+ ((ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
+ SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0) ||
+ bi.bytes == oss->bufsz))
+ return -EPIPE;
+
+ if (ci.ptr < oss->last_bytes)
+ oss->ptr += oss->bufsz;
+
+ oss->ptr += ci.ptr;
+ oss->ptr -= oss->last_bytes;
+ oss->ptr %= oss->ptr_align;
+
+ oss->last_bytes = ci.ptr;
+#else /* !FREEBSD_OSS_USE_IO_PTR */
+ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
+ SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0)
+ return -EINVAL;
+
+ if (bi.bytes == oss->bufsz && bi.bytes == oss->last_bytes) {
+#if 0
+#ifdef SNDCTL_DSP_GETERROR
+ audio_errinfo ei;
+ if (ioctl(oss->fd, SNDCTL_DSP_GETERROR, &ei) < 0 ||
+ (io->stream == SND_PCM_STREAM_PLAYBACK &&
+ ei.play_underruns != 0) ||
+ (io->stream == SND_PCM_STREAM_CAPTURE &&
+ ei.rec_overruns != 0))
+#endif
+#endif
+ return -EPIPE;
+ }
+
+ if (bi.bytes > oss->last_bytes) {
+ oss->ptr += bi.bytes - oss->last_bytes;
+ oss->ptr %= oss->ptr_align;
+ }
+
+ oss->last_bytes = bi.bytes;
+#endif /* FREEBSD_OSS_USE_IO_PTR */
+
+ return snd_pcm_bytes_to_frames(io->pcm, oss->ptr);
+#else
+ snd_pcm_oss_t *oss = io->private_data;
struct count_info info;
int ptr;
@@ -85,20 +205,59 @@ static snd_pcm_sframes_t oss_pointer(snd_pcm_ioplug_t
}
ptr = snd_pcm_bytes_to_frames(io->pcm, info.ptr);
return ptr;
+#endif
}
static int oss_start(snd_pcm_ioplug_t *io)
{
snd_pcm_oss_t *oss = io->private_data;
+#ifdef FREEBSD_OSS
+ audio_buf_info bi;
+#ifdef FREEBSD_OSS_USE_IO_PTR
+ struct count_info ci;
+#endif
+#endif
int tmp = io->stream == SND_PCM_STREAM_PLAYBACK ?
PCM_ENABLE_OUTPUT : PCM_ENABLE_INPUT;
+#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
if (ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp) < 0) {
fprintf(stderr, "*** OSS: trigger failed\n");
+#ifdef FREEBSD_OSS
+ return -EINVAL;
+#else
if (io->stream == SND_PCM_STREAM_CAPTURE)
/* fake read to trigger */
read(oss->fd, &tmp, 0);
+#endif
}
+
+#ifdef FREEBSD_OSS
+ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
+ SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0)
+ return -EINVAL;
+
+ if (oss->bufsz != (bi.fragsize * bi.fragstotal)) {
+ fprintf(stderr, "%s(): WARNING - bufsz changed! %d -> %d\n",
+ __func__, oss->bufsz, bi.fragsize * bi.fragstotal);
+ oss->bufsz = bi.fragsize * bi.fragstotal;
+ }
+
+#ifdef FREEBSD_OSS_USE_IO_PTR
+ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
+ SNDCTL_DSP_GETOPTR : SNDCTL_DSP_GETIPTR, &ci) < 0)
+ return -EINVAL;
+
+ oss->last_bytes = ci.ptr;
+#else
+ oss->last_bytes = bi.bytes;
+#endif
+ oss->ptr = 0;
+#endif
+
return 0;
}
@@ -107,6 +266,10 @@ static int oss_stop(snd_pcm_ioplug_t *io)
snd_pcm_oss_t *oss = io->private_data;
int tmp = 0;
+#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp);
return 0;
}
@@ -115,18 +278,46 @@ static int oss_drain(snd_pcm_ioplug_t *io)
{
snd_pcm_oss_t *oss = io->private_data;
+#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
if (io->stream == SND_PCM_STREAM_PLAYBACK)
- ioctl(oss->fd, SNDCTL_DSP_SYNC);
+ ioctl(oss->fd, SNDCTL_DSP_SYNC, NULL);
return 0;
}
+static int oss_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delayp)
+{
+ snd_pcm_oss_t *oss = io->private_data;
+ int tmp;
+
+ if (oss->fd < 0)
+ return -EBADFD;
+
+ if (io->stream == SND_PCM_STREAM_PLAYBACK) {
+ if (ioctl(oss->fd, SNDCTL_DSP_GETODELAY, &tmp) < 0 || tmp < 0)
+ tmp = 0;
+ } else {
+ tmp = 0;
+ }
+ *delayp = snd_pcm_bytes_to_frames(io->pcm, tmp);
+
+ return (0);
+}
+
+#ifndef FREEBSD_OSS
static int oss_prepare(snd_pcm_ioplug_t *io)
{
snd_pcm_oss_t *oss = io->private_data;
int tmp;
- ioctl(oss->fd, SNDCTL_DSP_RESET);
+#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+ ioctl(oss->fd, SNDCTL_DSP_RESET, NULL);
+
tmp = io->channels;
if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0) {
perror("SNDCTL_DSP_CHANNELS");
@@ -145,16 +336,75 @@ static int oss_prepare(snd_pcm_ioplug_t *io)
}
return 0;
}
+#endif
+#ifdef FREEBSD_OSS
+static const struct {
+ int oss_format;
+ snd_pcm_format_t alsa_format;
+} oss_formats_tab[] = {
+ { AFMT_U8, SND_PCM_FORMAT_U8 },
+ { AFMT_S8, SND_PCM_FORMAT_S8 },
+ { AFMT_MU_LAW, SND_PCM_FORMAT_MU_LAW },
+ { AFMT_A_LAW, SND_PCM_FORMAT_A_LAW },
+ { AFMT_S16_LE, SND_PCM_FORMAT_S16_LE },
+ { AFMT_S16_BE, SND_PCM_FORMAT_S16_BE },
+ { AFMT_U16_LE, SND_PCM_FORMAT_U16_LE },
+ { AFMT_U16_BE, SND_PCM_FORMAT_U16_BE },
+ { AFMT_S24_LE, SND_PCM_FORMAT_S24_3LE },
+ { AFMT_S24_BE, SND_PCM_FORMAT_S24_3BE },
+ { AFMT_U24_LE, SND_PCM_FORMAT_U24_3LE },
+ { AFMT_U24_BE, SND_PCM_FORMAT_U24_3BE },
+ { AFMT_S32_LE, SND_PCM_FORMAT_S32_LE },
+ { AFMT_S32_BE, SND_PCM_FORMAT_S32_BE },
+ { AFMT_U32_LE, SND_PCM_FORMAT_U32_LE },
+ { AFMT_U32_BE, SND_PCM_FORMAT_U32_BE },
+ /* Special */
+ { AFMT_S24_LE, SND_PCM_FORMAT_S20_3LE },
+ { AFMT_S24_BE, SND_PCM_FORMAT_S20_3BE },
+ { AFMT_U24_LE, SND_PCM_FORMAT_U20_3LE },
+ { AFMT_U24_BE, SND_PCM_FORMAT_U20_3BE },
+ { AFMT_S24_LE, SND_PCM_FORMAT_S18_3LE },
+ { AFMT_S24_BE, SND_PCM_FORMAT_S18_3BE },
+ { AFMT_U24_LE, SND_PCM_FORMAT_U18_3LE },
+ { AFMT_U24_BE, SND_PCM_FORMAT_U18_3BE },
+ { AFMT_S32_LE, SND_PCM_FORMAT_S24_LE },
+ { AFMT_S32_BE, SND_PCM_FORMAT_S24_BE },
+ { AFMT_U32_LE, SND_PCM_FORMAT_U24_LE },
+ { AFMT_U32_BE, SND_PCM_FORMAT_U24_BE },
+};
+#endif
+
static int oss_hw_params(snd_pcm_ioplug_t *io,
snd_pcm_hw_params_t *params ATTRIBUTE_UNUSED)
{
snd_pcm_oss_t *oss = io->private_data;
int i, tmp, err;
+#ifdef FREEBSD_OSS
+ int blksz_shift, blkcnt;
+ audio_buf_info bi;
+#else
unsigned int period_bytes;
+#endif
long oflags, flags;
+#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
oss->frame_bytes = (snd_pcm_format_physical_width(io->format) * io->channels) / 8;
+#ifdef FREEBSD_OSS
+ oss->ptr_align = io->buffer_size * oss->frame_bytes;
+
+ oss->format = 0;
+ for (i = 0; i < ARRAY_SIZE(oss_formats_tab); i++) {
+ if (oss_formats_tab[i].alsa_format == io->format) {
+ oss->format = oss_formats_tab[i].oss_format;
+ break;
+ }
+ }
+ if (oss->format == 0) {
+#else
switch (io->format) {
case SND_PCM_FORMAT_U8:
oss->format = AFMT_U8;
@@ -166,9 +416,93 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,
oss->format = AFMT_S16_BE;
break;
default:
+#endif
fprintf(stderr, "*** OSS: unsupported format %s\n", snd_pcm_format_name(io->format));
return -EINVAL;
}
+#ifdef FREEBSD_OSS
+
+ ioctl(oss->fd, SNDCTL_DSP_RESET);
+
+ /* use a 16ms HW buffer by default */
+ tmp = ((16 * io->rate) / 1000) * oss->frame_bytes;
+
+ /* round up to nearest power of two */
+ while (tmp & (tmp - 1))
+ tmp += tmp & ~(tmp - 1);
+
+ /* get logarithmic value */
+ for (blksz_shift = 0; blksz_shift < 24; blksz_shift++) {
+ if (tmp == (1 << blksz_shift))
+ break;
+ }
+
+ tmp = io->buffer_size * oss->frame_bytes;
+
+ /* compute HW buffer big enough to hold SW buffer */
+ for (blkcnt = FREEBSD_OSS_BLKCNT_MIN; blkcnt != FREEBSD_OSS_BLKCNT_MAX; blkcnt *= 2) {
+ if ((blkcnt << blksz_shift) >= tmp)
+ break;
+ }
+
+ tmp = blksz_shift | (blkcnt << 16);
+ if (ioctl(oss->fd, SNDCTL_DSP_SETFRAGMENT, &tmp) < 0) {
+ perror("SNDCTL_DSP_SETFRAGMENTS");
+ return -EINVAL;
+ }
+
+ tmp = oss->format;
+ if (ioctl(oss->fd, SNDCTL_DSP_SETFMT, &tmp) < 0 ||
+ tmp != oss->format) {
+ perror("SNDCTL_DSP_SETFMT");
+ return -EINVAL;
+ }
+
+ tmp = io->channels;
+ if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0 ||
+ tmp != io->channels) {
+ perror("SNDCTL_DSP_CHANNELS");
+ return -EINVAL;
+ }
+
+ tmp = io->rate;
+ if (ioctl(oss->fd, SNDCTL_DSP_SPEED, &tmp) < 0 ||
+ tmp > io->rate * 1.01 || tmp < io->rate * 0.99) {
+ perror("SNDCTL_DSP_SPEED");
+ return -EINVAL;
+ }
+
+ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
+ SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0) {
+ perror("SNDCTL_DSP_GET[I/O]SPACE");
+ return -EINVAL;
+ }
+
+ oss->bufsz = bi.fragsize * bi.fragstotal;
+
+#ifdef SNDCTL_DSP_LOW_WATER
+ tmp = ((io->period_size * oss->frame_bytes) * 3) / 4;
+ tmp -= tmp % oss->frame_bytes;
+ if (tmp < oss->frame_bytes)
+ tmp = oss->frame_bytes;
+ if (tmp > bi.fragsize)
+ tmp = bi.fragsize;
+ if (ioctl(oss->fd, SNDCTL_DSP_LOW_WATER, &tmp) < 0)
+ perror("SNDCTL_DSP_LOW_WATER");
+#endif
+
+#ifdef FREEBSD_OSS_DEBUG_VERBOSE
+ fprintf(stderr,
+ "\n\n[%lu -> %d] %lu ~ %d -> %d, %lu ~ %d -> %d [d:%ld lw:%d]\n\n",
+ io->buffer_size / io->period_size, bi.fragstotal,
+ io->buffer_size * oss->frame_bytes,
+ (1 << blksz_shift) * blkcnt, oss->bufsz,
+ io->period_size * oss->frame_bytes, 1 << blksz_shift,
+ bi.fragsize,
+ (long)(io->buffer_size * oss->frame_bytes) -
+ oss->bufsz, tmp);
+#endif
+#else
period_bytes = io->period_size * oss->frame_bytes;
oss->period_shift = 0;
for (i = 31; i >= 4; i--) {
@@ -209,6 +543,7 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,
goto _retry;
}
oss->fragment_set = 1;
+#endif
if ((flags = fcntl(oss->fd, F_GETFL)) < 0) {
err = -errno;
@@ -229,16 +564,152 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,
return 0;
}
-#define ARRAY_SIZE(ary) (sizeof(ary)/sizeof(ary[0]))
-
static int oss_hw_constraint(snd_pcm_oss_t *oss)
{
+#ifdef FREEBSD_OSS
snd_pcm_ioplug_t *io = &oss->io;
static const snd_pcm_access_t access_list[] = {
SND_PCM_ACCESS_RW_INTERLEAVED,
SND_PCM_ACCESS_MMAP_INTERLEAVED
};
+#ifdef FREEBSD_OSS_BLKCNT_P2
+ unsigned int period_list[30];
+#endif
+#ifdef FREEBSD_OSS_BUFSZ_P2
+ unsigned int bufsz_list[30];
+#endif
unsigned int nformats;
+ unsigned int format[ARRAY_SIZE(oss_formats_tab)];
+#if 0
+ unsigned int nchannels;
+ unsigned int channel[FREEBSD_OSS_CHANNELS_MAX];
+#endif
+ int i, err, tmp;
+
+#ifdef FREEBSD_OSS_DEBUG_VERBOSE
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
+ /* check trigger */
+ tmp = 0;
+ if (ioctl(oss->fd, SNDCTL_DSP_GETCAPS, &tmp) >= 0) {
+ if (!(tmp & DSP_CAP_TRIGGER))
+ fprintf(stderr, "*** OSS: trigger is not supported!\n");
+ }
+
+ /* access type - interleaved only */
+ if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_ACCESS,
+ ARRAY_SIZE(access_list), access_list)) < 0)
+ return err;
+
+ /* supported formats. */
+ tmp = 0;
+ ioctl(oss->fd, SNDCTL_DSP_GETFMTS, &tmp);
+ nformats = 0;
+ for (i = 0; i < ARRAY_SIZE(oss_formats_tab); i++) {
+ if (tmp & oss_formats_tab[i].oss_format)
+ format[nformats++] = oss_formats_tab[i].alsa_format;
+ }
+ if (! nformats)
+ format[nformats++] = SND_PCM_FORMAT_S16;
+ if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT,
+ nformats, format)) < 0)
+ return err;
+
+#if 0
+ /* supported channels */
+ nchannels = 0;
+ for (i = 0; i < ARRAY_SIZE(channel); i++) {
+ tmp = i + 1;
+ if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) >= 0 &&
+ 1 + i == tmp)
+ channel[nchannels++] = tmp;
+ }
+ if (! nchannels) /* assume 2ch stereo */
+ err = snd_pcm_ioplug_set_param_minmax(io,
+ SND_PCM_IOPLUG_HW_CHANNELS, 2, 2);
+ else
+ err = snd_pcm_ioplug_set_param_list(io,
+ SND_PCM_IOPLUG_HW_CHANNELS, nchannels, channel);
+ if (err < 0)
+ return err;
+#endif
+ err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_CHANNELS,
+ FREEBSD_OSS_CHANNELS_MIN, FREEBSD_OSS_CHANNELS_MAX);
+ if (err < 0)
+ return err;
+
+ /* supported rates */
+ err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE,
+ FREEBSD_OSS_RATE_MIN, FREEBSD_OSS_RATE_MAX);
+ if (err < 0)
+ return err;
+
+ /*
+ * Maximum buffer size on FreeBSD can go up to 131072 bytes without
+ * strict ^2 alignment so that s24le in 3bytes packing can be fed
+ * directly.
+ */
+
+#ifdef FREEBSD_OSS_BLKCNT_P2
+ tmp = 0;
+ for (i = 1; i < 31 && tmp < ARRAY_SIZE(period_list); i++) {
+ if ((1 << i) > FREEBSD_OSS_BLKCNT_MAX)
+ break;
+ if ((1 << i) < FREEBSD_OSS_BLKCNT_MIN)
+ continue;
+ period_list[tmp++] = 1 << i;
+ }
+
+ if (tmp > 0)
+ err = snd_pcm_ioplug_set_param_list(io,
+ SND_PCM_IOPLUG_HW_PERIODS, tmp, period_list);
+ else
+#endif
+ /* periods , not strictly ^2 but later on will be refined */
+ err = snd_pcm_ioplug_set_param_minmax(io,
+ SND_PCM_IOPLUG_HW_PERIODS, FREEBSD_OSS_BLKCNT_MIN,
+ FREEBSD_OSS_BLKCNT_MAX);
+ if (err < 0)
+ return err;
+
+ /* period size , not strictly ^2 */
+ err = snd_pcm_ioplug_set_param_minmax(io,
+ SND_PCM_IOPLUG_HW_PERIOD_BYTES, FREEBSD_OSS_BLKSZ_MIN,
+ FREEBSD_OSS_BLKSZ_MAX);
+ if (err < 0)
+ return err;
+
+#ifdef FREEBSD_OSS_BUFSZ_P2
+ tmp = 0;
+ for (i = 1; i < 31 && tmp < ARRAY_SIZE(bufsz_list); i++) {
+ if ((1 << i) > FREEBSD_OSS_BUFSZ_MAX)
+ break;
+ if ((1 << i) < FREEBSD_OSS_BUFSZ_MIN)
+ continue;
+ bufsz_list[tmp++] = 1 << i;
+ }
+
+ if (tmp > 0)
+ err = snd_pcm_ioplug_set_param_list(io,
+ SND_PCM_IOPLUG_HW_BUFFER_BYTES, tmp, bufsz_list);
+ else
+#endif
+ /* buffer size , not strictly ^2 */
+ err = snd_pcm_ioplug_set_param_minmax(io,
+ SND_PCM_IOPLUG_HW_BUFFER_BYTES, FREEBSD_OSS_BUFSZ_MIN,
+ FREEBSD_OSS_BUFSZ_MAX);
+ if (err < 0)
+ return err;
+
+ return 0;
+#else
+ snd_pcm_ioplug_t *io = &oss->io;
+ static const snd_pcm_access_t access_list[] = {
+ SND_PCM_ACCESS_RW_INTERLEAVED,
+ SND_PCM_ACCESS_MMAP_INTERLEAVED
+ };
+ unsigned int nformats;
unsigned int format[5];
unsigned int nchannels;
unsigned int channel[6];
@@ -317,6 +788,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss)
return err;
return 0;
+#endif
}
@@ -324,6 +796,10 @@ static int oss_close(snd_pcm_ioplug_t *io)
{
snd_pcm_oss_t *oss = io->private_data;
+#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
close(oss->fd);
free(oss->device);
free(oss);
@@ -337,8 +813,11 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca
.pointer = oss_pointer,
.close = oss_close,
.hw_params = oss_hw_params,
+#ifndef FREEBSD_OSS
.prepare = oss_prepare,
+#endif
.drain = oss_drain,
+ .delay = oss_delay,
};
static const snd_pcm_ioplug_callback_t oss_capture_callback = {
@@ -348,8 +827,11 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal
.pointer = oss_pointer,
.close = oss_close,
.hw_params = oss_hw_params,
+#ifndef FREEBSD_OSS
.prepare = oss_prepare,
+#endif
.drain = oss_drain,
+ .delay = oss_delay,
};
@@ -360,6 +842,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss)
int err;
snd_pcm_oss_t *oss;
+#if defined(FREEBSD_OSS) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
snd_config_for_each(i, next, conf) {
snd_config_t *n = snd_config_iterator_entry(i);
const char *id;
Reference in a new issue View git blame Copy permalink