commit 317ca79a49746dbd1b6bb83712e93e2dc5f6e4f0
author James Dong <jdong@google.com> Thu Nov 18 18:19:30 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 18 18:19:30 2010 -0800
tree ad8a70e1e44a6a22d1371390afe205fd2caed725
parent c726bd8b7b9929fd917b01e5551a66ad5fe2c04e
parent c7fc37a3dab9bd1f96713649f351b5990e6316ff

Merge "64-bit file size/offset support for media framework"

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 5ed4d84..6ca0f4f 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -595,7 +595,7 @@
                 size -= length;
             }
 
-            CODEC_LOGV(
+            CODEC_LOGI(
                     "AVC profile = %d (%s), level = %d",
                     (int)profile, AVCProfileToString(profile), level);
 
@@ -1714,7 +1714,7 @@
     // Set up the native window.
     // XXX TODO: Get the gralloc usage flags from the OMX plugin!
     err = native_window_set_usage(
-            mNativeWindow.get(), GRALLOC_USAGE_HW_TEXTURE);
+            mNativeWindow.get(), GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP);
     if (err != 0) {
         LOGE("native_window_set_usage failed: %s (%d)", strerror(-err), -err);
         return err;

media/libstagefright/colorconversion/SoftwareRenderer.cpp

diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index 3d507ca..acbea05 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -88,7 +88,7 @@
             native_window_set_usage(
             mSurface.get(),
             GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_OFTEN
-            | GRALLOC_USAGE_HW_TEXTURE));
+            | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP));
 
     CHECK_EQ(0, native_window_set_buffer_count(mSurface.get(), 2));