From patchwork Sun Oct 29 18:34:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 16014 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1811669vqb; Sun, 29 Oct 2023 11:45:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGvZYMgV840zUsRuhonx3QCFCTOzdDkp5iweDQ1fya8EaZQXveQ1vVij5k7tKKSbB0tgeuU X-Received: by 2002:a05:6830:1544:b0:6ce:25b9:d9b5 with SMTP id l4-20020a056830154400b006ce25b9d9b5mr8118698otp.38.1698605101445; Sun, 29 Oct 2023 11:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698605101; cv=none; d=google.com; s=arc-20160816; b=Vzbji+ipqxZ5rsxE2tXgM2mLiarJwL2eiezD8RcxSybFxKSXgoLpCGrKrUT/fUP8Za /zrZLO7fsAC6U2cDAJx7sggDRQesm1Fc3kA7044gvFLUmmhGW2YSaXCxwx9idzW9xYuz gKdfpOjnLbb8js5mZcfflHwBWEUouDJCbiVY6x3YpapO90rYYPEVMf3lmwRJgVEfhAus VHtF8SnOCj0KTsxo0Vk+t0Ii6sslmgwh4kV6y7dQ9upGzMuifAvevrkrgjoK7FldrIWs KnZsO5/s3xNhoEnt7tCcOeaJrIIT/ial0pBlcvubjmPy/inx/ewgKwY4sqFe+wH9UuNx Qh9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gogipZf0R0iOWdYyr1sBKjhOfpGlLqwJaMpBSjca5Mk=; fh=fPMqcnQAZalXTNWSA3r/kmDGHkDH83vatainXKA8F4o=; b=01w9BU7Oiplf80QKc9QFnaFlUJ89A3GPAQOnio3OqG7lgxhkkud1++iktUr/RwiSpb JD+xm4XKGgwHnc7E5fYKNf2eFbPP9PhCmkPIZyAbMRvrPHbM4AxijujC1yujBb3/uBgY 1ePD0wiyxc9kjZhWeJ4vKoLpIWLoNOYQa2ZWmiYA6M3ZdoqhQdhcne8Gdc/h7lCROsFY UADkvCS6I0gJ3oEvDBTJOZ2Oaxg8rlf0bRov6smZSb8NdagumoZahVVZ28IB56b4EyB3 6Wzm3p9loLodMk58kLdy15bSS+CesLVI/WtTQFzF5Jg2hTZmnEgOaU7/8r+DtYa4M16u K0Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kwiboo.se header.s=fe-e1b5cab7be header.b=eZjJcwec; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kwiboo.se Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id hk10-20020a17090b224a00b0027cf3fd376bsi5917134pjb.28.2023.10.29.11.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 11:45:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@kwiboo.se header.s=fe-e1b5cab7be header.b=eZjJcwec; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kwiboo.se Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id CE8D08086839; Sun, 29 Oct 2023 11:44:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230333AbjJ2Soq (ORCPT + 30 others); Sun, 29 Oct 2023 14:44:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbjJ2Soo (ORCPT ); Sun, 29 Oct 2023 14:44:44 -0400 X-Greylist: delayed 595 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 29 Oct 2023 11:44:39 PDT Received: from smtp.forwardemail.net (smtp.forwardemail.net [149.28.215.223]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 012B3C2; Sun, 29 Oct 2023 11:44:39 -0700 (PDT) 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=1698605077; bh=gogipZf0R0iOWdYyr1sBKjhOfpGlLqwJaMpBSjca5Mk=; b=eZjJcwec7ptknl/8pfUQrGoejCwWCyRsIFKsCp/NqoNYqAJzWzB58D/9YO3PYCj4zYH9JOdY8 Stn0vPWMvgfCMQcaY6am/CC957fBY7OaE9o7wwAmfVOBwRoUr0mXZy1+l9wlobC+p8otmWeYDo2 hj5dXxg238cR1IsjkObiLR8Ts2FDbfoj15Ev2t+BeAEfWcE0WgLqLGoaj17NVbECUrVmUM4gFHx N6i6Y0K/4K2xsZ7qfQXdmqMOo90BGjzG6Jtq11QBot4Eh3IdkHi9z8+TL10KGmxwEIWvAGwO+KR s6M/HMgfuur8hKx5ZwAsfxuAQLgUDDglCaEuirp7WUNA== From: Jonas Karlman To: Ezequiel Garcia , Mauro Carvalho Chehab Cc: Alex Bee , Nicolas Dufresne , Benjamin Gaignard , Sebastian Fricke , Christopher Obbard , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Jonas Karlman Subject: [PATCH v3 00/10] media: rkvdec: Add H.264 High 10 and 4:2:2 profile support Date: Sun, 29 Oct 2023 18:34:07 +0000 Message-ID: <20231029183427.1781554-1-jonas@kwiboo.se> X-Mailer: git-send-email 2.42.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: 653ea5b98fe0ffca230b0f08 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 29 Oct 2023 11:44:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781116542521810784 X-GMAIL-MSGID: 1781116542521810784 This is a revival of a 3 year old series [1] now that NV15/NV20/NV30 support for display driver have landed in drm-misc tree. This series adds H.264 High 10 and 4:2:2 profile support to the Rockchip Video Decoder driver. Patch 1 adds helpers for calculating plane bytesperline and sizeimage. Patch 2 adds 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 remove an unnecessary call to validate sps at streaming start. Patch 6-9 refactor code to support validation and filtering of CAPUTRE formats based on codec ops. Patch 10 adds final bits to support H.264 High 10 and 4:2:2 profiles. 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 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 Following drm-misc commits adds support for NV15/NV20/NV30 to VOP driver: 728c15b4b5f3 ("drm/fourcc: Add NV20 and NV30 YUV formats") d4b384228562 ("drm/rockchip: vop: Add NV15, NV20 and NV30 support") To fully runtime test this series you may need above drm commits and ffmpeg patches from [2], this series and drm patches is also available at [3]. [1] https://lore.kernel.org/linux-media/20200706215430.22859-1-jonas@kwiboo.se/ [2] https://github.com/jernejsk/FFmpeg/commits/v4l2-request-n6.0/ [3] https://github.com/Kwiboo/linux-rockchip/commits/linuxtv-rkvdec-high-10-v3/ Regards, Jonas Alex Bee (1): media: rkvdec: h264: Don't hardcode SPS/PPS parameters Jonas Karlman (9): 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: h264: Remove SPS validation at streaming start media: rkvdec: Extract rkvdec_fill_decoded_pixfmt helper method media: rkvdec: Move rkvdec_reset_decoded_fmt() function media: rkvdec: Prepare for adding format validation ops media: rkvdec: Add get_fmt_opaque and valid_fmt ops media: rkvdec: h264: Support High 10 and 4:2:2 profiles .../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 | 91 ++++---- drivers/staging/media/rkvdec/rkvdec.c | 194 +++++++++++++----- drivers/staging/media/rkvdec/rkvdec.h | 3 + include/uapi/linux/videodev2.h | 2 + 7 files changed, 367 insertions(+), 133 deletions(-) Tested-by: Christopher Obbard --- 2.42.0