Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3778838e authored by Andreas Huber's avatar Andreas Huber
Browse files

Disable yuv->yuv mode and external display support until various driver fixes are in.

Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
parent 3d0de325
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 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)
+7 −1
Original line number Diff line number Diff line
@@ -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(