From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AB2B262FDA for ; Tue, 22 Apr 2025 21:20:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745356862; cv=none; b=SXX38tZr72b+9ua4bmjd5taqDogzQIKHTeSiKhf3fBowDaKCecrEge9lGg8+7Oav0//AYbL3SNXMGxycAgZ0jVoSjCbATo3Q4N06aDsDSxQ/Q7BxR0/v54uiIEAyKSyiiAqbZ0mgME1XZ5cSb6fm0QO7FQNAUtDU6prpD3ksFlc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745356862; c=relaxed/simple; bh=TaWy0LZEsPyXkQz2MkEjBCwUsMf7/Sbik/r/E/4wEg4=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=EY3QIiRAxPEPv64TMyaoWvDUszt8FQLXD4HmMqS/6eebF0KO/JKpdxi98ZGFvvqpJWFDIHlAnHriZctnL8pEO7OkvppU454dtxfQFfzHiJsXvuu7RWO2VFNXwVkJhW6/TDlj9uSp3tsFuJ8MMtg/5B2nxxlgH+qMNlOV/tl5Cls= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=CCemR4dS; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="CCemR4dS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1745356858; bh=TaWy0LZEsPyXkQz2MkEjBCwUsMf7/Sbik/r/E/4wEg4=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=CCemR4dSTq7g7pSjZFKWGyEsbuX4JoyzuAmNN35253ZmrC5tmjnX7JUo55QPRejqj B1pI31LbUzGxY+aX5n6tYO91b0blGziZ6joAH0NHeGUzlum8qY7Gv8kMEPyvMXX//g RRcRfVnoRNxOTitaI7j5i9KYJLMKu+T7iA3ihC0r4Qdu2TjuI7A4yw5yEQLFbwF1Wf eV2vsCRXaL3siVTNWpl/F4Bg/CQJbldFDKZnxXerXOA5aZOF5zWhND4UZobWnUuL6Y EbRhvpPmE/p02oP3Pa+Nx3FViBc/598eZo1dR9C5Hfip+EuG8vKQ/PRsXOyPqmFjbp 71pazM1zMdYZg== Received: from [IPv6:2606:6d00:15:9913::5ac] (unknown [IPv6:2606:6d00:15:9913::5ac]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nicolas) by bali.collaboradmins.com (Postfix) with ESMTPSA id B8E9917E0B56; Tue, 22 Apr 2025 23:20:56 +0200 (CEST) Message-ID: Subject: Re: [PATCH v9 4/4] media: rkvdec: h264: Support High 10 and 4:2:2 profiles From: Nicolas Dufresne To: Hans Verkuil Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Jonas Karlman , Christopher Obbard , Ezequiel Garcia , Mauro Carvalho Chehab , Greg Kroah-Hartman Date: Tue, 22 Apr 2025 17:20:54 -0400 In-Reply-To: <20250417-b4-rkvdec_h264_high10_and_422_support-v9-4-0e8738ccb46b@collabora.com> References: <20250417-b4-rkvdec_h264_high10_and_422_support-v9-0-0e8738ccb46b@collabora.com> <20250417-b4-rkvdec_h264_high10_and_422_support-v9-4-0e8738ccb46b@collabora.com> Organization: Collabora Canada Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.56.0 (3.56.0-1.fc42) Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Hi Hans, since you raised concern on this one when I tried to pull, looking forward your Ack or Rb. regards, Nicolas Le jeudi 17 avril 2025 à 17:58 -0400, Nicolas Dufresne a écrit : > From: Jonas Karlman > > Add support and enable decoding of H264 High 10 and 4:2:2 profiles. > > Decoded CAPTURE buffer width is aligned to 64 pixels to accommodate > HW > requirement of 10-bit format buffers, fixes decoding of all the 4:2:2 > and 10bit 4:2:2 flusters tests except two stream that present some > visual artifacts. > > - Hi422FREXT17_SONY_A > - Hi422FREXT19_SONY_A > > The get_image_fmt() ops is implemented to select an image format > required for the provided SPS control, and returns RKVDEC_IMG_FMT_ANY > for other controls. > > Signed-off-by: Jonas Karlman > Reviewed-by: Nicolas Dufresne > Tested-by: Nicolas Dufresne > Tested-by: Christopher Obbard > Signed-off-by: Nicolas Dufresne > --- >  drivers/staging/media/rkvdec/rkvdec-h264.c | 37 > ++++++++++++++++++++++------- >  drivers/staging/media/rkvdec/rkvdec.c      | 38 > +++++++++++++++++++++++------- >  drivers/staging/media/rkvdec/rkvdec.h      |  3 +++ >  3 files changed, 60 insertions(+), 18 deletions(-) > > diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c > b/drivers/staging/media/rkvdec/rkvdec-h264.c > index > 8bce8902b8dda39bb2058c8504bd52ccae6b4204..d14b4d173448dbcce4ab978a838 > 06064b100ca24 100644 > --- a/drivers/staging/media/rkvdec/rkvdec-h264.c > +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c > @@ -1027,24 +1027,42 @@ static int rkvdec_h264_adjust_fmt(struct > rkvdec_ctx *ctx, >   return 0; >  } >   > +static enum rkvdec_image_fmt rkvdec_h264_get_image_fmt(struct > rkvdec_ctx *ctx, > +        struct > v4l2_ctrl *ctrl) > +{ > + const struct v4l2_ctrl_h264_sps *sps = ctrl- > >p_new.p_h264_sps; > + > + if (ctrl->id != V4L2_CID_STATELESS_H264_SPS) > + return RKVDEC_IMG_FMT_ANY; > + > + if (sps->bit_depth_luma_minus8 == 0) { > + if (sps->chroma_format_idc == 2) > + return RKVDEC_IMG_FMT_422_8BIT; > + else > + return RKVDEC_IMG_FMT_420_8BIT; > + } else if (sps->bit_depth_luma_minus8 == 2) { > + if (sps->chroma_format_idc == 2) > + return RKVDEC_IMG_FMT_422_10BIT; > + else > + return RKVDEC_IMG_FMT_420_10BIT; > + } > + > + return RKVDEC_IMG_FMT_ANY; > +} > + >  static int rkvdec_h264_validate_sps(struct rkvdec_ctx *ctx, >       const struct v4l2_ctrl_h264_sps > *sps) >  { >   unsigned int width, height; >   > - /* > - * TODO: The hardware supports 10-bit and 4:2:2 profiles, > - * but it's currently broken in the driver. > - * Reject them for now, until it's fixed. > - */ > - if (sps->chroma_format_idc > 1) > - /* Only 4:0:0 and 4:2:0 are supported */ > + if (sps->chroma_format_idc > 2) > + /* Only 4:0:0, 4:2:0 and 4:2:2 are supported */ >   return -EINVAL; >   if (sps->bit_depth_luma_minus8 != sps- > >bit_depth_chroma_minus8) >   /* Luma and chroma bit depth mismatch */ >   return -EINVAL; > - if (sps->bit_depth_luma_minus8 != 0) > - /* Only 8-bit is supported */ > + if (sps->bit_depth_luma_minus8 != 0 && sps- > >bit_depth_luma_minus8 != 2) > + /* Only 8-bit and 10-bit is supported */ >   return -EINVAL; >   >   width = (sps->pic_width_in_mbs_minus1 + 1) * 16; > @@ -1190,4 +1208,5 @@ const struct rkvdec_coded_fmt_ops > rkvdec_h264_fmt_ops = { >   .stop = rkvdec_h264_stop, >   .run = rkvdec_h264_run, >   .try_ctrl = rkvdec_h264_try_ctrl, > + .get_image_fmt = rkvdec_h264_get_image_fmt, >  }; > diff --git a/drivers/staging/media/rkvdec/rkvdec.c > b/drivers/staging/media/rkvdec/rkvdec.c > index > 6c6fe411f48772419e1810d869ab40d168848e65..26f8b8cfcf64f872de73b49b9da > 9df22ce22d98b 100644 > --- a/drivers/staging/media/rkvdec/rkvdec.c > +++ b/drivers/staging/media/rkvdec/rkvdec.c > @@ -186,9 +186,10 @@ static const struct rkvdec_ctrl_desc > rkvdec_h264_ctrl_descs[] = { >   { >   .cfg.id = V4L2_CID_MPEG_VIDEO_H264_PROFILE, >   .cfg.min = > V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE, > - .cfg.max = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, > + .cfg.max = > V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422_INTRA, >   .cfg.menu_skip_mask = > - BIT(V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED), > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_PR > EDICTIVE), >   .cfg.def = V4L2_MPEG_VIDEO_H264_PROFILE_MAIN, >   }, >   { > @@ -203,11 +204,23 @@ static const struct rkvdec_ctrls > rkvdec_h264_ctrls = { >   .num_ctrls = ARRAY_SIZE(rkvdec_h264_ctrl_descs), >  }; >   > -static const struct rkvdec_decoded_fmt_desc > rkvdec_h264_vp9_decoded_fmts[] = { > +static const struct rkvdec_decoded_fmt_desc > rkvdec_h264_decoded_fmts[] = { >   { >   .fourcc = V4L2_PIX_FMT_NV12, >   .image_fmt = RKVDEC_IMG_FMT_420_8BIT, >   }, > + { > + .fourcc = V4L2_PIX_FMT_NV15, > + .image_fmt = RKVDEC_IMG_FMT_420_10BIT, > + }, > + { > + .fourcc = V4L2_PIX_FMT_NV16, > + .image_fmt = RKVDEC_IMG_FMT_422_8BIT, > + }, > + { > + .fourcc = V4L2_PIX_FMT_NV20, > + .image_fmt = RKVDEC_IMG_FMT_422_10BIT, > + }, >  }; >   >  static const struct rkvdec_ctrl_desc rkvdec_vp9_ctrl_descs[] = { > @@ -230,21 +243,28 @@ static const struct rkvdec_ctrls > rkvdec_vp9_ctrls = { >   .num_ctrls = ARRAY_SIZE(rkvdec_vp9_ctrl_descs), >  }; >   > +static const struct rkvdec_decoded_fmt_desc > rkvdec_vp9_decoded_fmts[] = { > + { > + .fourcc = V4L2_PIX_FMT_NV12, > + .image_fmt = RKVDEC_IMG_FMT_420_8BIT, > + }, > +}; > + >  static const struct rkvdec_coded_fmt_desc rkvdec_coded_fmts[] = { >   { >   .fourcc = V4L2_PIX_FMT_H264_SLICE, >   .frmsize = { > - .min_width = 48, > + .min_width = 64, >   .max_width = 4096, > - .step_width = 16, > + .step_width = 64, >   .min_height = 48, >   .max_height = 2560, >   .step_height = 16, >   }, >   .ctrls = &rkvdec_h264_ctrls, >   .ops = &rkvdec_h264_fmt_ops, > - .num_decoded_fmts = > ARRAY_SIZE(rkvdec_h264_vp9_decoded_fmts), > - .decoded_fmts = rkvdec_h264_vp9_decoded_fmts, > + .num_decoded_fmts = > ARRAY_SIZE(rkvdec_h264_decoded_fmts), > + .decoded_fmts = rkvdec_h264_decoded_fmts, >   .subsystem_flags = > VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF, >   }, >   { > @@ -259,8 +279,8 @@ static const struct rkvdec_coded_fmt_desc > rkvdec_coded_fmts[] = { >   }, >   .ctrls = &rkvdec_vp9_ctrls, >   .ops = &rkvdec_vp9_fmt_ops, > - .num_decoded_fmts = > ARRAY_SIZE(rkvdec_h264_vp9_decoded_fmts), > - .decoded_fmts = rkvdec_h264_vp9_decoded_fmts, > + .num_decoded_fmts = > ARRAY_SIZE(rkvdec_vp9_decoded_fmts), > + .decoded_fmts = rkvdec_vp9_decoded_fmts, >   } >  }; >   > diff --git a/drivers/staging/media/rkvdec/rkvdec.h > b/drivers/staging/media/rkvdec/rkvdec.h > index > e466a2753ccfc13738e0a672bc578e521af2c3f2..9a9f4fced7a184b952d341d75c7 > faedaa75163d6 100644 > --- a/drivers/staging/media/rkvdec/rkvdec.h > +++ b/drivers/staging/media/rkvdec/rkvdec.h > @@ -80,6 +80,9 @@ struct rkvdec_coded_fmt_ops { >  enum rkvdec_image_fmt { >   RKVDEC_IMG_FMT_ANY = 0, >   RKVDEC_IMG_FMT_420_8BIT, > + RKVDEC_IMG_FMT_420_10BIT, > + RKVDEC_IMG_FMT_422_8BIT, > + RKVDEC_IMG_FMT_422_10BIT, >  }; >   >  struct rkvdec_decoded_fmt_desc { -- Nicolas Dufresne Principal Engineer at Collabora