linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: kernel@collabora.com, Jonas Karlman <jonas@kwiboo.se>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	Nicolas Dufresne <nicolas.dufresne@collabora.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Maxime Ripard <mripard@kernel.org>,
	Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
	Jernej Skrabec <jernej.skrabec@siol.net>,
	Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH v5 04/14] media: cedrus: h264: Support profile controls
Date: Thu, 26 Nov 2020 06:36:08 -0300	[thread overview]
Message-ID: <20201126093618.137292-5-ezequiel@collabora.com> (raw)
In-Reply-To: <20201126093618.137292-1-ezequiel@collabora.com>

Cedrus supports H.264 profiles from Baseline to High,
except for the Extended profile

Expose the V4L2_CID_MPEG_VIDEO_H264_PROFILE so that
userspace can query the driver for the supported
profiles and levels.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Reviewed-by: Jernej Skrabec <jernej.skrabec@siol.net>
Tested-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
 drivers/staging/media/sunxi/cedrus/cedrus.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index 9a102b7c1bb9..97000f0e0011 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -103,6 +103,25 @@ static const struct cedrus_control cedrus_controls[] = {
 		.codec		= CEDRUS_CODEC_H264,
 		.required	= false,
 	},
+	/*
+	 * We only expose supported profiles information,
+	 * and not levels as it's not clear what is supported
+	 * for each hardware/core version.
+	 * In any case, TRY/S_FMT will clamp the format resolution
+	 * to the maximum supported.
+	 */
+	{
+		.cfg = {
+			.id	= V4L2_CID_MPEG_VIDEO_H264_PROFILE,
+			.min	= V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE,
+			.def	= V4L2_MPEG_VIDEO_H264_PROFILE_MAIN,
+			.max	= V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,
+			.menu_skip_mask =
+				BIT(V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED),
+		},
+		.codec		= CEDRUS_CODEC_H264,
+		.required	= false,
+	},
 	{
 		.cfg = {
 			.id	= V4L2_CID_MPEG_VIDEO_HEVC_SPS,
-- 
2.27.0


  parent reply	other threads:[~2020-11-26  9:37 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-26  9:36 [PATCH v5 00/14] Stateless H.264 de-staging Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 01/14] media: vidioc-g-ext-ctrls.rst: document V4L2_CTRL_CLASS_DETECT Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 02/14] media: controls: Add validate failure debug message Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 03/14] media: rkvdec: h264: Support profile and level controls Ezequiel Garcia
2020-11-26  9:36 ` Ezequiel Garcia [this message]
2020-11-26  9:36 ` [PATCH v5 05/14] media: Rename stateful codec control macros Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 06/14] media: Clean stateless control includes Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 07/14] media: controls: Validate H264 stateless controls Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 08/14] media: controls: Add the stateless codec control class Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 09/14] media: uapi: Move parsed H264 pixel format out of staging Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 10/14] media: doc: Replace symbol for V4L2_CTRL_TYPE_H264_PRED_WEIGHTS Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 11/14] media: uapi: Move the H264 stateless control types out of staging Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 12/14] media: controls: Log H264 stateless controls in .std_log Ezequiel Garcia
2020-11-26  9:36 ` [PATCH v5 13/14] media: uapi: move H264 stateless controls out of staging Ezequiel Garcia
2020-12-03  9:28   ` Mauro Carvalho Chehab
2020-12-03  9:46     ` Hans Verkuil
2020-11-26  9:36 ` [PATCH v5 14/14] media: docs: Move the H264 stateless codec uAPI Ezequiel Garcia

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=20201126093618.137292-5-ezequiel@collabora.com \
    --to=ezequiel@collabora.com \
    --cc=hverkuil@xs4all.nl \
    --cc=jernej.skrabec@siol.net \
    --cc=jonas@kwiboo.se \
    --cc=kernel@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mripard@kernel.org \
    --cc=nicolas.dufresne@collabora.com \
    --cc=p.zabel@pengutronix.de \
    --cc=paul.kocialkowski@bootlin.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).