diff options
| author | Marco Nelissen <marcone@google.com> | 2012-03-13 13:23:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-13 13:23:07 -0700 |
| commit | 36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab (patch) | |
| tree | eec0f805e2e83ed1d720519748527c03affafc29 /media/libstagefright/AudioPlayer.cpp | |
| parent | 5e7616cc0e5493241211333134555d74aec89982 (diff) | |
| parent | 6b74d671a1321a6ecc4a40b6c87beedfecc1ec44 (diff) | |
| download | frameworks_av-36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab.zip frameworks_av-36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab.tar.gz frameworks_av-36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab.tar.bz2 | |
Merge "Gapless playback, step 1."
Diffstat (limited to 'media/libstagefright/AudioPlayer.cpp')
| -rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index 23c3c74..9db3c97 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/media/libstagefright/AudioPlayer.cpp @@ -419,7 +419,11 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) { timeToCompletionUs, timeToCompletionUs / 1E6); postEOS = true; - postEOSDelayUs = timeToCompletionUs + mLatencyUs; + if (mAudioSink->needsTrailingPadding()) { + postEOSDelayUs = timeToCompletionUs + mLatencyUs; + } else { + postEOSDelayUs = 0; + } } mReachedEOS = true; |