From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
Philipp Zabel <p.zabel@pengutronix.de>,
Robert Beckett <bob.beckett@collabora.com>,
Nicolas Dufresne <nicolas.dufresne@collabora.com>,
kernel@collabora.com, stable@vger.kernel.org,
Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH 2/2] media: coda: Add more H264 levels for CODA960
Date: Fri, 17 Jul 2020 00:49:23 -0300 [thread overview]
Message-ID: <20200717034923.219524-2-ezequiel@collabora.com> (raw)
In-Reply-To: <20200717034923.219524-1-ezequiel@collabora.com>
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
This add H264 level 4.1, 4.2 and 5.0 to the list of supported formats.
While the hardware does not fully support these levels, it do support
most of them. The constraints on frame size and pixel formats already
cover the limitation.
This fixes negotiation of level on GStreamer 1.17.1.
Cc: stable@vger.kernel.org
Fixes: 42a68012e67c2 ("media: coda: add read-only h.264 decoder profile/level controls")
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
drivers/media/platform/coda/coda-common.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index c641d1608825..d0fc573d6ed9 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2355,7 +2355,10 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
(1 << V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
(1 << V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
(1 << V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
- (1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_0)),
+ (1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_0) |
+ (1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
+ (1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_2) |
+ (1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_0)),
V4L2_MPEG_VIDEO_H264_LEVEL_4_0);
}
v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
@@ -2428,7 +2431,7 @@ static void coda_decode_ctrls(struct coda_ctx *ctx)
ctx->dev->devtype->product == CODA_7541)
max = V4L2_MPEG_VIDEO_H264_LEVEL_4_0;
else if (ctx->dev->devtype->product == CODA_960)
- max = V4L2_MPEG_VIDEO_H264_LEVEL_4_1;
+ max = V4L2_MPEG_VIDEO_H264_LEVEL_5_0;
else
return;
ctx->h264_level_ctrl = v4l2_ctrl_new_std_menu(&ctx->ctrls,
--
2.27.0
next prev parent reply other threads:[~2020-07-17 3:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 3:49 [PATCH 1/2] media: coda: Fix reported H264 profile Ezequiel Garcia
2020-07-17 3:49 ` Ezequiel Garcia [this message]
2020-07-17 7:48 ` [PATCH 2/2] media: coda: Add more H264 levels for CODA960 Philipp Zabel
2020-07-17 15:50 ` Nicolas Dufresne
2020-07-20 8:31 ` Philipp Zabel
2020-07-20 15:36 ` Nicolas Dufresne
2020-07-20 16:09 ` Nicolas Dufresne
2020-07-20 21:43 ` Nicolas Dufresne
2020-07-21 8:14 ` Philipp Zabel
2020-07-17 8:14 ` [PATCH 1/2] media: coda: Fix reported H264 profile Philipp Zabel
2020-07-17 15:56 ` Nicolas Dufresne
2020-07-20 8:40 ` Philipp Zabel
2020-07-20 16:20 ` Nicolas Dufresne
2020-07-20 16:13 ` 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=20200717034923.219524-2-ezequiel@collabora.com \
--to=ezequiel@collabora.com \
--cc=bob.beckett@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-media@vger.kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=stable@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.