diff options
| author | Wei Jia <wjia@google.com> | 2014-10-28 17:09:06 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2014-10-28 18:40:45 -0700 |
| commit | 9421174a2f002fef31b330fb04e00105a905dca4 (patch) | |
| tree | c98aba03fef5848ac810b6487dd951b93f172953 /media/libmediaplayerservice/nuplayer/NuPlayer.h | |
| parent | b80a2a8871d3af8619bf774a0c9ddbac8d598bf9 (diff) | |
| download | frameworks_av-9421174a2f002fef31b330fb04e00105a905dca4.zip frameworks_av-9421174a2f002fef31b330fb04e00105a905dca4.tar.gz frameworks_av-9421174a2f002fef31b330fb04e00105a905dca4.tar.bz2 | |
NuPlayer: merge start() and resume().
NuPlayerDriver: allow seekTo called in STOPPED_AND_PREPARED state.
Bug: 18127606
Change-Id: I92ff9f7e0a176c434202762d30966d8c4643d1ef
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index d6120d2..14056ca 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -54,7 +54,6 @@ struct NuPlayer : public AHandler { void start(); void pause(); - void resume(); // Will notify the driver through "notifyResetComplete" once finished. void resetAsync(); @@ -213,6 +212,9 @@ private: void handleFlushComplete(bool audio, bool isDecoder); void finishFlushIfPossible(); + void onStart(); + void onResume(); + bool audioDecoderStillNeeded(); void flushDecoder( |