Merge "msm: vidc: Update controls and output buffers list check" (254a6a70) · Commits · e / devices / android_kernel_fairphone_FP3

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -1897,6 +1897,23 @@ int msm_venc_s_ctrl(struct msm_vidc_inst inst, struct v4l2_ctrl ctrl)
		vui_timing_info.time_scale = NSEC_PER_SEC;
		break;
		}
		case V4L2_CID_MPEG_VIDC_VIDEO_LTRMODE:
		case V4L2_CID_MPEG_VIDC_VIDEO_LTRCOUNT:
		case V4L2_CID_MPEG_VIDC_VENC_PARAM_SAR_WIDTH:
		case V4L2_CID_MPEG_VIDC_VENC_PARAM_SAR_HEIGHT:
		case V4L2_CID_MPEG_VIDC_VIDEO_BLUR_WIDTH:
		case V4L2_CID_MPEG_VIDC_VIDEO_BLUR_HEIGHT:
		case V4L2_CID_MPEG_VIDC_VIDEO_LAYER_ID:
		case V4L2_CID_MPEG_VIDC_VENC_PARAM_LAYER_BITRATE:
		case V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP_MIN:
		case V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP_MIN:
		case V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP_MIN:
		case V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP_MAX:
		case V4L2_CID_MPEG_VIDC_VIDEO_P_FRAME_QP_MAX:
		case V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP_MAX:
		dprintk(VIDC_DBG, "Set the control : %#x using ext ctrl\n",
		ctrl->id);
		break;
		default:
		dprintk(VIDC_ERR, "Unsupported index: %x\n", ctrl->id);
		rc = -ENOTSUPP;

+7 −1

Original line number	Diff line number	Diff line
		@@ -1246,7 +1246,7 @@ static int msm_vidc_comm_update_ctrl(struct msm_vidc_inst *inst,
		if (ctrl) {
		v4l2_ctrl_modify_range(ctrl, capability->min,
		capability->max, ctrl->step,
		capability->min);
		ctrl->default_value);
		dprintk(VIDC_DBG,
		"%s: Updated Range = %lld --> %lld Def value = %lld\n",
		ctrl->name, ctrl->minimum, ctrl->maximum,
		@@ -1783,6 +1783,12 @@ void msm_comm_validate_output_buffers(struct msm_vidc_inst *inst)
		return;
		}
		mutex_lock(&inst->outputbufs.lock);
		if (list_empty(&inst->outputbufs.list)) {
		dprintk(VIDC_DBG, "%s: no OUTPUT buffers allocated\n",
		__func__);
		mutex_unlock(&inst->outputbufs.lock);
		return;
		}
		list_for_each_entry(binfo, &inst->outputbufs.list, list) {
		if (binfo->buffer_ownership != DRIVER) {
		dprintk(VIDC_DBG,