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

Commit 07f18349 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: Remove frame size setting on OUTPUT Port"

parents d11fbd33 5ede6a75

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

+0 −8
Original line number Diff line number Diff line
@@ -846,7 +846,6 @@ int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
		return -EINVAL;

	}

	if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {

		struct hal_frame_size frame_sz;



		fmt = msm_comm_get_pixel_fmt_fourcc(vdec_formats,

			ARRAY_SIZE(vdec_formats), f->fmt.pix_mp.pixelformat,
@@ -863,13 +862,6 @@ int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
		inst->prop.width[OUTPUT_PORT] = f->fmt.pix_mp.width;

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

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

		frame_sz.buffer_type = HAL_BUFFER_OUTPUT;

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

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

		dprintk(VIDC_DBG, "width = %d, height = %d\n",

				frame_sz.width, frame_sz.height);

		ret = msm_comm_try_set_prop(inst,

			HAL_PARAM_FRAME_SIZE, &frame_sz);

		ret = ret || msm_comm_try_get_bufreqs(inst);

		if (ret) {

			for (i = 0; i < fmt->num_planes; ++i) {