/*****************************************************************************
* 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
(*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)
/*****************************************************************************
* aout_sys_t: audio output method descriptor
SLObjectItf playerObject;
SLPlayItf playerPlay;
- aout_buffer_t *p_buffer_array[BUFF_QUEUE];
- int i_toclean_buffer;
- int i_toappend_buffer;
+
+ vlc_mutex_t lock;
+ block_t *p_chain;
+ block_t **pp_last;
+ mtime_t length;
void *p_so_handle;
};
static void Clean( aout_sys_t *p_sys )
{
- Destroy( p_sys->playerObject );
- Destroy( p_sys->outputMixObject );
- Destroy( p_sys->engineObject );
+ if( p_sys->playerObject )
+ Destroy( p_sys->playerObject );
+ if( p_sys->outputMixObject )
+ Destroy( p_sys->outputMixObject );
+ if( p_sys->engineObject )
+ Destroy( p_sys->engineObject );
- dlclose( p_sys->p_so_handle );
+ if( p_sys->p_so_handle )
+ dlclose( p_sys->p_so_handle );
free( p_sys );
}
+static void Flush(audio_output_t *p_aout, bool wait)
+{
+ (void)wait; /* FIXME */
+ aout_sys_t *p_sys = p_aout->sys;
+
+ vlc_mutex_lock( &p_sys->lock );
+ SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_STOPPED );
+ Clear( p_sys->playerBufferQueue );
+ SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_PLAYING );
+ block_ChainRelease( p_sys->p_chain );
+ p_sys->p_chain = NULL;
+ p_sys->pp_last = &p_sys->p_chain;
+ vlc_mutex_unlock( &p_sys->lock );
+}
+
+static void Pause(audio_output_t *p_aout, bool pause, mtime_t date)
+{
+ (void)date;
+ aout_sys_t *p_sys = p_aout->sys;
+ SetPlayState( p_sys->playerPlay,
+ pause ? SL_PLAYSTATE_PAUSED : SL_PLAYSTATE_PLAYING );
+}
+
/*****************************************************************************
* Play: play a sound
*****************************************************************************/
-static void Play( audio_output_t *p_aout, block_t *p_buffer )
+static void Play( audio_output_t *p_aout, block_t *p_buffer,
+ mtime_t *restrict drift )
{
aout_sys_t *p_sys = p_aout->sys;
int tries = 5;
+ block_t **pp_last, *p_block;
+
+ SLAndroidSimpleBufferQueueState st;
+ SLresult res = GetState(p_sys->playerBufferQueue, &st);
+ if (unlikely(res != SL_RESULT_SUCCESS)) {
+ msg_Err(p_aout, "Could not query buffer queue state (%lu)", res);
+ st.count = 0;
+ }
+
+ if (!p_buffer->i_length) {
+ p_buffer->i_length = (mtime_t)(p_buffer->i_buffer / 2 / p_aout->format.i_channels) * CLOCK_FREQ / p_aout->format.i_rate;
+ }
+
+ vlc_mutex_lock( &p_sys->lock );
+
+ mtime_t delay = p_sys->length;
+ p_sys->length += p_buffer->i_length;
+
+ /* If something bad happens, we must remove this buffer from the FIFO */
+ pp_last = p_sys->pp_last;
+ p_block = *pp_last;
+
+ block_ChainLastAppend( &p_sys->pp_last, p_buffer );
+ vlc_mutex_unlock( &p_sys->lock );
+
+ if (delay && st.count)
+ *drift = mdate() + delay - p_buffer->i_pts;
for (;;)
{
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.
+ // FIXME: buffer in aout_sys_t and retry at next Play() call
msleep(CLOCK_FREQ);
continue;
}
default:
msg_Warn( p_aout, "Error %lu, dropping buffer", result );
- aout_BufferFree( p_buffer );
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->pp_last = pp_last;
+ *pp_last = p_block;
+ p_sys->length -= p_buffer->i_length;
+ vlc_mutex_unlock( &p_sys->lock );
+ block_Release( p_buffer );
+ case SL_RESULT_SUCCESS:
return;
}
}
}
+
static void PlayedCallback (SLAndroidSimpleBufferQueueItf caller, void *pContext )
{
- aout_sys_t *p_sys = pContext;
+ (void)caller;
+ block_t *p_block;
+ audio_output_t *p_aout = pContext;
+ aout_sys_t *p_sys = p_aout->sys;
assert (caller == p_sys->playerBufferQueue);
- 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;
+ vlc_mutex_lock( &p_sys->lock );
+
+ p_block = p_sys->p_chain;
+ assert( p_block );
+
+ p_sys->p_chain = p_sys->p_chain->p_next;
+ /* if we exhausted our fifo, we must reset the pointer to the last
+ * appended block */
+ if (!p_sys->p_chain)
+ p_sys->pp_last = &p_sys->p_chain;
+
+ p_sys->length -= p_block->i_length;
+
+ vlc_mutex_unlock( &p_sys->lock );
+
+ block_Release( p_block );
}
/*****************************************************************************
- * Open: open a dummy audio device
+ * Open
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
CHECK_OPENSL_ERROR( "Failed to get buff queue interface" );
result = RegisterCallback( p_sys->playerBufferQueue, PlayedCallback,
- (void*)p_sys);
+ (void*)p_aout);
CHECK_OPENSL_ERROR( "Failed to register buff queue callback." );
result = SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_PLAYING );
CHECK_OPENSL_ERROR( "Failed to switch to playing state" );
+ vlc_mutex_init( &p_sys->lock );
+ p_sys->p_chain = NULL;
+ p_sys->pp_last = &p_sys->p_chain;
+
// 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;
+ p_aout->pf_pause = Pause;
+ p_aout->pf_flush = Flush;
aout_FormatPrepare( &p_aout->format );
}
/*****************************************************************************
- * Close: close our file
+ * Close
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_STOPPED );
//Flush remaining buffers if any.
Clear( p_sys->playerBufferQueue );
+ block_ChainRelease( p_sys->p_chain );
+ vlc_mutex_destroy( &p_sys->lock );
Clean( p_sys );
}