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/NuPlayer.cpp

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