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

am: 7966b44126 Change-Id: I8fc2bc363261d5edfdcc55608f4a7cb7d0a5610f
7 years ago · 12131a23cb
parent 3f1e4784c7 7966b44126
commit 12131a23cb
1 changed files with 2 additions and 1 deletions
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@ -615,7 +615,8 @@ status_t AudioTrack::start()
                            + 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