diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2018-03-16 12:20:27 -0400 |
|---|---|---|
| committer | Naseer Ahmed <naseer@codeaurora.org> | 2018-03-16 17:13:01 -0400 |
| commit | ce9a3c3c9e0de91e1073d042f5c2cf14b2ed1460 (patch) | |
| tree | f9b8d8898b691346ea9363e3b39df556ba68ebf1 /gralloc | |
| parent | 7ae93696c4dba51cb616ff11f0baeda4ffced009 (diff) | |
| parent | 07bf27fe83daaaec4edb83c0e556d9c229b6b9d3 (diff) | |
| download | display-ce9a3c3c9e0de91e1073d042f5c2cf14b2ed1460.tar.gz | |
Merge tag 'display.lnx.4.0-180312' into display.lnx.4.0
Change-Id: If3dca0edf21476ac14809748dc4e187da4618dad
Diffstat (limited to 'gralloc')
| -rw-r--r-- | gralloc/gr_utils.cpp | 5 | ||||
| -rw-r--r-- | gralloc/gralloc_priv.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp index f2f1caf9..7801005b 100644 --- a/gralloc/gr_utils.cpp +++ b/gralloc/gr_utils.cpp @@ -232,7 +232,6 @@ unsigned int GetSize(const BufferInfo &info, unsigned int alignedw, unsigned int } else if (IsCompressedRGBFormat(format)) { size = alignedw * alignedh * ASTC_BLOCK_SIZE; } else { - // Below switch should be for only YUV/custom formats switch (format) { case HAL_PIXEL_FORMAT_RAW16: @@ -289,9 +288,11 @@ unsigned int GetSize(const BufferInfo &info, unsigned int alignedw, unsigned int size = ALIGN(alignedw * alignedh * 2, SIZE_4K); break; case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS: - case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:size = VENUS_BUFFER_SIZE(COLOR_FMT_NV12, width, height); + case HAL_PIXEL_FORMAT_NV12_ENCODEABLE: + size = VENUS_BUFFER_SIZE(COLOR_FMT_NV12, width, height); break; case HAL_PIXEL_FORMAT_YCrCb_420_SP_VENUS: + case HAL_PIXEL_FORMAT_NV21_ENCODEABLE: size = VENUS_BUFFER_SIZE(COLOR_FMT_NV21, width, height); break; case HAL_PIXEL_FORMAT_BLOB: diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h index c6e8ca63..73eacaa1 100644 --- a/gralloc/gralloc_priv.h +++ b/gralloc/gralloc_priv.h @@ -91,6 +91,7 @@ inline int roundUpToPageSize(int x) { #define HAL_PIXEL_FORMAT_RGBA_5551 6 #define HAL_PIXEL_FORMAT_RGBA_4444 7 #define HAL_PIXEL_FORMAT_NV12_ENCODEABLE 0x102 +#define HAL_PIXEL_FORMAT_NV21_ENCODEABLE 0x7FA30C00 #define HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS 0x7FA30C04 #define HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED 0x7FA30C03 #define HAL_PIXEL_FORMAT_YCbCr_420_SP 0x109 |