Thread (21 messages) 21 messages, 3 authors, 2021-06-28

Re: [PATCH v3 5/8] media: hantro: hevc: Allow to produce 10-bit frames

From: Ezequiel Garcia <hidden>
Date: 2021-06-22 13:27:09
Also in: linux-media, linux-rockchip, lkml

Hi Benjamin,

On Fri, 2021-06-18 at 15:15 +0200, Benjamin Gaignard wrote:
quoted hunk ↗ jump to hunk
If Hantro driver receive an 10-bit encoded bitstream allow it
to produce 10-bit frames.
Check that we are not try to produce 10-bit frames from a 8-bit
encoded bitstream.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
 drivers/staging/media/hantro/hantro_drv.c      | 18 ++++++++++++++++++
 .../staging/media/hantro/hantro_g2_hevc_dec.c  | 18 ++++++++++++++----
 drivers/staging/media/hantro/hantro_hevc.c     |  2 +-
 drivers/staging/media/hantro/imx8m_vpu_hw.c    |  4 ++++
 4 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index f6635ceb5111..b6373934734e 100644
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -243,6 +243,16 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)
        return vb2_queue_init(dst_vq);
 }
 
+static bool hantro_is_10bit_dst_format(struct hantro_ctx *ctx)
+{
+       switch (ctx->vpu_dst_fmt->fourcc) {
+       case V4L2_PIX_FMT_P010:
+               return true;
+       default:
+               return false;
+       }
+}
+
 static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)
 {
        if (ctrl->id == V4L2_CID_STATELESS_H264_SPS) {
@@ -259,6 +269,10 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)
                        return -EINVAL;
        } else if (ctrl->id == V4L2_CID_MPEG_VIDEO_HEVC_SPS) {
                const struct v4l2_ctrl_hevc_sps *sps = ctrl->p_new.p_hevc_sps;
+               struct hantro_ctx *ctx;
+
+               ctx = container_of(ctrl->handler,
+                                  struct hantro_ctx, ctrl_handler);
 
                if (sps->bit_depth_luma_minus8 != sps->bit_depth_chroma_minus8)
                        /* Luma and chroma bit depth mismatch */
@@ -270,6 +284,10 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)
                if (sps->flags & V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED)
                        /* No scaling support */
                        return -EINVAL;
+               if (sps->bit_depth_luma_minus8 == 0 &&
+                   hantro_is_10bit_dst_format(ctx)) {
+                       return -EINVAL;
I had some more time to think about this,
and I recalled that this topic was already discussed
some time ago [1].

This approach won't work. You need to restrict the pixel
formats returned by TRY/G_FMT after the SPS is set with S_EXT_CTRL,
as per the specification.

https://www.spinics.net/lists/kernel/msg3576779.html

Thanks,
Ezequiel


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help