am c15cf3d: Merge "stagefright: limit audio gap for looped playback" into ics-mr1

Eric Laurent · Android Git Automerger · commit 05985a2e2ae5 · 2012-01-11T11:12:45.000-08:00
* commit 'c15cf3d286f3d63d141b73f639a5a61ddb028029':
  stagefright: limit audio gap for looped playback
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
@@ -1841,6 +1841,10 @@ void AwesomePlayer::postCheckAudioStatusEvent(int64_t delayUs) {
         return;
     }
     mAudioStatusEventPending = true;
+    // Do not honor delay when looping in order to limit audio gap
+    if (mFlags & (LOOPING | AUTO_LOOPING)) {
+        delayUs = 0;
+    }
     mQueue.postEventWithDelay(mCheckAudioStatusEvent, delayUs);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1841,6 +1841,10 @@ void AwesomePlayer::postCheckAudioStatusEvent(int64_t delayUs) {`
`1841`	`1841`	`return;`
`1842`	`1842`	`}`
`1843`	`1843`	`mAudioStatusEventPending = true;`
	`1844`	`+ // Do not honor delay when looping in order to limit audio gap`
	`1845`	`+ if (mFlags & (LOOPING \| AUTO_LOOPING)) {`
	`1846`	`+ delayUs = 0;`
	`1847`	`+ }`
`1844`	`1848`	`mQueue.postEventWithDelay(mCheckAudioStatusEvent, delayUs);`
`1845`	`1849`	`}`
`1846`	`1850`