summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2014-11-17 23:14:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-17 23:14:04 +0000
commit39b109a1df23e7610b031b466e9ecf510b3c077f (patch)
treef7b65ac4779af866f4d278004e7f583936cf2d1e /media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
parentf89f2ff4df0855eb56d95a02ab29d856e0ffa858 (diff)
parent89bf2525c5b57f17260de5b00c5f3f78ac4b881e (diff)
downloadframeworks_av-39b109a1df23e7610b031b466e9ecf510b3c077f.zip
frameworks_av-39b109a1df23e7610b031b466e9ecf510b3c077f.tar.gz
frameworks_av-39b109a1df23e7610b031b466e9ecf510b3c077f.tar.bz2
Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
index 02e9caf..e335055 100644
--- a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
@@ -139,6 +139,14 @@ sp<AMessage> NuPlayer::HTTPLiveSource::getTrackInfo(size_t trackIndex) const {
return mLiveSession->getTrackInfo(trackIndex);
}
+ssize_t NuPlayer::HTTPLiveSource::getSelectedTrack(media_track_type type) const {
+ if (mLiveSession == NULL) {
+ return -1;
+ } else {
+ return mLiveSession->getSelectedTrack(type);
+ }
+}
+
status_t NuPlayer::HTTPLiveSource::selectTrack(size_t trackIndex, bool select) {
status_t err = mLiveSession->selectTrack(trackIndex, select);