OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ossaudio: port to the new audio backend api

Browse Source 
Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Message-id: 22ab335146acd8099779583edcf6ed46de836bd6.1568927990.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Kővágó, Zoltán 2019-09-19 23:24:14 +02:00 committed by Gerd Hoffmann
parent affc691a14
commit 3ba4066d08
1 changed files with 100 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

280
audio/ossaudio.c
View File

@ -40,19 +40,15 @@
typedef struct OSSVoiceOut { typedef struct OSSVoiceOut {
HWVoiceOut hw; HWVoiceOut hw;
void *pcm_buf;
int fd; int fd;
int wpos;
int nfrags; int nfrags;
int fragsize; int fragsize;
int mmapped; int mmapped;
int pending;
Audiodev *dev; Audiodev *dev;
} OSSVoiceOut; } OSSVoiceOut;
typedef struct OSSVoiceIn { typedef struct OSSVoiceIn {
HWVoiceIn hw; HWVoiceIn hw;
void *pcm_buf;
int fd; int fd;
int nfrags; int nfrags;
int fragsize; int fragsize;
@ -371,98 +367,87 @@ static int oss_open(int in, struct oss_params *req, audsettings *as,
return -1; return -1;
} }
static void oss_write_pending (OSSVoiceOut *oss) static size_t oss_get_available_bytes(OSSVoiceOut *oss)
{ {
HWVoiceOut *hw = &oss->hw; int err;
struct count_info cntinfo;
assert(oss->mmapped);
if (oss->mmapped) { err = ioctl(oss->fd, SNDCTL_DSP_GETOPTR, &cntinfo);
return; if (err < 0) {
oss_logerr(errno, "SNDCTL_DSP_GETOPTR failed\n");
return 0;
} }
while (oss->pending) { return audio_ring_dist(cntinfo.ptr, oss->hw.pos_emul, oss->hw.size_emul);
int samples_written; }
ssize_t bytes_written;
int samples_till_end = hw->samples - oss->wpos;
int samples_to_write = MIN (oss->pending, samples_till_end);
int bytes_to_write = samples_to_write << hw->info.shift;
void *pcm = advance (oss->pcm_buf, oss->wpos << hw->info.shift);
bytes_written = write (oss->fd, pcm, bytes_to_write); static void *oss_get_buffer_out(HWVoiceOut *hw, size_t *size)
if (bytes_written < 0) { {
if (errno != EAGAIN) { OSSVoiceOut *oss = (OSSVoiceOut *) hw;
oss_logerr (errno, "failed to write %d bytes\n", if (oss->mmapped) {
bytes_to_write); *size = MIN(oss_get_available_bytes(oss), hw->size_emul - hw->pos_emul);
} return hw->buf_emul + hw->pos_emul;
break; } else {
} return audio_generic_get_buffer_out(hw, size);
if (bytes_written & hw->info.align) {
dolog ("misaligned write asked for %d, but got %zd\n",
bytes_to_write, bytes_written);
return;
}
samples_written = bytes_written >> hw->info.shift;
oss->pending -= samples_written;
oss->wpos = (oss->wpos + samples_written) % hw->samples;
if (bytes_written - bytes_to_write) {
break;
}
} }
} }
static size_t oss_run_out(HWVoiceOut *hw, size_t live) static size_t oss_put_buffer_out(HWVoiceOut *hw, void *buf, size_t size)
{ {
OSSVoiceOut *oss = (OSSVoiceOut *) hw; OSSVoiceOut *oss = (OSSVoiceOut *) hw;
int err; if (oss->mmapped) {
size_t decr; assert(buf == hw->buf_emul + hw->pos_emul && size < hw->size_emul);
struct audio_buf_info abinfo;
struct count_info cntinfo;
size_t bufsize;
bufsize = hw->samples << hw->info.shift; hw->pos_emul = (hw->pos_emul + size) % hw->size_emul;
return size;
} else {
return audio_generic_put_buffer_out(hw, buf, size);
}
}
static size_t oss_write(HWVoiceOut *hw, void *buf, size_t len)
{
OSSVoiceOut *oss = (OSSVoiceOut *) hw;
size_t pos;
if (oss->mmapped) { if (oss->mmapped) {
int bytes, pos; size_t total_len;
len = MIN(len, oss_get_available_bytes(oss));
err = ioctl (oss->fd, SNDCTL_DSP_GETOPTR, &cntinfo); total_len = len;
if (err < 0) { while (len) {
oss_logerr (errno, "SNDCTL_DSP_GETOPTR failed\n"); size_t to_copy = MIN(len, hw->size_emul - hw->pos_emul);
return 0; memcpy(hw->buf_emul + hw->pos_emul, buf, to_copy);
}
pos = hw->rpos << hw->info.shift; hw->pos_emul = (hw->pos_emul + to_copy) % hw->pos_emul;
bytes = audio_ring_dist (cntinfo.ptr, pos, bufsize); buf += to_copy;
decr = MIN (bytes >> hw->info.shift, live); len -= to_copy;
}
else {
err = ioctl (oss->fd, SNDCTL_DSP_GETOSPACE, &abinfo);
if (err < 0) {
oss_logerr (errno, "SNDCTL_DSP_GETOPTR failed\n");
return 0;
}
if (abinfo.bytes > bufsize) {
trace_oss_invalid_available_size(abinfo.bytes, bufsize);
abinfo.bytes = bufsize;
}
if (abinfo.bytes < 0) {
trace_oss_invalid_available_size(abinfo.bytes, bufsize);
return 0;
}
decr = MIN (abinfo.bytes >> hw->info.shift, live);
if (!decr) {
return 0;
} }
return total_len;
} }
decr = audio_pcm_hw_clip_out (hw, oss->pcm_buf, decr, oss->pending); pos = 0;
oss->pending += decr; while (len) {
oss_write_pending (oss); ssize_t bytes_written;
void *pcm = advance(buf, pos);
return decr; bytes_written = write(oss->fd, pcm, len);
if (bytes_written < 0) {
if (errno != EAGAIN) {
oss_logerr(errno, "failed to write %zu bytes\n",
len);
}
return pos;
}
pos += bytes_written;
if (bytes_written < len) {
break;
}
len -= bytes_written;
}
return pos;
} }
static void oss_fini_out (HWVoiceOut *hw) static void oss_fini_out (HWVoiceOut *hw)
@ -473,18 +458,13 @@ static void oss_fini_out (HWVoiceOut *hw)
ldebug ("oss_fini\n"); ldebug ("oss_fini\n");
oss_anal_close (&oss->fd); oss_anal_close (&oss->fd);
if (oss->pcm_buf) { if (oss->mmapped && hw->buf_emul) {
if (oss->mmapped) { err = munmap(hw->buf_emul, hw->size_emul);
err = munmap (oss->pcm_buf, hw->samples << hw->info.shift); if (err) {
if (err) { oss_logerr(errno, "Failed to unmap buffer %p, size %zu\n",
oss_logerr(errno, "Failed to unmap buffer %p, size %zu\n", hw->buf_emul, hw->size_emul);
oss->pcm_buf, hw->samples << hw->info.shift);
}
} }
else { hw->buf_emul = NULL;
g_free (oss->pcm_buf);
}
oss->pcm_buf = NULL;
} }
} }
@ -535,19 +515,20 @@ static int oss_init_out(HWVoiceOut *hw, struct audsettings *as,
oss->mmapped = 0; oss->mmapped = 0;
if (oopts->has_try_mmap && oopts->try_mmap) { if (oopts->has_try_mmap && oopts->try_mmap) {
oss->pcm_buf = mmap ( hw->size_emul = hw->samples << hw->info.shift;
hw->buf_emul = mmap(
NULL, NULL,
hw->samples << hw->info.shift, hw->size_emul,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
MAP_SHARED, MAP_SHARED,
fd, fd,
0 0
); );
if (oss->pcm_buf == MAP_FAILED) { if (hw->buf_emul == MAP_FAILED) {
oss_logerr(errno, "Failed to map %zu bytes of DAC\n", oss_logerr(errno, "Failed to map %zu bytes of DAC\n",
hw->samples << hw->info.shift); hw->size_emul);
} hw->buf_emul = NULL;
else { } else {
int err; int err;
int trig = 0; int trig = 0;
if (ioctl (fd, SNDCTL_DSP_SETTRIGGER, &trig) < 0) { if (ioctl (fd, SNDCTL_DSP_SETTRIGGER, &trig) < 0) {
@ -567,30 +548,16 @@ static int oss_init_out(HWVoiceOut *hw, struct audsettings *as,
} }
if (!oss->mmapped) { if (!oss->mmapped) {
err = munmap (oss->pcm_buf, hw->samples << hw->info.shift); err = munmap(hw->buf_emul, hw->size_emul);
if (err) { if (err) {
oss_logerr(errno, "Failed to unmap buffer %p size %zu\n", oss_logerr(errno, "Failed to unmap buffer %p size %zu\n",
oss->pcm_buf, hw->samples << hw->info.shift); hw->buf_emul, hw->size_emul);
} }
hw->buf_emul = NULL;
} }
} }
} }
if (!oss->mmapped) {
oss->pcm_buf = audio_calloc(__func__,
hw->samples,
1 << hw->info.shift);
if (!oss->pcm_buf) {
dolog (
"Could not allocate DAC buffer (%zu samples, each %d bytes)\n",
hw->samples,
1 << hw->info.shift
);
oss_anal_close (&fd);
return -1;
}
}
oss->fd = fd; oss->fd = fd;
oss->dev = dev; oss->dev = dev;
return 0; return 0;
@ -618,7 +585,7 @@ static int oss_ctl_out (HWVoiceOut *hw, int cmd, ...)
return 0; return 0;
} }
audio_pcm_info_clear_buf (&hw->info, oss->pcm_buf, hw->samples); audio_pcm_info_clear_buf(&hw->info, hw->buf_emul, hw->samples);
trig = PCM_ENABLE_OUTPUT; trig = PCM_ENABLE_OUTPUT;
if (ioctl (oss->fd, SNDCTL_DSP_SETTRIGGER, &trig) < 0) { if (ioctl (oss->fd, SNDCTL_DSP_SETTRIGGER, &trig) < 0) {
oss_logerr ( oss_logerr (
@ -692,13 +659,6 @@ static int oss_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
} }
hw->samples = (obt.nfrags * obt.fragsize) >> hw->info.shift; hw->samples = (obt.nfrags * obt.fragsize) >> hw->info.shift;
oss->pcm_buf = audio_calloc(__func__, hw->samples, 1 << hw->info.shift);
if (!oss->pcm_buf) {
dolog("Could not allocate ADC buffer (%zu samples, each %d bytes)\n",
hw->samples, 1 << hw->info.shift);
oss_anal_close (&fd);
return -1;
}
oss->fd = fd; oss->fd = fd;
oss->dev = dev; oss->dev = dev;
@ -710,78 +670,36 @@ static void oss_fini_in (HWVoiceIn *hw)
OSSVoiceIn *oss = (OSSVoiceIn *) hw; OSSVoiceIn *oss = (OSSVoiceIn *) hw;
oss_anal_close (&oss->fd); oss_anal_close (&oss->fd);
g_free(oss->pcm_buf);
oss->pcm_buf = NULL;
} }
static size_t oss_run_in(HWVoiceIn *hw) static size_t oss_read(HWVoiceIn *hw, void *buf, size_t len)
{ {
OSSVoiceIn *oss = (OSSVoiceIn *) hw; OSSVoiceIn *oss = (OSSVoiceIn *) hw;
int hwshift = hw->info.shift; size_t pos = 0;
int i;
size_t live = audio_pcm_hw_get_live_in (hw);
size_t dead = hw->samples - live;
size_t read_samples = 0;
struct {
size_t add;
size_t len;
} bufs[2] = {
{ .add = hw->wpos, .len = 0 },
{ .add = 0, .len = 0 }
};
if (!dead) { while (len) {
return 0;
}
if (hw->wpos + dead > hw->samples) {
bufs[0].len = (hw->samples - hw->wpos) << hwshift;
bufs[1].len = (dead - (hw->samples - hw->wpos)) << hwshift;
}
else {
bufs[0].len = dead << hwshift;
}
for (i = 0; i < 2; ++i) {
ssize_t nread; ssize_t nread;
if (bufs[i].len) { void *dst = advance(buf, pos);
void *p = advance (oss->pcm_buf, bufs[i].add << hwshift); nread = read(oss->fd, dst, len);
nread = read (oss->fd, p, bufs[i].len);
if (nread > 0) { if (nread == -1) {
if (nread & hw->info.align) { switch (errno) {
dolog("warning: Misaligned read %zd (requested %zu), " case EINTR:
"alignment %d\n", nread, bufs[i].add << hwshift, case EAGAIN:
hw->info.align + 1); break;
} default:
read_samples += nread >> hwshift; oss_logerr(errno, "Failed to read %zu bytes of audio (to %p)\n",
hw->conv (hw->conv_buf + bufs[i].add, p, nread >> hwshift); len, dst);
}
if (bufs[i].len - nread) {
if (nread == -1) {
switch (errno) {
case EINTR:
case EAGAIN:
break;
default:
oss_logerr(
errno,
"Failed to read %zu bytes of audio (to %p)\n",
bufs[i].len, p
);
break;
}
}
break; break;
} }
} }
pos += nread;
len -= nread;
} }
hw->wpos = (hw->wpos + read_samples) % hw->samples; return pos;
return read_samples;
} }
static int oss_ctl_in (HWVoiceIn *hw, int cmd, ...) static int oss_ctl_in (HWVoiceIn *hw, int cmd, ...)
@ -845,12 +763,14 @@ static void oss_audio_fini (void *opaque)
static struct audio_pcm_ops oss_pcm_ops = { static struct audio_pcm_ops oss_pcm_ops = {
.init_out = oss_init_out, .init_out = oss_init_out,
.fini_out = oss_fini_out, .fini_out = oss_fini_out,
.run_out = oss_run_out, .write = oss_write,
.get_buffer_out = oss_get_buffer_out,
.put_buffer_out = oss_put_buffer_out,
.ctl_out = oss_ctl_out, .ctl_out = oss_ctl_out,
.init_in = oss_init_in, .init_in = oss_init_in,
.fini_in = oss_fini_in, .fini_in = oss_fini_in,
.run_in = oss_run_in, .read = oss_read,
.ctl_in = oss_ctl_in .ctl_in = oss_ctl_in
}; };