From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27279C38A2A for ; Fri, 8 May 2020 10:34:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F05FF20708 for ; Fri, 8 May 2020 10:34:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="TCUXp1kA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727071AbgEHKez (ORCPT ); Fri, 8 May 2020 06:34:55 -0400 Received: from lb2-smtp-cloud7.xs4all.net ([194.109.24.28]:44591 "EHLO lb2-smtp-cloud7.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726618AbgEHKey (ORCPT ); Fri, 8 May 2020 06:34:54 -0400 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud7.xs4all.net with ESMTPA id X0LAjdgdgtKAsX0LDje0Ij; Fri, 08 May 2020 12:34:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s1; t=1588934091; bh=rTaj2j7yLA0szwh23jYmBUjOXAbRc2/au8nmnpb2Zdc=; h=Subject:To:From:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=TCUXp1kABX/YT/L2UPmdaQiapw6XKAogo5Qn9QcezED3EJ6LQcxgAGkGDXj48wg+h ISJM6cWbdq1LJiu4zI79sJWLiqJhllggifF4B66OuGq0vYPJ86VitjflsvUmLE4CjP 4URbsIG5F7RLTZYNoxp9OfJZiGbgV8ZQkSBA1d3CJcJ+pT1YJzv2jt3oPY5M1dcR94 +2yAjWUahqciijGwXtTLsMZqkM7TuNmhQvpl9lHjTO65v6WMtz3F8M+zxdoEtEgQbU i80NF+uY0cPNKw7O2tRYLrlKP/N1/AjHF3Kl9X2QbkaOTYGEdEktWA80oCl5cckTwL z9qCfIXPPZpyQ== Subject: Re: [PATCH v3 3/3] media: rkvdec: Add the VP9 backend To: Ezequiel Garcia , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Tomasz Figa , kernel@collabora.com, Jonas Karlman , Heiko Stuebner , Alexandre Courbot , Jeffrey Kardatzke , gustavo.padovan@collabora.com, Boris Brezillon References: <20200505134110.3435-1-ezequiel@collabora.com> <20200505134110.3435-4-ezequiel@collabora.com> From: Hans Verkuil Message-ID: <8e8eda07-e5f5-86dc-899b-0823ea0479f2@xs4all.nl> Date: Fri, 8 May 2020 12:34:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200505134110.3435-4-ezequiel@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfJ86TdI1pvKHRfu5hsHU8t8yFvBoKIzTCou3UH+Ra77tQTuI8FHFV23LFzHAgOqdGDIsnh9RfGNX7FSWeTCCyL/4BXYSMlrWDgdW2oZMRNF2euitDKf1 Rs9FPZLQq+MrczrwiFI+zibyA5tu9RYM0hjZiTsldfC2CCwH6Z3ncQ4PGQU+hA4Vqe7r1Fu74BzzgId+svluSpK9jsXxLTv60GZ2XCwiqn7ELZSViaABQkcO gr7T+SOVtsW7Lq8IKCaRk56Fk/0ivc/6Lq4np9ok9RbS4Z7sBd2K9HlFtoWw10EavuBLeRcL8xOAI3H1JcGx9XIC5NUSPAF6/Rs3J3O5XFqufn7h818F8QBk cYBdveq5iVcUwfOsuwxA8NAF3OvhIcy+YEhFOGMskV0R1iY+9Psp1LPlxs3GhyyVIRHAyjXtHC84EyyBhN08gcy2PGGLFcqVgg8guPVKxgy2BMs/jHW47Vrw EqYQUhGFjLaYpF0v6ZMFckaOYSd8dIcWGWv2zb1I40Ld5rM5MsFLGOTUS+XBEQh1FfRvCZbig7P1o3VZyAmfGoG7GzWE7i+PigerLQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/05/2020 15:41, Ezequiel Garcia wrote: > From: Boris Brezillon > > The Rockchip VDEC supports VP9 profile 0 up to 4096x2304@30fps. Add > a backend for this new format. > > Signed-off-by: Boris Brezillon > Signed-off-by: Ezequiel Garcia > --- > drivers/staging/media/rkvdec/Makefile | 2 +- > drivers/staging/media/rkvdec/rkvdec-vp9.c | 1577 +++++++++++++++++++++ > drivers/staging/media/rkvdec/rkvdec.c | 56 +- > drivers/staging/media/rkvdec/rkvdec.h | 6 + > 4 files changed, 1637 insertions(+), 4 deletions(-) > create mode 100644 drivers/staging/media/rkvdec/rkvdec-vp9.c > > diff --git a/drivers/staging/media/rkvdec/Makefile b/drivers/staging/media/rkvdec/Makefile > index c08fed0a39f9..cb86b429cfaa 100644 > --- a/drivers/staging/media/rkvdec/Makefile > +++ b/drivers/staging/media/rkvdec/Makefile > @@ -1,3 +1,3 @@ > obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rockchip-vdec.o > > -rockchip-vdec-y += rkvdec.o rkvdec-h264.o > +rockchip-vdec-y += rkvdec.o rkvdec-h264.o rkvdec-vp9.o > diff --git a/drivers/staging/media/rkvdec/rkvdec-vp9.c b/drivers/staging/media/rkvdec/rkvdec-vp9.c > new file mode 100644 > index 000000000000..37d0ea4e3570 > --- /dev/null > +++ b/drivers/staging/media/rkvdec/rkvdec-vp9.c > @@ -0,0 +1,1577 @@ > +static void init_inter_probs(struct rkvdec_ctx *ctx, > + const struct rkvdec_vp9_run *run) > +{ > + const struct v4l2_ctrl_vp9_frame_decode_params *dec_params; > + struct rkvdec_vp9_ctx *vp9_ctx = ctx->priv; > + struct rkvdec_vp9_priv_tbl *tbl = vp9_ctx->priv_tbl.cpu; > + struct rkvdec_vp9_inter_frame_probs *rkprobs; > + const struct v4l2_vp9_probabilities *probs; > + unsigned int i, j, k; > + > + rkprobs = &tbl->probs.inter; > + dec_params = run->decode_params; > + probs = &dec_params->probs; > + > + /* > + * inter probs > + * 151 x 128 bits, aligned to 152 x 128 bits > + * inter only > + * intra_y_mode & inter_block info 6 x 128 bits > + */ > + > + memcpy(rkprobs->y_mode, probs->y_mode, sizeof(rkprobs->y_mode)); > + memcpy(rkprobs->comp_mode, probs->comp_mode, > + sizeof(rkprobs->comp_mode)); > + memcpy(rkprobs->comp_ref, probs->comp_ref, > + sizeof(rkprobs->comp_ref)); > + memcpy(rkprobs->single_ref, probs->single_ref, > + sizeof(rkprobs->single_ref)); > + memcpy(rkprobs->inter_mode, probs->inter_mode, > + sizeof(rkprobs->inter_mode)); > + memcpy(rkprobs->interp_filter, probs->interp_filter, > + sizeof(rkprobs->interp_filter)); > + > + /* 128 x 128 bits coeff related */ > + for (i = 0; i < ARRAY_SIZE(probs->coef); i++) { > + for (j = 0; j < ARRAY_SIZE(probs->coef[0]); j++) { > + for (k = 0; k < ARRAY_SIZE(probs->coef[0][0]); k++) > + write_coeff_plane(probs->coef[i][j][k], > + rkprobs->coef[k][i][j]); > + } > + } > + > + /* intra uv mode 6 x 128 */ > + memcpy(rkprobs->uv_mode_0_2, &probs->uv_mode[0], > + sizeof(rkprobs->uv_mode_0_2)); > + memcpy(rkprobs->uv_mode_3_5, &probs->uv_mode[3], > + sizeof(rkprobs->uv_mode_3_5)); > + memcpy(rkprobs->uv_mode_6_8, &probs->uv_mode[6], > + sizeof(rkprobs->uv_mode_6_8)); > + memcpy(rkprobs->uv_mode_9, &probs->uv_mode[9], > + sizeof(rkprobs->uv_mode_9)); > + > + /* mv related 6 x 128 */ > + memcpy(rkprobs->mv.joint, probs->mv.joint, > + sizeof(rkprobs->mv.joint)); > + memcpy(rkprobs->mv.sign, probs->mv.sign, > + sizeof(rkprobs->mv.sign)); > + memcpy(rkprobs->mv.class, probs->mv.class, > + sizeof(rkprobs->mv.class)); > + memcpy(rkprobs->mv.class0_bit, probs->mv.class0_bit, > + sizeof(rkprobs->mv.class0_bit)); > + memcpy(rkprobs->mv.bits, probs->mv.bits, > + sizeof(rkprobs->mv.bits)); > + memcpy(rkprobs->mv.class0_fr, probs->mv.class0_fr, > + sizeof(rkprobs->mv.class0_fr)); > + memcpy(rkprobs->mv.fr, probs->mv.fr, > + sizeof(rkprobs->mv.fr)); > + memcpy(rkprobs->mv.class0_hp, probs->mv.class0_hp, > + sizeof(rkprobs->mv.class0_hp)); > + memcpy(rkprobs->mv.hp, probs->mv.hp, > + sizeof(rkprobs->mv.hp)); Can't you just do: 'rkprobs->mv = probs->mv'? > +} Regards, Hans