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

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

Merge "msm: vidc: Remove inversion of video priority ctrl value"

parents 63d74ae5 3fac4607

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

+1 −4
Original line number Diff line number Diff line
@@ -1128,10 +1128,7 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY:

		property_id = HAL_CONFIG_REALTIME;

		/* firmware has inverted values for realtime and

		 * non-realtime priority

		 */

		hal_property.enable = !(ctrl->val);

		hal_property.enable = ctrl->val;

		pdata = &hal_property;

		switch (ctrl->val) {

		case V4L2_MPEG_MSM_VIDC_DISABLE:

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

+1 −4
Original line number Diff line number Diff line
@@ -1828,10 +1828,7 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
	}

	case V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY:

		property_id = HAL_CONFIG_REALTIME;

		/* firmware has inverted values for realtime and

		 * non-realtime priority

		 */

		enable.enable = !(ctrl->val);

		enable.enable = ctrl->val;

		pdata = &enable;

		switch (ctrl->val) {

		case V4L2_MPEG_MSM_VIDC_DISABLE: