[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/51] audio: do not run each backend in audio_run
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH 24/51] audio: do not run each backend in audio_run |
Date: |
Thu, 14 Jan 2016 14:45:37 +0100 |
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.
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/alsaaudio.c | 7 +++++--
audio/audio.c | 17 +++++++----------
audio/audio_int.h | 2 +-
audio/ossaudio.c | 12 ++++++------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index e2ad3ba..dcc2a09 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -40,6 +40,7 @@ struct pollhlp {
struct pollfd *pfds;
int count;
int mask;
+ AudioState *s;
};
typedef struct ALSAVoiceOut {
@@ -200,11 +201,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:
@@ -758,6 +759,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;
@@ -859,6 +861,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 f469db8..6cafe87 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -790,8 +790,9 @@ static void audio_reset_timer (AudioState *s)
static void audio_timer (void *opaque)
{
- audio_run ("timer");
- audio_reset_timer (opaque);
+ AudioState *s = opaque;
+ audio_run(s, "timer");
+ audio_reset_timer(s);
}
/*
@@ -1194,15 +1195,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/audio_int.h b/audio/audio_int.h
index 1d81658..c52c656 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -220,7 +220,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/ossaudio.c b/audio/ossaudio.c
index 7bc76c0..ae4c452 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -112,28 +112,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.7.0
- [Qemu-devel] [PATCH 20/51] audio: audiodev= parameters no longer optional when -audiodev present, (continued)
- [Qemu-devel] [PATCH 20/51] audio: audiodev= parameters no longer optional when -audiodev present, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 32/51] ossaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 42/51] audio: add mixeng option (documentation), Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 43/51] audio: make mixeng optional, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 47/51] audio: basic support for multichannel audio, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 39/51] audio: remove hw->samples, buffer_size_in/out pcm_ops, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 41/51] audio: split ctl_* functions into enable_* and volume_*, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 49/51] usb-audio: do not count on avail bytes actually available, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 40/51] audio: common rate control code for timer based outputs, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 51/51] usbaudio: change playback counters to 64 bit, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 24/51] audio: do not run each backend in audio_run,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH 23/51] audio: remove audio_MIN, audio_MAX, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 48/51] paaudio: channel-map option, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 46/51] audio: replace shift in audio_pcm_info with bytes_per_frame, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 38/51] audio: unify input and output mixeng buffer management, Kővágó, Zoltán, 2016/01/14
- Re: [Qemu-devel] [PATCH 00/51] audio 5.1 patches, Victor Toso, 2016/01/14
- Re: [Qemu-devel] [PATCH 00/51] audio 5.1 patches, Gerd Hoffmann, 2016/01/15