commit 7966b4412671e573e32127fbbd272f94a9cc1fe8
author Andy Hung <hunga@google.com> Thu Sep 07 16:28:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 07 16:28:42 2017 +0000
tree 902d778e17d4e56820b832d40f538d694eb4fa7d
parent cc840346766d29c511a513081209e00db4465015
parent c4e60eb165608f08cd85ed2fccbdaa6700f271cd

Merge "AudioTrack: Fix extended timestamp offset" into oc-mr1-dev

media/libaudioclient/AudioTrack.cpp

diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index c212112..1084f03 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -615,7 +615,8 @@
                             + mStartEts.mPosition[ExtendedTimestamp::LOCATION_SERVER]),
                     (long long)mStartEts.mFlushed,
                     (long long)mFramesWritten);
-            mFramesWrittenServerOffset = -mStartEts.mPosition[ExtendedTimestamp::LOCATION_SERVER];
+            // mStartEts is already adjusted by mFramesWrittenServerOffset, so we delta adjust.
+            mFramesWrittenServerOffset -= mStartEts.mPosition[ExtendedTimestamp::LOCATION_SERVER];
         }
         mFramesWritten = 0;
         mProxy->clearTimestamp(); // need new server push for valid timestamp