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

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

Merge "msm: vidc: Add support for Adaptive B"

parents e14e6b52 0518b702

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

+8 −0
Original line number Diff line number Diff line
@@ -1377,6 +1377,14 @@ int create_pkt_cmd_session_set_property( 
		pkt->size += sizeof(u32);

		break;

	}

	case HAL_PARAM_VENC_ADAPTIVE_B:

	{

		create_pkt_enable(pkt->rg_property_data,

			HFI_PROPERTY_PARAM_VENC_ADAPTIVE_B,

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

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

		break;

	}

	case HAL_PARAM_VDEC_CONCEAL_COLOR:

	{

		struct hfi_conceal_color *hfi;

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

+14 −0
Original line number Diff line number Diff line
@@ -300,6 +300,15 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.menu_skip_mask = 0,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_ADAPTIVE_B,

		.name = "Adaptive B frames",

		.type = V4L2_CTRL_TYPE_BOOLEAN,

		.minimum = V4L2_MPEG_MSM_VIDC_DISABLE,

		.maximum = V4L2_MPEG_MSM_VIDC_ENABLE,

		.default_value = V4L2_MPEG_MSM_VIDC_ENABLE,

		.step = 1,

	},

	{

		.id = V4L2_CID_MIN_BUFFERS_FOR_CAPTURE,

		.name = "CAPTURE Count",
@@ -1329,6 +1338,11 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		pdata = &intra_period;

		break;

	}

	case V4L2_CID_MPEG_VIDC_VIDEO_ADAPTIVE_B:

		property_id = HAL_PARAM_VENC_ADAPTIVE_B;

		enable.enable = ctrl->val;

		pdata = &enable;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_REQUEST_IFRAME:

		property_id = HAL_CONFIG_VENC_REQUEST_IFRAME;

		request_iframe.enable = true;

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

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ enum hal_property { 
	HAL_PARAM_VENC_SESSION_QP_RANGE,

	HAL_CONFIG_VENC_INTRA_PERIOD,

	HAL_CONFIG_VENC_IDR_PERIOD,

	HAL_PARAM_VENC_ADAPTIVE_B,

	HAL_PARAM_VPE_ROTATION,

	HAL_PARAM_VENC_INTRA_REFRESH,

	HAL_PARAM_VENC_MULTI_SLICE_CONTROL,

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

+2 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ struct hfi_buffer_info { 
	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x035)

#define  HFI_PROPERTY_PARAM_VENC_HDR10_PQ_SEI			\

	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x036)

#define  HFI_PROPERTY_PARAM_VENC_ADAPTIVE_B \

	(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x037)



#define HFI_PROPERTY_CONFIG_VENC_COMMON_START				\

	(HFI_DOMAIN_BASE_VENC + HFI_ARCH_COMMON_OFFSET + 0x6000)

include/uapi/linux/v4l2-controls.h

+3 −0
Original line number Diff line number Diff line
@@ -936,6 +936,9 @@ enum v4l2_mpeg_vidc_video_vp9_level { 
	V4L2_MPEG_VIDC_VIDEO_VP9_LEVEL_51 = 10,

};



#define V4L2_CID_MPEG_VIDC_VIDEO_ADAPTIVE_B \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 98)



#define V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 99)

#define V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP \