diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-10 04:33:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-10 04:33:08 +0000 |
| commit | 157defdde7013062bbd04f7e873b6856adce14ca (patch) | |
| tree | bf6503e41529df950c27f694e256519add85752b /media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | |
| parent | 6d5a1afac2a7bca6b171261ca9b237c3a516e567 (diff) | |
| parent | 4fc5d758d6722bedf341e5d93a0ba5698c658c29 (diff) | |
| download | frameworks_av-157defdde7013062bbd04f7e873b6856adce14ca.zip frameworks_av-157defdde7013062bbd04f7e873b6856adce14ca.tar.gz frameworks_av-157defdde7013062bbd04f7e873b6856adce14ca.tar.bz2 | |
am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-dev
* commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29':
nuplayer: acquire wakelock during offload pause timeout
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h index 98fc44d..003d1d0 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h @@ -23,6 +23,7 @@ namespace android { struct ABuffer; +class AWakeLock; struct VideoFrameScheduler; struct NuPlayer::Renderer : public AHandler { @@ -194,6 +195,8 @@ private: int32_t mTotalBuffersQueued; int32_t mLastAudioBufferDrained; + sp<AWakeLock> mWakeLock; + status_t getCurrentPositionOnLooper(int64_t *mediaUs); status_t getCurrentPositionOnLooper( int64_t *mediaUs, int64_t nowUs, bool allowPastQueuedVideo = false); |