From: Fritz Koenig <frkoenig@chromium.org>
To: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, stanimir.varbanov@linaro.org,
vgarodia@codeaurora.org, dikshita@codeaurora.org,
acourbot@chromium.org
Cc: Fritz Koenig <frkoenig@chromium.org>
Subject: [PATCH] venus: venc: Add VIDIOC_TRY_ENCODER_CMD support
Date: Sun, 29 Nov 2020 06:05:18 +0000 [thread overview]
Message-ID: <20201129060517.2029659-1-frkoenig@chromium.org> (raw)
V4L2_ENC_CMD_STOP and V4L2_ENC_CMD_START are already
supported. Add a way to query for support.
---
drivers/media/platform/qcom/venus/venc.c | 26 ++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 2ddfeddf98514..e05db3c4bfb24 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -507,6 +507,27 @@ static int venc_enum_frameintervals(struct file *file, void *fh,
return 0;
}
+static int
+venc_try_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder_cmd *cmd)
+{
+ struct venus_inst *inst = to_inst(file);
+ struct device *dev = inst->core->dev_dec;
+
+ switch (cmd->cmd) {
+ case V4L2_ENC_CMD_STOP:
+ case V4L2_ENC_CMD_START:
+ if (cmd->flags != 0) {
+ dev_dbg(dev, "flags=%u are not supported", cmd->flags);
+ return -EINVAL;
+ }
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static int
venc_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder_cmd *cmd)
{
@@ -514,6 +535,10 @@ venc_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder_cmd *cmd)
struct hfi_frame_data fdata = {0};
int ret = 0;
+ ret = venc_try_encoder_cmd(file, fh, cmd);
+ if (ret < 0)
+ return ret;
+
ret = v4l2_m2m_ioctl_try_encoder_cmd(file, fh, cmd);
if (ret)
return ret;
@@ -575,6 +600,7 @@ static const struct v4l2_ioctl_ops venc_ioctl_ops = {
.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
.vidioc_encoder_cmd = venc_encoder_cmd,
+ .vidioc_try_encoder_cmd = venc_try_encoder_cmd,
};
static int venc_set_properties(struct venus_inst *inst)
--
2.29.2.454.gaff20da3a2-goog
next reply other threads:[~2020-11-29 6:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-29 6:05 Fritz Koenig [this message]
2020-12-01 3:23 ` [PATCH] venus: venc: Add VIDIOC_TRY_ENCODER_CMD support Alexandre Courbot
2020-12-01 4:06 ` Fritz Koenig
2020-12-01 4:17 ` Alexandre Courbot
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=20201129060517.2029659-1-frkoenig@chromium.org \
--to=frkoenig@chromium.org \
--cc=acourbot@chromium.org \
--cc=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).