Re: [PATCH v1 13/18] media: hantro: Introduce G2/HEVC decoder

[Benjamin Gaignard]

Le 17/02/2021 à 21:45, Ezequiel Garcia a écrit :
> Hi Benjamin,
>
> Before I review the implementation in detail,
> there's one thing that looks suspicious.
>
> On Wed, 2021-02-17 at 09:03 +0100, Benjamin Gaignard wrote:
> > Implement all the logic to get G2 hardware decoding HEVC frames.
> > It support up level 5.1 HEVC stream.
> > It doesn't support yet 10 bits formats or scaling feature.
> >
> > Add HANTRO HEVC dedicated control to skip some bits at the beginning
> > of the slice header. That is very specific to this hardware so can't
> > go into uapi structures. Compute the needed value is complex and require
> > information from the stream that only the userland knows so let it
> > provide the correct value to the driver.
> >
> > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxxxxx>
> > Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx>
> > Signed-off-by: Adrian Ratiu <adrian.ratiu@xxxxxxxxxxxxx>
> > ---
> >   drivers/staging/media/hantro/Makefile         |   2 +
> >   drivers/staging/media/hantro/hantro_drv.c     |  41 ++
> >   .../staging/media/hantro/hantro_g2_hevc_dec.c | 637 ++++++++++++++++++
> >   drivers/staging/media/hantro/hantro_g2_regs.h | 198 ++++++
> >   drivers/staging/media/hantro/hantro_hevc.c    | 274 ++++++++
> >   drivers/staging/media/hantro/hantro_hw.h      |  14 +
> >   6 files changed, 1166 insertions(+)
> >   create mode 100644 drivers/staging/media/hantro/hantro_g2_hevc_dec.c
> >   create mode 100644 drivers/staging/media/hantro/hantro_g2_regs.h
> >   create mode 100644 drivers/staging/media/hantro/hantro_hevc.c
> >
> > diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile
> > index 743ce08eb184..0357f1772267 100644
> > --- a/drivers/staging/media/hantro/Makefile
> > +++ b/drivers/staging/media/hantro/Makefile
> > @@ -9,12 +9,14 @@ hantro-vpu-y += \
> >                  hantro_h1_jpeg_enc.o \
> >                  hantro_g1_h264_dec.o \
> >                  hantro_g1_mpeg2_dec.o \
> > +               hantro_g2_hevc_dec.o \
> >                  hantro_g1_vp8_dec.o \
> >                  rk3399_vpu_hw_jpeg_enc.o \
> >                  rk3399_vpu_hw_mpeg2_dec.o \
> >                  rk3399_vpu_hw_vp8_dec.o \
> >                  hantro_jpeg.o \
> >                  hantro_h264.o \
> > +               hantro_hevc.o \
> >                  hantro_mpeg2.o \
> >                  hantro_vp8.o
> >   
> > diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
> > index e1443c394f62..d171fb80876a 100644
> > --- a/drivers/staging/media/hantro/hantro_drv.c
> > +++ b/drivers/staging/media/hantro/hantro_drv.c
> > @@ -280,6 +280,20 @@ static int hantro_jpeg_s_ctrl(struct v4l2_ctrl *ctrl)
> >          return 0;
> >   }
> >   
> > +static int hantro_extra_s_ctrl(struct v4l2_ctrl *ctrl)
> > +{
> > +       const struct hantro_hevc_extra_decode_params *extra_params;
> > +       struct hantro_ctx *ctx;
> > +
> > +       ctx = container_of(ctrl->handler,
> > +                          struct hantro_ctx, ctrl_handler);
> > +       extra_params = &ctx->hevc_dec.ctrls.extra_params;
> > +
> > +       memcpy((void *)extra_params, ctrl->p_new.p_u8, sizeof(extra_params));
> > +
> > +       return 0;
> > +}
> > +
> >   static const struct v4l2_ctrl_ops hantro_ctrl_ops = {
> >          .try_ctrl = hantro_try_ctrl,
> >   };
> > @@ -288,6 +302,10 @@ static const struct v4l2_ctrl_ops hantro_jpeg_ctrl_ops = {
> >          .s_ctrl = hantro_jpeg_s_ctrl,
> >   };
> >   
> > +static const struct v4l2_ctrl_ops hantro_extra_ctrl_ops = {
> > +       .s_ctrl = hantro_extra_s_ctrl,
> > +};
> > +
> >   static const struct hantro_ctrl controls[] = {
> >          {
> >                  .codec = HANTRO_JPEG_ENCODER,
> > @@ -413,6 +431,29 @@ static const struct hantro_ctrl controls[] = {
> >                  .cfg = {
> >                          .id = V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS,
> >                  },
> > +       }, {
> > +               .codec = HANTRO_HEVC_DECODER,
> > +               .cfg = {
> > +                       .id = V4L2_CID_HANTRO_HEVC_EXTRA_DECODE_PARAMS,
> > +                       .name = "HANTRO extra decode params",
> > +                       .type = V4L2_CTRL_TYPE_U8,
> > +                       .min = 0,
> > +                       .def = 0,
> > +                       .max = 255,
> > +                       .step = 1,
> > +                       .dims = { sizeof(struct hantro_hevc_extra_decode_params) },
> > +                       .ops = &hantro_extra_ctrl_ops,
> > +               },
> > +       }, {
> > +               .codec = HANTRO_JPEG_ENCODER | HANTRO_MPEG2_DECODER |
> > +                        HANTRO_VP8_DECODER | HANTRO_H264_DECODER |
> > +                        HANTRO_HEVC_DECODER,
> > +               .cfg = {
> > +                       .id = V4L2_CID_USER_CLASS,
> Are you sure you need to expose the V4L2_CID_USER_CLASS?
> Maybe I'm missing something, but this looks odd.

v4l2-compliance complains if this isn't exposed when adding V4L2_CID_HANTRO_HEVC_EXTRA_DECODE_PARAMS.
Other drivers with dedicated control have duplicated this definition but I prefer use it directly.

Benjamin

> Thanks,
> Ezequiel