commit 755106eb9cff51dc4eda45d8cefc4306df308845
author Robert Shih <robertshih@google.com> Thu Apr 30 14:36:45 2015 -0700
committer Robert Shih <robertshih@google.com> Thu Apr 30 16:18:18 2015 -0700
tree 468855e3ac3118e6a3b71bcbd1ca560bf34b0008
parent f105b28e94c50802cab61ec4cdf4986e9dd3c097

GenericSource: reply mime information for *all* track types

Bug: 20729923
Change-Id: I65a8aedf089cfa4756fc9de433949c1b4bd416ce

media/libmediaplayerservice/nuplayer/GenericSource.cpp

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);