summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/colorconversion/SoftwareRenderer.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-05-16 16:14:13 -0700
committerAndreas Huber <andih@google.com>2011-05-16 16:14:13 -0700
commit3778838eee9470825bea7e5bad376f1dc9a94392 (patch)
tree9d1fa9d2c79088cc488e2cc36edff3910bf5ff1a /media/libstagefright/colorconversion/SoftwareRenderer.cpp
parent3d0de325381b66880626357f6b68ea09da0a9dda (diff)
downloadframeworks_av-3778838eee9470825bea7e5bad376f1dc9a94392.zip
frameworks_av-3778838eee9470825bea7e5bad376f1dc9a94392.tar.gz
frameworks_av-3778838eee9470825bea7e5bad376f1dc9a94392.tar.bz2
Disable yuv->yuv mode and external display support until various driver fixes are in.
Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
Diffstat (limited to 'media/libstagefright/colorconversion/SoftwareRenderer.cpp')
-rw-r--r--media/libstagefright/colorconversion/SoftwareRenderer.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index a4e8ee4..1828ac8 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -59,6 +59,7 @@ SoftwareRenderer::SoftwareRenderer(
size_t bufWidth, bufHeight;
switch (mColorFormat) {
+#ifndef THIS_IS_CRESPO
case OMX_COLOR_FormatYUV420Planar:
{
halFormat = HAL_PIXEL_FORMAT_YV12;
@@ -66,6 +67,7 @@ SoftwareRenderer::SoftwareRenderer(
bufHeight = (mHeight + 1) & ~1;
break;
}
+#endif
default:
halFormat = HAL_PIXEL_FORMAT_RGB_565;
@@ -87,7 +89,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
+#ifndef THIS_IS_CRESPO
+ | GRALLOC_USAGE_EXTERNAL_DISP
+#endif
+ ));
// Width must be multiple of 32???
CHECK_EQ(0, native_window_set_buffers_geometry(