summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2013-09-06 15:34:50 -0700
committerChong Zhang <chz@google.com>2013-09-11 14:55:52 -0700
commita911f51c21430ac92f1d796b2338878fd98382e9 (patch)
tree8bf7f7c99f88c36d63a98e1ef1a1dd5666e41346 /media/libstagefright/httplive
parentc728c580fc512b50604f33f1c4581c500062b245 (diff)
downloadframeworks_av-a911f51c21430ac92f1d796b2338878fd98382e9.zip
frameworks_av-a911f51c21430ac92f1d796b2338878fd98382e9.tar.gz
frameworks_av-a911f51c21430ac92f1d796b2338878fd98382e9.tar.bz2
Pass subtitle track properties to getTrackInfo
Bug: 10326117 Change-Id: I15fcc49ad02e26d7cc92e82ee670bafca62a09a7
Diffstat (limited to 'media/libstagefright/httplive')
-rw-r--r--media/libstagefright/httplive/M3UParser.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index bc6d629..243888c 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -200,6 +200,13 @@ void M3UParser::MediaGroup::getTrackInfo(Parcel* reply) const {
const Media &item = mMediaItems.itemAt(i);
const char *lang = item.mLanguage.empty() ? "und" : item.mLanguage.c_str();
reply->writeString16(String16(lang));
+
+ if (mType == TYPE_SUBS) {
+ // TO-DO: pass in a MediaFormat instead
+ reply->writeInt32(!!(item.mFlags & MediaGroup::FLAG_AUTOSELECT));
+ reply->writeInt32(!!(item.mFlags & MediaGroup::FLAG_DEFAULT));
+ reply->writeInt32(!!(item.mFlags & MediaGroup::FLAG_FORCED));
+ }
}
}