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

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

Merge "msm: vidc: Enable decoder HDR histogram"

parents e2ba5b89 e33a8608

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

+2 −0
Original line number Diff line number Diff line
@@ -1405,6 +1405,8 @@ 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);

	msm_comm_set_extradata(inst,

		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) {

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

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ struct hfi_extradata_header { 
	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x0021)

#define HFI_PROPERTY_PARAM_VDEC_UBWC_CR_STAT_INFO_EXTRADATA	\

	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x0022)

#define HFI_PROPERTY_PARAM_HDR10_HIST_EXTRADATA \

	(HFI_PROPERTY_PARAM_OX_START + 0x0023)



#define HFI_PROPERTY_CONFIG_VDEC_OX_START				\

	(HFI_DOMAIN_BASE_VDEC + HFI_ARCH_OX_OFFSET + 0x4000)

include/uapi/media/msm_vidc_utils.h

+5 −0
Original line number Diff line number Diff line
@@ -268,6 +268,11 @@ struct msm_vidc_vui_display_info_payload { 
	__u32 chroma_sample_loc_type_bottom_field;

};



#define  MSM_VIDC_EXTRADATA_HDR_HIST 0x7F100008

struct msm_vidc_extradata_hdr_hist_payload {

	__u32 value_count[1024];

};



#define MSM_VIDC_EXTRADATA_MPEG2_SEQDISP 0x0000000D

struct msm_vidc_mpeg2_seqdisp_payload {

	__u32 video_format;