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

Commit 117c5f04 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Rename Access Unit Delimiter" into msm-4.9

parents e07f544c 7fce7ee8

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

+2 −2
Original line number Diff line number Diff line
@@ -1592,10 +1592,10 @@ int create_pkt_cmd_session_set_property( 
		pkt->size += sizeof(u32) + sizeof(struct hfi_enable);

		break;

	}

	case HAL_PARAM_VENC_H264_GENERATE_AUDNAL:

	case HAL_PARAM_VENC_GENERATE_AUDNAL:

	{

		create_pkt_enable(pkt->rg_property_data,

				HFI_PROPERTY_PARAM_VENC_H264_GENERATE_AUDNAL,

				HFI_PROPERTY_PARAM_VENC_GENERATE_AUDNAL,

				((struct hal_enable *)pdata)->enable);

		pkt->size += sizeof(u32) + sizeof(struct hfi_enable);

		break;

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

+2 −2
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_AU_DELIMITER,

		.name = "H264 AU Delimiter",

		.name = "AU Delimiter",

		.type = V4L2_CTRL_TYPE_BOOLEAN,

		.minimum = V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_DISABLED,

		.maximum = V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_ENABLED,
@@ -2338,7 +2338,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		pdata = &extra;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_AU_DELIMITER:

		property_id = HAL_PARAM_VENC_H264_GENERATE_AUDNAL;

		property_id = HAL_PARAM_VENC_GENERATE_AUDNAL;



		switch (ctrl->val) {

		case V4L2_MPEG_VIDC_VIDEO_AU_DELIMITER_DISABLED:

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

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ enum hal_property { 
	HAL_PARAM_VENC_H264_ENTROPY_CABAC_MODEL,

	HAL_CONFIG_VENC_MAX_BITRATE,

	HAL_PARAM_VENC_H264_VUI_TIMING_INFO,

	HAL_PARAM_VENC_H264_GENERATE_AUDNAL,

	HAL_PARAM_VENC_GENERATE_AUDNAL,

	HAL_PARAM_VENC_MAX_NUM_B_FRAMES,

	HAL_PARAM_BUFFER_ALLOC_MODE,

	HAL_PARAM_VDEC_FRAME_ASSEMBLY,

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

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ struct hfi_buffer_info { 
	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x014)

#define  HFI_PROPERTY_PARAM_VENC_H264_PPS_ID               \

	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x015)

#define HFI_PROPERTY_PARAM_VENC_H264_GENERATE_AUDNAL	\

#define HFI_PROPERTY_PARAM_VENC_GENERATE_AUDNAL	\

	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x016)

#define HFI_PROPERTY_PARAM_VENC_ASPECT_RATIO			\

	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x017)