diff options
| author | Tony Lofthouse <a0741364@ti.com> | 2012-07-05 17:25:21 -0500 |
|---|---|---|
| committer | Jason Simmons <jsimmons@google.com> | 2012-10-22 15:30:01 -0700 |
| commit | dfc644c88eeac97a2dd0feb5967e746fa64dd1c6 (patch) | |
| tree | 9d2117b7c56905f86f142476f268a34650464976 | |
| parent | 3d32f43362ff52bdac5a83855c63e8a8274da55a (diff) | |
| download | omap4-aah-dfc644c88eeac97a2dd0feb5967e746fa64dd1c6.tar.gz | |
hwc: Add HAL_PIXEL_FORMAT_TI_NV12_1D
Ported from p-ics-mr1:
93f38c6 hwc: Add HAL_PIXEL_FORMAT_TI_NV12_1D
Change-Id: I6ec62cec7590b90fb58cddfbfb5d253b8a7b469e
Signed-off-by: Tony Lofthouse <a0741364@ti.com>
(cherry picked from commit 7819b77e1a264805195cfa84c6da22de97b8bfe7)
| -rw-r--r-- | hwc/hal_public.h | 2 | ||||
| -rw-r--r-- | hwc/hwc.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/hwc/hal_public.h b/hwc/hal_public.h index 2776fab..f4433ad 100644 --- a/hwc/hal_public.h +++ b/hwc/hal_public.h @@ -170,6 +170,8 @@ IMG_buffer_format_public_t; */ #define HAL_PIXEL_FORMAT_BGRX_8888 0x1FF #define HAL_PIXEL_FORMAT_TI_NV12 0x100 +#define HAL_PIXEL_FORMAT_TI_UNUSED 0x101 /* Free for use */ +#define HAL_PIXEL_FORMAT_TI_NV12_1D 0x102 #endif /* HAL_PUBLIC_H */ @@ -211,6 +211,7 @@ struct omap4_hwc_device { typedef struct omap4_hwc_device omap4_hwc_device_t; #define HAL_FMT(f) ((f) == HAL_PIXEL_FORMAT_TI_NV12 ? "NV12" : \ + (f) == HAL_PIXEL_FORMAT_TI_NV12_1D ? "NV12" : \ (f) == HAL_PIXEL_FORMAT_YV12 ? "YV12" : \ (f) == HAL_PIXEL_FORMAT_BGRX_8888 ? "xRGB32" : \ (f) == HAL_PIXEL_FORMAT_RGBX_8888 ? "xBGR32" : \ @@ -397,6 +398,7 @@ static int omap4_hwc_is_valid_format(int format) case HAL_PIXEL_FORMAT_BGRA_8888: case HAL_PIXEL_FORMAT_BGRX_8888: case HAL_PIXEL_FORMAT_TI_NV12: + case HAL_PIXEL_FORMAT_TI_NV12_1D: return 1; default: @@ -470,6 +472,7 @@ static int is_NV12(IMG_native_handle_t *handle) switch(handle->iFormat) { case HAL_PIXEL_FORMAT_TI_NV12: + case HAL_PIXEL_FORMAT_TI_NV12_1D: return 1; default: return 0; @@ -573,6 +576,7 @@ omap4_hwc_setup_layer_base(struct dss2_ovl_cfg *oc, int index, int format, int b break; case HAL_PIXEL_FORMAT_TI_NV12: + case HAL_PIXEL_FORMAT_TI_NV12_1D: oc->color_mode = OMAP_DSS_COLOR_NV12; bits_per_pixel = 8; oc->cconv = ctbl_bt601_5; |