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

Commit 8fdcf95d 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: Update instance state before cap check"

parents 2a8a44ed d8994f69

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

+7 −7
Original line number Diff line number Diff line
@@ -1472,13 +1472,6 @@ int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
			inst->prop.height[CAPTURE_PORT] = f->fmt.pix_mp.height;

		}



		rc = msm_vidc_check_session_supported(inst);

		if (rc) {

			dprintk(VIDC_ERR,

				"%s: session not supported\n", __func__);

			goto err_invalid_fmt;

		}



		fmt = msm_comm_get_pixel_fmt_fourcc(vdec_formats,

				ARRAY_SIZE(vdec_formats),

				f->fmt.pix_mp.pixelformat,
@@ -1514,6 +1507,13 @@ int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
			goto err_invalid_fmt;

		}



		rc = msm_vidc_check_session_supported(inst);

		if (rc) {

			dprintk(VIDC_ERR,

				"%s: session not supported\n", __func__);

			goto err_invalid_fmt;

		}



		frame_sz.buffer_type = HAL_BUFFER_INPUT;

		frame_sz.width = inst->prop.width[OUTPUT_PORT];

		frame_sz.height = inst->prop.height[OUTPUT_PORT];

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

+9 −7
Original line number Diff line number Diff line
@@ -3462,6 +3462,14 @@ int msm_venc_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
			goto exit;

		}



		inst->fmts[fmt->type] = fmt;



		rc = msm_comm_try_state(inst, MSM_VIDC_OPEN_DONE);

		if (rc) {

			dprintk(VIDC_ERR, "Failed to open instance\n");

			goto exit;

		}



		inst->prop.width[CAPTURE_PORT] = f->fmt.pix_mp.width;

		inst->prop.height[CAPTURE_PORT] = f->fmt.pix_mp.height;

		rc = msm_vidc_check_session_supported(inst);
@@ -3506,6 +3514,7 @@ int msm_venc_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
			rc = -EINVAL;

			goto exit;

		}

		inst->fmts[fmt->type] = fmt;



		msm_comm_set_color_format(inst, HAL_BUFFER_INPUT, fmt->fourcc);

	} else {
@@ -3515,19 +3524,12 @@ int msm_venc_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
		goto exit;

	}



	inst->fmts[fmt->type] = fmt;

	f->fmt.pix_mp.num_planes = fmt->num_planes;



	if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {

		struct hal_frame_size frame_sz = {0};

		struct hal_buffer_requirements *bufreq = NULL;



		rc = msm_comm_try_state(inst, MSM_VIDC_OPEN_DONE);

		if (rc) {

			dprintk(VIDC_ERR, "Failed to open instance\n");

			goto exit;

		}



		frame_sz.width = inst->prop.width[CAPTURE_PORT];

		frame_sz.height = inst->prop.height[CAPTURE_PORT];

		frame_sz.buffer_type = HAL_BUFFER_OUTPUT;