From patchwork Tue Jul 2 17:00:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 11028393 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 C2C9C112C for ; Tue, 2 Jul 2019 17:00:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A85101FF81 for ; Tue, 2 Jul 2019 17:00:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C142285E0; Tue, 2 Jul 2019 17:00:37 +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 44C4A1FF81 for ; Tue, 2 Jul 2019 17:00:37 +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=Pmz6aVp+4l/kXcn9jQ9pXs/wycfYX2zBhvcvXVVdcvc=; b=SvLCcrQIoD7bHo LAv2NjaJx4cta1dBK0bhEK9C8i8ArQv11Tsjd0bvshxxk5i2SbJT8T5I4PkMpCwvbmMDeBWQrpOb0 50MWbgIjGKuHuYv1rf68lnqnFfOvkDJ+ZsDBsBiYcWT9gUOWc+Rj3RAR7K43KSSzUkJx589NF7/NJ cgJJ97pK/k7QrSoi/ktXELZKmnhkZ51TridnEv4Qqj3QPSR41aYgC4pO5aXYQ1X3Qznyj2SRk+czN 5aBty9KTmiNyZbjLRnMbFIXAMuH8p8NDPZbfOowD4RLV/LaCbVKtaLm3utGW1VZYt8x+JLkPckQoe coCa8fNFwwbIE5a6iZAA==; 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 1hiM8w-0004gb-N3; Tue, 02 Jul 2019 17:00:34 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hiM8t-0004fY-AX for linux-rockchip@lists.infradead.org; Tue, 02 Jul 2019 17:00:33 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id 9F16B26394E From: Ezequiel Garcia To: linux-media@vger.kernel.org, Hans Verkuil Subject: [PATCH v2 0/2] RK3288 VP8 decoding support Date: Tue, 2 Jul 2019 14:00:14 -0300 Message-Id: <20190702170016.5210-1-ezequiel@collabora.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190702_100031_500948_22638A10 X-CRM114-Status: UNSURE ( 9.44 ) X-CRM114-Notice: Please train this message. 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 This patchset adds support for Hantro G1 VP8 stateless decoding, as available on RK3288 SoC. In order to support VP8 stateless decoding, a new pixel format is introduced V4L2_PIX_FMT_VP8_FRAME, to be used with a new control V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER. As suggested by Boris on this new version of the uAPI all the structures and fields have 8-bytes alignment. In addition, I've checked once again the VP8 spec [1] and did a few changes: * Moved 1-bit fields to a bit in the appropriate flags fields. * Dropped dequant_factors[4][3][2], I really couldn't find this field or anything similar in the spec. It's not mentioned anywhere in Chromium or FFMPEG, so I decided to drop it. I have verified the current uAPI and it now matches the VP8 specification completely, with the exception of the "macroblock_bit_offset" field. This field is present in VAAPI's VP8 interface as "macroblock_offset" and is required to find the start of the first macroblock. [1] https://www.rfc-editor.org/rfc/rfc6386.html [2] http://intel.github.io/libva/va__dec__vp8_8h_source.html Thanks, Ezequiel Changes from v1: * Move 1-bit fields to flags in the respective structures. * Add padding fields to make all structures 8-byte aligned. * Reorder fields where needed to avoid padding as much as possible. * Fix documentation as needed. * Place operators at the end of each line, as suggested by Boris. Changes from RFC: * Verify the various ABIs. * Move entropy coder state fields to a struct. * Move key_frame field to the flags. * Remove unneeded first_part_offset field. * Add documentation. As before, the ABI has been verified with Maxime Ripard's tools: https://gitlab.collabora.com/ezequiel/v4l2-ctrl-abi-check Pawel Osciak (1): media: uapi: Add VP8 stateless decoder API ZhiChao Yu (1): media: hantro: Add support for VP8 decoding on rk3288 Documentation/media/uapi/v4l/biblio.rst | 10 + .../media/uapi/v4l/ext-ctrls-codec.rst | 323 ++++++++++ .../media/uapi/v4l/pixfmt-compressed.rst | 20 + drivers/media/v4l2-core/v4l2-ctrls.c | 8 + drivers/media/v4l2-core/v4l2-ioctl.c | 1 + drivers/staging/media/hantro/Makefile | 4 +- drivers/staging/media/hantro/hantro.h | 5 + drivers/staging/media/hantro/hantro_drv.c | 6 + .../staging/media/hantro/hantro_g1_vp8_dec.c | 552 ++++++++++++++++++ drivers/staging/media/hantro/hantro_hw.h | 17 + drivers/staging/media/hantro/hantro_v4l2.c | 1 + drivers/staging/media/hantro/hantro_vp8.c | 188 ++++++ drivers/staging/media/hantro/rk3288_vpu_hw.c | 22 +- include/media/v4l2-ctrls.h | 3 + include/media/vp8-ctrls.h | 110 ++++ 15 files changed, 1268 insertions(+), 2 deletions(-) create mode 100644 drivers/staging/media/hantro/hantro_g1_vp8_dec.c create mode 100644 drivers/staging/media/hantro/hantro_vp8.c create mode 100644 include/media/vp8-ctrls.h