]> git.sesse.net Git - vlc/commitdiff
opensles: the time since last buffering update is useless
authorRafaël Carré <funman@videolan.org>
Thu, 20 Dec 2012 16:48:01 +0000 (17:48 +0100)
committerRafaël Carré <funman@videolan.org>
Thu, 20 Dec 2012 21:05:13 +0000 (22:05 +0100)
modules/audio_output/opensles_android.c

index 65a1742b0600d9e57d6638d4a5aca1e46513fd20..c02c0e54b643ef44ab7a7912e408e665e4d1f3ea 100644 (file)
@@ -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 );