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

Commit 6aa9bdf5 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: Use internal size for extradata plane"

parents b161f4f5 81f021f0

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

+10 −18
Original line number Diff line number Diff line
@@ -1087,7 +1087,6 @@ int msm_vdec_g_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
	struct hfi_device *hdev;

	int rc = 0, i = 0, stride = 0, scanlines = 0, color_format = 0;

	unsigned int *plane_sizes = NULL, extra_idx = 0;

	struct hal_buffer_requirements *bufreq;



	if (!inst || !f || !inst->core || !inst->core->device) {

		dprintk(VIDC_ERR,
@@ -1168,10 +1167,10 @@ int msm_vdec_g_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 


		extra_idx = EXTRADATA_IDX(fmt->num_planes);

		if (extra_idx && extra_idx < VIDEO_MAX_PLANES) {

			bufreq = get_buff_req_buffer(inst,

					HAL_BUFFER_EXTRADATA_OUTPUT);

			f->fmt.pix_mp.plane_fmt[extra_idx].sizeimage =

				bufreq ? bufreq->buffer_size : 0;

				VENUS_EXTRADATA_SIZE(

					inst->prop.height[CAPTURE_PORT],

					inst->prop.width[CAPTURE_PORT]);

		}



		for (i = 0; i < fmt->num_planes; ++i)
@@ -1230,7 +1229,6 @@ int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
	int ret = 0;

	int i;

	int max_input_size = 0;

	struct hal_buffer_requirements *bufreq;



	if (!inst || !inst->core || !f) {

		dprintk(VIDC_ERR, "%s invalid parameters\n", __func__);
@@ -1276,16 +1274,12 @@ int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 


		extra_idx = EXTRADATA_IDX(fmt->num_planes);

		if (extra_idx && extra_idx < VIDEO_MAX_PLANES) {

			bufreq = get_buff_req_buffer(inst,

					HAL_BUFFER_EXTRADATA_OUTPUT);

			f->fmt.pix_mp.plane_fmt[extra_idx].sizeimage =

				bufreq ? bufreq->buffer_size : 0;

				VENUS_EXTRADATA_SIZE(

					inst->prop.height[CAPTURE_PORT],

					inst->prop.width[CAPTURE_PORT]);

		}



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

			inst->bufq[CAPTURE_PORT].vb2_bufq.plane_sizes[i] =

				f->fmt.pix_mp.plane_fmt[i].sizeimage;



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

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

			inst->bufq[CAPTURE_PORT].vb2_bufq.plane_sizes[i] =
@@ -1568,12 +1562,10 @@ static int msm_vdec_queue_setup(struct vb2_queue *q, 
		extra_idx =

			EXTRADATA_IDX(inst->fmts[CAPTURE_PORT]->num_planes);

		if (extra_idx && extra_idx < VIDEO_MAX_PLANES) {

			bufreq = get_buff_req_buffer(inst,

					HAL_BUFFER_EXTRADATA_OUTPUT);

			if (bufreq)

				sizes[extra_idx] = bufreq->buffer_size;

			else

				sizes[extra_idx] = 0;

			sizes[extra_idx] =

				VENUS_EXTRADATA_SIZE(

					inst->prop.height[CAPTURE_PORT],

					inst->prop.width[CAPTURE_PORT]);

		}

		break;

	default: