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

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

Merge "msm: vidc: New extradata for hdr10 plus metadata"

parents b612f1de d5899958

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

+3 −0
Original line number Diff line number Diff line
@@ -577,6 +577,9 @@ static int get_hfi_extradata_index(enum hal_extradata_id index) 
	case HAL_EXTRADATA_UBWC_CR_STATS_INFO:

		ret = HFI_PROPERTY_PARAM_VDEC_UBWC_CR_STAT_INFO_EXTRADATA;

		break;

	case HAL_EXTRADATA_HDR10PLUS_METADATA:

		ret = HFI_PROPERTY_PARAM_VENC_HDR10PLUS_METADATA_EXTRADATA;

		break;

	default:

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

		break;

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

+3 −1
Original line number Diff line number Diff line
@@ -690,7 +690,8 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_EXTRADATA_NUM_CONCEALED_MB) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ASPECT_RATIO) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_LTR) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ROI_QP)

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ROI_QP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_HDR10PLUS_METADATA)

			),

		.qmenu = mpeg_video_vidc_extradata,

	},
@@ -1759,6 +1760,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		switch (ctrl->val) {

		case V4L2_MPEG_VIDC_EXTRADATA_ASPECT_RATIO:

		case V4L2_MPEG_VIDC_EXTRADATA_ROI_QP:

		case V4L2_MPEG_VIDC_EXTRADATA_HDR10PLUS_METADATA:

			inst->bufq[OUTPUT_PORT].num_planes = 2;

			break;

		case V4L2_MPEG_VIDC_EXTRADATA_LTR:

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

+4 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ const char *const mpeg_video_vidc_extradata[] = { 
	"Extradata LTR",

	"Extradata macroblock metadata",

	"Extradata VQZip SEI",

	"Extradata YUV Stats",

	"Extradata HDR10+ Metadata",

	"Extradata ROI QP",

	"Extradata output crop",

	"Extradata display colour SEI",
@@ -5343,6 +5343,9 @@ enum hal_extradata_id msm_comm_get_hal_extradata_index( 
	case V4L2_MPEG_VIDC_EXTRADATA_UBWC_CR_STATS_INFO:

		ret = HAL_EXTRADATA_UBWC_CR_STATS_INFO;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_HDR10PLUS_METADATA:

		ret = HAL_EXTRADATA_HDR10PLUS_METADATA;

		break;

	default:

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

		break;

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

+3 −0
Original line number Diff line number Diff line
@@ -218,6 +218,9 @@ struct hfi_extradata_header { 
	(HFI_PROPERTY_PARAM_VENC_OX_START + 0x006)

#define  HFI_PROPERTY_PARAM_VENC_ROI_QP_EXTRADATA		\

	(HFI_PROPERTY_PARAM_VENC_OX_START + 0x008)

#define HFI_PROPERTY_PARAM_VENC_HDR10PLUS_METADATA_EXTRADATA	\

	(HFI_PROPERTY_PARAM_VENC_OX_START + 0x00A)



#define HFI_PROPERTY_CONFIG_VENC_OX_START				\

	(HFI_DOMAIN_BASE_VENC + HFI_ARCH_OX_OFFSET + 0x6000)

#define HFI_PROPERTY_PARAM_VPE_OX_START					\

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

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ enum hal_extradata_id { 
	HAL_EXTRADATA_VUI_DISPLAY_INFO,

	HAL_EXTRADATA_VPX_COLORSPACE,

	HAL_EXTRADATA_UBWC_CR_STATS_INFO,

	HAL_EXTRADATA_HDR10PLUS_METADATA,

};



enum hal_property {