From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: Pawel Osciak <pawel@osciak.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
Stanimir Varbanov <stanimir.varbanov@linaro.org>
Subject: [PATCH 2/7] media: venus: venc: set correct resolution on compressed stream
Date: Fri, 18 Aug 2017 17:16:01 +0300 [thread overview]
Message-ID: <20170818141606.4835-3-stanimir.varbanov@linaro.org> (raw)
In-Reply-To: <20170818141606.4835-1-stanimir.varbanov@linaro.org>
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: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
drivers/media/platform/qcom/venus/venc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 39748e7a08e4..01af1ac89edf 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -289,7 +289,7 @@ venc_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f)
pixmp->height = clamp(pixmp->height, inst->cap_height.min,
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->width = ALIGN(pixmp->width, 2);
@@ -747,8 +747,8 @@ static int venc_init_session(struct venus_inst *inst)
if (ret)
return ret;
- ret = venus_helper_set_input_resolution(inst, inst->out_width,
- inst->out_height);
+ ret = venus_helper_set_input_resolution(inst, inst->width,
+ inst->height);
if (ret)
goto deinit;
@@ -1010,6 +1010,8 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->allow_zero_bytesused = 1;
src_vq->min_buffers_needed = 1;
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);
if (ret)
return ret;
--
2.11.0
next prev parent reply other threads:[~2017-08-18 14:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-18 14:15 [PATCH 0/7] Venus updates Stanimir Varbanov
2017-08-18 14:16 ` [PATCH 1/7] media: vb2: add bidirectional flag in vb2_queue Stanimir Varbanov
2017-08-18 14:30 ` Hans Verkuil
2017-08-18 14:42 ` Stanimir Varbanov
2017-08-21 9:09 ` [PATCH 1/7 v2] " Stanimir Varbanov
2017-08-21 9:29 ` Marek Szyprowski
2017-08-21 10:21 ` Hans Verkuil
2017-08-21 11:37 ` Stanimir Varbanov
2017-08-21 11:34 ` [PATCH 1/7 v3] " Stanimir Varbanov
2017-08-21 12:21 ` Marek Szyprowski
2017-08-21 14:13 ` Stanimir Varbanov
2017-08-18 14:16 ` Stanimir Varbanov [this message]
2017-08-18 14:16 ` [PATCH 3/7] media: venus: mark venc and vdec PM functions as __maybe_unused Stanimir Varbanov
2017-08-18 14:16 ` [PATCH 4/7] media: venus: fill missing video_device name Stanimir Varbanov
2017-08-18 14:16 ` [PATCH 5/7] media: venus: add helper to check supported codecs Stanimir Varbanov
2017-08-18 14:16 ` [PATCH 6/7] media: venus: use helper function " Stanimir Varbanov
2017-08-18 14:16 ` [PATCH 7/7] media: venus: venc: drop VP9 codec support Stanimir Varbanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170818141606.4835-3-stanimir.varbanov@linaro.org \
--to=stanimir.varbanov@linaro.org \
--cc=hverkuil@xs4all.nl \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@kernel.org \
--cc=pawel@osciak.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).