diff options
| -rw-r--r-- | media/libstagefright/colorconversion/Android.mk | 4 | ||||
| -rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk index 702a7b4..62ba40f 100644 --- a/media/libstagefright/colorconversion/Android.mk +++ b/media/libstagefright/colorconversion/Android.mk @@ -9,10 +9,6 @@ LOCAL_C_INCLUDES := \ $(TOP)/frameworks/base/include/media/stagefright/openmax \ $(TOP)/hardware/msm7k -ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),) -LOCAL_CFLAGS += -DTHIS_IS_CRESPO=1 -endif - LOCAL_MODULE:= libstagefright_color_conversion include $(BUILD_STATIC_LIBRARY) diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp index 1828ac8..a4e8ee4 100644 --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp @@ -59,7 +59,6 @@ SoftwareRenderer::SoftwareRenderer( size_t bufWidth, bufHeight; switch (mColorFormat) { -#ifndef THIS_IS_CRESPO case OMX_COLOR_FormatYUV420Planar: { halFormat = HAL_PIXEL_FORMAT_YV12; @@ -67,7 +66,6 @@ SoftwareRenderer::SoftwareRenderer( bufHeight = (mHeight + 1) & ~1; break; } -#endif default: halFormat = HAL_PIXEL_FORMAT_RGB_565; @@ -89,11 +87,7 @@ SoftwareRenderer::SoftwareRenderer( native_window_set_usage( mNativeWindow.get(), GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_OFTEN - | GRALLOC_USAGE_HW_TEXTURE -#ifndef THIS_IS_CRESPO - | GRALLOC_USAGE_EXTERNAL_DISP -#endif - )); + | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP)); // Width must be multiple of 32??? CHECK_EQ(0, native_window_set_buffers_geometry( |