media: coda: Add more H264 levels for CODA960

commit eb2fd187abc878a2dfad46902becb74963473c7d upstream.

Add H264 level 1.0, 4.1, 4.2 to the list of supported formats.
While the hardware does not fully support these levels, it does 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")
Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 41ce1163e7f18753033c0ce04d93b32bee28c5bd..14d4830d5db51eb0c43055ddbe66bc014f6b7842 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2358,12 +2358,15 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
        if (ctx->dev->devtype->product == CODA_960) {
                v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
                        V4L2_CID_MPEG_VIDEO_H264_LEVEL,
-                       V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
-                       ~((1 << V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |
+                       V4L2_MPEG_VIDEO_H264_LEVEL_4_2,
+                       ~((1 << V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |
+                         (1 << V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |
                          (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)),
                        V4L2_MPEG_VIDEO_H264_LEVEL_4_0);
        }
        v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,