commit c8a8472a0205dd698c8d81bf7e09026ca1013d1e
author Andreas Huber <andih@google.com> Mon Mar 21 11:23:15 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 21 11:23:15 2011 -0700
tree d4200abc40d050b0b65f716b68acb04886a6820c
parent 1d54b3e0ec3d1ef17e75fec6f97be59f29721fff
parent af8791e112c8072452bd14ef3c43a47511d19542

Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"

media/libstagefright/StagefrightMetadataRetriever.cpp

diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp
index f58726e..4095fbf 100644
--- a/media/libstagefright/StagefrightMetadataRetriever.cpp
+++ b/media/libstagefright/StagefrightMetadataRetriever.cpp
@@ -232,6 +232,14 @@
     frame->mData = new uint8_t[frame->mSize];
     frame->mRotationAngle = rotationAngle;
 
+    int32_t displayWidth, displayHeight;
+    if (meta->findInt32(kKeyDisplayWidth, &displayWidth)) {
+        frame->mDisplayWidth = displayWidth;
+    }
+    if (meta->findInt32(kKeyDisplayHeight, &displayHeight)) {
+        frame->mDisplayHeight = displayHeight;
+    }
+
     int32_t srcFormat;
     CHECK(meta->findInt32(kKeyColorFormat, &srcFormat));
 
@@ -466,7 +474,7 @@
     }
 
     if (numTracks == 1 && hasAudio && audioBitrate >= 0) {
-        sprintf(tmp, "%ld", audioBitrate);
+        sprintf(tmp, "%d", audioBitrate);
         mMetaData.add(METADATA_KEY_BITRATE, String8(tmp));
     } else {
         off64_t sourceSize;