From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
Kővágó@redhat.com, "Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Michael Walle" <michael@walle.cc>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
Zoltán <DirtY.iCE.hu@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [Qemu-devel] [PULL 02/15] audio: basic support for multi backend audio
Date: Tue, 13 Aug 2019 13:17:56 +0200 [thread overview]
Message-ID: <20190813111809.3141-3-kraxel@redhat.com> (raw)
In-Reply-To: <20190813111809.3141-1-kraxel@redhat.com>
From: Kővágó, Zoltán <dirty.ice.hu@gmail.com>
Audio functions no longer access glob_audio_state, instead they get an
AudioState as a parameter. This is required in order to support
multiple backends.
glob_audio_state is also gone, and replaced with a tailq so we can store
more than one states.
Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Message-id: eacee3fe658ed65121dcbeb8ba7cf8df58820517.1564925486.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
audio/audio.h | 12 +++--
audio/audio_int.h | 2 +
audio/audio_template.h | 2 +-
audio/audio.c | 102 +++++++++++++++++++++++++++++++----------
audio/wavcapture.c | 6 +--
monitor/misc.c | 2 +-
ui/vnc.c | 2 +-
7 files changed, 95 insertions(+), 33 deletions(-)
diff --git a/audio/audio.h b/audio/audio.h
index 64b0f761bcaa..ad2457f4de95 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -78,8 +78,10 @@ typedef struct SWVoiceOut SWVoiceOut;
typedef struct CaptureVoiceOut CaptureVoiceOut;
typedef struct SWVoiceIn SWVoiceIn;
+typedef struct AudioState AudioState;
typedef struct QEMUSoundCard {
char *name;
+ AudioState *state;
QLIST_ENTRY (QEMUSoundCard) entries;
} QEMUSoundCard;
@@ -92,7 +94,8 @@ void AUD_log (const char *cap, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
void AUD_register_card (const char *name, QEMUSoundCard *card);
void AUD_remove_card (QEMUSoundCard *card);
-CaptureVoiceOut *AUD_add_capture (
+CaptureVoiceOut *AUD_add_capture(
+ AudioState *s,
struct audsettings *as,
struct audio_capture_ops *ops,
void *opaque
@@ -160,8 +163,8 @@ static inline void *advance (void *p, int incr)
#define audio_MAX(a, b) ((a)<(b)?(b):(a))
#endif
-int wav_start_capture (CaptureState *s, const char *path, int freq,
- int bits, int nchannels);
+int wav_start_capture(AudioState *state, CaptureState *s, const char *path,
+ int freq, int bits, int nchannels);
bool audio_is_cleaning_up(void);
void audio_cleanup(void);
@@ -175,4 +178,7 @@ void audio_parse_option(const char *opt);
void audio_init_audiodevs(void);
void audio_legacy_help(void);
+AudioState *audio_state_by_name(const char *name);
+const char *audio_get_id(QEMUSoundCard *card);
+
#endif /* QEMU_AUDIO_H */
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 8164696b2c4a..9f01f6ad002c 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -196,6 +196,8 @@ typedef struct AudioState {
bool timer_running;
uint64_t timer_last;
+
+ QTAILQ_ENTRY(AudioState) list;
} AudioState;
extern const struct mixeng_volume nominal_volume;
diff --git a/audio/audio_template.h b/audio/audio_template.h
index c721fed75d7d..54f07338e76f 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -428,7 +428,7 @@ SW *glue (AUD_open_, TYPE) (
struct audsettings *as
)
{
- AudioState *s = &glob_audio_state;
+ AudioState *s = card->state;
AudiodevPerDirectionOptions *pdo = glue(audio_get_pdo_, TYPE)(s->dev);
if (audio_bug(__func__, !card || !name || !callback_fn || !as)) {
diff --git a/audio/audio.c b/audio/audio.c
index 8d2f5807884e..4baa37caac93 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -87,7 +87,8 @@ audio_driver *audio_driver_lookup(const char *name)
return NULL;
}
-static AudioState glob_audio_state;
+static QTAILQ_HEAD(AudioStateHead, AudioState) audio_states =
+ QTAILQ_HEAD_INITIALIZER(audio_states);
const struct mixeng_volume nominal_volume = {
.mute = 0,
@@ -1236,11 +1237,14 @@ static void audio_run_capture (AudioState *s)
void audio_run (const char *msg)
{
- AudioState *s = &glob_audio_state;
+ AudioState *s;
+
+ QTAILQ_FOREACH(s, &audio_states, list) {
+ audio_run_out(s);
+ audio_run_in(s);
+ audio_run_capture(s);
+ }
- audio_run_out (s);
- audio_run_in (s);
- audio_run_capture (s);
#ifdef DEBUG_POLL
{
static double prevtime;
@@ -1304,13 +1308,11 @@ bool audio_is_cleaning_up(void)
return is_cleaning_up;
}
-void audio_cleanup(void)
+static void free_audio_state(AudioState *s)
{
- AudioState *s = &glob_audio_state;
HWVoiceOut *hwo, *hwon;
HWVoiceIn *hwi, *hwin;
- is_cleaning_up = true;
QLIST_FOREACH_SAFE(hwo, &s->hw_head_out, entries, hwon) {
SWVoiceCap *sc;
@@ -1347,6 +1349,17 @@ void audio_cleanup(void)
qapi_free_Audiodev(s->dev);
s->dev = NULL;
}
+ g_free(s);
+}
+
+void audio_cleanup(void)
+{
+ is_cleaning_up = true;
+ while (!QTAILQ_EMPTY(&audio_states)) {
+ AudioState *s = QTAILQ_FIRST(&audio_states);
+ QTAILQ_REMOVE(&audio_states, s, list);
+ free_audio_state(s);
+ }
}
static const VMStateDescription vmstate_audio = {
@@ -1373,28 +1386,33 @@ static AudiodevListEntry *audiodev_find(
return NULL;
}
-static int audio_init(Audiodev *dev)
+/*
+ * if we have dev, this function was called because of an -audiodev argument =>
+ * initialize a new state with it
+ * if dev == NULL => legacy implicit initialization, return the already created
+ * state or create a new one
+ */
+static AudioState *audio_init(Audiodev *dev)
{
+ static bool atexit_registered;
size_t i;
int done = 0;
const char *drvname = NULL;
VMChangeStateEntry *e;
- AudioState *s = &glob_audio_state;
+ AudioState *s;
struct audio_driver *driver;
/* silence gcc warning about uninitialized variable */
AudiodevListHead head = QSIMPLEQ_HEAD_INITIALIZER(head);
- if (s->drv) {
- if (dev) {
- dolog("Cannot create more than one audio backend, sorry\n");
- qapi_free_Audiodev(dev);
- }
- return -1;
- }
-
if (dev) {
/* -audiodev option */
drvname = AudiodevDriver_str(dev->driver);
+ } else if (!QTAILQ_EMPTY(&audio_states)) {
+ /*
+ * todo: check for -audiodev once we have normal audiodev selection
+ * support
+ */
+ return QTAILQ_FIRST(&audio_states);
} else {
/* legacy implicit initialization */
head = audio_handle_legacy_opts();
@@ -1408,12 +1426,18 @@ static int audio_init(Audiodev *dev)
dev = QSIMPLEQ_FIRST(&head)->dev;
audio_validate_opts(dev, &error_abort);
}
+
+ s = g_malloc0(sizeof(AudioState));
s->dev = dev;
QLIST_INIT (&s->hw_head_out);
QLIST_INIT (&s->hw_head_in);
QLIST_INIT (&s->cap_head);
- atexit(audio_cleanup);
+ if (!atexit_registered) {
+ atexit(audio_cleanup);
+ atexit_registered = true;
+ }
+ QTAILQ_INSERT_TAIL(&audio_states, s, list);
s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);
@@ -1478,7 +1502,7 @@ static int audio_init(Audiodev *dev)
QLIST_INIT (&s->card_head);
vmstate_register (NULL, 0, &vmstate_audio, s);
- return 0;
+ return s;
}
void audio_free_audiodev_list(AudiodevListHead *head)
@@ -1493,10 +1517,13 @@ void audio_free_audiodev_list(AudiodevListHead *head)
void AUD_register_card (const char *name, QEMUSoundCard *card)
{
- audio_init(NULL);
+ if (!card->state) {
+ card->state = audio_init(NULL);
+ }
+
card->name = g_strdup (name);
memset (&card->entries, 0, sizeof (card->entries));
- QLIST_INSERT_HEAD (&glob_audio_state.card_head, card, entries);
+ QLIST_INSERT_HEAD(&card->state->card_head, card, entries);
}
void AUD_remove_card (QEMUSoundCard *card)
@@ -1506,16 +1533,21 @@ void AUD_remove_card (QEMUSoundCard *card)
}
-CaptureVoiceOut *AUD_add_capture (
+CaptureVoiceOut *AUD_add_capture(
+ AudioState *s,
struct audsettings *as,
struct audio_capture_ops *ops,
void *cb_opaque
)
{
- AudioState *s = &glob_audio_state;
CaptureVoiceOut *cap;
struct capture_callback *cb;
+ if (!s) {
+ /* todo: remove when we have normal audiodev selection support */
+ s = audio_init(NULL);
+ }
+
if (audio_validate_settings (as)) {
dolog ("Invalid settings were passed when trying to add capture\n");
audio_print_settings (as);
@@ -1805,3 +1837,25 @@ int audio_buffer_bytes(AudiodevPerDirectionOptions *pdo,
return audio_buffer_samples(pdo, as, def_usecs) *
audioformat_bytes_per_sample(as->fmt);
}
+
+AudioState *audio_state_by_name(const char *name)
+{
+ AudioState *s;
+ QTAILQ_FOREACH(s, &audio_states, list) {
+ assert(s->dev);
+ if (strcmp(name, s->dev->id) == 0) {
+ return s;
+ }
+ }
+ return NULL;
+}
+
+const char *audio_get_id(QEMUSoundCard *card)
+{
+ if (card->state) {
+ assert(card->state->dev);
+ return card->state->dev->id;
+ } else {
+ return "";
+ }
+}
diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 74320dfecc76..81c5c190327b 100644
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -105,8 +105,8 @@ static struct capture_ops wav_capture_ops = {
.info = wav_capture_info
};
-int wav_start_capture (CaptureState *s, const char *path, int freq,
- int bits, int nchannels)
+int wav_start_capture(AudioState *state, CaptureState *s, const char *path,
+ int freq, int bits, int nchannels)
{
WAVState *wav;
uint8_t hdr[] = {
@@ -171,7 +171,7 @@ int wav_start_capture (CaptureState *s, const char *path, int freq,
goto error_free;
}
- cap = AUD_add_capture (&as, &ops, wav);
+ cap = AUD_add_capture(state, &as, &ops, wav);
if (!cap) {
error_report("Failed to add audio capture");
goto error_free;
diff --git a/monitor/misc.c b/monitor/misc.c
index 00338c002a67..e393333a0e13 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -1156,7 +1156,7 @@ static void hmp_wavcapture(Monitor *mon, const QDict *qdict)
bits = has_bits ? bits : 16;
nchannels = has_channels ? nchannels : 2;
- if (wav_start_capture (s, path, freq, bits, nchannels)) {
+ if (wav_start_capture(NULL, s, path, freq, bits, nchannels)) {
monitor_printf(mon, "Failed to add wave capture\n");
g_free (s);
return;
diff --git a/ui/vnc.c b/ui/vnc.c
index 38f92bfca3d7..140f364ddacf 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1222,7 +1222,7 @@ static void audio_add(VncState *vs)
ops.destroy = audio_capture_destroy;
ops.capture = audio_capture;
- vs->audio_cap = AUD_add_capture(&vs->as, &ops, vs);
+ vs->audio_cap = AUD_add_capture(NULL, &vs->as, &ops, vs);
if (!vs->audio_cap) {
error_report("Failed to add audio capture");
}
--
2.18.1
next prev parent reply other threads:[~2019-08-13 11:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 11:17 [Qemu-devel] [PULL 00/15] Audio 20190813 patches Gerd Hoffmann
2019-08-13 11:17 ` [Qemu-devel] [PULL 01/15] audio: reduce glob_audio_state usage Gerd Hoffmann
2019-08-13 11:17 ` Gerd Hoffmann [this message]
2019-08-13 11:17 ` [Qemu-devel] [PULL 03/15] audio: add audiodev property to vnc and wav_capture Gerd Hoffmann
2019-08-13 11:17 ` [Qemu-devel] [PULL 04/15] audio: add audiodev properties to frontends Gerd Hoffmann
2019-08-13 11:17 ` [Qemu-devel] [PULL 05/15] paaudio: prepare for multiple audiodev Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 06/15] audio: audiodev= parameters no longer optional when -audiodev present Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 07/15] paaudio: do not move stream when sink/source name is specified Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 08/15] paaudio: properly disconnect streams in fini_* Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 09/15] audio: remove audio_MIN, audio_MAX Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 10/15] audio: do not run each backend in audio_run Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 11/15] paaudio: fix playback glitches Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 12/15] audio: remove read and write pcm_ops Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 13/15] audio: use size_t where makes sense Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 14/15] audio: fix memory leak reported by ASAN Gerd Hoffmann
2019-08-13 11:18 ` [Qemu-devel] [PULL 15/15] audio: Add missing fall through comments Gerd Hoffmann
2019-08-13 11:22 ` [Qemu-devel] [PULL 00/15] Audio 20190813 patches Peter Maydell
2019-08-13 11:53 ` Gerd Hoffmann
2019-08-16 10:10 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190813111809.3141-3-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=DirtY.iCE.hu@gmail.com \
--cc=Kővágó@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=michael@walle.cc \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).