summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrack.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-08-29 23:47:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-29 23:47:34 +0000
commit865f6f248bf10189272020ebfdbf4827433caf0f (patch)
tree02c8e8e58c3b3e549c718bda3bd344f332682ce9 /media/libmedia/AudioTrack.cpp
parente3b8b6e3e3a78ec6f9978f56c4573e193866ef53 (diff)
parentce70374bf105f8a6160bf5dd70affea012b2a464 (diff)
downloadframeworks_av-865f6f248bf10189272020ebfdbf4827433caf0f.zip
frameworks_av-865f6f248bf10189272020ebfdbf4827433caf0f.tar.gz
frameworks_av-865f6f248bf10189272020ebfdbf4827433caf0f.tar.bz2
Merge "New AudioTrack C++ API for audio timestamps" into klp-dev
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r--media/libmedia/AudioTrack.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 7aa9e35..64e49f7 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1715,6 +1715,11 @@ status_t AudioTrack::setParameters(const String8& keyValuePairs)
}
}
+status_t AudioTrack::getTimestamp(AudioTimestamp& timestamp)
+{
+ return INVALID_OPERATION;
+}
+
String8 AudioTrack::getParameters(const String8& keys)
{
if (mOutput) {