summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/GenericSource.cpp
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-04-30 14:36:45 -0700
committerRobert Shih <robertshih@google.com>2015-04-30 16:18:18 -0700
commit755106eb9cff51dc4eda45d8cefc4306df308845 (patch)
tree468855e3ac3118e6a3b71bcbd1ca560bf34b0008 /media/libmediaplayerservice/nuplayer/GenericSource.cpp
parentf105b28e94c50802cab61ec4cdf4986e9dd3c097 (diff)
downloadframeworks_av-755106eb9cff51dc4eda45d8cefc4306df308845.zip
frameworks_av-755106eb9cff51dc4eda45d8cefc4306df308845.tar.gz
frameworks_av-755106eb9cff51dc4eda45d8cefc4306df308845.tar.bz2
GenericSource: reply mime information for *all* track types
Bug: 20729923 Change-Id: I65a8aedf089cfa4756fc9de433949c1b4bd416ce
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/GenericSource.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 7eaa0e0..5e7b644 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1065,6 +1065,7 @@ sp<AMessage> NuPlayer::GenericSource::getTrackInfo(size_t trackIndex) const {
const char *mime;
CHECK(meta->findCString(kKeyMIMEType, &mime));
+ format->setString("mime", mime);
int32_t trackType;
if (!strncasecmp(mime, "video/", 6)) {
@@ -1085,8 +1086,6 @@ sp<AMessage> NuPlayer::GenericSource::getTrackInfo(size_t trackIndex) const {
format->setString("language", lang);
if (trackType == MEDIA_TRACK_TYPE_SUBTITLE) {
- format->setString("mime", mime);
-
int32_t isAutoselect = 1, isDefault = 0, isForced = 0;
meta->findInt32(kKeyTrackIsAutoselect, &isAutoselect);
meta->findInt32(kKeyTrackIsDefault, &isDefault);