From: Chong Zhang <chz@google.com>
Date: Tue, 26 Aug 2014 17:38:17 +0000 (+0000)
Subject: Merge "do string compare with mime immediately after we get the value" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~852^2~431
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5bbffc05432b6a81280872a9c3ed9cac7bec53df;p=android-x86%2Fframeworks-av.git

Merge "do string compare with mime immediately after we get the value" into lmp-dev
---

5bbffc05432b6a81280872a9c3ed9cac7bec53df
diff --cc media/libmediaplayerservice/nuplayer/GenericSource.cpp
index cdb7e69b1f,5a4d131967..f0f4e454cd
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@@ -138,9 -133,9 +138,11 @@@ status_t NuPlayer::GenericSource::initF
          }
      }
  
 +    int32_t totalBitrate = 0;
 +
      for (size_t i = 0; i < extractor->countTracks(); ++i) {
+         sp<MediaSource> track = extractor->getTrack(i);
+ 
          sp<MetaData> meta = extractor->getTrackMetaData(i);
  
          const char *mime;