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

Commit 07d3717a authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

media: venus: venc: set correct resolution on compressed stream 



This change the alignment restriction for output type of buffers
only, also set corect input resolution and fill bidirectional
vb2 queue flag in order to map output type buffers read/write.
The last is needed by encoder firmware to add padding at the
bottom of output (input buffers).

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 5b6f9abe

drivers/media/platform/qcom/venus/venc.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -295,7 +295,7 @@ venc_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f) 
	pixmp->height = clamp(pixmp->height, inst->cap_height.min,

	pixmp->height = clamp(pixmp->height, inst->cap_height.min,

			      inst->cap_height.max);

			      inst->cap_height.max);





	if (inst->core->res->hfi_version == HFI_VERSION_1XX)

	if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)

		pixmp->height = ALIGN(pixmp->height, 32);

		pixmp->height = ALIGN(pixmp->height, 32);





	pixmp->width = ALIGN(pixmp->width, 2);

	pixmp->width = ALIGN(pixmp->width, 2);
@@ -753,8 +753,8 @@ static int venc_init_session(struct venus_inst *inst) 
	if (ret)

	if (ret)

		return ret;

		return ret;





	ret = venus_helper_set_input_resolution(inst, inst->out_width,

	ret = venus_helper_set_input_resolution(inst, inst->width,

						inst->out_height);

						inst->height);

	if (ret)

	if (ret)

		goto deinit;

		goto deinit;
@@ -1016,6 +1016,8 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, 
	src_vq->allow_zero_bytesused = 1;

	src_vq->allow_zero_bytesused = 1;

	src_vq->min_buffers_needed = 1;

	src_vq->min_buffers_needed = 1;

	src_vq->dev = inst->core->dev;

	src_vq->dev = inst->core->dev;

	if (inst->core->res->hfi_version == HFI_VERSION_1XX)

		src_vq->bidirectional = 1;

	ret = vb2_queue_init(src_vq);

	ret = vb2_queue_init(src_vq);

	if (ret)

	if (ret)

		return ret;

		return ret;