From: Dikshita Agarwal <dikshita@codeaurora.org>
To: linux-media@vger.kernel.org, stanimir.varbanov@linaro.org
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
vgarodia@codeaurora.org,
Dikshita Agarwal <dikshita@codeaurora.org>
Subject: [PATCH 2/2] venus: venc: fix handlig of S_SELECTION and G_SELECTION
Date: Thu, 24 Sep 2020 23:01:14 +0530 [thread overview]
Message-ID: <1600968674-11559-3-git-send-email-dikshita@codeaurora.org> (raw)
In-Reply-To: <1600968674-11559-1-git-send-email-dikshita@codeaurora.org>
From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
- return correct width and height for G_SELECTION
- if requested rectangle wxh doesn't match with capture port wxh
adjust the rectangle to supported wxh.
Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>
---
drivers/media/platform/qcom/venus/venc.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 7d2aaa8..a2cc12d 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -463,13 +463,13 @@ static int venc_g_fmt(struct file *file, void *fh, struct v4l2_format *f)
switch (s->target) {
case V4L2_SEL_TGT_CROP_DEFAULT:
case V4L2_SEL_TGT_CROP_BOUNDS:
- s->r.width = inst->width;
- s->r.height = inst->height;
- break;
- case V4L2_SEL_TGT_CROP:
s->r.width = inst->out_width;
s->r.height = inst->out_height;
break;
+ case V4L2_SEL_TGT_CROP:
+ s->r.width = inst->width;
+ s->r.height = inst->height;
+ break;
default:
return -EINVAL;
}
@@ -490,10 +490,14 @@ static int venc_g_fmt(struct file *file, void *fh, struct v4l2_format *f)
switch (s->target) {
case V4L2_SEL_TGT_CROP:
- if (s->r.width != inst->out_width ||
- s->r.height != inst->out_height ||
- s->r.top != 0 || s->r.left != 0)
- return -EINVAL;
+ if (s->r.width != inst->width ||
+ s->r.height != inst->height ||
+ s->r.top != 0 || s->r.left != 0) {
+ s->r.top = 0;
+ s->r.left = 0;
+ s->r.width = inst->width;
+ s->r.height = inst->height;
+ }
break;
default:
return -EINVAL;
--
1.9.1
next prev parent reply other threads:[~2020-09-24 17:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 17:31 [PATCH 0/2] Venus: fix handling of crop and s_fmt Dikshita Agarwal
2020-09-24 17:31 ` [PATCH 1/2] venus: venc: update output format based on capture format Dikshita Agarwal
2020-12-16 6:14 ` dikshita
2020-09-24 17:31 ` Dikshita Agarwal [this message]
2020-09-24 23:09 ` [PATCH 2/2] venus: venc: fix handlig of S_SELECTION and G_SELECTION Stanimir Varbanov
2020-09-25 20:55 ` Tomasz Figa
2020-10-01 1:32 ` Stanimir Varbanov
2020-10-01 15:17 ` Tomasz Figa
2020-10-07 19:33 ` vgarodia
2020-10-08 14:21 ` Tomasz Figa
2020-10-13 9:26 ` vgarodia
2020-10-13 13:39 ` Tomasz Figa
2020-10-22 4:37 ` vgarodia
2020-10-22 23:08 ` Tomasz Figa
2020-10-27 15:02 ` vgarodia
2020-11-03 17:02 ` dikshita
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=1600968674-11559-3-git-send-email-dikshita@codeaurora.org \
--to=dikshita@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=stanimir.varbanov@linaro.org \
--cc=vgarodia@codeaurora.org \
/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).