diff options
| author | Chong Zhang <chz@google.com> | 2013-09-11 16:58:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-11 16:58:36 -0700 |
| commit | 33010b80bc01d0000456c49a1c31b647c8a4aa61 (patch) | |
| tree | 484ea02f44070c87713ed2f51a05b013f64f54f0 /media | |
| parent | fe2d2ac2f24a511bfb06916efc107c4459ddd93a (diff) | |
| parent | a911f51c21430ac92f1d796b2338878fd98382e9 (diff) | |
| download | frameworks_av-33010b80bc01d0000456c49a1c31b647c8a4aa61.zip frameworks_av-33010b80bc01d0000456c49a1c31b647c8a4aa61.tar.gz frameworks_av-33010b80bc01d0000456c49a1c31b647c8a4aa61.tar.bz2 | |
am a911f51c: Pass subtitle track properties to getTrackInfo
* commit 'a911f51c21430ac92f1d796b2338878fd98382e9':
Pass subtitle track properties to getTrackInfo
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 7 |
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)); + } } } |