Merge "msm: vidc: Update extradata plane size during valid extradata index" (2d19fc87) · Commits · e / devices / android_kernel_fairphone_FP3

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

+14 −12

Original line number	Diff line number	Diff line
		@@ -1553,23 +1553,25 @@ int msm_venc_s_ctrl(struct msm_vidc_inst inst, struct v4l2_ctrl ctrl)
		break;
		}

		extra_idx = EXTRADATA_IDX(inst->bufq[OUTPUT_PORT].num_planes);
		if (extra_idx && (extra_idx < VIDEO_MAX_PLANES)) {
		buff_req_buffer = get_buff_req_buffer(inst,
		HAL_BUFFER_EXTRADATA_INPUT);

		extra_idx = EXTRADATA_IDX(inst->bufq[OUTPUT_PORT].num_planes);

		inst->bufq[OUTPUT_PORT].plane_sizes[extra_idx] =
		buff_req_buffer ?
		buff_req_buffer->buffer_size : 0;
		}

		extra_idx = EXTRADATA_IDX(inst->bufq[CAPTURE_PORT].num_planes);
		if (extra_idx && (extra_idx < VIDEO_MAX_PLANES)) {
		buff_req_buffer = get_buff_req_buffer(inst,
		HAL_BUFFER_EXTRADATA_OUTPUT);

		extra_idx = EXTRADATA_IDX(inst->bufq[CAPTURE_PORT].num_planes);
		inst->bufq[CAPTURE_PORT].plane_sizes[extra_idx] =
		buff_req_buffer ?
		buff_req_buffer->buffer_size : 0;

		}
		property_id = 0;
		}
		break;