Skip to contentSkip to conversation

media: coda: Fix reported H264 profile

PATCH Superseded Fabio Estevam 2 participants 3 messages Mar 9, 2022 – Mar 11, 2022

Subsystems (2)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 media: coda: Fix reported H264 profile

From: Nicolas Dufresne <[email protected]>

The CODA960 manual states that ASO/FMO features of baseline are not supported, so for this reason this driver should only report constrained baseline support.

This fixes negotiation issue with constrained baseline content on GStreamer 1.17.1.

ASO/FMO features are unsupported for the encoder and untested for the decoder because there is currently no userspace support. Neither GStreamer parsers nor FFMPEG parsers support ASO/FMO.

Fixes 42a68012e67c2 ("media: coda: add read-only h.264 decoder profile/level controls")

---
Changes since v2:
- None. Only addded Philipp' Reviewed-by tag.

 drivers/media/platform/coda/coda-common.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/coda/coda-common.c +3 -3
index 1eed69d29149..280d77f1567c 100644
@@ -2334,8 +2334,8 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
 		V4L2_CID_MPEG_VIDEO_H264_CHROMA_QP_INDEX_OFFSET, -12, 12, 1, 0);
 	v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
 		V4L2_CID_MPEG_VIDEO_H264_PROFILE,
-		V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, 0x0,
-		V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE);
+		V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE, 0x0,
+		V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE);
 	if (ctx->dev->devtype->product == CODA_HX4 ||
 	    ctx->dev->devtype->product == CODA_7541) {
 		v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
@@ -2416,7 +2416,7 @@ static void coda_decode_ctrls(struct coda_ctx *ctx)
 	ctx->h264_profile_ctrl = v4l2_ctrl_new_std_menu(&ctx->ctrls,
 		&coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_H264_PROFILE,
 		V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,
-		~((1 << V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |
+		~((1 << V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |
 		  (1 << V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |
 		  (1 << V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
 		V4L2_MPEG_VIDEO_H264_PROFILE_HIGH);
Signature · 1 line
2.25.1
#1 lore raw

PATCH v3 2/2 media: coda: Add more H264 levels for CODA960

From: Nicolas Dufresne <[email protected]>

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.

Fixes 42a68012e67c2 ("media: coda: add read-only h.264 decoder profile/level controls")

---
Changes since v2:
- Remove 5.0 level and use Phillip's suggestion to get the correct levels being reported by v4l2h264enc:

                     h264_level 0x00990a67 (menu)   : min=0 max=13 default=11 value=11
				0: 1
				5: 2
				8: 3
				9: 3.1
				10: 3.2
				11: 4
				12: 4.1
				13: 4.2
 drivers/media/platform/coda/coda-common.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/media/platform/coda/coda-common.c +6 -3
index 280d77f1567c..da8bc1f87ba0 100644
@@ -2349,12 +2349,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,
Signature · 1 line
2.25.1
Reviewed-by on v3 2/2
#2 lore raw

Re: [PATCH v3 2/2] media: coda: Add more H264 levels for CODA960

Quoted 55 lines · Fabio Estevam

From: Nicolas Dufresne <[email protected]>

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.

Fixes 42a68012e67c2 ("media: coda: add read-only h.264 decoder

profile/level controls")

---
Changes since v2:
- Remove 5.0 level and use Phillip's suggestion to get the correct levels
being reported by v4l2h264enc:

                     h264_level 0x00990a67 (menu)   : min=0 max=13 default=11 value=11
                                0: 1
                                5: 2
                                8: 3
                                9: 3.1
                                10: 3.2
                                11: 4
                                12: 4.1
                                13: 4.2

 drivers/media/platform/coda/coda-common.c | 9 ++++++---

 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/media/platform/coda/coda-common.c +3 -2
index 280d77f1567c..da8bc1f87ba0 100644
@@ -2349,12 +2349,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) |
Quoted 7 lines

-                         (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,

regards
Philipp