Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcbbba5c authored by Manikanta Sivapala's avatar Manikanta Sivapala
Browse files

msm: vidc: Add support for color space information 



When clients specify color space information, venus HW
should embed it in the bit stream. This helps to
regenerate original colors when decoded by decoder.
When decoder detects the color space VUI, Venus fills
the corresponding extradata

CRs-Fixed: 1026204
Change-Id: Ie9523558c23a8edc7a7ee058937658dd87ef5b16
Signed-off-by: default avatarPraneeth Paladugu <ppaladug@codeaurora.org>
Signed-off-by: default avatarManikanta Sivapala <msivap@codeaurora.org>
parent e94b446e

drivers/media/platform/msm/vidc/hfi_packetization.c

+26 −0
Original line number Diff line number Diff line
@@ -675,6 +675,12 @@ static int get_hfi_extradata_index(enum hal_extradata_id index) 
	case HAL_EXTRADATA_PQ_INFO:

		ret = HFI_PROPERTY_PARAM_VENC_OVERRIDE_QP_EXTRADATA;

		break;

	case HAL_EXTRADATA_VUI_DISPLAY_INFO:

		ret = HFI_PROPERTY_PARAM_VUI_DISPLAY_INFO_EXTRADATA;

		break;

	case HAL_EXTRADATA_VPX_COLORSPACE:

		ret = HFI_PROPERTY_PARAM_VDEC_VPX_COLORSPACE_EXTRADATA;

		break;

	default:

		dprintk(VIDC_WARN, "Extradata index not found: %d\n", index);

		break;
@@ -2127,6 +2133,26 @@ int create_pkt_cmd_session_set_property( 
		pkt->size += sizeof(u32) + sizeof(struct hfi_enable);

		break;

	}

	case HAL_PARAM_VENC_VIDEO_SIGNAL_INFO:

	{

		struct hal_video_signal_info *hal = pdata;

		struct hfi_video_signal_metadata *signal_info =

			(struct hfi_video_signal_metadata *)

			&pkt->rg_property_data[1];



		signal_info->enable = true;

		signal_info->video_format = MSM_VIDC_NTSC;

		signal_info->video_full_range = hal->full_range;

		signal_info->color_description = MSM_VIDC_COLOR_DESC_PRESENT;

		signal_info->color_primaries = hal->color_space;

		signal_info->transfer_characteristics = hal->transfer_chars;

		signal_info->matrix_coeffs = hal->matrix_coeffs;



		pkt->rg_property_data[0] =

			HFI_PROPERTY_PARAM_VENC_VIDEO_SIGNAL_INFO;

		pkt->size += sizeof(u32) + sizeof(*signal_info);

		break;

	}

	/* FOLLOWING PROPERTIES ARE NOT IMPLEMENTED IN CORE YET */

	case HAL_CONFIG_BUFFER_REQUIREMENTS:

	case HAL_CONFIG_PRIORITY:

drivers/media/platform/msm/vidc/msm_vdec.c

+5 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.name = "Extradata Type",

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_VPX_COLORSPACE,

		.default_value = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.menu_skip_mask = ~(

			(1 << V4L2_MPEG_VIDC_EXTRADATA_NONE) |
@@ -273,7 +273,10 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_EXTRADATA_VQZIP_SEI) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_DISPLAY_COLOUR_SEI) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI)

			(1 <<

			V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_VUI_DISPLAY) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_VPX_COLORSPACE)

			),

		.qmenu = mpeg_video_vidc_extradata,

	},

drivers/media/platform/msm/vidc/msm_venc.c

+99 −4
Original line number Diff line number Diff line
@@ -1242,6 +1242,46 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.default_value = V4L2_MPEG_VIDC_VIDEO_H264_TRANSFORM_8x8_ENABLE,

		.step = 1,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_COLOR_SPACE,

		.name = "Set Color space",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = MSM_VIDC_BT709_5,

		.maximum = MSM_VIDC_BT2020,

		.default_value = MSM_VIDC_BT601_6_625,

		.step = 1,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE,

		.name = "Set Color space range",

		.type = V4L2_CTRL_TYPE_BOOLEAN,

		.minimum = V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE_DISABLE,

		.maximum = V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE_ENABLE,

		.default_value = V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE_DISABLE,

		.step = 1,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_TRANSFER_CHARS,

		.name = "Set Color space transfer characterstics",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = MSM_VIDC_TRANSFER_BT709_5,

		.maximum = MSM_VIDC_TRANSFER_BT_2020_12,

		.default_value = MSM_VIDC_TRANSFER_601_6_625,

		.step = 1,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_MATRIX_COEFFS,

		.name = "Set Color space matrix coefficients",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = MSM_VIDC_MATRIX_BT_709_5,

		.maximum = MSM_VIDC_MATRIX_BT_2020_CONST,

		.default_value = MSM_VIDC_MATRIX_601_6_625,

		.step = 1,

		.qmenu = NULL,

	},



};



#define NUM_CTRLS ARRAY_SIZE(msm_venc_ctrls)
@@ -2105,6 +2145,7 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
	int baselayerid = 0;

	int frameqp = 0;

	int pic_order_cnt = 0;

	struct hal_video_signal_info signal_info = {0};



	if (!inst || !inst->core || !inst->core->device) {

		dprintk(VIDC_ERR, "%s invalid parameters\n", __func__);
@@ -3093,6 +3134,64 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		pdata = &pic_order_cnt;

		break;

	}

	case V4L2_CID_MPEG_VIDC_VIDEO_COLOR_SPACE:

	{

		signal_info.color_space = ctrl->val;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE);

		signal_info.full_range = temp_ctrl ? temp_ctrl->val : 0;

		temp_ctrl =

			TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_TRANSFER_CHARS);

		signal_info.transfer_chars = temp_ctrl ? temp_ctrl->val : 0;

		temp_ctrl =

			TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_MATRIX_COEFFS);

		signal_info.matrix_coeffs = temp_ctrl ? temp_ctrl->val : 0;

		property_id = HAL_PARAM_VENC_VIDEO_SIGNAL_INFO;

		pdata = &signal_info;

		break;

	}

	case V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE:

	{

		signal_info.full_range = ctrl->val;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_COLOR_SPACE);

		signal_info.color_space = temp_ctrl ? temp_ctrl->val : 0;

		temp_ctrl =

			TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_TRANSFER_CHARS);

		signal_info.transfer_chars = temp_ctrl ? temp_ctrl->val : 0;

		temp_ctrl =

			TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_MATRIX_COEFFS);

		signal_info.matrix_coeffs = temp_ctrl ? temp_ctrl->val : 0;

		property_id = HAL_PARAM_VENC_VIDEO_SIGNAL_INFO;

		pdata = &signal_info;

		break;

	}

	case V4L2_CID_MPEG_VIDC_VIDEO_TRANSFER_CHARS:

	{

		signal_info.transfer_chars = ctrl->val;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE);

		signal_info.full_range = temp_ctrl ? temp_ctrl->val : 0;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_COLOR_SPACE);

		signal_info.color_space = temp_ctrl ? temp_ctrl->val : 0;

		temp_ctrl =

			TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_MATRIX_COEFFS);

		signal_info.matrix_coeffs = temp_ctrl ? temp_ctrl->val : 0;

		property_id = HAL_PARAM_VENC_VIDEO_SIGNAL_INFO;

		pdata = &signal_info;

		break;

	}

	case V4L2_CID_MPEG_VIDC_VIDEO_MATRIX_COEFFS:

	{

		signal_info.matrix_coeffs = ctrl->val;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_FULL_RANGE);

		signal_info.full_range = temp_ctrl ? temp_ctrl->val : 0;

		temp_ctrl =

			TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_TRANSFER_CHARS);

		signal_info.transfer_chars = temp_ctrl ? temp_ctrl->val : 0;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDC_VIDEO_COLOR_SPACE);

		signal_info.color_space = temp_ctrl ? temp_ctrl->val : 0;

		property_id = HAL_PARAM_VENC_VIDEO_SIGNAL_INFO;

		pdata = &signal_info;

		break;

	}

	case V4L2_CID_MPEG_VIDC_VIDEO_VPE_CSC:

		if (ctrl->val == V4L2_CID_MPEG_VIDC_VIDEO_VPE_CSC_ENABLE) {

			rc = msm_venc_set_csc(inst);
@@ -3516,10 +3615,6 @@ int msm_venc_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
	}

	hdev = inst->core->device;



	if (msm_vidc_vpe_csc_601_to_709) {

		msm_venc_set_csc(inst);

	}



	if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {

		fmt = msm_comm_get_pixel_fmt_fourcc(venc_formats,

			ARRAY_SIZE(venc_formats), f->fmt.pix_mp.pixelformat,

drivers/media/platform/msm/vidc/msm_vidc_common.c

+11 −1
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ const char *const mpeg_video_vidc_extradata[] = { 
	"Extradata display colour SEI",

	"Extradata light level SEI",

	"Extradata PQ Info",

	"Extradata display VUI",

	"Extradata vpx color space",

};



struct getprop_buf {
@@ -210,7 +212,8 @@ int msm_comm_ctrl_init(struct msm_vidc_inst *inst, 
		}



		if (!ctrl) {

			dprintk(VIDC_ERR, "%s - invalid ctrl\n", __func__);

			dprintk(VIDC_ERR, "%s - invalid ctrl %s\n", __func__,

				 drv_ctrls[idx].name);

			return -EINVAL;

		}
@@ -4692,6 +4695,13 @@ enum hal_extradata_id msm_comm_get_hal_extradata_index( 
	case V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO:

		ret = HAL_EXTRADATA_PQ_INFO;

		break;



	case V4L2_MPEG_VIDC_EXTRADATA_VUI_DISPLAY:

		ret = HAL_EXTRADATA_VUI_DISPLAY_INFO;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_VPX_COLORSPACE:

		ret = HAL_EXTRADATA_VPX_COLORSPACE;

		break;

	default:

		dprintk(VIDC_WARN, "Extradata not found: %d\n", index);

		break;

drivers/media/platform/msm/vidc/msm_vidc_debug.c

+0 −2
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ struct dentry *msm_vidc_debugfs_init_drv(void) 
			&msm_vidc_fw_low_power_mode) &&

	__debugfs_create(u32, "debug_output", &msm_vidc_debug_out) &&

	__debugfs_create(u32, "hw_rsp_timeout", &msm_vidc_hw_rsp_timeout) &&

	__debugfs_create(bool, "enable_vpe_csc_601_709",

			&msm_vidc_vpe_csc_601_to_709) &&

	__debugfs_create(bool, "sys_idle_indicator",

			&msm_vidc_sys_idle_indicator) &&

	__debugfs_create(u32, "firmware_unload_delay",