summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPhil Burk <philburk@google.com>2015-04-30 20:48:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-30 20:48:55 +0000
commitdc0ac804721efff054ec9720d53e93ecca86cf5e (patch)
tree8560f730cb37dddfccc6ea2a513d99889998e2c2 /include
parent5f9bf49397b36ad4ebd838aef66b83e9e9fa42bc (diff)
parent1b42097f38e72574ed853a35f4e8a66e4739c421 (diff)
downloadframeworks_av-dc0ac804721efff054ec9720d53e93ecca86cf5e.zip
frameworks_av-dc0ac804721efff054ec9720d53e93ecca86cf5e.tar.gz
frameworks_av-dc0ac804721efff054ec9720d53e93ecca86cf5e.tar.bz2
Merge "AudioTrack: fix spurious retrograde messages" into mnc-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioTrack.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index e7ee0ce..d361901 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -832,6 +832,9 @@ protected:
int64_t mStartUs; // the start time after flush or stop.
// only used for offloaded and direct tracks.
+ bool mPreviousTimestampValid;// true if mPreviousTimestamp is valid
+ AudioTimestamp mPreviousTimestamp; // used to detect retrograde motion
+
audio_output_flags_t mFlags;
// const after set(), except for bits AUDIO_OUTPUT_FLAG_FAST and AUDIO_OUTPUT_FLAG_OFFLOAD.
// mLock must be held to read or write those bits reliably.