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

Commit 84399731 authored by Vaibhav Deshu Venkatesh's avatar Vaibhav Deshu Venkatesh
Browse files

msm: vidc: Set HDR histogram extradata only for HEVC/VP9 



Currently set property for HDR histogram happens for all
codecs but for non-HEVC/VP9 it is being set to 0. With this
firmware is throwing errors. So, do not set this property
for other codecs.

Change-Id: I1b8d32de3513e260f40b283b9e340887dbaa0832
Signed-off-by: default avatarVaibhav Deshu Venkatesh <vdeshuve@codeaurora.org>
parent 05c45a66

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

+3 −4
Original line number Diff line number Diff line
@@ -1378,7 +1378,6 @@ int msm_vdec_set_extradata(struct msm_vidc_inst *inst) 
	uint32_t display_info = HFI_PROPERTY_PARAM_VUI_DISPLAY_INFO_EXTRADATA;

	struct v4l2_ctrl *ctrl;

	u32 value = 0x0;

	u32 hdr10_hist = 0x0;



	ctrl = get_ctrl(inst, V4L2_CID_MPEG_VIDC_VIDEO_EXTRADATA);

	switch (inst->fmts[OUTPUT_PORT].fourcc) {
@@ -1404,10 +1403,10 @@ int msm_vdec_set_extradata(struct msm_vidc_inst *inst) 
	msm_comm_set_extradata(inst, display_info, 0x1);

	if (inst->fmts[OUTPUT_PORT].fourcc == V4L2_PIX_FMT_VP9 ||

		inst->fmts[OUTPUT_PORT].fourcc == V4L2_PIX_FMT_HEVC) {

		hdr10_hist = 0x1;

	}

		msm_comm_set_extradata(inst,

		HFI_PROPERTY_PARAM_HDR10_HIST_EXTRADATA, hdr10_hist);

			HFI_PROPERTY_PARAM_HDR10_HIST_EXTRADATA, 0x1);

	}



	msm_comm_set_extradata(inst,

		HFI_PROPERTY_PARAM_VDEC_NUM_CONCEALED_MB, 0x1);

	if (inst->fmts[OUTPUT_PORT].fourcc == V4L2_PIX_FMT_HEVC) {