From patchwork Mon Jul 6 21:54:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 11646957 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 79D641398 for ; Mon, 6 Jul 2020 21:54:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5095220715 for ; Mon, 6 Jul 2020 21:54:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="F+V6g8Cl"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="YoIQFPcJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5095220715 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kwiboo.se Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:References:In-Reply-To:Message-Id:Date:Subject: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qtmYl1bN4wTSE3wvpsE4Vm8K1QK4RpImz8G1k0nvNd4=; b=F+V6g8ClEQAblZfCnRivAhpgnB M3E6JcPnqXrp1CzLv7um4eomim+BIg+2YPaLIt7EjkCldo4I/iv+vhqBM2r0Vs2WczdWXDteK8WTI 9noO5O7mY+wlLSC8SB19kftFuCo5wgciX1Xcs1w27YqZ15AZnAChMTf9lkLyyMS8YWlOErsNxHDw1 MTkmMyrKLzRYO/jBDdwX3FLSGSh5x6zuxoc3mkHs04UayFJYmSKmJ7TZ++TL7RybHNFC6Z7wEbD4W NUCrwIK6XhdR9hAAt+Ge4lcpGgF67dM3zK7xcXszVGkKWMAoR0GGCRyr1edKue864RKowK+k7mRd8 rc+RCoNw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsZ4R-0007kk-Bl; Mon, 06 Jul 2020 21:54:39 +0000 Received: from o1.b.az.sendgrid.net ([208.117.55.133]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsZ4M-0007fo-Qw for linux-rockchip@lists.infradead.org; Mon, 06 Jul 2020 21:54:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:to:cc:content-type: content-transfer-encoding; s=001; bh=zH7tX8PPrQOiC8YQYfNApiiYgPL8wf8hdlJJn7cx1Rc=; b=YoIQFPcJX23K4CfU4auvTouFdT/J035h8AJE9Py+DXVx+HiFocDTHIKMR4sU/q5+ebKd SnjjrxkFIXmWqyK1Mmqzo3j8MrIyuxj5sMpBGhDEN2xboGAGp797rYqw8lei6CtOnvwRoN r6pLbjS3vK1YXJkV68S/75j5kn5RkcxVY= Received: by filterdrecv-p3iad2-5b55dcd864-pbk2w with SMTP id filterdrecv-p3iad2-5b55dcd864-pbk2w-17-5F039D99-1F 2020-07-06 21:54:33.351928764 +0000 UTC m=+881113.475332882 Received: from bionic.localdomain (unknown) by ismtpd0008p1lon1.sendgrid.net (SG) with ESMTP id coCc3ZK0SEeNipq-mYYnXg Mon, 06 Jul 2020 21:54:33.104 +0000 (UTC) From: Jonas Karlman Subject: [PATCH v2 00/12] media: rkvdec: Add H.264 High 10 and 4:2:2 profile support Date: Mon, 06 Jul 2020 21:54:33 +0000 (UTC) Message-Id: <20200706215430.22859-1-jonas@kwiboo.se> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200701215616.30874-1-jonas@kwiboo.se> References: <20200701215616.30874-1-jonas@kwiboo.se> X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0hypXKcIOeSYpNSUeYemRpIrZd9puwQGdPqGdlyH4xQt+Xy/er833ML+ZYb0lIUcPP/Zt/5FyizZgascWuYLH4/BH9QSH59SoIzjnY1DS4+xPxYSC55bmE4PT6+eH15DmBWk86/8gsc9SyHjafY3zcxQPwhPl3Q6VxCk+pZ8gLWNv1UcG2PW7h3Esc581fJys0g== To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200706_175435_211084_0CB84913 X-CRM114-Status: GOOD ( 12.76 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [208.117.55.133 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [208.117.55.133 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines 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: Alexandre Courbot , Jonas Karlman , Tomasz Figa , Hans Verkuil , Nicolas Dufresne , Ezequiel Garcia MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org This series contains minor fixes and adds H.264 High 10 and 4:2:2 profile support to the Rockchip Video Decoder driver. Patch 1 and 3 fixes two issues when decoding field encoded content. Patch 2 ensures CAPTURE buffer is same resolution or larger than OUTPUT buffer. Patch 5 allows userspace to set OUTPUT sizeimage. Patch 6 updates the v4l2_format helpers to consider block width and height when calculating plane bytesperline and sizeimage. Patch 7 adds two new pixelformats for 10-bit 4:2:0/4:2:2. Patch 8 change to use bytesperline and buffer height to configure strides. Patch 9 and 10 add support for limit/lock down a pixelformat based on SPS. Patch 11 adds final bits to support H.264 High 10 and 4:2:2 profiles. Patch 12 adds profile and level controls. 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 See indivitual patch for changes. This series depend on the "handle unsupported H.264 bitstreams" series at [1] with a small fixup, s/p_cur/p_new/. To fully runtime test this series you may need drm patches from [2] and ffmpeg patches from [3], this series and drm patches is also available at [4]. [1] https://patchwork.linuxtv.org/cover/64977/ [2] https://patchwork.freedesktop.org/series/78099/ [3] https://github.com/Kwiboo/FFmpeg/commits/v4l2-request-hwaccel-4.3-rkvdec-high-10 [4] https://github.com/Kwiboo/linux-rockchip/commits/linuxtv-rkvdec-high-10-v2 Regards, Jonas Jonas Karlman (12): media: rkvdec: h264: Fix reference frame_num wrap for second field media: rkvdec: Ensure decoded resolution fit coded resolution media: rkvdec: h264: Validate and use pic width and height in mbs media: rkvdec: h264: Fix bit depth wrap in pps packet media: rkvdec: h264: Do not override output buffer sizeimage 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 to calculate stride media: rkvdec: Extract rkvdec_fill_decoded_pixfmt helper method media: rkvdec: Lock capture pixel format in s_ctrl and s_fmt media: rkvdec: h264: Support High 10 and 4:2:2 profiles media: rkvdec: h264: Support profile and level controls .../userspace-api/media/v4l/pixfmt-nv15.rst | 101 ++++++++++++++ .../userspace-api/media/v4l/pixfmt-nv20.rst | 99 +++++++++++++ .../userspace-api/media/v4l/yuv-formats.rst | 2 + drivers/media/v4l2-core/v4l2-common.c | 80 +++++------ drivers/media/v4l2-core/v4l2-ioctl.c | 2 + drivers/staging/media/rkvdec/rkvdec-h264.c | 45 ++++-- drivers/staging/media/rkvdec/rkvdec.c | 130 ++++++++++++++---- drivers/staging/media/rkvdec/rkvdec.h | 2 + include/uapi/linux/videodev2.h | 3 + 9 files changed, 384 insertions(+), 80 deletions(-) create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-nv15.rst create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-nv20.rst