From patchwork Wed Aug 14 19:59:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 11094399 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2993A1510 for ; Wed, 14 Aug 2019 20:00:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 167882881D for ; Wed, 14 Aug 2019 20:00:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A54728823; Wed, 14 Aug 2019 20:00:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 79CE12883C for ; Wed, 14 Aug 2019 19:59:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=N8I10c60MhLV2JLNL0SULk7rHyvcptM0Lx04mBBCOKs=; b=SIuFyEv+p6KP/B ddZLbUUugatkQmSazas0vc8Z+JsV1xPoU0Pzzu4vqqau/Wt6cuQxVoLKJfR+Kczy+qZljHy5AAKFq 5e001Korvmhl7XoW9Mj/WKpvAcVcxK8szjenV9dzL2EzZFqlIjmuh3jwgwUmN9KdIk2JsGPJNC/Y3 DKlH5xlqLMUaGd2zbY5Wpf+x9MD3qlpn6BxRbk5E7UkCvva1SNcdxYergFTpe+X3bQQ7Jwcn1DObr eRR1xfaBi35c8rGFE7PmkB5WPCexPZa8Z5wwtJwaRaV4eL4safEZeURB3avHtEoYLkvecNAQJn1ER b5Nyuf/3HURo/2KyqoZw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hxzR3-00023n-1F; Wed, 14 Aug 2019 19:59:53 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxzQz-000236-7R for linux-rockchip@lists.infradead.org; Wed, 14 Aug 2019 19:59:51 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id DA10228CB47 From: Ezequiel Garcia To: linux-media@vger.kernel.org Subject: [PATCH v6 00/11] media: hantro: Add support for H264 decoding Date: Wed, 14 Aug 2019 16:59:20 -0300 Message-Id: <20190814195931.6587-1-ezequiel@collabora.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190814_125949_541654_00381240 X-CRM114-Status: GOOD ( 14.60 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fbuergisser@chromium.org, Nicolas Dufresne , Heiko Stuebner , Alexandre Courbot , Jonas Karlman , linux-kernel@vger.kernel.org, Tomasz Figa , Paul Kocialkowski , linux-rockchip@lists.infradead.org, Boris Brezillon , Philipp Zabel , kernel@collabora.com, Ezequiel Garcia Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Small respin of H264 uAPI review and Hantro G1 H264 decoding support. Compared to previous version, this version does some more improvements on the uAPI spec, addressing feedback from Hans and Paul. I really hope I managed to get this right, and address current concerns. Here's previous cover letter, for reference: This series consolidates the two recent H264 series submitted by Boris [1] [2]. Some patches from [2] have been merged (namely, helpers for the Hantro driver), and so I'm adding the remanining bits required to support H264 on Hantro G1 VPU. * Patch 1 adds support for the sort_r() variant and has been posted separately by Rasmus. It would be good to merge this patch via the media tree, ideally as soon as possible, to avoid the synchronisation burden that might appear if we decide to delay it. * Patch 2 to 4 extends the H264 uAPI, introducing frame-based vs slice-based decoding granularity, and also support for different NALU start codes. Currently, Annex B and no start codes are the supported options. With the introduction of the start code control, the H264 parsed slices pixel format should be renamed, dropping the _RAW suffix, which is now meaningless. * Patch 5 removes the P0/B0/B1 ref lists from the decode_params control. These lists are no longer needed since we build them on the kernel side based on the DPB. * Patch 6 and 7 exposes the proper decoding mode and start code on the cedrus driver. The driver functionality is not changed, and only the Cedrus support is now being properly exposed to userspace. * Patch 8 is needed to properly propagate the OUTPUT buffer timestamp to the CAPTURE buffer one, which is required for intra-frame references. * Patches 9 to 11 adds H264 support for Hantro G1 and then enable H264 decoding on RK3288. This is based on media master and tested on Rockchip RK3288 for Hantro and Allwinner H3 boards for Cedrus. Philipp Zabel tested on i.MX8MQ EVK using [3]. The Ffmpeg branch used to test is based on the great work of Jonas and Boris, and is available in [4]. Instructions to build and run are as follows: ./configure --enable-v4l2-request --enable-libdrm make -j4 (test via framebuffer rendering): ./ffmpeg -loglevel debug -hwaccel drm -hwaccel_device /dev/dri/card0 -i $some_file.avi -pix_fmt bgra -f fbdev /dev/fb0 [1] https://www.mail-archive.com/linux-media@vger.kernel.org/msg148299.html [2] https://lkml.org/lkml/2019/6/19/379 [3] git://git.pengutronix.de/git/pza/linux.git hantro/imx8m-wip [4] https://gitlab.collabora.com/ezequiel/ffmpeg/tree/stateless-mpeg2-vp8-h264-v4 Boris Brezillon (3): media: uapi: h264: Add the concept of decoding mode media: uapi: h264: Get rid of the p0/b0/b1 ref-lists media: hantro: Move copy_metadata() before doing a decode operation Ezequiel Garcia (4): media: uapi: h264: Rename pixel format media: uapi: h264: Add the concept of start code media: cedrus: Cleanup control initialization media: cedrus: Specify H264 startcode and decoding mode Hertz Wong (3): media: hantro: Add core bits to support H264 decoding media: hantro: Add support for H264 decoding on G1 media: hantro: Enable H264 decoding on rk3288 Rasmus Villemoes (1): lib/sort.c: implement sort() variant taking context argument .../media/uapi/v4l/ext-ctrls-codec.rst | 89 ++- .../media/uapi/v4l/pixfmt-compressed.rst | 11 +- drivers/media/v4l2-core/v4l2-ctrls.c | 18 + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- drivers/staging/media/hantro/Makefile | 2 + drivers/staging/media/hantro/hantro.h | 9 +- drivers/staging/media/hantro/hantro_drv.c | 50 +- .../staging/media/hantro/hantro_g1_h264_dec.c | 292 ++++++++ drivers/staging/media/hantro/hantro_h264.c | 641 ++++++++++++++++++ drivers/staging/media/hantro/hantro_hw.h | 56 ++ drivers/staging/media/hantro/hantro_v4l2.c | 10 + drivers/staging/media/hantro/rk3288_vpu_hw.c | 21 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 65 +- drivers/staging/media/sunxi/cedrus/cedrus.h | 3 +- .../staging/media/sunxi/cedrus/cedrus_dec.c | 2 +- .../staging/media/sunxi/cedrus/cedrus_video.c | 6 +- include/linux/sort.h | 5 + include/media/h264-ctrls.h | 21 +- lib/sort.c | 34 +- 19 files changed, 1281 insertions(+), 56 deletions(-) create mode 100644 drivers/staging/media/hantro/hantro_g1_h264_dec.c create mode 100644 drivers/staging/media/hantro/hantro_h264.c