[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/14] audio: do not run each backend in audio_ru
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH v2 10/14] audio: do not run each backend in audio_run |
Date: |
Mon, 15 Jul 2019 23:08:12 +0200 |
audio_run is called manually by alsa and oss backends when polling.
In this case only the requesting backend should be run, not all of them.
Signed-off-by: Kővágó, Zoltán <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
audio/audio_int.h | 2 +-
audio/alsaaudio.c | 7 +++++--
audio/audio.c | 14 +++++---------
audio/ossaudio.c | 12 ++++++------
4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 9f01f6ad00..7e00c1332e 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -221,7 +221,7 @@ int audio_pcm_hw_clip_out (HWVoiceOut *hw, void *pcm_buf,
int audio_bug (const char *funcname, int cond);
void *audio_calloc (const char *funcname, int nmemb, size_t size);
-void audio_run (const char *msg);
+void audio_run(AudioState *s, const char *msg);
#define VOICE_ENABLE 1
#define VOICE_DISABLE 2
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 6b9e0f06af..3daa7c8f8f 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -39,6 +39,7 @@ struct pollhlp {
struct pollfd *pfds;
int count;
int mask;
+ AudioState *s;
};
typedef struct ALSAVoiceOut {
@@ -199,11 +200,11 @@ static void alsa_poll_handler (void *opaque)
break;
case SND_PCM_STATE_PREPARED:
- audio_run ("alsa run (prepared)");
+ audio_run(hlp->s, "alsa run (prepared)");
break;
case SND_PCM_STATE_RUNNING:
- audio_run ("alsa run (running)");
+ audio_run(hlp->s, "alsa run (running)");
break;
default:
@@ -749,6 +750,7 @@ static int alsa_init_out(HWVoiceOut *hw, struct audsettings
*as,
return -1;
}
+ alsa->pollhlp.s = hw->s;
alsa->handle = handle;
alsa->dev = dev;
return 0;
@@ -850,6 +852,7 @@ static int alsa_init_in(HWVoiceIn *hw, struct audsettings
*as, void *drv_opaque)
return -1;
}
+ alsa->pollhlp.s = hw->s;
alsa->handle = handle;
alsa->dev = dev;
return 0;
diff --git a/audio/audio.c b/audio/audio.c
index cb0222ab4a..07b35ffa03 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -835,7 +835,7 @@ static void audio_timer (void *opaque)
}
s->timer_last = now;
- audio_run("timer");
+ audio_run(s, "timer");
audio_reset_timer(s);
}
@@ -1237,15 +1237,11 @@ static void audio_run_capture (AudioState *s)
}
}
-void audio_run (const char *msg)
+void audio_run(AudioState *s, const char *msg)
{
- 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
{
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 29139ef1f5..456fba7480 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -110,28 +110,28 @@ static void oss_anal_close (int *fdp)
static void oss_helper_poll_out (void *opaque)
{
- (void) opaque;
- audio_run ("oss_poll_out");
+ AudioState *s = opaque;
+ audio_run(s, "oss_poll_out");
}
static void oss_helper_poll_in (void *opaque)
{
- (void) opaque;
- audio_run ("oss_poll_in");
+ AudioState *s = opaque;
+ audio_run(s, "oss_poll_in");
}
static void oss_poll_out (HWVoiceOut *hw)
{
OSSVoiceOut *oss = (OSSVoiceOut *) hw;
- qemu_set_fd_handler (oss->fd, NULL, oss_helper_poll_out, NULL);
+ qemu_set_fd_handler(oss->fd, NULL, oss_helper_poll_out, hw->s);
}
static void oss_poll_in (HWVoiceIn *hw)
{
OSSVoiceIn *oss = (OSSVoiceIn *) hw;
- qemu_set_fd_handler (oss->fd, oss_helper_poll_in, NULL, NULL);
+ qemu_set_fd_handler(oss->fd, oss_helper_poll_in, NULL, hw->s);
}
static int oss_write (SWVoiceOut *sw, void *buf, int len)
--
2.22.0
- [Qemu-devel] [PATCH v2 03/14] audio: add audiodev property to vnc and wav_capture, (continued)
- [Qemu-devel] [PATCH v2 03/14] audio: add audiodev property to vnc and wav_capture, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 01/14] audio: reduce glob_audio_state usage, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 07/14] paaudio: do not move stream when sink/source name is specified, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 05/14] paaudio: prepare for multiple audiodev, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 08/14] paaudio: properly disconnect streams in fini_*, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 11/14] paaudio: fix playback glitches, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 04/14] audio: add audiodev properties to frontends, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 06/14] audio: audiodev= parameters no longer optional when -audiodev present, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 10/14] audio: do not run each backend in audio_run,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH v2 12/14] audio: remove read and write pcm_ops, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 14/14] audio: fix memory leak reported by ASAN, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 09/14] audio: remove audio_MIN, audio_MAX, Kővágó, Zoltán, 2019/07/15
- [Qemu-devel] [PATCH v2 13/14] audio: use size_t where makes sense, Kővágó, Zoltán, 2019/07/15
- Re: [Qemu-devel] [PATCH v2 00/14] Multiple simultaneous audio backends, no-reply, 2019/07/15
- Re: [Qemu-devel] [PATCH v2 00/14] Multiple simultaneous audio backends, no-reply, 2019/07/16