diff options
| author | Robert Shih <robertshih@google.com> | 2014-11-19 02:27:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 02:27:04 +0000 |
| commit | fab5ad9331de20b82b02aac4bc73cccf7054fd38 (patch) | |
| tree | 11f41e0832e408181ffc02b86601c0f8192da2f1 /media/libmediaplayerservice/nuplayer/NuPlayer.h | |
| parent | 640228b8e0e537a527f2bb63a4f4d4b5a1ef29cd (diff) | |
| parent | 2f65ada84cced6704e8fcdb03835fe218d917fcb (diff) | |
| download | frameworks_av-fab5ad9331de20b82b02aac4bc73cccf7054fd38.zip frameworks_av-fab5ad9331de20b82b02aac4bc73cccf7054fd38.tar.gz frameworks_av-fab5ad9331de20b82b02aac4bc73cccf7054fd38.tar.bz2 | |
am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for responsiveness" into lmp-mr1-dev
* commit '2f65ada84cced6704e8fcdb03835fe218d917fcb':
NuPlayer: pass media time to selectTrack for responsiveness
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index 7175e15..524f197 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -65,7 +65,7 @@ struct NuPlayer : public AHandler { status_t setVideoScalingMode(int32_t mode); status_t getTrackInfo(Parcel* reply) const; status_t getSelectedTrack(int32_t type, Parcel* reply) const; - status_t selectTrack(size_t trackIndex, bool select); + status_t selectTrack(size_t trackIndex, bool select, int64_t timeUs); status_t getCurrentPosition(int64_t *mediaUs); void getStats(int64_t *mNumFramesTotal, int64_t *mNumFramesDropped); |