diff options
author | Glenn Kasten <gkasten@google.com> | 2013-09-03 22:08:53 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-03 22:08:53 +0000 |
commit | 943ba3cca8df0da24db38e97e43aaacb5b788a21 (patch) | |
tree | f0e19f47cec090e2795df2df75b91c88c935ec01 /media/libnbaio | |
parent | 572864b94e7882c2d23537525c708abcacde43b0 (diff) | |
parent | 767094dd98b01baf21de2ad09c27b3c98776cf73 (diff) | |
download | frameworks_av-943ba3cca8df0da24db38e97e43aaacb5b788a21.zip frameworks_av-943ba3cca8df0da24db38e97e43aaacb5b788a21.tar.gz frameworks_av-943ba3cca8df0da24db38e97e43aaacb5b788a21.tar.bz2 |
Merge "Add NBAIO_Sink::getTimestamp()" into klp-dev
Diffstat (limited to 'media/libnbaio')
-rw-r--r-- | media/libnbaio/AudioStreamOutSink.cpp | 12 | ||||
-rw-r--r-- | media/libnbaio/MonoPipe.cpp | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/media/libnbaio/AudioStreamOutSink.cpp b/media/libnbaio/AudioStreamOutSink.cpp index 6f525e5..b2de8a2 100644 --- a/media/libnbaio/AudioStreamOutSink.cpp +++ b/media/libnbaio/AudioStreamOutSink.cpp @@ -79,4 +79,16 @@ status_t AudioStreamOutSink::getNextWriteTimestamp(int64_t *timestamp) { return mStream->get_next_write_timestamp(mStream, timestamp); } +status_t AudioStreamOutSink::getTimestamp(AudioTimestamp& timestamp) +{ + // FIXME position64 won't be needed after AudioTimestamp.mPosition is changed to uint64_t + uint64_t position64; + int ok = mStream->get_presentation_position(mStream, &position64, ×tamp.mTime); + if (ok != 0) { + return INVALID_OPERATION; + } + timestamp.mPosition = position64; + return OK; +} + } // namespace android diff --git a/media/libnbaio/MonoPipe.cpp b/media/libnbaio/MonoPipe.cpp index e8d3d9b..a74b49e 100644 --- a/media/libnbaio/MonoPipe.cpp +++ b/media/libnbaio/MonoPipe.cpp @@ -310,4 +310,9 @@ bool MonoPipe::isShutdown() return mIsShutdown; } +status_t MonoPipe::getTimestamp(AudioTimestamp& timestamp) +{ + return INVALID_OPERATION; +} + } // namespace android |