Merge "msm: vidc: Add support for VQZIP SEI type" (df4be0fb) · Commits · e / devices / android_kernel_xiaomi_markw

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -2135,6 +2135,14 @@ static int create_3x_pkt_cmd_session_set_property(
		pkt->size += sizeof(u32) + sizeof(struct hfi_enable);
		break;
		}
		case HAL_PARAM_VENC_VQZIP_SEI:
		{
		create_pkt_enable(pkt->rg_property_data,
		HFI_PROPERTY_PARAM_VENC_VQZIP_SEI_TYPE,
		((struct hal_enable *)pdata)->enable);
		pkt->size += sizeof(u32) + sizeof(struct hfi_enable);
		break;
		}
		/* Deprecated param on Venus 3xx */
		case HAL_PARAM_VDEC_CONTINUE_DATA_TRANSFER:
		{

+16 −1

Original line number	Diff line number	Diff line
		@@ -1127,6 +1127,15 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = {
		.step = 1,
		.qmenu = NULL,
		},
		{
		.id = V4L2_CID_MPEG_VIDC_VIDEO_VQZIP_SEI,
		.name = "VQZIP SEI",
		.type = V4L2_CTRL_TYPE_BOOLEAN,
		.minimum = V4L2_CID_MPEG_VIDC_VIDEO_VQZIP_SEI_DISABLE,
		.maximum = V4L2_CID_MPEG_VIDC_VIDEO_VQZIP_SEI_ENABLE,
		.default_value = V4L2_CID_MPEG_VIDC_VIDEO_VQZIP_SEI_DISABLE,
		.step = 1,
		},
		};

		#define NUM_CTRLS ARRAY_SIZE(msm_venc_ctrls)
		@@ -2834,6 +2843,11 @@ static int try_set_ctrl(struct msm_vidc_inst inst, struct v4l2_ctrl ctrl)
		frameqp = ctrl->val;
		pdata = &frameqp;
		break;
		case V4L2_CID_MPEG_VIDC_VIDEO_VQZIP_SEI:
		property_id = HAL_PARAM_VENC_VQZIP_SEI;
		enable.enable = ctrl->val;
		pdata = &enable;
		break;
		default:
		dprintk(VIDC_ERR, "Unsupported index: %x\n", ctrl->id);
		rc = -ENOTSUPP;
		@@ -3727,7 +3741,8 @@ int msm_venc_ctrl_init(struct msm_vidc_inst *inst)
		}

		if (!ctrl) {
		dprintk(VIDC_ERR, "%s - invalid ctrl\n", __func__);
		dprintk(VIDC_ERR, "%s - invalid ctrl : %s\n",
		ctrl_cfg.name, __func__);
		return -EINVAL;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,7 @@ enum hal_property {
		HAL_PARAM_SYNC_BASED_INTERRUPT,
		HAL_CONFIG_VENC_FRAME_QP,
		HAL_CONFIG_VENC_BASELAYER_PRIORITYID,
		HAL_PARAM_VENC_VQZIP_SEI,
		HAL_PARAM_EXTRADATA_INPUT_CROP,
		HAL_PROPERTY_PARAM_VENC_ASPECT_RATIO,
		HAL_CONFIG_VDEC_ENTROPY,

+2 −0

Original line number	Diff line number	Diff line
		@@ -369,6 +369,8 @@ struct hfi_buffer_info {
		(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x02C)
		#define HFI_PROPERTY_PARAM_VENC_HIER_P_HYBRID_MODE \
		(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x02F)
		#define HFI_PROPERTY_PARAM_VENC_VQZIP_SEI_TYPE \
		(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x033)

		#define HFI_PROPERTY_CONFIG_VENC_COMMON_START \
		(HFI_DOMAIN_BASE_VENC + HFI_ARCH_COMMON_OFFSET + 0x6000)

+8 −0

Original line number	Diff line number	Diff line
		@@ -1083,6 +1083,14 @@ enum v4l2_vidc_qbuf_mode {
		#define V4L2_CID_MPEG_VIDC_VENC_PARAM_SAR_HEIGHT \
		(V4L2_CID_MPEG_MSM_VIDC_BASE + 80)

		#define V4L2_CID_MPEG_VIDC_VIDEO_VQZIP_SEI \
		(V4L2_CID_MPEG_MSM_VIDC_BASE + 81)

		enum v4l2_mpeg_vidc_video_vqzip_sei_enable {
		V4L2_CID_MPEG_VIDC_VIDEO_VQZIP_SEI_DISABLE = 0,
		V4L2_CID_MPEG_VIDC_VIDEO_VQZIP_SEI_ENABLE = 1
		};

		/* Camera class control IDs */

		#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA \| 0x900)