From 203f09ac3f03ad6e97d0554506776ac45de61be7 Mon Sep 17 00:00:00 2001 From: Dikshita Agarwal Date: Mon, 8 Aug 2022 15:48:10 +0530 Subject: [PATCH] video: driver: add mapping for missing colorspace vidc macros Add mapping for missing vidc macros MSM_VIDC_TRANSFER_UNSPECIFIED and MSM_VIDC_PRIMARIES_UNSPECIFIED. Change-Id: I39fc60d98fe9f7c73d91768f5a0eb36e2c72a94c Signed-off-by: Dikshita Agarwal --- driver/platform/kalama/src/msm_vidc_kalama.c | 12 ++++++++++++ driver/vidc/src/msm_vidc_driver.c | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/driver/platform/kalama/src/msm_vidc_kalama.c b/driver/platform/kalama/src/msm_vidc_kalama.c index ad83d0459e..1dd768b067 100644 --- a/driver/platform/kalama/src/msm_vidc_kalama.c +++ b/driver/platform/kalama/src/msm_vidc_kalama.c @@ -119,6 +119,10 @@ static struct color_primaries_info color_primaries_data_kalama[] = { .v4l2_color_primaries = V4L2_COLORSPACE_DEFAULT, .vidc_color_primaries = MSM_VIDC_PRIMARIES_RESERVED, }, + { + .v4l2_color_primaries = V4L2_COLORSPACE_DEFAULT, + .vidc_color_primaries = MSM_VIDC_PRIMARIES_UNSPECIFIED, + }, { .v4l2_color_primaries = V4L2_COLORSPACE_REC709, .vidc_color_primaries = MSM_VIDC_PRIMARIES_BT709, @@ -166,6 +170,10 @@ static struct transfer_char_info transfer_char_data_kalama[] = { .v4l2_transfer_char = V4L2_XFER_FUNC_DEFAULT, .vidc_transfer_char = MSM_VIDC_TRANSFER_RESERVED, }, + { + .v4l2_transfer_char = V4L2_XFER_FUNC_DEFAULT, + .vidc_transfer_char = MSM_VIDC_TRANSFER_UNSPECIFIED, + }, { .v4l2_transfer_char = V4L2_XFER_FUNC_709, .vidc_transfer_char = MSM_VIDC_TRANSFER_BT709, @@ -225,6 +233,10 @@ static struct matrix_coeff_info matrix_coeff_data_kalama[] = { .v4l2_matrix_coeff = V4L2_YCBCR_ENC_DEFAULT, .vidc_matrix_coeff = MSM_VIDC_MATRIX_COEFF_RESERVED, }, + { + .v4l2_matrix_coeff = V4L2_YCBCR_ENC_DEFAULT, + .vidc_matrix_coeff = MSM_VIDC_MATRIX_COEFF_UNSPECIFIED, + }, { .v4l2_matrix_coeff = V4L2_YCBCR_VIDC_SRGB_OR_SMPTE_ST428, .vidc_matrix_coeff = MSM_VIDC_MATRIX_COEFF_SRGB_SMPTE_ST428_1, diff --git a/driver/vidc/src/msm_vidc_driver.c b/driver/vidc/src/msm_vidc_driver.c index 164d10e636..9d01b714f6 100644 --- a/driver/vidc/src/msm_vidc_driver.c +++ b/driver/vidc/src/msm_vidc_driver.c @@ -1013,8 +1013,8 @@ u32 v4l2_matrix_coeff_from_driver(struct msm_vidc_inst *inst, size = core->platform->data.format_data->matrix_coeff_info_size; for (i = 0; i < size; i++) { - if (matrix_coeff_info[i].v4l2_matrix_coeff == v4l2_matrix_coeff) - return matrix_coeff_info[i].vidc_matrix_coeff; + if (matrix_coeff_info[i].vidc_matrix_coeff == vidc_matrix_coeff) + return matrix_coeff_info[i].v4l2_matrix_coeff; } i_vpr_e(inst, "%s: invalid hfi matrix coeff %d\n",