diff options
| author | Ramkumar Radhakrishnan <ramkumar@codeaurora.org> | 2014-10-09 13:37:52 -0700 |
|---|---|---|
| committer | Ramkumar Radhakrishnan <ramkumar@codeaurora.org> | 2014-10-29 17:23:41 -0700 |
| commit | 964395241b68cc75d9281a361390b6024057f93b (patch) | |
| tree | ef7b3b51201ad860bcbe3bee20ea2567e229e48d /libcopybit | |
| parent | aad6232698277d3d78d69cefb9af6a1048797925 (diff) | |
| download | display-964395241b68cc75d9281a361390b6024057f93b.tar.gz | |
Revert "get rid of HAL pixelformats 5551 and 4444"
This reverts commit e4001e736d35179a0a3fec751906ce41e4458745.
Change-Id: Ic09ba8bc5b0784bce07e8800f6276b3290bc0e7a
Diffstat (limited to 'libcopybit')
| -rw-r--r-- | libcopybit/copybit.cpp | 2 | ||||
| -rw-r--r-- | libcopybit/copybit.h | 2 | ||||
| -rw-r--r-- | libcopybit/copybit_c2d.cpp | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libcopybit/copybit.cpp b/libcopybit/copybit.cpp index 2302d646..bd9fc1aa 100644 --- a/libcopybit/copybit.cpp +++ b/libcopybit/copybit.cpp @@ -440,6 +440,8 @@ static int stretch_copybit( // we don't support plane alpha with RGBA formats case HAL_PIXEL_FORMAT_RGBA_8888: case HAL_PIXEL_FORMAT_BGRA_8888: + case HAL_PIXEL_FORMAT_RGBA_5551: + case HAL_PIXEL_FORMAT_RGBA_4444: ALOGE ("%s : Unsupported Pixel format %d", __FUNCTION__, src->format); return -EINVAL; diff --git a/libcopybit/copybit.h b/libcopybit/copybit.h index dbb89f0b..9a6de9b8 100644 --- a/libcopybit/copybit.h +++ b/libcopybit/copybit.h @@ -48,6 +48,8 @@ enum { COPYBIT_FORMAT_RGB_888 = HAL_PIXEL_FORMAT_RGB_888, COPYBIT_FORMAT_RGB_565 = HAL_PIXEL_FORMAT_RGB_565, COPYBIT_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888, + COPYBIT_FORMAT_RGBA_5551 = HAL_PIXEL_FORMAT_RGBA_5551, + COPYBIT_FORMAT_RGBA_4444 = HAL_PIXEL_FORMAT_RGBA_4444, COPYBIT_FORMAT_YCbCr_422_SP = 0x10, COPYBIT_FORMAT_YCrCb_420_SP = 0x11, }; diff --git a/libcopybit/copybit_c2d.cpp b/libcopybit/copybit_c2d.cpp index 7841bb73..23daa274 100644 --- a/libcopybit/copybit_c2d.cpp +++ b/libcopybit/copybit_c2d.cpp @@ -265,6 +265,8 @@ static int get_format(int format) { case HAL_PIXEL_FORMAT_RGBA_8888: return C2D_COLOR_FORMAT_8888_ARGB | C2D_FORMAT_SWAP_RB; case HAL_PIXEL_FORMAT_BGRA_8888: return C2D_COLOR_FORMAT_8888_ARGB; + case HAL_PIXEL_FORMAT_RGBA_5551: return C2D_COLOR_FORMAT_5551_RGBA; + case HAL_PIXEL_FORMAT_RGBA_4444: return C2D_COLOR_FORMAT_4444_RGBA; case HAL_PIXEL_FORMAT_YCbCr_420_SP: return C2D_COLOR_FORMAT_420_NV12; case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:return C2D_COLOR_FORMAT_420_NV12; case HAL_PIXEL_FORMAT_YCrCb_420_SP: return C2D_COLOR_FORMAT_420_NV21; @@ -403,7 +405,9 @@ static int is_supported_rgb_format(int format) case HAL_PIXEL_FORMAT_RGBX_8888: case HAL_PIXEL_FORMAT_RGB_888: case HAL_PIXEL_FORMAT_RGB_565: - case HAL_PIXEL_FORMAT_BGRA_8888: { + case HAL_PIXEL_FORMAT_BGRA_8888: + case HAL_PIXEL_FORMAT_RGBA_5551: + case HAL_PIXEL_FORMAT_RGBA_4444: { return COPYBIT_SUCCESS; } default: |