diff options
| author | Lajos Molnar <lajos@google.com> | 2014-09-17 23:15:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-17 23:16:00 +0000 |
| commit | 832666776a681ec3a30ee8fc7d5da9039646147d (patch) | |
| tree | 5db9531f473caf0e8f8cce740a997f1ad282edb2 /media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | |
| parent | a87be62b083fb969aeece99d6c29735ef9a5a373 (diff) | |
| parent | 06ad1528e6dd4c866c085d3cad9235d2752eb3ed (diff) | |
| download | frameworks_av-832666776a681ec3a30ee8fc7d5da9039646147d.zip frameworks_av-832666776a681ec3a30ee8fc7d5da9039646147d.tar.gz frameworks_av-832666776a681ec3a30ee8fc7d5da9039646147d.tar.bz2 | |
Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h index 5c7d2d7..2b32c48 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h @@ -130,7 +130,8 @@ private: size_t fillAudioBuffer(void *buffer, size_t size); bool onDrainAudioQueue(); - int64_t getAudioPendingPlayoutUs(); + int64_t getPendingAudioPlayoutDurationUs(int64_t nowUs); + int64_t getPlayedOutAudioDurationUs(int64_t nowUs); void postDrainAudioQueue_l(int64_t delayUs = 0); void onDrainVideoQueue(); |