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

Commit e79b26e2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Fix for KW error"

parents c2913e67 2e7ced2f

drivers/media/platform/msm/vidc_3x/msm_vdec.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -2491,6 +2491,11 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		break;

		break;

	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:

	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_LEVEL);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_LEVEL);

		if (!temp_ctrl) {

			dprintk(VIDC_ERR,

				"failed to get control\n");

			return -EINVAL;

		}

		property_id =

		property_id =

			HAL_PARAM_PROFILE_LEVEL_CURRENT;

			HAL_PARAM_PROFILE_LEVEL_CURRENT;

		profile_level.profile = vdec_v4l2_to_hal(ctrl->id,

		profile_level.profile = vdec_v4l2_to_hal(ctrl->id,
@@ -2502,6 +2507,11 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		break;

		break;

	case V4L2_CID_MPEG_VIDEO_H264_LEVEL:

	case V4L2_CID_MPEG_VIDEO_H264_LEVEL:

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_PROFILE);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_PROFILE);

		if (!temp_ctrl) {

			dprintk(VIDC_ERR,

				"failed to get control\n");

			return -EINVAL;

		}

		property_id =

		property_id =

			HAL_PARAM_PROFILE_LEVEL_CURRENT;

			HAL_PARAM_PROFILE_LEVEL_CURRENT;

		profile_level.level = vdec_v4l2_to_hal(ctrl->id,

		profile_level.level = vdec_v4l2_to_hal(ctrl->id,

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

+15 −0
Original line number Original line Diff line number Diff line
@@ -2320,6 +2320,11 @@ static int msm_venc_validate_qp_value(struct msm_vidc_inst *inst, 
	switch (inst->fmts[CAPTURE_PORT].fourcc) {

	switch (inst->fmts[CAPTURE_PORT].fourcc) {

	case V4L2_PIX_FMT_VP8:

	case V4L2_PIX_FMT_VP8:

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_MAX_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_MAX_QP);

		if (!temp_ctrl) {

			dprintk(VIDC_ERR,

				"failed to get control");

			return -EINVAL;

		}

		max = temp_ctrl->maximum;

		max = temp_ctrl->maximum;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_MIN_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_MIN_QP);

		min = temp_ctrl->minimum;

		min = temp_ctrl->minimum;
@@ -2329,6 +2334,11 @@ static int msm_venc_validate_qp_value(struct msm_vidc_inst *inst, 
	case V4L2_PIX_FMT_H263:

	case V4L2_PIX_FMT_H263:

	case V4L2_PIX_FMT_MPEG4:

	case V4L2_PIX_FMT_MPEG4:

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP);

		if (!temp_ctrl) {

			dprintk(VIDC_ERR,

				"failed to get control");

			return -EINVAL;

		}

		max = temp_ctrl->maximum;

		max = temp_ctrl->maximum;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP);

		min = temp_ctrl->minimum;

		min = temp_ctrl->minimum;
@@ -2338,6 +2348,11 @@ static int msm_venc_validate_qp_value(struct msm_vidc_inst *inst, 
	case V4L2_PIX_FMT_H264:

	case V4L2_PIX_FMT_H264:

	case V4L2_PIX_FMT_HEVC:

	case V4L2_PIX_FMT_HEVC:

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_MAX_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_MAX_QP);

		if (!temp_ctrl) {

			dprintk(VIDC_ERR,

				"failed to get control");

			return -EINVAL;

		}

		max = temp_ctrl->maximum;

		max = temp_ctrl->maximum;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_MIN_QP);

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_MIN_QP);

		min = temp_ctrl->minimum;

		min = temp_ctrl->minimum;