Commit 18e2c177 authored by Kővágó, Zoltán's avatar Kővágó, Zoltán Committed by Gerd Hoffmann
Browse files

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: default avatarKővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 10221fcea2028fa18d95cf531526ffe3b1d9b21a.1566168923.git.DirtY.iCE.hu@gmail.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 58935915

audio/alsaaudio.c

+5 −2
Original line number Diff line number Diff line
@@ -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;

audio/audio.c

+5 −9
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ static void audio_timer (void *opaque) 
    }

    s->timer_last = now;



    audio_run("timer");

    audio_run(s, "timer");

    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;



    QTAILQ_FOREACH(s, &audio_states, list) {

    audio_run_out(s);

    audio_run_in(s);

    audio_run_capture(s);

    }



#ifdef DEBUG_POLL

    {

audio/audio_int.h

+1 −1
Original line number Diff line number Diff line
@@ -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

audio/ossaudio.c

+6 −6
Original line number Diff line number Diff line
@@ -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)