diff options
| author | Lajos Molnar <lajos@google.com> | 2014-08-28 07:27:44 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-09-17 23:01:24 +0000 |
| commit | 06ad1528e6dd4c866c085d3cad9235d2752eb3ed (patch) | |
| tree | 4b8411a9c418927b3916d5b5381cc8738a3ccb31 /media/libmediaplayerservice/MediaPlayerService.cpp | |
| parent | 919b93473ebbba036f3934e92039f038c7f91a54 (diff) | |
| download | frameworks_av-06ad1528e6dd4c866c085d3cad9235d2752eb3ed.zip frameworks_av-06ad1528e6dd4c866c085d3cad9235d2752eb3ed.tar.gz frameworks_av-06ad1528e6dd4c866c085d3cad9235d2752eb3ed.tar.bz2 | |
NuPlayer: use getTimestamp instead of getPosition
Bug: 14659809
Bug: 16985287
Change-Id: I59ec72fbd40a9b8d28fe548ddad082c03000c045
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index c8cb7ed..8eb1269 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -43,6 +43,7 @@ #include <utils/Errors.h> // for status_t #include <utils/String8.h> #include <utils/SystemClock.h> +#include <utils/Timers.h> #include <utils/Vector.h> #include <media/IMediaHTTPService.h> @@ -1496,6 +1497,12 @@ status_t MediaPlayerService::AudioOutput::getPosition(uint32_t *position) const return mTrack->getPosition(position); } +status_t MediaPlayerService::AudioOutput::getTimestamp(AudioTimestamp &ts) const +{ + if (mTrack == 0) return NO_INIT; + return mTrack->getTimestamp(ts); +} + status_t MediaPlayerService::AudioOutput::getFramesWritten(uint32_t *frameswritten) const { if (mTrack == 0) return NO_INIT; @@ -1971,6 +1978,15 @@ status_t MediaPlayerService::AudioCache::getPosition(uint32_t *position) const return NO_ERROR; } +status_t MediaPlayerService::AudioCache::getTimestamp(AudioTimestamp &ts) const +{ + ts.mPosition = mSize / mFrameSize; + nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC); + ts.mTime.tv_sec = now / 1000000000LL; + ts.mTime.tv_nsec = now - (1000000000LL * ts.mTime.tv_sec); + return NO_ERROR; +} + status_t MediaPlayerService::AudioCache::getFramesWritten(uint32_t *written) const { if (written == 0) return BAD_VALUE; |