Correct gralloc usage flags for renderer and some code style improvem…

…ents
Alexious-sh · Nov 19, 2012 · c9a1797 · Alexious-sh · Nov 19, 2012 · ItachiSan
1 parent 850bd1b
commit c9a1797
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
@@ -1294,7 +1294,7 @@ static size_t getFrameSize(
 
 #ifdef QCOM_LEGACY_OMX
     case OMX_QCOM_COLOR_FormatYVU420SemiPlanar:
-        return (((width + 15) & -16) * ((height + 15) & -16) * 3) / 2;
+        return ALIGN(width, 16) * ALIGN(height, 16) * 3 / 2;
 #endif
 
 #ifdef SAMSUNG_CODEC_SUPPORT

diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk
@@ -11,6 +11,7 @@ LOCAL_C_INCLUDES := \
 
 ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
         LOCAL_C_INCLUDES += $(TOP)/vendor/qcom/opensource/omx/mm-core/omxcore/inc
+        LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/display/libgralloc 
 endif
 
 LOCAL_MODULE:= libstagefright_color_conversion

diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -28,6 +28,10 @@
 #include <ui/GraphicBufferMapper.h>
 #include <gui/ISurfaceTexture.h>
 
+#ifdef QCOM_LEGACY_OMX
+#include <gralloc_priv.h>
+#endif
+
 namespace android {
 
 #ifdef QCOM_HARDWARE
@@ -83,7 +87,7 @@ SoftwareRenderer::SoftwareRenderer(
             halFormat = HAL_PIXEL_FORMAT_YCrCb_420_SP;
             bufWidth = (mCropWidth + 1) & ~1;
             bufHeight = (mCropHeight + 1) & ~1;
-            mAlign = ((mWidth + 15) & -16) * ((mHeight + 15) & -16);
+            mAlign = ALIGN(mWidth, 16) * ALIGN(mHeight, 16);
             break;
         }
 #endif
@@ -112,7 +116,11 @@ SoftwareRenderer::SoftwareRenderer(
             native_window_set_usage(
             mNativeWindow.get(),
             GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_OFTEN
-            | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP));
+            | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP
+#ifdef QCOM_LEGACY_OMX
+            | GRALLOC_USAGE_PRIVATE_ADSP_HEAP | GRALLOC_USAGE_PRIVATE_UNCACHED
+#endif
+            ));
 
     CHECK_EQ(0,
             native_window_set_scaling_mode(
@@ -289,4 +297,4 @@ void SoftwareRenderer::render(
     buf = NULL;
 }
 
-}  // namespace android
+}  // namespace android