Implementation of the previously added mixeng option.
Signed-off-by: Kővágó, Zoltán <dirty.ice...@gmail.com>
---
audio/audio.c | 70 +++++++++++++++++++++++++++++++++++++++++++++-----
audio/audio_template.h | 22 +++++++++++-----
2 files changed, 79 insertions(+), 13 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 94ffd72..ee02b5c 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -794,32 +794,46 @@ static void audio_timer (void *opaque)
*/
size_t AUD_write(SWVoiceOut *sw, void *buf, size_t size)
{
+ HWVoiceOut *hw;
+
if (!sw) {
/* XXX: Consider options */
return size;
}
+ hw = sw->hw;
- if (!sw->hw->enabled) {
+ if (!hw->enabled) {
dolog ("Writing to disabled voice %s\n", SW_NAME (sw));
return 0;
}
- return audio_pcm_sw_write(sw, buf, size);
+ if (hw->s->dev->out->mixeng) {
+ return audio_pcm_sw_write(sw, buf, size);
+ } else {
+ return hw->pcm_ops->write(hw, buf, size);
+ }
}
size_t AUD_read(SWVoiceIn *sw, void *buf, size_t size)
{
+ HWVoiceIn *hw;
+
if (!sw) {
/* XXX: Consider options */
return size;
}
+ hw = sw->hw;
- if (!sw->hw->enabled) {
+ if (!hw->enabled) {
dolog ("Reading from disabled voice %s\n", SW_NAME (sw));
return 0;
}
- return audio_pcm_sw_read(sw, buf, size);
+ if (hw->s->dev->in->mixeng) {
+ return audio_pcm_sw_read(sw, buf, size);
+ } else {
+ return hw->pcm_ops->read(hw, buf, size);
+ }
}
int AUD_get_buffer_size_out (SWVoiceOut *sw)
@@ -1033,6 +1047,26 @@ static void audio_run_out (AudioState *s)
HWVoiceOut *hw = NULL;
SWVoiceOut *sw;
+ if (!s->dev->out->mixeng) {
+ while ((hw = audio_pcm_hw_find_any_enabled_out(s, hw))) {
+ /* there is exactly 1 sw for each hw with no mixeng */
+ sw = hw->sw_head.lh_first;
+
+ if (hw->pending_disable) {
+ hw->enabled = 0;
+ hw->pending_disable = 0;
+ if (hw->pcm_ops->enable_out) {
+ hw->pcm_ops->enable_out(hw, false);
+ }
+ }
+
+ if (sw->active) {
+ sw->callback.fn(sw->callback.opaque, INT_MAX);
+ }
+ }
+ return;
+ }
+
while ((hw = audio_pcm_hw_find_any_enabled_out(s, hw))) {
size_t played, live, prev_rpos, free;
int nb_live, cleanup_required;
@@ -1167,6 +1201,17 @@ static void audio_run_in (AudioState *s)
{
HWVoiceIn *hw = NULL;
+ if (!s->dev->in->mixeng) {
+ while ((hw = audio_pcm_hw_find_any_enabled_in(s, hw))) {
+ /* there is exactly 1 sw for each hw with no mixeng */
+ SWVoiceIn *sw = hw->sw_head.lh_first;
+ if (sw->active) {
+ sw->callback.fn(sw->callback.opaque, INT_MAX);
+ }
+ }
+ return;
+ }
+
while ((hw = audio_pcm_hw_find_any_enabled_in(s, hw))) {
SWVoiceIn *sw;
size_t captured, min;
@@ -1643,6 +1688,11 @@ CaptureVoiceOut *AUD_add_capture(
s = QTAILQ_FIRST(&audio_states);
}
+ if (!s->dev->out->mixeng) {
+ dolog("Can't capture with mixeng disabled\n");
+ goto err0;
+ }
+
if (audio_validate_settings (as)) {
dolog ("Invalid settings were passed when trying to add capture\n");
audio_print_settings (as);
@@ -1800,9 +1850,13 @@ QemuOptsList qemu_audiodev_opts = {
static void validate_per_direction_opts(AudiodevPerDirectionOptions *pdo,
Error **errp)
{
+ if (!pdo->has_mixeng) {
+ pdo->has_mixeng = true;
+ pdo->mixeng = true;
+ }
if (!pdo->has_fixed_settings) {
pdo->has_fixed_settings = true;
- pdo->fixed_settings = true;
+ pdo->fixed_settings = pdo->mixeng;
}
if (!pdo->fixed_settings &&
(pdo->has_frequency || pdo->has_channels || pdo->has_format)) {
@@ -1810,6 +1864,10 @@ static void
validate_per_direction_opts(AudiodevPerDirectionOptions *pdo,
"You can't use frequency, channels or format with
fixed-settings=off");
return;
}
+ if (!pdo->mixeng && pdo->fixed_settings) {
+ error_setg(errp, "You can't use fixed-settings without mixeng");
+ return;
+ }
if (!pdo->has_frequency) {
pdo->has_frequency = true;
@@ -1821,7 +1879,7 @@ static void
validate_per_direction_opts(AudiodevPerDirectionOptions *pdo,
}
if (!pdo->has_voices) {
pdo->has_voices = true;
- pdo->voices = 1;
+ pdo->voices = pdo->mixeng ? 1 : INT_MAX;
}
if (!pdo->has_format) {
pdo->has_format = true;
diff --git a/audio/audio_template.h b/audio/audio_template.h
index 473eac9..942d9a4 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -78,15 +78,19 @@ static void glue (audio_pcm_hw_free_resources_, TYPE) (HW
*hw)
static void glue(audio_pcm_hw_alloc_resources_, TYPE)(HW *hw)
{
- size_t samples;
- if (hw->pcm_ops->glue(buffer_size_, TYPE)) {
- samples = hw->pcm_ops->glue(buffer_size_, TYPE)(hw);
+ if (hw->s->dev->TYPE->mixeng) {
+ size_t samples;
+ if (hw->pcm_ops->glue(buffer_size_, TYPE)) {
+ samples = hw->pcm_ops->glue(buffer_size_, TYPE)(hw);
+ } else {
+ samples = 1024; /* todo better default */
+ }
+
+ HWBUF = g_malloc0(sizeof(STSampleBuffer) + sizeof(st_sample)*samples);
+ HWBUF->size = samples;
} else {
- samples = 1024; /* todo better default */
+ HWBUF = NULL;
}
-
- HWBUF = g_malloc0(sizeof(STSampleBuffer) + sizeof(st_sample)*samples);
- HWBUF->size = samples;
}
static void glue (audio_pcm_sw_free_resources_, TYPE) (SW *sw)
@@ -105,6 +109,10 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW
*sw)
{
int samples;
+ if (!sw->s->dev->TYPE->mixeng) {
+ return 0;
+ }
+
samples = ((int64_t) sw->HWBUF->size << 32) / sw->ratio;
sw->buf = audio_calloc (AUDIO_FUNC, samples, sizeof (struct st_sample));
--
2.4.5
