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

sdlaudio: port to the new audio backend api 



Signed-off-by: default avatarKővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Message-id: ac1722a03fb1b530c2081f46585ce7fa80ebef6c.1568927990.git.DirtY.iCE.hu@gmail.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 49ddd7e1

audio/sdlaudio.c

+42 −45
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ 


typedef struct SDLVoiceOut {

    HWVoiceOut hw;

    size_t live;

    size_t decr;

} SDLVoiceOut;



static struct SDLAudioState {
@@ -184,62 +182,59 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) 
    SDLVoiceOut *sdl = opaque;

    SDLAudioState *s = &glob_sdl;

    HWVoiceOut *hw = &sdl->hw;

    size_t samples = len >> hw->info.shift;

    size_t to_mix, decr;



    if (s->exit || !sdl->live) {

    if (s->exit) {

        return;

    }



    /* dolog ("in callback samples=%zu live=%zu\n", samples, sdl->live); */



    to_mix = MIN(samples, sdl->live);

    decr = to_mix;

    while (to_mix) {

        size_t chunk = MIN(to_mix, hw->samples - hw->rpos);

        struct st_sample *src = hw->mix_buf + hw->rpos;



        /* dolog ("in callback to_mix %zu, chunk %zu\n", to_mix, chunk); */

        hw->clip(buf, src, chunk);

        hw->rpos = (hw->rpos + chunk) % hw->samples;

        to_mix -= chunk;

        buf += chunk << hw->info.shift;

    while (hw->pending_emul && len) {

        size_t write_len;

        ssize_t start = ((ssize_t) hw->pos_emul) - hw->pending_emul;

        if (start < 0) {

            start += hw->size_emul;

        }

    samples -= decr;

    sdl->live -= decr;

    sdl->decr += decr;

        assert(start >= 0 && start < hw->size_emul);



    /* dolog ("done len=%zu\n", len); */

        write_len = MIN(MIN(hw->pending_emul, len),

                        hw->size_emul - start);



    /* SDL2 does not clear the remaining buffer for us, so do it on our own */

    if (samples) {

        memset(buf, 0, samples << hw->info.shift);

        memcpy(buf, hw->buf_emul + start, write_len);

        hw->pending_emul -= write_len;

        len -= write_len;

        buf += write_len;

    }

}



static size_t sdl_run_out(HWVoiceOut *hw, size_t live)

{

    size_t decr;

    SDLVoiceOut *sdl = (SDLVoiceOut *) hw;



    SDL_LockAudio();



    if (sdl->decr > live) {

        ldebug ("sdl->decr %d live %d sdl->live %d\n",

                sdl->decr,

                live,

                sdl->live);

    /* clear remaining buffer that we couldn't fill with data */

    if (len) {

        memset(buf, 0, len);

    }

}



    decr = MIN (sdl->decr, live);

    sdl->decr -= decr;

#define SDL_WRAPPER_FUNC(name, ret_type, args_decl, args, fail, unlock) \

    static ret_type glue(sdl_, name)args_decl                           \

    {                                                                   \

        ret_type ret;                                                   \

                                                                        \

        SDL_LockAudio();                                                \

                                                                        \

        ret = glue(audio_generic_, name)args;                           \

                                                                        \

        SDL_UnlockAudio();                                              \

        return ret;                                                     \

    }



    sdl->live = live;

SDL_WRAPPER_FUNC(get_buffer_out, void *, (HWVoiceOut *hw, size_t *size),

                 (hw, size), *size = 0, sdl_unlock)

SDL_WRAPPER_FUNC(put_buffer_out_nowrite, size_t,

                 (HWVoiceOut *hw, void *buf, size_t size), (hw, buf, size),

                 /*nothing*/, sdl_unlock_and_post)

SDL_WRAPPER_FUNC(write, size_t,

                 (HWVoiceOut *hw, void *buf, size_t size), (hw, buf, size),

                 /*nothing*/, sdl_unlock_and_post)



    SDL_UnlockAudio();



    return decr;

}

#undef SDL_WRAPPER_FUNC



static void sdl_fini_out (HWVoiceOut *hw)

{
@@ -336,7 +331,9 @@ static void sdl_audio_fini (void *opaque) 
static struct audio_pcm_ops sdl_pcm_ops = {

    .init_out = sdl_init_out,

    .fini_out = sdl_fini_out,

    .run_out  = sdl_run_out,

    .write    = sdl_write,

    .get_buffer_out = sdl_get_buffer_out,

    .put_buffer_out = sdl_put_buffer_out_nowrite,

    .ctl_out  = sdl_ctl_out,

};