diff options
| author | Robert Shih <robertshih@google.com> | 2014-11-19 02:34:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 02:34:32 +0000 |
| commit | 642025caee4b7917ca261ef65168c602d1e20630 (patch) | |
| tree | 96d3c1d332d103c1cf8534bfebb3be48e070e90f /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | 29b539abab7b0fb57d6b780f93e4860236d6192f (diff) | |
| parent | fab5ad9331de20b82b02aac4bc73cccf7054fd38 (diff) | |
| download | frameworks_av-642025caee4b7917ca261ef65168c602d1e20630.zip frameworks_av-642025caee4b7917ca261ef65168c602d1e20630.tar.gz frameworks_av-642025caee4b7917ca261ef65168c602d1e20630.tar.bz2 | |
am fab5ad93: am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for responsiveness" into lmp-mr1-dev
* commit 'fab5ad9331de20b82b02aac4bc73cccf7054fd38':
NuPlayer: pass media time to selectTrack for responsiveness
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index e3ccab2..39b2287 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -488,13 +488,16 @@ status_t NuPlayerDriver::invoke(const Parcel &request, Parcel *reply) { case INVOKE_ID_SELECT_TRACK: { int trackIndex = request.readInt32(); - return mPlayer->selectTrack(trackIndex, true /* select */); + int msec = 0; + // getCurrentPosition should always return OK + getCurrentPosition(&msec); + return mPlayer->selectTrack(trackIndex, true /* select */, msec * 1000ll); } case INVOKE_ID_UNSELECT_TRACK: { int trackIndex = request.readInt32(); - return mPlayer->selectTrack(trackIndex, false /* select */); + return mPlayer->selectTrack(trackIndex, false /* select */, 0xdeadbeef /* not used */); } case INVOKE_ID_GET_SELECTED_TRACK: |