Merge "msm: vidc: add RGBA UBWC colorformat support"

This commit is contained in:
qctecmdr 2020-05-20 16:13:28 -07:00 • committed by Gerrit - the friendly Code Review server
commit b80bcd6127
3 changed files with 14 additions and 0 deletions

View file

@ -1020,6 +1020,11 @@ static struct msm_vidc_format_desc venc_input_formats[] = {
.description = "Y/CbCr 4:2:0 512 aligned",
.fourcc = V4L2_PIX_FMT_NV12_512,
},
{
.name = "32bit RGBA UBWC 8:8:8:8",
.description = "32-bit RGBA UBWC 8:8:8:8",
.fourcc = V4L2_PIX_FMT_RGBA8888_UBWC,
},
};
static struct msm_vidc_format_desc venc_output_formats[] = {

View file

@ -245,6 +245,7 @@ static inline int __bpp(enum hal_uncompressed_format f, u32 sid)
case HAL_COLOR_FORMAT_NV12:
case HAL_COLOR_FORMAT_NV21:
case HAL_COLOR_FORMAT_NV12_UBWC:
case HAL_COLOR_FORMAT_RGBA8888_UBWC:
return 8;
case HAL_COLOR_FORMAT_NV12_TP10_UBWC:
case HAL_COLOR_FORMAT_P010:

View file

@ -864,6 +864,9 @@ enum hal_uncompressed_format msm_comm_get_hal_uncompressed(int fourcc)
case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS:
format = HAL_COLOR_FORMAT_P010;
break;
case V4L2_PIX_FMT_RGBA8888_UBWC:
format = HAL_COLOR_FORMAT_RGBA8888_UBWC;
break;
default:
format = HAL_UNUSED_COLOR;
break;
@ -895,6 +898,9 @@ u32 msm_comm_get_hfi_uncompressed(int fourcc, u32 sid)
case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS:
format = HFI_COLOR_FORMAT_P010;
break;
case V4L2_PIX_FMT_RGBA8888_UBWC:
format = HFI_COLOR_FORMAT_RGBA8888_UBWC;
break;
default:
format = HFI_COLOR_FORMAT_NV12_UBWC;
s_vpr_e(sid, "Invalid format, defaulting to UBWC");
@ -3475,6 +3481,8 @@ u32 msm_comm_convert_color_fmt(u32 v4l2_fmt, u32 sid)
return COLOR_FMT_NV12_UBWC;
case V4L2_PIX_FMT_NV12_TP10_UBWC:
return COLOR_FMT_NV12_BPP10_UBWC;
case V4L2_PIX_FMT_RGBA8888_UBWC:
return COLOR_FMT_RGBA8888_UBWC;
default:
s_vpr_e(sid,
"Invalid v4l2 color fmt FMT : %x, Set default(NV12)",