Merge "msm: vidc: Add support for setting initial qp" (1256b840) · Commits · e / devices / android_kernel_sony_msm8994

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -1724,6 +1724,22 @@ int create_pkt_cmd_session_set_property(
		pkt->size += sizeof(u32) * 2;
		break;
		}
		case HAL_PARAM_VENC_ENABLE_INITIAL_QP:
		{
		struct hfi_initial_quantization *hfi;
		struct hal_initial_quantization *quant = pdata;
		pkt->rg_property_data[0] =
		HFI_PROPERTY_PARAM_VENC_INITIAL_QP;
		hfi = (struct hfi_initial_quantization *)
		&pkt->rg_property_data[1];
		hfi->init_qp_enable = quant->init_qp_enable;
		hfi->qp_i = quant->qpi;
		hfi->qp_p = quant->qpp;
		hfi->qp_b = quant->qpb;
		pkt->size += sizeof(u32) +
		sizeof(struct hfi_initial_quantization);
		break;
		}
		/* FOLLOWING PROPERTIES ARE NOT IMPLEMENTED IN CORE YET */
		case HAL_CONFIG_BUFFER_REQUIREMENTS:
		case HAL_CONFIG_PRIORITY:

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

+65 −4

Original line number	Diff line number	Diff line
		@@ -890,6 +890,46 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = {
		(1 << V4L2_MPEG_VIDC_VIDEO_RATE_CONTROL_TIMESTAMP_MODE_IGNORE)),
		.qmenu = timestamp_mode,
		},
		{
		.id = V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP,
		.name = "Enable setting initial QP",
		.type = V4L2_CTRL_TYPE_BUTTON,
		.minimum = 0,
		.maximum = 0,
		.default_value = 0,
		.step = 0,
		.cluster = 0,
		},
		{
		.id = V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP,
		.name = "Iframe initial QP",
		.type = V4L2_CTRL_TYPE_INTEGER,
		.minimum = 1,
		.maximum = 51,
		.default_value = 1,
		.step = 1,
		.qmenu = NULL,
		},
		{
		.id = V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP,
		.name = "Pframe initial QP",
		.type = V4L2_CTRL_TYPE_INTEGER,
		.minimum = 1,
		.maximum = 51,
		.default_value = 1,
		.step = 1,
		.qmenu = NULL,
		},
		{
		.id = V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP,
		.name = "Bframe initial QP",
		.type = V4L2_CTRL_TYPE_INTEGER,
		.minimum = 1,
		.maximum = 51,
		.default_value = 1,
		.step = 1,
		.qmenu = NULL,
		}
		};

		#define NUM_CTRLS ARRAY_SIZE(msm_venc_ctrls)
		@@ -2317,6 +2357,7 @@ static int try_set_ext_ctrl(struct msm_vidc_inst *inst,
		u32 property_id = 0;
		void *pdata = NULL;
		struct msm_vidc_core_capability *cap = NULL;
		struct hal_initial_quantization quant;

		if (!inst \|\| !inst->core \|\| !inst->core->device \|\| !ctrl) {
		dprintk(VIDC_ERR, "%s invalid parameters\n", __func__);
		@@ -2361,6 +2402,26 @@ static int try_set_ext_ctrl(struct msm_vidc_inst *inst,
		property_id = HAL_PARAM_VENC_LTRMODE;
		pdata = &ltrmode;
		break;
		case V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP:
		property_id = HAL_PARAM_VENC_ENABLE_INITIAL_QP;
		quant.init_qp_enable = control[i].value;
		pdata = &quant;
		break;
		case V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP:
		quant.qpi = control[i].value;
		property_id = HAL_PARAM_VENC_ENABLE_INITIAL_QP;
		pdata = &quant;
		break;
		case V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP:
		quant.qpp = control[i].value;
		property_id = HAL_PARAM_VENC_ENABLE_INITIAL_QP;
		pdata = &quant;
		break;
		case V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP:
		quant.qpb = control[i].value;
		property_id = HAL_PARAM_VENC_ENABLE_INITIAL_QP;
		pdata = &quant;
		break;
		default:
		dprintk(VIDC_ERR, "Invalid id set: %d\n",
		control[i].id);

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -200,6 +200,7 @@ enum hal_property {
		HAL_CONFIG_VENC_HIER_P_NUM_FRAMES,
		HAL_PARAM_VENC_HIER_P_MAX_ENH_LAYERS,
		HAL_PARAM_VENC_DISABLE_RC_TIMESTAMP,
		HAL_PARAM_VENC_ENABLE_INITIAL_QP,
		};

		enum hal_domain {
		@@ -638,6 +639,13 @@ struct hal_quantization {
		u32 layer_id;
		};

		struct hal_initial_quantization {
		u32 qpi;
		u32 qpp;
		u32 qpb;
		u32 init_qp_enable;
		};

		struct hal_quantization_range {
		u32 min_qp;
		u32 max_qp;

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -327,7 +327,8 @@ struct hfi_buffer_info {
		(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x026)
		#define HFI_PROPERTY_PARAM_VENC_DISABLE_RC_TIMESTAMP \
		(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x027)

		#define HFI_PROPERTY_PARAM_VENC_INITIAL_QP \
		(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x028)

		#define HFI_PROPERTY_CONFIG_VENC_COMMON_START \
		(HFI_DOMAIN_BASE_VENC + HFI_ARCH_COMMON_OFFSET + 0x6000)
		@@ -543,6 +544,13 @@ struct hfi_quantization {
		u32 layer_id;
		};

		struct hfi_initial_quantization {
		u32 qp_i;
		u32 qp_p;
		u32 qp_b;
		u32 init_qp_enable;
		};

		struct hfi_quantization_range {
		u32 min_qp;
		u32 max_qp;

include/uapi/linux/v4l2-controls.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -878,6 +878,18 @@ enum v4l2_mpeg_vidc_video_rate_control_timestamp_mode {
		V4L2_MPEG_VIDC_VIDEO_RATE_CONTROL_TIMESTAMP_MODE_IGNORE = 1,
		};

		#define V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP \
		(V4L2_CID_MPEG_MSM_VIDC_BASE + 53)

		#define V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP \
		(V4L2_CID_MPEG_MSM_VIDC_BASE + 54)

		#define V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP \
		(V4L2_CID_MPEG_MSM_VIDC_BASE + 55)

		#define V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP \
		(V4L2_CID_MPEG_MSM_VIDC_BASE + 56)

		/* Camera class control IDs */

		#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA \| 0x900)