vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio: do not run each backend in audio_run 

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 <DirtY.iCE.hu@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 10221fcea2028fa18d95cf531526ffe3b1d9b21a.1566168923.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
master
Kővágó, Zoltán 2019-08-19 01:06:55 +02:00 committed by Gerd Hoffmann
parent 5893591503
commit 18e2c1771b
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
audio/alsaaudio.c
View File

@ -39,6 +39,7 @@ struct pollhlp {
struct pollfd *pfds; struct pollfd *pfds;
int count; int count;
int mask; int mask;
AudioState *s;
}; };
typedef struct ALSAVoiceOut { typedef struct ALSAVoiceOut {
@ -199,11 +200,11 @@ static void alsa_poll_handler (void *opaque)
break; break;
case SND_PCM_STATE_PREPARED: case SND_PCM_STATE_PREPARED:
audio_run ("alsa run (prepared)"); audio_run(hlp->s, "alsa run (prepared)");
break; break;
case SND_PCM_STATE_RUNNING: case SND_PCM_STATE_RUNNING:
audio_run ("alsa run (running)"); audio_run(hlp->s, "alsa run (running)");
break; break;
default: default:
@ -749,6 +750,7 @@ static int alsa_init_out(HWVoiceOut *hw, struct audsettings *as,
return -1; return -1;
} }
alsa->pollhlp.s = hw->s;
alsa->handle = handle; alsa->handle = handle;
alsa->dev = dev; alsa->dev = dev;
return 0; return 0;
@ -850,6 +852,7 @@ static int alsa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)
return -1; return -1;
} }
alsa->pollhlp.s = hw->s;
alsa->handle = handle; alsa->handle = handle;
alsa->dev = dev; alsa->dev = dev;
return 0; return 0;

14
audio/audio.c
View File

@ -837,7 +837,7 @@ static void audio_timer (void *opaque)
} }
s->timer_last = now; s->timer_last = now;
audio_run("timer"); audio_run(s, "timer");
audio_reset_timer(s); audio_reset_timer(s);
} }
@ -1239,15 +1239,11 @@ static void audio_run_capture (AudioState *s)
} }
} }
void audio_run (const char *msg) void audio_run(AudioState *s, const char *msg)
{ {
AudioState *s; audio_run_out(s);
audio_run_in(s);
QTAILQ_FOREACH(s, &audio_states, list) { audio_run_capture(s);
audio_run_out(s);
audio_run_in(s);
audio_run_capture(s);
}
#ifdef DEBUG_POLL #ifdef DEBUG_POLL
{ {

2
audio/audio_int.h
View File

@ -221,7 +221,7 @@ int audio_pcm_hw_clip_out (HWVoiceOut *hw, void *pcm_buf,
int audio_bug (const char *funcname, int cond); int audio_bug (const char *funcname, int cond);
void *audio_calloc (const char *funcname, int nmemb, size_t size); 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_ENABLE 1
#define VOICE_DISABLE 2 #define VOICE_DISABLE 2

12
audio/ossaudio.c
View File

@ -110,28 +110,28 @@ static void oss_anal_close (int *fdp)
static void oss_helper_poll_out (void *opaque) static void oss_helper_poll_out (void *opaque)
{ {
(void) opaque; AudioState *s = opaque;
audio_run ("oss_poll_out"); audio_run(s, "oss_poll_out");
} }
static void oss_helper_poll_in (void *opaque) static void oss_helper_poll_in (void *opaque)
{ {
(void) opaque; AudioState *s = opaque;
audio_run ("oss_poll_in"); audio_run(s, "oss_poll_in");
} }
static void oss_poll_out (HWVoiceOut *hw) static void oss_poll_out (HWVoiceOut *hw)
{ {
OSSVoiceOut *oss = (OSSVoiceOut *) 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) static void oss_poll_in (HWVoiceIn *hw)
{ {
OSSVoiceIn *oss = (OSSVoiceIn *) 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) static int oss_write (SWVoiceOut *sw, void *buf, int len)