From 103487c0cb5c06f47225484486a98bc84745a059 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Wed, 8 Jun 2011 14:57:23 -0700
Subject: This device-specific workaround is no longer necessary.

We can now enable yuv->yuv blitting instead of converting to RGB565.

Change-Id: Ia6a94b706f20a0c9e6ef78a7325cff4f5bb216b8
related-to-bug: 4394005
---
 media/libstagefright/colorconversion/SoftwareRenderer.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'media/libstagefright/colorconversion/SoftwareRenderer.cpp')

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(
-- 
cgit v1.1