resolved conflicts for merge of 07bacabe to master

Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1

diff --cc media/libstagefright/AwesomePlayer.cpp
index 1f225a7,18dd8ef..759d05a
--- 1/media/libstagefright/AwesomePlayer.cpp
--- 2/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@@ -2030,6 -2038,34 +2038,34 @@@ status_t AwesomePlayer::finishSetDataSo
                          break;
                      }
  
 -                    LOGV("now cached %d bytes of data", cachedDataRemaining);
++                    ALOGV("now cached %d bytes of data", cachedDataRemaining);
+ 
+                     if (metaDataSize < 0
+                             && cachedDataRemaining >= kMinBytesForSniffing) {
+                         String8 tmp;
+                         float confidence;
+                         sp<AMessage> meta;
+                         if (!dataSource->sniff(&tmp, &confidence, &meta)) {
+                             mLock.lock();
+                             return UNKNOWN_ERROR;
+                         }
+ 
+                         // We successfully identified the file's extractor to
+                         // be, remember this mime type so we don't have to
+                         // sniff it again when we call MediaExtractor::Create()
+                         // below.
+                         sniffedMIME = tmp.string();
+ 
+                         if (meta == NULL
+                                 || !meta->findInt64(
+                                     "meta-data-size", &metaDataSize)) {
+                             metaDataSize = kHighWaterMarkBytes;
+                         }
+ 
+                         CHECK_GE(metaDataSize, 0ll);
 -                        LOGV("metaDataSize = %lld bytes", metaDataSize);
++                        ALOGV("metaDataSize = %lld bytes", metaDataSize);
+                     }
+ 
                      usleep(200000);
                  }
  

diff --cc media/libstagefright/MPEG4Extractor.cpp
index 7b6fa38,f6b06c7..0a69df4
--- 1/media/libstagefright/MPEG4Extractor.cpp
--- 2/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@@ -2340,6 -2403,13 +2404,13 @@@ static bool BetterSniffMPEG4
      *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4;
      *confidence = 0.4f;
  
 -        LOGV("found metadata size: %lld", moovAtomEndOffset);
+     if (moovAtomEndOffset >= 0) {
+         *meta = new AMessage;
+         (*meta)->setInt64("meta-data-size", moovAtomEndOffset);
+ 
++        ALOGV("found metadata size: %lld", moovAtomEndOffset);
+     }
+ 
      return true;
  }