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

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

Merge "msm: vidc: fix mirror configuration"

parents f70ca804 75096e88

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

+3 −6
Original line number Diff line number Diff line
@@ -1410,12 +1410,9 @@ int create_pkt_cmd_session_set_property( 
		 * 0xbbppii, where ii = qp range for I-frames,

		 * pp = qp range for P-frames, etc.

		 */

		hfi->min_qp.qp_packed = hal_range->qpi_min |

			hal_range->qpp_min << 8 |

			hal_range->qpb_min << 16;

		hfi->max_qp.qp_packed = hal_range->qpi_max |

			hal_range->qpp_max << 8 |

			hal_range->qpb_max << 16;

		hfi->min_qp.qp_packed = hal_range->qp_min_packed;

		hfi->max_qp.qp_packed = hal_range->qp_max_packed;



		hfi->max_qp.layer_id = hal_range->layer_id;

		hfi->min_qp.layer_id = hal_range->layer_id;

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

+9 −15
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.name = "HEVC Quantization Range Minimum",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 127,

		.default_value = 1,

		.maximum = 0x7F7F7F,

		.default_value = 0x010101,

		.step = 1,

		.menu_skip_mask = 0,

		.qmenu = NULL,
@@ -147,8 +147,8 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.name = "HEVC Quantization Range Maximum",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = 127,

		.default_value = 127,

		.maximum = 0x7F7F7F,

		.default_value = 0x7F7F7F,

		.step = 1,

		.menu_skip_mask = 0,

		.qmenu = NULL,
@@ -2202,9 +2202,7 @@ int msm_venc_set_qp_range(struct msm_vidc_inst *inst) 
		dprintk(VIDC_ERR, "%s: get qpi_min failed\n", __func__);

		return -EINVAL;

	}

	qp_range.qpi_min = ctrl->val;

	qp_range.qpp_min = ctrl->val;

	qp_range.qpb_min = ctrl->val;

	qp_range.qp_min_packed = ctrl->val;



	ctrl = msm_venc_get_ctrl(inst,

			V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP);
@@ -2212,16 +2210,12 @@ int msm_venc_set_qp_range(struct msm_vidc_inst *inst) 
		dprintk(VIDC_ERR, "%s: get qpi_max failed\n", __func__);

		return -EINVAL;

	}

	qp_range.qpi_max = ctrl->val;

	qp_range.qpp_max = ctrl->val;

	qp_range.qpb_max = ctrl->val;

	qp_range.qp_max_packed = ctrl->val;



	dprintk(VIDC_DBG,

		"%s: layers %#x qpi_min %#x qpi_max %#x qpp_min %#x qpp_max %#x qpb_min %#x qpb_max %#x\n",

			"%s: layers %#x qp_min %#x qp_max %#x\n",

			__func__, qp_range.layer_id,

		qp_range.qpi_min, qp_range.qpi_max,

		qp_range.qpp_min, qp_range.qpp_max,

		qp_range.qpb_min, qp_range.qpb_max);

			qp_range.qp_min_packed, qp_range.qp_max_packed);

	rc = call_hfi_op(hdev, session_set_property, inst->session,

			HAL_PARAM_VENC_SESSION_QP_RANGE, &qp_range);

	if (rc)

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

+1 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ static int msm_vidc_set_rotation(struct msm_vidc_inst *inst) 
		return value;

	}



	vflip = msm_comm_g_ctrl_for_id(inst, V4L2_CID_HFLIP);

	vflip = msm_comm_g_ctrl_for_id(inst, V4L2_CID_VFLIP);

	if (vflip < 0) {

		dprintk(VIDC_ERR, "Get control for vflip failed\n");

		return value;

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

+2 −6
Original line number Diff line number Diff line
@@ -607,12 +607,8 @@ struct hal_quantization { 
};



struct hal_quantization_range {

	u32 qpi_min;

	u32 qpp_min;

	u32 qpb_min;

	u32 qpi_max;

	u32 qpp_max;

	u32 qpb_max;

	u32 qp_min_packed;

	u32 qp_max_packed;

	u32 layer_id;

};