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 D8B8720C300 for ; Fri, 25 Oct 2024 17:36:31 +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=1729877794; cv=none; b=qWzIsSp0Tvyf0yOKadinxFYWKhThrBKFYVfWNnwT3564BTbI0+3V0PcOdBigJ6KojK36yQhWaYpEJCQhcfQpf5co9xIb/Pigs0VEF4EXvVF1OE2wVPqpx01lQfgfcbco5ybErA3pANqIRFu2P8Y85VBGWQ57arnn3AObqvMUYk8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729877794; c=relaxed/simple; bh=x4jpxHklaZinyrxH+w/otUFIrF7xpzlfk3/g5e1I3KE=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=qFe5QMjY7oEb1ZjUzULDI9g4E7EXY9hxQsb6eGS7lcdLUbSxSbr5uOGieaEdtFQzTVG9OW/gT4Yhskw5rHkOw73tHabW2jCBOQ2CPKu+Zc/BiGjRZCVs1qMUXPUIVnrApftl85HMJmHwKqV8wX1iX02bJgIbo39nx4rp9belW0E= 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=RhWrmVOG; 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="RhWrmVOG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1729877789; bh=x4jpxHklaZinyrxH+w/otUFIrF7xpzlfk3/g5e1I3KE=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=RhWrmVOGzNQoNyvObXXer83FMP3ggDqn1HjeCx6WApTvtxLFVPvhMvbyP/Vdn+fQV SqTu2IzyAQB/jetcHZ0JArXoZmd4xdpSi96B53TpGq86qx3jOWqtmQAtasSvO2qxuQ 0Jmry+kTcmHcVh2NRAIkcDDIbu3cvh39CvB2+xEHfOYO6s9AYdz8El+cXYrrCn7kZz OWl5mfnYC+leB2tT3K+/RVCTb/xEZJuaz9+9ahafQ6UNAzNIdHNXotwSK8OdwLtxt+ qMwEugKqS/vlQmP9qOfx9C3zvcXcG8zdMtwr+qUYenBG+OrAToDRRNVyZ0bfh/ZGsk Pc65nNhGOGT5Q== Received: from nicolas-tpx395.lan (unknown [IPv6:2606:6d00:15:862e::7a9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: nicolas) by bali.collaboradmins.com (Postfix) with ESMTPSA id 2450517E36AE; Fri, 25 Oct 2024 19:36:28 +0200 (CEST) Message-ID: <59ffa319a35e9e914bb5c8169df782ddabbd68c3.camel@collabora.com> Subject: Re: [PATCH v6 08/11] media: rkvdec: Add image format concept From: Nicolas Dufresne To: Jonas Karlman , Sebastian Fricke , Ezequiel Garcia , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: Alex Bee , 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, Christopher Obbard Date: Fri, 25 Oct 2024 13:36:27 -0400 In-Reply-To: <20240909192522.1076704-9-jonas@kwiboo.se> References: <20240909192522.1076704-1-jonas@kwiboo.se> <20240909192522.1076704-9-jonas@kwiboo.se> Organization: Collabora Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.52.4 (3.52.4-1.fc40) Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Le lundi 09 septembre 2024 à 19:25 +0000, Jonas Karlman a écrit : > Add an enum rkvdec_image_fmt used to signal an image format, e.g. > 4:2:0 8-bit, 4:2:0 10-bit or any. > > Tag each supported CAPUTRE format with an image format and use this tag > to filter out unsupported CAPTURE formats. > > Signed-off-by: Jonas Karlman > Tested-by: Nicolas Dufresne > Tested-by: Christopher Obbard > --- > v6: > - Change to use fmt_idx instead of j++ tucked inside a condition (Dan) > > v5: > - Collect t-b tags > > v4: > - Change fmt_opaque into an image format > - Split patch into two > > v3: > - New patch > --- > drivers/staging/media/rkvdec/rkvdec.c | 48 ++++++++++++++++++++------- > drivers/staging/media/rkvdec/rkvdec.h | 13 +++++++- > 2 files changed, 48 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c > index efbf9aa578ae..467fc05b347a 100644 > --- a/drivers/staging/media/rkvdec/rkvdec.c > +++ b/drivers/staging/media/rkvdec/rkvdec.c > @@ -27,26 +27,45 @@ > #include "rkvdec.h" > #include "rkvdec-regs.h" > > -static u32 rkvdec_enum_decoded_fmt(struct rkvdec_ctx *ctx, int index) > +static inline bool rkvdec_image_fmt_match(enum rkvdec_image_fmt fmt1, > + enum rkvdec_image_fmt fmt2) nit: We usually let the compiler inline function, specially when small and static. Reviewed-by: Nicolas Dufresne > +{ > + return fmt1 == fmt2 || fmt2 == RKVDEC_IMG_FMT_ANY || > + fmt1 == RKVDEC_IMG_FMT_ANY; > +} > + > +static u32 rkvdec_enum_decoded_fmt(struct rkvdec_ctx *ctx, int index, > + enum rkvdec_image_fmt image_fmt) > { > const struct rkvdec_coded_fmt_desc *desc = ctx->coded_fmt_desc; > + int fmt_idx = -1; > + unsigned int i; > > if (WARN_ON(!desc)) > return 0; > > - if (index >= desc->num_decoded_fmts) > - return 0; > + for (i = 0; i < desc->num_decoded_fmts; i++) { > + if (!rkvdec_image_fmt_match(desc->decoded_fmts[i].image_fmt, > + image_fmt)) > + continue; > + fmt_idx++; > + if (index == fmt_idx) > + return desc->decoded_fmts[i].fourcc; > + } > > - return desc->decoded_fmts[index]; > + return 0; > } > > -static bool rkvdec_is_valid_fmt(struct rkvdec_ctx *ctx, u32 fourcc) > +static bool rkvdec_is_valid_fmt(struct rkvdec_ctx *ctx, u32 fourcc, > + enum rkvdec_image_fmt image_fmt) > { > const struct rkvdec_coded_fmt_desc *desc = ctx->coded_fmt_desc; > unsigned int i; > > for (i = 0; i < desc->num_decoded_fmts; i++) { > - if (desc->decoded_fmts[i] == fourcc) > + if (rkvdec_image_fmt_match(desc->decoded_fmts[i].image_fmt, > + image_fmt) && > + desc->decoded_fmts[i].fourcc == fourcc) > return true; > } > > @@ -80,7 +99,7 @@ static void rkvdec_reset_decoded_fmt(struct rkvdec_ctx *ctx) > struct v4l2_format *f = &ctx->decoded_fmt; > u32 fourcc; > > - fourcc = rkvdec_enum_decoded_fmt(ctx, 0); > + fourcc = rkvdec_enum_decoded_fmt(ctx, 0, ctx->image_fmt); > rkvdec_reset_fmt(ctx, f, fourcc); > f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; > f->fmt.pix_mp.width = ctx->coded_fmt.fmt.pix_mp.width; > @@ -149,8 +168,11 @@ static const struct rkvdec_ctrls rkvdec_h264_ctrls = { > .num_ctrls = ARRAY_SIZE(rkvdec_h264_ctrl_descs), > }; > > -static const u32 rkvdec_h264_vp9_decoded_fmts[] = { > - V4L2_PIX_FMT_NV12, > +static const struct rkvdec_decoded_fmt_desc rkvdec_h264_vp9_decoded_fmts[] = { > + { > + .fourcc = V4L2_PIX_FMT_NV12, > + .image_fmt = RKVDEC_IMG_FMT_420_8BIT, > + }, > }; > > static const struct rkvdec_ctrl_desc rkvdec_vp9_ctrl_descs[] = { > @@ -282,8 +304,9 @@ static int rkvdec_try_capture_fmt(struct file *file, void *priv, > if (WARN_ON(!coded_desc)) > return -EINVAL; > > - if (!rkvdec_is_valid_fmt(ctx, pix_mp->pixelformat)) > - pix_mp->pixelformat = rkvdec_enum_decoded_fmt(ctx, 0); > + if (!rkvdec_is_valid_fmt(ctx, pix_mp->pixelformat, ctx->image_fmt)) > + pix_mp->pixelformat = rkvdec_enum_decoded_fmt(ctx, 0, > + ctx->image_fmt); > > /* Always apply the frmsize constraint of the coded end. */ > pix_mp->width = max(pix_mp->width, ctx->coded_fmt.fmt.pix_mp.width); > @@ -400,6 +423,7 @@ static int rkvdec_s_output_fmt(struct file *file, void *priv, > * > * Note that this will propagates any size changes to the decoded format. > */ > + ctx->image_fmt = RKVDEC_IMG_FMT_ANY; > rkvdec_reset_decoded_fmt(ctx); > > /* Propagate colorspace information to capture. */ > @@ -449,7 +473,7 @@ static int rkvdec_enum_capture_fmt(struct file *file, void *priv, > struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv); > u32 fourcc; > > - fourcc = rkvdec_enum_decoded_fmt(ctx, f->index); > + fourcc = rkvdec_enum_decoded_fmt(ctx, f->index, ctx->image_fmt); > if (!fourcc) > return -EINVAL; > > diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h > index 633335ebb9c4..6f8cf50c5d99 100644 > --- a/drivers/staging/media/rkvdec/rkvdec.h > +++ b/drivers/staging/media/rkvdec/rkvdec.h > @@ -75,13 +75,23 @@ struct rkvdec_coded_fmt_ops { > int (*try_ctrl)(struct rkvdec_ctx *ctx, struct v4l2_ctrl *ctrl); > }; > > +enum rkvdec_image_fmt { > + RKVDEC_IMG_FMT_ANY = 0, > + RKVDEC_IMG_FMT_420_8BIT, > +}; > + > +struct rkvdec_decoded_fmt_desc { > + u32 fourcc; > + enum rkvdec_image_fmt image_fmt; > +}; > + > struct rkvdec_coded_fmt_desc { > u32 fourcc; > struct v4l2_frmsize_stepwise frmsize; > const struct rkvdec_ctrls *ctrls; > const struct rkvdec_coded_fmt_ops *ops; > unsigned int num_decoded_fmts; > - const u32 *decoded_fmts; > + const struct rkvdec_decoded_fmt_desc *decoded_fmts; > u32 subsystem_flags; > }; > > @@ -104,6 +114,7 @@ struct rkvdec_ctx { > const struct rkvdec_coded_fmt_desc *coded_fmt_desc; > struct v4l2_ctrl_handler ctrl_hdl; > struct rkvdec_dev *dev; > + enum rkvdec_image_fmt image_fmt; > void *priv; > }; >