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

am: 12131a23cb Change-Id: Icc86ada7ecf279827f7a43bd93dbdae1ff445cb0
7 years ago · a488402046
parent b8ba103f7f 12131a23cb
commit a488402046
1 changed files with 2 additions and 1 deletions
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@ -617,7 +617,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