summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerSource.h
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2014-11-19 02:27:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-19 02:27:04 +0000
commitfab5ad9331de20b82b02aac4bc73cccf7054fd38 (patch)
tree11f41e0832e408181ffc02b86601c0f8192da2f1 /media/libmediaplayerservice/nuplayer/NuPlayerSource.h
parent640228b8e0e537a527f2bb63a4f4d4b5a1ef29cd (diff)
parent2f65ada84cced6704e8fcdb03835fe218d917fcb (diff)
downloadframeworks_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/NuPlayerSource.h')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerSource.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h
index 9924f18..e92cd36 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h
@@ -96,7 +96,7 @@ struct NuPlayer::Source : public AHandler {
return INVALID_OPERATION;
}
- virtual status_t selectTrack(size_t /* trackIndex */, bool /* select */) {
+ virtual status_t selectTrack(size_t /* trackIndex */, bool /* select */, int64_t /* timeUs*/) {
return INVALID_OPERATION;
}