diff options
| author | Eric Laurent <elaurent@google.com> | 2013-10-16 15:35:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-16 15:35:35 -0700 |
| commit | 7f8c397378a7ee5abd395413be71388ad36d3ed2 (patch) | |
| tree | 3a41029ec403c6fd32aeb91aa699c05720db6f44 /media/libmedia/AudioTrack.cpp | |
| parent | ace8947dbcd18e86c6a089291ffe1ce32fb42508 (diff) | |
| parent | 120a88471a607c85c4d60300d73c3be0a1e8f8c8 (diff) | |
| download | frameworks_av-7f8c397378a7ee5abd395413be71388ad36d3ed2.zip frameworks_av-7f8c397378a7ee5abd395413be71388ad36d3ed2.tar.gz frameworks_av-7f8c397378a7ee5abd395413be71388ad36d3ed2.tar.bz2 | |
am 120a8847: Merge "AudioTrack: fix head position after restore" into klp-dev
* commit '120a88471a607c85c4d60300d73c3be0a1e8f8c8':
AudioTrack: fix head position after restore
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 37d50cf..507f9bc 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1662,7 +1662,9 @@ status_t AudioTrack::restoreTrack_l(const char *from) // if the new IAudioTrack is created, createTrack_l() will modify the // following member variables: mAudioTrack, mCblkMemory and mCblk. // It will also delete the strong references on previous IAudioTrack and IMemory - size_t position = mProxy->getPosition(); + + // take the frames that will be lost by track recreation into account in saved position + size_t position = mProxy->getPosition() + mProxy->getFramesFilled(); mNewPosition = position + mUpdatePeriod; size_t bufferPosition = mStaticProxy != NULL ? mStaticProxy->getBufferPosition() : 0; result = createTrack_l(mStreamType, |