From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: balaton@eik.bme.hu
Subject: [PATCH 05/13] audio: commonize voice initialization
Date: Mon, 2 Oct 2023 16:57:19 +0200 [thread overview]
Message-ID: <20231002145728.87958-6-pbonzini@redhat.com> (raw)
In-Reply-To: <20231002145728.87958-1-pbonzini@redhat.com>
Move some mostly irrelevant code out of audio_init.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
audio/audio.c | 19 ++-----------------
audio/audio_template.h | 9 ++++++++-
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 874a4c3c412..bb1734a95d3 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1570,8 +1570,8 @@ static int audio_driver_init(AudioState *s, struct audio_driver *drv,
drv->pcm_ops->put_buffer_out = audio_generic_put_buffer_out;
}
- audio_init_nb_voices_out(s, drv);
- audio_init_nb_voices_in(s, drv);
+ audio_init_nb_voices_out(s, drv, 1);
+ audio_init_nb_voices_in(s, drv, 0);
s->drv = drv;
return 0;
} else {
@@ -1774,21 +1774,6 @@ static AudioState *audio_init(Audiodev *dev, const char *name)
s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);
- s->nb_hw_voices_out = audio_get_pdo_out(dev)->voices;
- s->nb_hw_voices_in = audio_get_pdo_in(dev)->voices;
-
- if (s->nb_hw_voices_out < 1) {
- dolog ("Bogus number of playback voices %d, setting to 1\n",
- s->nb_hw_voices_out);
- s->nb_hw_voices_out = 1;
- }
-
- if (s->nb_hw_voices_in < 0) {
- dolog ("Bogus number of capture voices %d, setting to 0\n",
- s->nb_hw_voices_in);
- s->nb_hw_voices_in = 0;
- }
-
if (drvname) {
driver = audio_driver_lookup(drvname);
if (driver) {
diff --git a/audio/audio_template.h b/audio/audio_template.h
index dc0c74aa746..7ccfec01168 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -37,11 +37,12 @@
#endif
static void glue(audio_init_nb_voices_, TYPE)(AudioState *s,
- struct audio_driver *drv)
+ struct audio_driver *drv, int min_voices)
{
int max_voices = glue (drv->max_voices_, TYPE);
size_t voice_size = glue(drv->voice_size_, TYPE);
+ glue (s->nb_hw_voices_, TYPE) = glue(audio_get_pdo_, TYPE)(s->dev)->voices;
if (glue (s->nb_hw_voices_, TYPE) > max_voices) {
if (!max_voices) {
#ifdef DAC
@@ -56,6 +57,12 @@ static void glue(audio_init_nb_voices_, TYPE)(AudioState *s,
glue (s->nb_hw_voices_, TYPE) = max_voices;
}
+ if (glue (s->nb_hw_voices_, TYPE) < min_voices) {
+ dolog ("Bogus number of " NAME " voices %d, setting to %d\n",
+ glue (s->nb_hw_voices_, TYPE),
+ min_voices);
+ }
+
if (audio_bug(__func__, !voice_size && max_voices)) {
dolog ("drv=`%s' voice_size=0 max_voices=%d\n",
drv->name, max_voices);
--
2.41.0
next prev parent reply other threads:[~2023-10-02 14:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 14:57 [PATCH v4 00/13] Cleanup deprecated audio features, take 2 Paolo Bonzini
2023-10-02 14:57 ` [PATCH 01/13] ui/vnc: Require audiodev= to enable audio Paolo Bonzini
2023-10-02 14:57 ` [PATCH 02/13] audio: Require AudioState in AUD_add_capture Paolo Bonzini
2023-10-02 14:57 ` [PATCH 03/13] audio: allow returning an error from the driver init Paolo Bonzini
2023-10-02 14:57 ` [PATCH 04/13] audio: return Error ** from audio_state_by_name Paolo Bonzini
2023-10-02 14:57 ` Paolo Bonzini [this message]
2023-10-02 14:57 ` [PATCH 06/13] audio: simplify flow in audio_init Paolo Bonzini
2023-10-02 14:57 ` [PATCH 07/13] audio: remove QEMU_AUDIO_* and -audio-help support Paolo Bonzini
2023-10-02 14:57 ` [PATCH 08/13] Introduce machine property "audiodev" Paolo Bonzini
2023-10-02 14:57 ` [PATCH 09/13] hw/arm: Support machine-default audiodev with fallback Paolo Bonzini
2023-10-02 14:57 ` [PATCH 10/13] hw/ppc: " Paolo Bonzini
2023-10-02 14:57 ` [PATCH 11/13] vt82c686 machines: " Paolo Bonzini
2023-10-02 14:57 ` [PATCH 12/13] audio: propagate Error * out of audio_init Paolo Bonzini
2023-10-02 14:57 ` [PATCH 13/13] audio: forbid default audiodev backend with -nodefaults Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2023-09-28 7:36 [PATCH v2 00/13] Cleanup deprecated audio features, take 2 Paolo Bonzini
2023-09-28 7:36 ` [PATCH 05/13] audio: commonize voice initialization Paolo Bonzini
2023-09-23 8:54 [PATCH 00/13] Cleanup deprecated audio features, take 2 Paolo Bonzini
2023-09-23 8:54 ` [PATCH 05/13] audio: commonize voice initialization Paolo Bonzini
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=20231002145728.87958-6-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=balaton@eik.bme.hu \
--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).