diff options
author | Eric Laurent <elaurent@google.com> | 2012-01-11 11:14:30 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-11 11:14:30 -0800 |
commit | e51dd6dd7b7034c171246ebf5e08b187ef17150c (patch) | |
tree | e0ad17e5bf012befb4fdc60e5c54ad55ae443814 /media | |
parent | c40256146bee58bff09e1c16ef99ea06d31f89f9 (diff) | |
parent | a7cbd8e1a52c307cb8aac7d06a777ba2713fed82 (diff) | |
download | frameworks_av-e51dd6dd7b7034c171246ebf5e08b187ef17150c.zip frameworks_av-e51dd6dd7b7034c171246ebf5e08b187ef17150c.tar.gz frameworks_av-e51dd6dd7b7034c171246ebf5e08b187ef17150c.tar.bz2 |
am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit '05985a2e2ae5c21fbf69d2884c59ea475fce7f6d':
stagefright: limit audio gap for looped playback
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 7a2d7b3..d0cb7ff 100644 --- 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); } |