Commit 0e1c348b authored by Rafaël Carré's avatar Rafaël Carré

opensles: the time since last buffering update is useless

parent 27de2641
...@@ -76,7 +76,6 @@ struct aout_sys_t ...@@ -76,7 +76,6 @@ struct aout_sys_t
mtime_t length; mtime_t length;
int buffers; int buffers;
mtime_t last_callback;
/* audio buffered through opensles */ /* audio buffered through opensles */
block_t *p_chain; block_t *p_chain;
...@@ -143,7 +142,6 @@ static void Flush(audio_output_t *p_aout, bool drain) ...@@ -143,7 +142,6 @@ static void Flush(audio_output_t *p_aout, bool drain)
SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_PLAYING ); SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_PLAYING );
p_sys->length = 0; p_sys->length = 0;
p_sys->last_callback = 0;
p_sys->buffers = 0; p_sys->buffers = 0;
/* release audio data not yet written to opensles */ /* release audio data not yet written to opensles */
...@@ -197,12 +195,8 @@ static int TimeGet(audio_output_t* p_aout, mtime_t* restrict drift) ...@@ -197,12 +195,8 @@ static int TimeGet(audio_output_t* p_aout, mtime_t* restrict drift)
vlc_mutex_lock( &p_sys->lock ); vlc_mutex_lock( &p_sys->lock );
mtime_t delay = p_sys->length; mtime_t delay = p_sys->length;
mtime_t last_callback = p_sys->last_callback;
vlc_mutex_unlock( &p_sys->lock ); vlc_mutex_unlock( &p_sys->lock );
if (last_callback != 0)
delay += last_callback - mdate();
SLAndroidSimpleBufferQueueState st; SLAndroidSimpleBufferQueueState st;
SLresult res = GetState(p_sys->playerBufferQueue, &st); SLresult res = GetState(p_sys->playerBufferQueue, &st);
if (unlikely(res != SL_RESULT_SUCCESS)) { if (unlikely(res != SL_RESULT_SUCCESS)) {
...@@ -295,7 +289,6 @@ static void PlayedCallback (SLAndroidSimpleBufferQueueItf caller, void *pContext ...@@ -295,7 +289,6 @@ static void PlayedCallback (SLAndroidSimpleBufferQueueItf caller, void *pContext
vlc_mutex_lock( &p_sys->lock ); vlc_mutex_lock( &p_sys->lock );
p_sys->buffers--; p_sys->buffers--;
p_sys->last_callback = mdate();
p_block = p_sys->p_chain; p_block = p_sys->p_chain;
assert( p_block ); assert( p_block );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment