From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4088C3A59C for ; Fri, 16 Aug 2019 13:12:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C26D2133F for ; Fri, 16 Aug 2019 13:12:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727631AbfHPNMB (ORCPT ); Fri, 16 Aug 2019 09:12:01 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:48314 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727610AbfHPNL6 (ORCPT ); Fri, 16 Aug 2019 09:11:58 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id C125228D1D4 Message-ID: Subject: Re: [PATCH v6 09/11] media: hantro: Add core bits to support H264 decoding From: Ezequiel Garcia To: Hans Verkuil , linux-media@vger.kernel.org Cc: kernel@collabora.com, Nicolas Dufresne , Tomasz Figa , linux-rockchip@lists.infradead.org, Heiko Stuebner , Jonas Karlman , Philipp Zabel , Boris Brezillon , Paul Kocialkowski , Alexandre Courbot , fbuergisser@chromium.org, linux-kernel@vger.kernel.org, Hertz Wong Date: Fri, 16 Aug 2019 10:11:46 -0300 In-Reply-To: References: <20190814195931.6587-1-ezequiel@collabora.com> <20190814195931.6587-10-ezequiel@collabora.com> Organization: Collabora Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2019-08-16 at 09:41 +0200, Hans Verkuil wrote: > On 8/14/19 9:59 PM, Ezequiel Garcia wrote: > > From: Hertz Wong > > > > Add helpers and patch hantro_{drv,v4l2}.c to prepare addition of H264 > > decoding support. > > > > Signed-off-by: Hertz Wong > > Signed-off-by: Boris Brezillon > > Tested-by: Philipp Zabel > > --- > > Changes in v6: > > * Fixed duplicated CABAC table memcpy. > > * Adjust to renamed controls. > > Changes in v5: > > * None. > > Changes in v4: > > * Rework extra_size0, exposing the size via TRY_FMT/S_FMT > > to allow buffer importation, as suggested by Tomasz. > > * Drop max slice limit. > > * Use a ternary operator instead of substracting POCs, > > to avoid an overflow as pointed out by Rasmus. > > * Specify annex B slice start code. > > * Add missing extra_size0 to sizeimage > > * Swap the first 2 entries of list B1 when B0 and B1 match (mandated by > > the spec) > > * Move the update_dpb() call before the prepare_table() one to make the > > POCs stored in the private table match the content of the new DPB > > --- > > drivers/staging/media/hantro/Makefile | 1 + > > drivers/staging/media/hantro/hantro.h | 9 +- > > drivers/staging/media/hantro/hantro_drv.c | 42 ++ > > drivers/staging/media/hantro/hantro_h264.c | 641 +++++++++++++++++++++ > > drivers/staging/media/hantro/hantro_hw.h | 55 ++ > > drivers/staging/media/hantro/hantro_v4l2.c | 10 + > > 6 files changed, 757 insertions(+), 1 deletion(-) > > create mode 100644 drivers/staging/media/hantro/hantro_h264.c > > > > diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile > > index f5ec597d9e08..0f0d3afb1cca 100644 > > --- a/drivers/staging/media/hantro/Makefile > > +++ b/drivers/staging/media/hantro/Makefile > > @@ -10,6 +10,7 @@ hantro-vpu-y += \ > > rk3399_vpu_hw_mpeg2_dec.o \ > > rk3399_vpu_hw_vp8_dec.o \ > > hantro_jpeg.o \ > > + hantro_h264.o \ > > hantro_mpeg2.o \ > > hantro_vp8.o > > > > diff --git a/drivers/staging/media/hantro/hantro.h b/drivers/staging/media/hantro/hantro.h > > index c4c86c32ea2d..f670bbde4159 100644 > > --- a/drivers/staging/media/hantro/hantro.h > > +++ b/drivers/staging/media/hantro/hantro.h > > @@ -30,6 +30,10 @@ > > #define VP8_MB_WIDTH(w) DIV_ROUND_UP(w, VP8_MB_DIM) > > #define VP8_MB_HEIGHT(h) DIV_ROUND_UP(h, VP8_MB_DIM) > > > > +#define H264_MB_DIM 16 > > +#define H264_MB_WIDTH(w) DIV_ROUND_UP(w, H264_MB_DIM) > > +#define H264_MB_HEIGHT(h) DIV_ROUND_UP(h, H264_MB_DIM) > > + > > #define MPEG2_MB_DIM 16 > > #define MPEG2_MB_WIDTH(w) DIV_ROUND_UP(w, MPEG2_MB_DIM) > > #define MPEG2_MB_HEIGHT(h) DIV_ROUND_UP(h, MPEG2_MB_DIM) > > @@ -43,9 +47,9 @@ struct hantro_codec_ops; > > > > #define HANTRO_JPEG_ENCODER BIT(0) > > #define HANTRO_ENCODERS 0x0000ffff > > - > > #define HANTRO_MPEG2_DECODER BIT(16) > > #define HANTRO_VP8_DECODER BIT(17) > > +#define HANTRO_H264_DECODER BIT(18) > > #define HANTRO_DECODERS 0xffff0000 > > > > /** > > @@ -102,12 +106,14 @@ struct hantro_variant { > > * enum hantro_codec_mode - codec operating mode. > > * @HANTRO_MODE_NONE: No operating mode. Used for RAW video formats. > > * @HANTRO_MODE_JPEG_ENC: JPEG encoder. > > + * @HANTRO_MODE_H264_DEC: H264 decoder. > > * @HANTRO_MODE_MPEG2_DEC: MPEG-2 decoder. > > * @HANTRO_MODE_VP8_DEC: VP8 decoder. > > */ > > enum hantro_codec_mode { > > HANTRO_MODE_NONE = -1, > > HANTRO_MODE_JPEG_ENC, > > + HANTRO_MODE_H264_DEC, > > HANTRO_MODE_MPEG2_DEC, > > HANTRO_MODE_VP8_DEC, > > }; > > @@ -246,6 +252,7 @@ struct hantro_ctx { > > > > /* Specific for particular codec modes. */ > > union { > > + struct hantro_h264_dec_hw_ctx h264_dec; > > struct hantro_jpeg_enc_hw_ctx jpeg_enc; > > struct hantro_mpeg2_dec_hw_ctx mpeg2_dec; > > struct hantro_vp8_dec_hw_ctx vp8_dec; > > diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c > > index 6e2351e46750..f4cea216c926 100644 > > --- a/drivers/staging/media/hantro/hantro_drv.c > > +++ b/drivers/staging/media/hantro/hantro_drv.c > > @@ -314,6 +314,48 @@ static const struct hantro_ctrl controls[] = { > > .cfg = { > > .id = V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER, > > }, > > + }, { > > + .codec = HANTRO_H264_DECODER, > > + .cfg = { > > + .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS, > > + }, > > + }, { > > + .codec = HANTRO_H264_DECODER, > > + .cfg = { > > + .id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS, > > + }, > > + }, { > > + .codec = HANTRO_H264_DECODER, > > + .cfg = { > > + .id = V4L2_CID_MPEG_VIDEO_H264_SPS, > > + }, > > + }, { > > + .codec = HANTRO_H264_DECODER, > > + .cfg = { > > + .id = V4L2_CID_MPEG_VIDEO_H264_PPS, > > + }, > > + }, { > > + .codec = HANTRO_H264_DECODER, > > + .cfg = { > > + .id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, > > + }, > > + }, { > > + .codec = HANTRO_H264_DECODER, > > + .cfg = { > > + .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE, > > + .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, > > + .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_FRAME_BASED, > > + .menu_skip_mask = BIT(V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED), > > + }, > > + }, { > > + .codec = HANTRO_H264_DECODER, > > + .cfg = { > > + .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE, > > + .max = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, > > + .def = V4L2_MPEG_VIDEO_H264_START_CODE_ANNEX_B, > > + .menu_skip_mask = BIT(V4L2_MPEG_VIDEO_H264_START_CODE_NONE), > > + }, > > + }, { > > }, > > }; > > > > diff --git a/drivers/staging/media/hantro/hantro_h264.c b/drivers/staging/media/hantro/hantro_h264.c > > new file mode 100644 > > index 000000000000..05e210a2cdbe > > --- /dev/null > > +++ b/drivers/staging/media/hantro/hantro_h264.c > > @@ -0,0 +1,641 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Rockchip RK3288 VPU codec driver > > + * > > + * Copyright (c) 2014 Rockchip Electronics Co., Ltd. > > + * Hertz Wong > > + * Herman Chen > > + * > > + * Copyright (C) 2014 Google, Inc. > > + * Tomasz Figa > > + */ > > + > > +#include > > +#include > > +#include > > + > > +#include "hantro.h" > > +#include "hantro_hw.h" > > + > > +/* Size with u32 units. */ > > +#define CABAC_INIT_BUFFER_SIZE (460 * 2) > > +#define POC_BUFFER_SIZE 34 > > +#define SCALING_LIST_SIZE (6 * 16 + 6 * 64) > > + > > +#define POC_CMP(p0, p1) ((p0) < (p1) ? -1 : 1) > > + > > +/* Data structure describing auxiliary buffer format. */ > > +struct hantro_h264_dec_priv_tbl { > > + u32 cabac_table[CABAC_INIT_BUFFER_SIZE]; > > + u32 poc[POC_BUFFER_SIZE]; > > + u8 scaling_list[SCALING_LIST_SIZE]; > > +}; > > + > > +/* Constant CABAC table. */ > > Can you add a comment explaining where this table comes from? > I don't think this CABAC default table comes from the H264 spec, in the Hantro G1 SDK you can find this same blob as "cabac_init_values". As the comment says the CABAC table is constant, it may be possible to allow applications to pass it. However, this default value works for all use-cases, so there hasn't been a need for this. Sorry, but that's all I know about this. > > +static const u32 h264_cabac_table[] = { > > + 0x14f10236, 0x034a14f1, 0x0236034a, 0xe47fe968, 0xfa35ff36, 0x07330000, > > + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > > + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > > + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > > + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > > + 0x0029003f, 0x003f003f, 0xf7530456, 0x0061f948, 0x0d29033e, 0x000b0137, > > Regards, > > Hans