[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 42/50] audio: make mixeng optional
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH v3 42/50] audio: make mixeng optional |
Date: |
Thu, 17 Jan 2019 00:37:15 +0100 |
Implementation of the previously added mixeng option.
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/audio_template.h | 46 ++++++++++++++++-----------
audio/audio.c | 70 ++++++++++++++++++++++++++++++++++++++----
2 files changed, 92 insertions(+), 24 deletions(-)
diff --git a/audio/audio_template.h b/audio/audio_template.h
index 9ec565fc48..e5a4d6fa40 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -78,26 +78,32 @@ 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) {
- /*
- * We should only end up here when using wavcapture hmp command (and
not
- * the wavcapture audio backend).
- * It needs a lot of samples, otherwise you'll end up with "Could not
- * mix X bytes into a capture buffer" warnings and a garbled capture.
- */
- samples = 4096 * 4;
- } else 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) {
+ /*
+ * We should only end up here when using wavcapture hmp command
(and
+ * not the wavcapture audio backend).
+ * It needs a lot of samples, otherwise you'll end up with "Could
+ * not mix X bytes into a capture buffer" warnings and a garbled
+ * capture.
+ */
+ samples = 4096 * 4;
+ } else if (hw->pcm_ops->glue(buffer_size_, TYPE)) {
+ samples = hw->pcm_ops->glue(buffer_size_, TYPE)(hw);
+ } else {
+ samples = 1024; /* todo better default */
+ }
+
+ if (audio_bug(__func__, samples == 0)) {
+ dolog("Attempted to allocate empty buffer\n");
+ }
+
+ HWBUF = g_malloc0(sizeof(STSampleBuffer) + sizeof(st_sample) *
samples);
+ HWBUF->size = samples;
} else {
- samples = 1024; /* todo better default */
+ HWBUF = NULL;
}
- if (audio_bug(__func__, samples == 0)) {
- dolog("Attempted to allocate empty buffer\n");
- }
-
- HWBUF = g_malloc0(sizeof(STSampleBuffer) + sizeof(st_sample) * samples);
- HWBUF->size = samples;
}
static void glue (audio_pcm_sw_free_resources_, TYPE) (SW *sw)
@@ -116,6 +122,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(__func__, samples, sizeof(struct st_sample));
diff --git a/audio/audio.c b/audio/audio.c
index 6bbbcd3e03..db42d89dc3 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -839,32 +839,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)
@@ -1086,6 +1100,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;
@@ -1223,6 +1257,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 = 0, min;
@@ -1738,6 +1783,11 @@ CaptureVoiceOut *AUD_add_capture(
s = audio_init(NULL, NULL);
}
+ 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);
@@ -1888,9 +1938,13 @@ static void audio_validate_per_direction_opts(
*has_pdo = true;
}
+ 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))
{
@@ -1898,6 +1952,10 @@ static void audio_validate_per_direction_opts(
"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;
@@ -1909,7 +1967,7 @@ static void audio_validate_per_direction_opts(
}
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;
--
2.20.1
- [Qemu-devel] [PATCH v3 45/50] audio: replace shift in audio_pcm_info with bytes_per_frame, (continued)
- [Qemu-devel] [PATCH v3 45/50] audio: replace shift in audio_pcm_info with bytes_per_frame, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 37/50] audio: unify input and output mixeng buffer management, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 33/50] sdlaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 26/50] audio: api for mixeng code free backends, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 48/50] usb-audio: do not count on avail bytes actually available, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 41/50] audio: add mixeng option (documentation), Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 27/50] alsaaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 40/50] audio: split ctl_* functions into enable_* and volume_*, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 34/50] spiceaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 42/50] audio: make mixeng optional,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH v3 47/50] paaudio: channel-map option, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 29/50] dsoundaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 31/50] ossaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 25/50] audio: use size_t where makes sense, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 50/50] usbaudio: change playback counters to 64 bit, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 38/50] audio: remove hw->samples, buffer_size_in/out pcm_ops, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 39/50] audio: common rate control code for timer based outputs, Kővágó, Zoltán, 2019/01/16