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

Commit af88c178 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Split HDR info into different ext controls"

parents 59696a2f db53d1cc

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

+8 −8
Original line number Diff line number Diff line
@@ -2274,11 +2274,8 @@ int msm_venc_s_ext_ctrl(struct msm_vidc_inst *inst, 
	struct hal_frame_size blur_res;

	struct hal_quantization_range qp_range;

	struct hal_quantization qp;

	struct hal_hdr10_pq_sei hdr10_sei_params;

	struct msm_vidc_mastering_display_colour_sei_payload *mdisp_sei

		= &(hdr10_sei_params.disp_color_sei);

	struct msm_vidc_content_light_level_sei_payload *cll_sei

		= &(hdr10_sei_params.cll_sei);

	struct msm_vidc_mastering_display_colour_sei_payload *mdisp_sei = NULL;

	struct msm_vidc_content_light_level_sei_payload *cll_sei = NULL;



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

		dprintk(VIDC_ERR, "%s invalid parameters\n", __func__);
@@ -2293,6 +2290,9 @@ int msm_venc_s_ext_ctrl(struct msm_vidc_inst *inst, 


	control = ctrl->controls;



	mdisp_sei = &(inst->hdr10_sei_params.disp_color_sei);

	cll_sei = &(inst->hdr10_sei_params.cll_sei);



	for (i = 0; i < ctrl->count; i++) {

		switch (control[i].id) {

		case V4L2_CID_MPEG_VIDC_VIDEO_LTRMODE:
@@ -2429,9 +2429,9 @@ int msm_venc_s_ext_ctrl(struct msm_vidc_inst *inst, 
			break;

		case V4L2_CID_MPEG_VIDC_VENC_HDR_INFO:

			if (control[i].value ==

				V4L2_MPEG_VIDC_VENC_HDR_INFO_DISABLED)

				V4L2_MPEG_VIDC_VENC_HDR_INFO_DISABLED ||

					!mdisp_sei || !cll_sei)

				break;

			memset(&hdr10_sei_params, 0, sizeof(hdr10_sei_params));

			i++;

			while (i < ctrl->count) {

				switch (control[i].id) {
@@ -2494,7 +2494,7 @@ int msm_venc_s_ext_ctrl(struct msm_vidc_inst *inst, 
			}

			property_id =

				HAL_PARAM_VENC_HDR10_PQ_SEI;

			pdata = &hdr10_sei_params;

			pdata = &inst->hdr10_sei_params;

			break;

		default:

			dprintk(VIDC_ERR, "Invalid id set: %d\n",

drivers/media/platform/msm/vidc/msm_vidc_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ struct msm_vidc_inst { 
	u32 level;

	u32 entropy_mode;

	struct msm_vidc_codec_data *codec_data;

	struct hal_hdr10_pq_sei hdr10_sei_params;

};



extern struct msm_vidc_drv *vidc_driver;