summaryrefslogtreecommitdiffstats
path: root/include/private
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-10-16 15:38:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-16 15:38:30 -0700
commit771f1b6d196b7924707fc44177ac3a88fc31fa9e (patch)
treeffd599ada0a44511112fe0586c8f56121ce9ce6e /include/private
parenta529ee78d7cc5d94cbe79cea2d7e6469c88a0fba (diff)
parent7f8c397378a7ee5abd395413be71388ad36d3ed2 (diff)
downloadframeworks_av-771f1b6d196b7924707fc44177ac3a88fc31fa9e.zip
frameworks_av-771f1b6d196b7924707fc44177ac3a88fc31fa9e.tar.gz
frameworks_av-771f1b6d196b7924707fc44177ac3a88fc31fa9e.tar.bz2
am 7f8c3973: am 120a8847: Merge "AudioTrack: fix head position after restore" into klp-dev
* commit '7f8c397378a7ee5abd395413be71388ad36d3ed2': AudioTrack: fix head position after restore
Diffstat (limited to 'include/private')
-rw-r--r--include/private/media/AudioTrackShared.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h
index 4b13887..69d2486 100644
--- a/include/private/media/AudioTrackShared.h
+++ b/include/private/media/AudioTrackShared.h
@@ -256,6 +256,8 @@ public:
return mEpoch;
}
+ size_t getFramesFilled();
+
private:
size_t mEpoch;
};