GenericSource: reply mime information for *all* track types
Bug: 20729923
Change-Id: I65a8aedf089cfa4756fc9de433949c1b4bd416ce
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 @@
const char *mime;
CHECK(meta->findCString(kKeyMIMEType, &mime));
+ format->setString("mime", mime);
int32_t trackType;
if (!strncasecmp(mime, "video/", 6)) {
@@ -1085,8 +1086,6 @@
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 b670d68..09fefb0 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -368,23 +368,23 @@
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);