diff options
author | Robert Shih <robertshih@google.com> | 2015-05-01 00:31:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-01 00:31:30 +0000 |
commit | 94ce218596a88cc6d37098cce4e17e68f7405603 (patch) | |
tree | 4e455974cb284aac3d1119ad2df5c6480c55c90a | |
parent | 3a474aa67fc31505740526dd249d96204c08bf79 (diff) | |
parent | 755106eb9cff51dc4eda45d8cefc4306df308845 (diff) | |
download | frameworks_av-94ce218596a88cc6d37098cce4e17e68f7405603.zip frameworks_av-94ce218596a88cc6d37098cce4e17e68f7405603.tar.gz frameworks_av-94ce218596a88cc6d37098cce4e17e68f7405603.tar.bz2 |
Merge "GenericSource: reply mime information for *all* track types" into mnc-dev
-rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 3 | ||||
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 8 |
2 files changed, 5 insertions, 6 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); diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index cb8579b..4e30093 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -423,23 +423,23 @@ void NuPlayer::writeTrackInfo( int32_t trackType; CHECK(format->findInt32("type", &trackType)); + AString mime; + CHECK(format->findString("mime", &mime)); + AString lang; CHECK(format->findString("language", &lang)); reply->writeInt32(2); // write something non-zero reply->writeInt32(trackType); + reply->writeString16(String16(mime.c_str())); reply->writeString16(String16(lang.c_str())); if (trackType == MEDIA_TRACK_TYPE_SUBTITLE) { - AString mime; - CHECK(format->findString("mime", &mime)); - int32_t isAuto, isDefault, isForced; CHECK(format->findInt32("auto", &isAuto)); CHECK(format->findInt32("default", &isDefault)); CHECK(format->findInt32("forced", &isForced)); - reply->writeString16(String16(mime.c_str())); reply->writeInt32(isAuto); reply->writeInt32(isDefault); reply->writeInt32(isForced); |