From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Kyungmin Park <kyungmin.park@samsung.com>,
Kamil Debski <kamil@wypas.org>,
Jeongtae Park <jtp.park@samsung.com>,
Andrzej Hajda <a.hajda@samsung.com>,
Ezequiel Garcia <ezequiel@collabora.com>,
Maheshwar Ajja <majja@codeaurora.org>,
Nicolas Dufresne <nicolas@ndufresne.ca>,
Stanimir Varbanov <stanimir.varbanov@linaro.org>
Subject: [PATCH v2 5/6] media: s5p-mfc: Use standard frame skip mode control
Date: Tue, 21 Jul 2020 10:45:37 +0300 [thread overview]
Message-ID: <20200721074538.505-6-stanimir.varbanov@linaro.org> (raw)
In-Reply-To: <20200721074538.505-1-stanimir.varbanov@linaro.org>
Use the standard menu control for frame skip mode in the MFC
driver. The legacy private menu control is kept for backward
compatibility.
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 912fe0c5ab18..3092eb6777a5 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -261,6 +261,11 @@ static struct mfc_control controls[] = {
.menu_skip_mask = 0,
.default_value = V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_DISABLED,
},
+ {
+ .id = V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE,
+ .maximum = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT,
+ .default_value = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED,
+ },
{
.id = V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT,
.type = V4L2_CTRL_TYPE_BOOLEAN,
@@ -1849,6 +1854,7 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl)
p->seq_hdr_mode = ctrl->val;
break;
case V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE:
+ case V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE:
p->frame_skip_mode = ctrl->val;
break;
case V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT:
--
2.17.1
next prev parent reply other threads:[~2020-07-21 7:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 7:45 [PATCH v2 0/6] Add new controls for CQ and Frame-skip Stanimir Varbanov
2020-07-21 7:45 ` [PATCH v2 1/6] media: v4l2-ctrls: Add encoder constant quality control Stanimir Varbanov
2020-07-21 7:45 ` [PATCH v2 2/6] venus: venc: Add support for " Stanimir Varbanov
2020-07-21 7:45 ` [PATCH v2 3/6] media: v4l2-ctrl: Add frame-skip std encoder control Stanimir Varbanov
2020-07-21 7:45 ` [PATCH v2 4/6] venus: venc: Add support for frame-skip mode v4l2 control Stanimir Varbanov
2020-07-21 7:45 ` Stanimir Varbanov [this message]
2020-07-22 11:35 ` [PATCH v2 5/6] media: s5p-mfc: Use standard frame skip mode control Stanimir Varbanov
2020-08-19 9:35 ` Hans Verkuil
2020-07-21 7:45 ` [PATCH v2 6/6] media: docs: Deprecate mfc frame skip control Stanimir Varbanov
2020-07-21 7:55 ` Hans Verkuil
2020-08-19 9:48 ` Hans Verkuil
2020-07-24 14:49 ` [PATCH v2 0/6] Add new controls for CQ and Frame-skip Stanimir Varbanov
2020-07-30 13:57 ` Nicolas Dufresne
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=20200721074538.505-6-stanimir.varbanov@linaro.org \
--to=stanimir.varbanov@linaro.org \
--cc=a.hajda@samsung.com \
--cc=ezequiel@collabora.com \
--cc=jtp.park@samsung.com \
--cc=kamil@wypas.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=majja@codeaurora.org \
--cc=mchehab@kernel.org \
--cc=nicolas@ndufresne.ca \
/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).