From patchwork Mon Sep 9 19:24:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 13797453 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01891ECE587 for ; Mon, 9 Sep 2024 19:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :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=E7pESHAXk8Xhm+Gh44MQPGlneC4NLRvNitT/bH4FdtE=; b=uPDZ6+RFdQ0LgY fYL8TWlmsepfjDUX137fDnGIdtXM215IO1egTuGxqGvaMRS3cSMFOqraSt6H1dLKW3dlK9Hn/eoYp Qenwp61B7mj89WzxOb8Fxn6xOtlmxsl7h7ceBWEk2EGgOTQ9lEQBQMpglHLUPBrYyvHZsgRZxI94r w3ACAIoI+HAm4nUyO/KP2p3JAu2cBD05aTTn1lN6YtKy+vXnpywmnM1ho9xB86aQoWd6xLNHPCCly VW0/zE9bdAWO42rTMERqBoGqikbTfrtAnveThjx2/Xko+TT/IuWoZ4UXBV4mwOpbO158b6o1QkQ8A ZnVmD3mQjAmGJgjcNohQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1snk1F-000000034n3-1LN0; Mon, 09 Sep 2024 19:25:49 +0000 Received: from smtp.forwardemail.net ([149.28.215.223]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1snk1B-000000034kU-1Stw for linux-rockchip@lists.infradead.org; Mon, 09 Sep 2024 19:25:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1725909933; bh=x2QaFsh9EJMqL2uPo0SiypQbsPJylPWDU0XohT8JYoo=; b=FnTTabrKjNg1w/qkxFlmWpHJGlvx5eynj6e4yOxvzHPuE1BDS2/3wzBaEC6RT41fg42cj63RD Tigg/DqkQDN71pwXHyix7iyWQiXINjTilNYH+hw/x/mW0DJM1eQZakFmX+RfsNv0GmgYuM0JV/x vZIjQiJa0vUPP9mI1zjcE0Oi2tL0lDwucwUXZMADsrYjZ0HE1rBkj89blp0H9q/Bt/XSNUqKdRp H1pUwJmube7kO78G9Ja0qXHaH4/P0bQsGH5AqXpeH+EvClz4wQ+4qgbXDbczNAvbtyla6tcAMNH sEs+NsBsdTZ/Dv+nibQG1I5R3C6wxBZNdj7r0ig85s2A== From: Jonas Karlman To: Sebastian Fricke , Ezequiel Garcia , Mauro Carvalho Chehab Cc: Alex Bee , Nicolas Dufresne , Benjamin Gaignard , Detlev Casanova , Dan Carpenter , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Jonas Karlman Subject: [PATCH v6 00/11] media: rkvdec: Add H.264 High 10 and 4:2:2 profile support Date: Mon, 9 Sep 2024 19:24:58 +0000 Message-ID: <20240909192522.1076704-1-jonas@kwiboo.se> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Report-Abuse-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Complaints-To: abuse@forwardemail.net X-ForwardEmail-Version: 0.4.40 X-ForwardEmail-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-ForwardEmail-ID: 66df4baac680cb8b7d2dc0ea X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240909_122545_764486_AD104FAF X-CRM114-Status: GOOD ( 12.40 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org This series add H.264 High 10 and 4:2:2 profile support to the Rockchip Video Decoder driver. Patch 1 add helpers for calculating plane bytesperline and sizeimage. Patch 2 add two new pixelformats for semi-planer 10-bit 4:2:0/4:2:2 YUV. Patch 3 change to use bytesperline and buffer height to configure strides. Patch 4 change to use values from SPS/PPS control to configure the HW. Patch 5-9 refactor code to support filtering of CAPUTRE formats based on the image format returned from a get_image_fmt ops. Patch 10 add final bits to support H.264 High 10 and 4:2:2 profiles. Patch 11 add a fix for enumerated frame sizes returned to userspace. Tested on a ROCK Pi 4 (RK3399) and Rock64 (RK3328): v4l2-compliance 1.28.1, 64 bits, 64-bit time_t ... Total for rkvdec device /dev/video1: 48, Succeeded: 48, Failed: 0, Warnings: 0 Running test suite JVT-FR-EXT with decoder FFmpeg-H.264-v4l2request ... Ran 65/69 tests successfully Running test suite JVT-AVC_V1 with decoder FFmpeg-H.264-v4l2request ... Ran 129/135 tests successfully Before this series: Running test suite JVT-FR-EXT with decoder FFmpeg-H.264-v4l2request ... Ran 44/69 tests successfully Changes in v6: - Change to use fmt_idx instead of j++ tucked inside a condition (Dan) - Add patch to fix enumerated frame sizes returned to userspace (Alex) - Fluster test score is same as v4 and v5, see [4] and [5] Link to v5: https://lore.kernel.org/linux-media/20240618194647.742037-1-jonas@kwiboo.se/ Changes in v5: - Drop Remove SPS validation at streaming start patch - Move buffer align from rkvdec_fill_decoded_pixfmt to min/step_width - Use correct profiles for V4L2_CID_MPEG_VIDEO_H264_PROFILE - Collect r-b and t-b tags - Fluster test score is same as v4, see [4] and [5] Link to v4: https://lore.kernel.org/linux-media/20231105165521.3592037-1-jonas@kwiboo.se/ Changes in v4: - Fix failed v4l2-compliance tests related to CAPTURE queue - Rework CAPTURE format filter anv validate to use an image format - Run fluster test suite JVT-FR-EXT [4] and JVT-AVC_V1 [5] Link to v3: https://lore.kernel.org/linux-media/20231029183427.1781554-1-jonas@kwiboo.se/ Changes in v3: - Drop merged patches - Use bpp and bpp_div instead of prior misuse of block_w/block_h - New patch to use values from SPS/PPS control to configure the HW - New patch to remove an unnecessary call to validate sps at streaming start - Reworked pixel format validation Link to v2: https://lore.kernel.org/linux-media/20200706215430.22859-1-jonas@kwiboo.se/ Changes in v2: - Collect r-b tags - SPS pic width and height in mbs validation moved to rkvdec_try_ctrl - New patch to not override output buffer sizeimage - Reworked pixel format validation - Only align decoded buffer instead of changing frmsize step_width Link to v1: https://lore.kernel.org/linux-media/20200701215616.30874-1-jonas@kwiboo.se/ To fully runtime test this series you may need FFmpeg patches from [1] and fluster patches from [2], this series is also available at [3]. [1] https://github.com/Kwiboo/FFmpeg/commits/v4l2request-2024-v2-rkvdec/ [2] https://github.com/Kwiboo/fluster/commits/ffmpeg-v4l2request-rkvdec/ [3] https://github.com/Kwiboo/linux-rockchip/commits/linuxtv-rkvdec-high-10-v6/ [4] https://gist.github.com/Kwiboo/f4ac15576b2c72887ae2bc5d58b5c865 [5] https://gist.github.com/Kwiboo/459a1c8f1dcb56e45dc7a7a29cc28adf Regards, Jonas Alex Bee (1): media: rkvdec: h264: Don't hardcode SPS/PPS parameters Jonas Karlman (10): media: v4l2-common: Add helpers to calculate bytesperline and sizeimage media: v4l2: Add NV15 and NV20 pixel formats media: rkvdec: h264: Use bytesperline and buffer height as virstride media: rkvdec: Extract rkvdec_fill_decoded_pixfmt into helper media: rkvdec: Move rkvdec_reset_decoded_fmt helper media: rkvdec: Extract decoded format enumeration into helper media: rkvdec: Add image format concept media: rkvdec: Add get_image_fmt ops media: rkvdec: h264: Support High 10 and 4:2:2 profiles media: rkvdec: Fix enumerate frame sizes .../media/v4l/pixfmt-yuv-planar.rst | 128 ++++++++++ drivers/media/v4l2-core/v4l2-common.c | 80 +++--- drivers/media/v4l2-core/v4l2-ioctl.c | 2 + drivers/staging/media/rkvdec/rkvdec-h264.c | 64 +++-- drivers/staging/media/rkvdec/rkvdec.c | 239 +++++++++++++----- drivers/staging/media/rkvdec/rkvdec.h | 18 +- include/uapi/linux/videodev2.h | 2 + 7 files changed, 410 insertions(+), 123 deletions(-)