]> git.sesse.net Git - vlc/blobdiff - modules/audio_output/opensles_android.c
opensles: resample if original sampling rate is not accepted
[vlc] / modules / audio_output / opensles_android.c
index cb21ab59b176d5ceca0d6990196b7f1bceead266..9c80495dfdb0cd4a900cbc68cb0456a1b106dbe7 100644 (file)
@@ -1,22 +1,23 @@
 /*****************************************************************************
  * opensles_android.c : audio output for android native code
  *****************************************************************************
- * Copyright © 2011 VideoLAN
+ * Copyright © 2011-2012 VideoLAN
  *
  * Authors: Dominique Martinet <asmadeus@codewreck.org>
  *          Hugo Beauzée-Luyssen <beauze.h@gmail.com>
+ *          Rafaël Carré <funman@videolanorg>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include <vlc_aout.h>
 #include <assert.h>
 #include <dlfcn.h>
+#include <math.h>
 
 // For native audio
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
 
-// Maximum number of buffers to enqueue.
-#define BUFF_QUEUE  42
+#define OPENSLES_BUFFERS 255 /* maximum number of buffers */
+#define OPENSLES_BUFLEN  10   /* ms */
+/*
+ * 10ms of precision when mesasuring latency should be enough,
+ * with 255 buffers we can buffer 2.55s of audio.
+ */
+
+#define CHECK_OPENSL_ERROR(msg)                \
+    if (unlikely(result != SL_RESULT_SUCCESS)) \
+    {                                          \
+        msg_Err(aout, msg" (%lu)", result);    \
+        goto error;                            \
+    }
+
+typedef SLresult (*slCreateEngine_t)(
+        SLObjectItf*, SLuint32, const SLEngineOption*, SLuint32,
+        const SLInterfaceID*, const SLboolean*);
 
 #define Destroy(a) (*a)->Destroy(a);
 #define SetPlayState(a, b) (*a)->SetPlayState(a, b)
     (*a)->CreateAudioPlayer(a, b, c, d, e, f, g)
 #define Enqueue(a, b, c) (*a)->Enqueue(a, b, c)
 #define Clear(a) (*a)->Clear(a)
+#define GetState(a, b) (*a)->GetState(a, b)
+#define SetPositionUpdatePeriod(a, b) (*a)->SetPositionUpdatePeriod(a, b)
+#define SetVolumeLevel(a, b) (*a)->SetVolumeLevel(a, b)
+#define SetMute(a, b) (*a)->SetMute(a, b)
 
 /*****************************************************************************
- * aout_sys_t: audio output method descriptor
- *****************************************************************************
- * This structure is part of the audio output thread descriptor.
- * It describes the direct sound specific properties of an audio device.
+ *
  *****************************************************************************/
 struct aout_sys_t
 {
+    /* OpenSL objects */
     SLObjectItf                     engineObject;
     SLObjectItf                     outputMixObject;
     SLAndroidSimpleBufferQueueItf   playerBufferQueue;
     SLObjectItf                     playerObject;
-
+    SLVolumeItf                     volumeItf;
+    SLEngineItf                     engineEngine;
     SLPlayItf                       playerPlay;
-    aout_buffer_t                  *p_buffer_array[BUFF_QUEUE];
-    int                             i_toclean_buffer;
-    int                             i_toappend_buffer;
 
+    /* OpenSL symbols */
     void                           *p_so_handle;
+
+    slCreateEngine_t                slCreateEnginePtr;
+    SLInterfaceID                   SL_IID_ENGINE;
+    SLInterfaceID                   SL_IID_ANDROIDSIMPLEBUFFERQUEUE;
+    SLInterfaceID                   SL_IID_VOLUME;
+    SLInterfaceID                   SL_IID_PLAY;
+
+    /* */
+
+    vlc_mutex_t                     lock;
+
+    /* audio buffered through opensles */
+    uint8_t                        *buf;
+    size_t                          samples_per_buf;
+    int                             next_buf;
+
+    int                             rate;
+
+    /* if we can measure latency already */
+    bool                            started;
+
+    /* audio not yet buffered through opensles */
+    block_t                        *p_buffer_chain;
+    block_t                       **pp_buffer_last;
+    size_t                          samples;
 };
 
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
-static int  Open        ( vlc_object_t * );
-static void Close       ( vlc_object_t * );
+static int  Open  (vlc_object_t *);
+static void Close (vlc_object_t *);
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 
 vlc_module_begin ()
-    set_description( N_("OpenSLES audio output") )
-    set_shortname( N_("OpenSLES") )
-    set_category( CAT_AUDIO )
-    set_subcategory( SUBCAT_AUDIO_AOUT )
-
-    set_capability( "audio output", 170 )
-    add_shortcut( "opensles", "android" )
-    set_callbacks( Open, Close )
+    set_description(N_("OpenSLES audio output"))
+    set_shortname(N_("OpenSLES"))
+    set_category(CAT_AUDIO)
+    set_subcategory(SUBCAT_AUDIO_AOUT)
+
+    set_capability("audio output", 170)
+    add_shortcut("opensles", "android")
+    set_callbacks(Open, Close)
 vlc_module_end ()
 
+/*****************************************************************************
+ *
+ *****************************************************************************/
+
+static inline int bytesPerSample(void)
+{
+    return 2 /* S16 */ * 2 /* stereo */;
+}
 
-static void Clean( aout_sys_t *p_sys )
+static int TimeGet(audio_output_t* aout, mtime_t* restrict drift)
 {
-    Destroy( p_sys->playerObject );
-    Destroy( p_sys->outputMixObject );
-    Destroy( p_sys->engineObject );
+    aout_sys_t *sys = aout->sys;
+
+    SLAndroidSimpleBufferQueueState st;
+    SLresult res = GetState(sys->playerBufferQueue, &st);
+    if (unlikely(res != SL_RESULT_SUCCESS)) {
+        msg_Err(aout, "Could not query buffer queue state in TimeGet (%lu)", res);
+        return -1;
+    }
+
+    vlc_mutex_lock(&sys->lock);
+    bool started = sys->started;
+    vlc_mutex_unlock(&sys->lock);
+
+    if (!started)
+        return -1;
+
+    *drift = (CLOCK_FREQ * OPENSLES_BUFLEN * st.count / 1000)
+        + sys->samples * CLOCK_FREQ / sys->rate;
 
-    dlclose( p_sys->p_so_handle );
+    msg_Dbg(aout, "latency %"PRId64" ms, %d/%d buffers", *drift / 1000,
+        (int)st.count, OPENSLES_BUFFERS);
 
-    free( p_sys );
+    return 0;
 }
 
-/*****************************************************************************
- * Play: play a sound
- *****************************************************************************/
-static void Play( audio_output_t *p_aout, block_t *p_buffer )
+static void Flush(audio_output_t *aout, bool drain)
 {
-    aout_sys_t *p_sys = p_aout->sys;
-    int tries = 5;
-
-    for (;;)
-    {
-        SLresult result = Enqueue( p_sys->playerBufferQueue, p_buffer->p_buffer,
-                            p_buffer->i_buffer );
-
-        switch (result)
-        {
-        case SL_RESULT_SUCCESS:
-            p_sys->p_buffer_array[p_sys->i_toappend_buffer] = p_buffer;
-            if( ++p_sys->i_toappend_buffer == BUFF_QUEUE )
-                p_sys->i_toappend_buffer = 0;
-            return;
-
-        case SL_RESULT_BUFFER_INSUFFICIENT:
-            msg_Err( p_aout, "buffer insufficient");
-
-            if (tries--)
-            {
-                // Wait a bit to retry.
-                msleep(CLOCK_FREQ);
-                continue;
-            }
-
-        default:
-            msg_Warn( p_aout, "Error %lu, dropping buffer", result );
-            aout_BufferFree( p_buffer );
-            return;
-        }
+    aout_sys_t *sys = aout->sys;
+
+    if (drain) {
+        mtime_t delay;
+        if (!TimeGet(aout, &delay))
+            msleep(delay);
+    } else {
+        vlc_mutex_lock(&sys->lock);
+        SetPlayState(sys->playerPlay, SL_PLAYSTATE_STOPPED);
+        Clear(sys->playerBufferQueue);
+        SetPlayState(sys->playerPlay, SL_PLAYSTATE_PLAYING);
+
+        /* release audio data not yet written to opensles */
+        block_ChainRelease(sys->p_buffer_chain);
+        sys->p_buffer_chain = NULL;
+        sys->pp_buffer_last = &sys->p_buffer_chain;
+
+        sys->samples = 0;
+        sys->started = false;
+
+        vlc_mutex_unlock(&sys->lock);
     }
 }
-static void PlayedCallback (SLAndroidSimpleBufferQueueItf caller, void *pContext )
+
+static int VolumeSet(audio_output_t *aout, float vol)
 {
-    aout_sys_t *p_sys = pContext;
+    if (!aout->sys->volumeItf)
+        return -1;
 
-    assert (caller == p_sys->playerBufferQueue);
+    /* Convert UI volume to linear factor (cube) */
+    vol = vol * vol * vol;
 
-    aout_BufferFree( p_sys->p_buffer_array[p_sys->i_toclean_buffer] );
-    if( ++p_sys->i_toclean_buffer == BUFF_QUEUE )
-        p_sys->i_toclean_buffer = 0;
+    /* millibels from linear amplification */
+    int mb = lroundf(2000.f * log10f(vol));
+    if (mb < SL_MILLIBEL_MIN)
+        mb = SL_MILLIBEL_MIN;
+    else if (mb > 0)
+        mb = 0; /* maximum supported level could be higher: GetMaxVolumeLevel */
+
+    SLresult r = SetVolumeLevel(aout->sys->volumeItf, mb);
+    return (r == SL_RESULT_SUCCESS) ? 0 : -1;
 }
-/*****************************************************************************
- * Open: open a dummy audio device
- *****************************************************************************/
-static int Open( vlc_object_t *p_this )
+
+static int MuteSet(audio_output_t *aout, bool mute)
 {
-    audio_output_t *p_aout = (audio_output_t *)p_this;
-    SLresult       result;
-    SLEngineItf    engineEngine;
+    if (!aout->sys->volumeItf)
+        return -1;
 
-    /* Allocate structure */
-    p_aout->sys = calloc( 1, sizeof( aout_sys_t ) );
-    if( unlikely( p_aout->sys == NULL ) )
-        return VLC_ENOMEM;
+    SLresult r = SetMute(aout->sys->volumeItf, mute);
+    return (r == SL_RESULT_SUCCESS) ? 0 : -1;
+}
 
-    aout_sys_t *p_sys = p_aout->sys;
+static void Pause(audio_output_t *aout, bool pause, mtime_t date)
+{
+    (void)date;
+    aout_sys_t *sys = aout->sys;
+    SetPlayState(sys->playerPlay,
+        pause ? SL_PLAYSTATE_PAUSED : SL_PLAYSTATE_PLAYING);
+}
 
-    //Acquiring LibOpenSLES symbols :
-    p_sys->p_so_handle = dlopen( "libOpenSLES.so", RTLD_NOW );
-    if( p_sys->p_so_handle == NULL )
-    {
-        msg_Err( p_aout, "Failed to load libOpenSLES" );
-        goto error;
+static int WriteBuffer(audio_output_t *aout)
+{
+    aout_sys_t *sys = aout->sys;
+    const size_t unit_size = sys->samples_per_buf * bytesPerSample();
+
+    block_t *b = sys->p_buffer_chain;
+    if (!b)
+        return false;
+
+    /* Check if we can fill at least one buffer unit by chaining blocks */
+    if (b->i_buffer < unit_size) {
+        if (!b->p_next)
+            return false;
+        ssize_t needed = unit_size - b->i_buffer;
+        for (block_t *next = b->p_next; next; next = next->p_next) {
+            needed -= next->i_buffer;
+            if (needed <= 0)
+                break;
+        }
+
+        if (needed > 0)
+            return false;
     }
 
-    typedef SLresult (*slCreateEngine_t)(
-            SLObjectItf*, SLuint32, const SLEngineOption*, SLuint32,
-            const SLInterfaceID*, const SLboolean* );
-    slCreateEngine_t    slCreateEnginePtr = NULL;
-
-    SLInterfaceID *SL_IID_ENGINE;
-    SLInterfaceID *SL_IID_ANDROIDSIMPLEBUFFERQUEUE;
-    SLInterfaceID *SL_IID_VOLUME;
-    SLInterfaceID *SL_IID_PLAY;
-
-#define OPENSL_DLSYM( dest, handle, name )                   \
-    dest = dlsym( handle, name );                            \
-    if( dest == NULL )                                       \
-    {                                                        \
-        msg_Err( p_aout, "Failed to load symbol %s", name ); \
-        goto error;                                          \
+    SLAndroidSimpleBufferQueueState st;
+    SLresult res = GetState(sys->playerBufferQueue, &st);
+    if (unlikely(res != SL_RESULT_SUCCESS)) {
+        msg_Err(aout, "Could not query buffer queue state in %s (%lu)", __func__, res);
+        return false;
     }
 
-    OPENSL_DLSYM( slCreateEnginePtr, p_sys->p_so_handle, "slCreateEngine" );
-    OPENSL_DLSYM( SL_IID_ANDROIDSIMPLEBUFFERQUEUE, p_sys->p_so_handle,
-                 "SL_IID_ANDROIDSIMPLEBUFFERQUEUE" );
-    OPENSL_DLSYM( SL_IID_ENGINE, p_sys->p_so_handle, "SL_IID_ENGINE" );
-    OPENSL_DLSYM( SL_IID_PLAY, p_sys->p_so_handle, "SL_IID_PLAY" );
-    OPENSL_DLSYM( SL_IID_VOLUME, p_sys->p_so_handle, "SL_IID_VOLUME" );
+    if (st.count == OPENSLES_BUFFERS)
+        return false;
+
+    size_t done = 0;
+    while (done < unit_size) {
+        size_t cur = b->i_buffer;
+        if (cur > unit_size - done)
+            cur = unit_size - done;
 
+        memcpy(&sys->buf[unit_size * sys->next_buf + done], b->p_buffer, cur);
+        b->i_buffer -= cur;
+        b->p_buffer += cur;
+        done += cur;
 
-#define CHECK_OPENSL_ERROR( msg )                   \
-    if( unlikely( result != SL_RESULT_SUCCESS ) )   \
-    {                                               \
-        msg_Err( p_aout, msg" (%lu)", result );     \
-        goto error;                                 \
+        block_t *next = b->p_next;
+        if (b->i_buffer == 0) {
+            block_Release(b);
+            b = NULL;
+        }
+
+        if (done == unit_size)
+            break;
+        else
+            b = next;
     }
 
-    // create engine
-    result = slCreateEnginePtr( &p_sys->engineObject, 0, NULL, 0, NULL, NULL );
-    CHECK_OPENSL_ERROR( "Failed to create engine" );
+    sys->p_buffer_chain = b;
+    if (!b)
+        sys->pp_buffer_last = &sys->p_buffer_chain;
+
+    SLresult r = Enqueue(sys->playerBufferQueue,
+        &sys->buf[unit_size * sys->next_buf], unit_size);
+
+    sys->samples -= sys->samples_per_buf;
+
+    if (r == SL_RESULT_SUCCESS) {
+        if (++sys->next_buf == OPENSLES_BUFFERS)
+            sys->next_buf = 0;
+        return true;
+    } else {
+        /* XXX : if writing fails, we don't retry */
+        msg_Err(aout, "error %lu when writing %d bytes %s",
+                r, b->i_buffer,
+                (r == SL_RESULT_BUFFER_INSUFFICIENT) ? " (buffer insufficient)" : "");
+        return false;
+    }
+}
 
-    // realize the engine in synchronous mode
-    result = Realize( p_sys->engineObject, SL_BOOLEAN_FALSE );
-    CHECK_OPENSL_ERROR( "Failed to realize engine" );
+/*****************************************************************************
+ * Play: play a sound
+ *****************************************************************************/
+static void Play(audio_output_t *aout, block_t *p_buffer)
+{
+    aout_sys_t *sys = aout->sys;
 
-    // get the engine interface, needed to create other objects
-    result = GetInterface( p_sys->engineObject, *SL_IID_ENGINE, &engineEngine );
-    CHECK_OPENSL_ERROR( "Failed to get the engine interface" );
+    p_buffer->p_next = NULL; /* Make sur our linked list doesn't use old references */
+    vlc_mutex_lock(&sys->lock);
 
-    // create output mix, with environmental reverb specified as a non-required interface
-    const SLInterfaceID ids1[] = { *SL_IID_VOLUME };
-    const SLboolean req1[] = { SL_BOOLEAN_FALSE };
-    result = CreateOutputMix( engineEngine, &p_sys->outputMixObject, 1, ids1, req1 );
-    CHECK_OPENSL_ERROR( "Failed to create output mix" );
+    sys->samples += p_buffer->i_buffer / bytesPerSample();
 
-    // realize the output mix in synchronous mode
-    result = Realize( p_sys->outputMixObject, SL_BOOLEAN_FALSE );
-    CHECK_OPENSL_ERROR( "Failed to realize output mix" );
+    /* Hold this block until we can write it into the OpenSL buffer */
+    block_ChainLastAppend(&sys->pp_buffer_last, p_buffer);
+
+    /* Fill OpenSL buffer */
+    while (WriteBuffer(aout))
+        ;
 
+    vlc_mutex_unlock(&sys->lock);
+}
+
+static void PlayedCallback (SLAndroidSimpleBufferQueueItf caller, void *pContext)
+{
+    (void)caller;
+    audio_output_t *aout = pContext;
+    aout_sys_t *sys = aout->sys;
+
+    assert (caller == sys->playerBufferQueue);
+
+    vlc_mutex_lock(&sys->lock);
+    sys->started = true;
+    vlc_mutex_unlock(&sys->lock);
+}
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
+{
+    SLresult       result;
+
+    aout_sys_t *sys = aout->sys;
 
     // configure audio source - this defines the number of samples you can enqueue.
     SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {
         SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE,
-        BUFF_QUEUE
+        OPENSLES_BUFFERS
     };
 
     SLDataFormat_PCM format_pcm;
     format_pcm.formatType       = SL_DATAFORMAT_PCM;
     format_pcm.numChannels      = 2;
-    format_pcm.samplesPerSec    = ((SLuint32) p_aout->format.i_rate * 1000) ;
+    format_pcm.samplesPerSec    = ((SLuint32) fmt->i_rate * 1000) ;
     format_pcm.bitsPerSample    = SL_PCMSAMPLEFORMAT_FIXED_16;
     format_pcm.containerSize    = SL_PCMSAMPLEFORMAT_FIXED_16;
     format_pcm.channelMask      = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
@@ -255,62 +378,193 @@ static int Open( vlc_object_t *p_this )
     // configure audio sink
     SLDataLocator_OutputMix loc_outmix = {
         SL_DATALOCATOR_OUTPUTMIX,
-        p_sys->outputMixObject
+        sys->outputMixObject
     };
     SLDataSink audioSnk = {&loc_outmix, NULL};
 
     //create audio player
-    const SLInterfaceID ids2[] = { *SL_IID_ANDROIDSIMPLEBUFFERQUEUE };
-    static const SLboolean req2[] = { SL_BOOLEAN_TRUE };
-    result = CreateAudioPlayer( engineEngine, &p_sys->playerObject, &audioSrc,
-                                    &audioSnk, sizeof( ids2 ) / sizeof( *ids2 ),
-                                    ids2, req2 );
-    CHECK_OPENSL_ERROR( "Failed to create audio player" );
+    const SLInterfaceID ids2[] = { sys->SL_IID_ANDROIDSIMPLEBUFFERQUEUE, sys->SL_IID_VOLUME };
+    static const SLboolean req2[] = { SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE };
+    result = CreateAudioPlayer(sys->engineEngine, &sys->playerObject, &audioSrc,
+                                    &audioSnk, sizeof(ids2) / sizeof(*ids2),
+                                    ids2, req2);
+    if (unlikely(result != SL_RESULT_SUCCESS)) {
+        /* Try again with a more sensible samplerate */
+        fmt->i_rate = 44100;
+        format_pcm.samplesPerSec = ((SLuint32) 44100 * 1000) ;
+        result = CreateAudioPlayer(sys->engineEngine, &sys->playerObject, &audioSrc,
+                &audioSnk, sizeof(ids2) / sizeof(*ids2),
+                ids2, req2);
+    }
+    CHECK_OPENSL_ERROR("Failed to create audio player");
 
-    result = Realize( p_sys->playerObject, SL_BOOLEAN_FALSE );
-    CHECK_OPENSL_ERROR( "Failed to realize player object." );
+    result = Realize(sys->playerObject, SL_BOOLEAN_FALSE);
+    CHECK_OPENSL_ERROR("Failed to realize player object.");
 
-    result = GetInterface( p_sys->playerObject, *SL_IID_PLAY, &p_sys->playerPlay );
-    CHECK_OPENSL_ERROR( "Failed to get player interface." );
+    result = GetInterface(sys->playerObject, sys->SL_IID_PLAY, &sys->playerPlay);
+    CHECK_OPENSL_ERROR("Failed to get player interface.");
 
-    result = GetInterface( p_sys->playerObject, *SL_IID_ANDROIDSIMPLEBUFFERQUEUE,
-                                                  &p_sys->playerBufferQueue );
-    CHECK_OPENSL_ERROR( "Failed to get buff queue interface" );
+    result = GetInterface(sys->playerObject, sys->SL_IID_VOLUME, &sys->volumeItf);
+    CHECK_OPENSL_ERROR("failed to get volume interface.");
 
-    result = RegisterCallback( p_sys->playerBufferQueue, PlayedCallback,
-                                   (void*)p_sys);
-    CHECK_OPENSL_ERROR( "Failed to register buff queue callback." );
+    result = GetInterface(sys->playerObject, sys->SL_IID_ANDROIDSIMPLEBUFFERQUEUE,
+                                                  &sys->playerBufferQueue);
+    CHECK_OPENSL_ERROR("Failed to get buff queue interface");
 
+    result = RegisterCallback(sys->playerBufferQueue, PlayedCallback,
+                                   (void*)aout);
+    CHECK_OPENSL_ERROR("Failed to register buff queue callback.");
 
     // set the player's state to playing
-    result = SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_PLAYING );
-    CHECK_OPENSL_ERROR( "Failed to switch to playing state" );
+    result = SetPlayState(sys->playerPlay, SL_PLAYSTATE_PLAYING);
+    CHECK_OPENSL_ERROR("Failed to switch to playing state");
+
+    /* XXX: rounding shouldn't affect us at normal sampling rate */
+    sys->rate = fmt->i_rate;
+    sys->samples_per_buf = OPENSLES_BUFLEN * fmt->i_rate / 1000;
+    sys->buf = malloc(OPENSLES_BUFFERS * sys->samples_per_buf * bytesPerSample());
+    if (!sys->buf)
+        goto error;
+
+    sys->started = false;
+    sys->next_buf = 0;
 
-    // we want 16bit signed data little endian.
-    p_aout->format.i_format              = VLC_CODEC_S16L;
-    p_aout->format.i_physical_channels   = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
-    p_aout->pf_play                      = Play;
-    p_aout->pf_pause                     = NULL;
-    p_aout->pf_flush                     = NULL;
+    sys->p_buffer_chain = NULL;
+    sys->pp_buffer_last = &sys->p_buffer_chain;
+    sys->samples = 0;
 
-    aout_FormatPrepare( &p_aout->format );
+    // we want 16bit signed data native endian.
+    fmt->i_format              = VLC_CODEC_S16N;
+    fmt->i_physical_channels   = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+
+    SetPositionUpdatePeriod(sys->playerPlay, AOUT_MIN_PREPARE_TIME * 1000 / CLOCK_FREQ);
+
+    aout_FormatPrepare(fmt);
 
     return VLC_SUCCESS;
+
 error:
-    Clean( p_sys );
+    if (sys->playerObject) {
+        Destroy(sys->playerObject);
+        sys->playerObject = NULL;
+    }
+
     return VLC_EGENERIC;
 }
 
+static void Stop(audio_output_t *aout)
+{
+    aout_sys_t *sys = aout->sys;
+
+    SetPlayState(sys->playerPlay, SL_PLAYSTATE_STOPPED);
+    //Flush remaining buffers if any.
+    Clear(sys->playerBufferQueue);
+
+    free(sys->buf);
+    block_ChainRelease(sys->p_buffer_chain);
+
+    Destroy(sys->playerObject);
+    sys->playerObject = NULL;
+}
+
 /*****************************************************************************
- * Close: close our file
+ *
  *****************************************************************************/
-static void Close( vlc_object_t *p_this )
+static void Close(vlc_object_t *obj)
 {
-    audio_output_t *p_aout = (audio_output_t*)p_this;
-    aout_sys_t     *p_sys = p_aout->sys;
+    audio_output_t *aout = (audio_output_t *)obj;
+    aout_sys_t *sys = aout->sys;
+
+    Destroy(sys->outputMixObject);
+    Destroy(sys->engineObject);
+    dlclose(sys->p_so_handle);
+    vlc_mutex_destroy(&sys->lock);
+    free(sys);
+}
 
-    SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_STOPPED );
-    //Flush remaining buffers if any.
-    Clear( p_sys->playerBufferQueue );
-    Clean( p_sys );
+static int Open (vlc_object_t *obj)
+{
+    audio_output_t *aout = (audio_output_t *)obj;
+    aout_sys_t *sys;
+    SLresult result;
+
+    aout->sys = sys = calloc(1, sizeof(*sys));
+    if (unlikely(sys == NULL))
+        return VLC_ENOMEM;
+
+    sys->p_so_handle = dlopen("libOpenSLES.so", RTLD_NOW);
+    if (sys->p_so_handle == NULL)
+    {
+        msg_Err(aout, "Failed to load libOpenSLES");
+        goto error;
+    }
+
+    sys->slCreateEnginePtr = dlsym(sys->p_so_handle, "slCreateEngine");
+    if (unlikely(sys->slCreateEnginePtr == NULL))
+    {
+        msg_Err(aout, "Failed to load symbol slCreateEngine");
+        goto error;
+    }
+
+#define OPENSL_DLSYM(dest, name)                       \
+    do {                                                       \
+        const SLInterfaceID *sym = dlsym(sys->p_so_handle, "SL_IID_"name);        \
+        if (unlikely(sym == NULL))                             \
+        {                                                      \
+            msg_Err(aout, "Failed to load symbol SL_IID_"name); \
+            goto error;                                        \
+        }                                                      \
+        sys->dest = *sym;                                           \
+    } while(0)
+
+    OPENSL_DLSYM(SL_IID_ANDROIDSIMPLEBUFFERQUEUE, "ANDROIDSIMPLEBUFFERQUEUE");
+    OPENSL_DLSYM(SL_IID_ENGINE, "ENGINE");
+    OPENSL_DLSYM(SL_IID_PLAY, "PLAY");
+    OPENSL_DLSYM(SL_IID_VOLUME, "VOLUME");
+#undef OPENSL_DLSYM
+
+    // create engine
+    result = sys->slCreateEnginePtr(&sys->engineObject, 0, NULL, 0, NULL, NULL);
+    CHECK_OPENSL_ERROR("Failed to create engine");
+
+    // realize the engine in synchronous mode
+    result = Realize(sys->engineObject, SL_BOOLEAN_FALSE);
+    CHECK_OPENSL_ERROR("Failed to realize engine");
+
+    // get the engine interface, needed to create other objects
+    result = GetInterface(sys->engineObject, sys->SL_IID_ENGINE, &sys->engineEngine);
+    CHECK_OPENSL_ERROR("Failed to get the engine interface");
+
+    // create output mix, with environmental reverb specified as a non-required interface
+    const SLInterfaceID ids1[] = { sys->SL_IID_VOLUME };
+    const SLboolean req1[] = { SL_BOOLEAN_FALSE };
+    result = CreateOutputMix(sys->engineEngine, &sys->outputMixObject, 1, ids1, req1);
+    CHECK_OPENSL_ERROR("Failed to create output mix");
+
+    // realize the output mix in synchronous mode
+    result = Realize(sys->outputMixObject, SL_BOOLEAN_FALSE);
+    CHECK_OPENSL_ERROR("Failed to realize output mix");
+
+    vlc_mutex_init(&sys->lock);
+
+    aout->start      = Start;
+    aout->stop       = Stop;
+    aout->time_get   = TimeGet;
+    aout->play       = Play;
+    aout->pause      = Pause;
+    aout->flush      = Flush;
+    aout->mute_set   = MuteSet;
+    aout->volume_set = VolumeSet;
+
+    return VLC_SUCCESS;
+
+error:
+    if (sys->outputMixObject)
+        Destroy(sys->outputMixObject);
+    if (sys->engineObject)
+        Destroy(sys->engineObject);
+    if (sys->p_so_handle)
+        dlclose(sys->p_so_handle);
+    free(sys);
+    return VLC_EGENERIC;
 }