[vlc-commits] opensles: the time since last buffering update is useless

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Dec 20 17:48:01 2012 +0100| [0e1c348bf2db73ea890e84afc944c74d71b2cf90] | committer: Rafaël Carré

opensles: the time since last buffering update is useless

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0e1c348bf2db73ea890e84afc944c74d71b2cf90
---

 modules/audio_output/opensles_android.c |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/modules/audio_output/opensles_android.c b/modules/audio_output/opensles_android.c
index 65a1742..c02c0e5 100644
--- a/modules/audio_output/opensles_android.c
+++ b/modules/audio_output/opensles_android.c
@@ -76,7 +76,6 @@ struct aout_sys_t
     mtime_t                         length;
 
     int                             buffers;
-    mtime_t                         last_callback;
 
     /* audio buffered through opensles */
     block_t                        *p_chain;
@@ -143,7 +142,6 @@ static void Flush(audio_output_t *p_aout, bool drain)
         SetPlayState( p_sys->playerPlay, SL_PLAYSTATE_PLAYING );
 
         p_sys->length = 0;
-        p_sys->last_callback = 0;
         p_sys->buffers = 0;
 
         /* release audio data not yet written to opensles */
@@ -197,12 +195,8 @@ static int TimeGet(audio_output_t* p_aout, mtime_t* restrict drift)
 
     vlc_mutex_lock( &p_sys->lock );
     mtime_t delay = p_sys->length;
-    mtime_t last_callback = p_sys->last_callback;
     vlc_mutex_unlock( &p_sys->lock );
 
-    if (last_callback != 0)
-        delay += last_callback - mdate();
-
     SLAndroidSimpleBufferQueueState st;
     SLresult res = GetState(p_sys->playerBufferQueue, &st);
     if (unlikely(res != SL_RESULT_SUCCESS)) {
@@ -295,7 +289,6 @@ static void PlayedCallback (SLAndroidSimpleBufferQueueItf caller, void *pContext
 
     vlc_mutex_lock( &p_sys->lock );
     p_sys->buffers--;
-    p_sys->last_callback = mdate();
 
     p_block = p_sys->p_chain;
     assert( p_block );