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

Commit 9a34d8eb authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Enable HDR10 histogram extradata"

parents 5f2b92c8 39ee6e1e

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

+6 −1
Original line number Diff line number Diff line
@@ -1395,6 +1395,7 @@ 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) {
@@ -1418,8 +1419,12 @@ int msm_vdec_set_extradata(struct msm_vidc_inst *inst) 
	msm_comm_set_extradata(inst,

		HFI_PROPERTY_PARAM_VDEC_INTERLACE_VIDEO_EXTRADATA, 0x1);

	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, 0x1);

		HFI_PROPERTY_PARAM_HDR10_HIST_EXTRADATA, hdr10_hist);

	msm_comm_set_extradata(inst,

		HFI_PROPERTY_PARAM_VDEC_NUM_CONCEALED_MB, 0x1);

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