| Message ID | 20220405135957.3580343-2-festevam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4,1/2] media: coda: Fix reported H264 profile | expand |
Hi Fabio, On Di, 2022-04-05 at 10:59 -0300, Fabio Estevam wrote: > 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> > Tested-by: Pascal Speck <kernel@iktek.de> > Signed-off-by: Fabio Estevam <festevam@denx.de> > Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > Changes since v3: > - Rebased against linux-next and took the coda->chips-media rename > in consideration. > - Added Philipp's Reviewed-by tag. I think you rebased the wrong version of this patch. > drivers/media/platform/chips-media/coda-common.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/chips-media/coda-common.c > b/drivers/media/platform/chips-media/coda-common.c > index 53b2dd1b268c..f1234ad24f65 100644 > --- a/drivers/media/platform/chips-media/coda-common.c > +++ b/drivers/media/platform/chips-media/coda-common.c > @@ -2364,7 +2364,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)), I asked to remove the 5.0 level and to increase the max level to 4.2, you already fixed this in v3. > V4L2_MPEG_VIDEO_H264_LEVEL_4_0); > } > v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops, > @@ -2437,7 +2440,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; Same as above, there is no way to support level 5.0 frame size requirements. regards Philipp
Hi Philipp,
On Wed, Apr 6, 2022 at 11:59 AM Philipp Zabel <p.zabel@pengutronix.de> wrote:
> I think you rebased the wrong version of this patch.
Oops, good catch!
I have sent v5 with the correct one, thanks.
diff --git a/drivers/media/platform/chips-media/coda-common.c b/drivers/media/platform/chips-media/coda-common.c index 53b2dd1b268c..f1234ad24f65 100644 --- a/drivers/media/platform/chips-media/coda-common.c +++ b/drivers/media/platform/chips-media/coda-common.c @@ -2364,7 +2364,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, @@ -2437,7 +2440,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,