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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 0DFF6C10F14 for ; Wed, 2 Oct 2019 21:55:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D32EB20842 for ; Wed, 2 Oct 2019 21:55:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tCRO10qR"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="AoNS7mJE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D32EB20842 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: In-Reply-To:MIME-Version:References:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hLSuVsnmHBrus+hCP2+YqvAHq/8hojcGVPlPwPLVnOk=; b=tCRO10qR60krHj1c3kuhdgTqJ 8pvR2jujBU/o3T0LJA3RBMYaufvSiucHjJ4XSqd9pb9VNziDnA2vWffzz4qGPNAhqcYV2lgAAXJav acHJLLMTLJjc5Autnybe6F9KkK3tLR4PAnlqtGaAe3UkblfTggUp53TnJREDrmlBqLhaCVd9nJqkB taXj+WLaOsfEekIYhHrWGTU531pV2ovRdruHZVTXQhuHLQ1p+PIwOiymxMNWeP/uHi6G86+2vgRLJ /Zm6JKxtw4/6ynyrLFXR4tmmlD8AGk+Z3GXc5hY3mA7i/dHLUx0JRwbAf96A3dcMJl9q2HUZr3jaw 1upUOZOeA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iFmap-0004Kt-88; Wed, 02 Oct 2019 21:55:31 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iFman-0004Kk-GG for linux-arm-kernel@bombadil.infradead.org; Wed, 02 Oct 2019 21:55:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=f3ydCW2xRmXnAQt81w4mrJAcCkS98e/boPtq/3j/L0I=; b=AoNS7mJEfaL1zU/1zye5CGyiJ gB+Vke0VD+qiNHmlfcXvH70vzYHkyFvLwZw+9U5fHBvZYimLna4j34Fi3+ZWLkOGXLRZmaIguy8Bn wOCdl6/loOV4O7IPIX4Xq4VCv+Uw1zeiHIUEh3wvMqD8LLg90KydPuc18sMbr1DseMgY+C7BDVbv/ sw18qHURu10/8veEbHhbmvNq5p46NBpn13pjebd+BzzKcEYkNg0fzF0HKOG3/LriiAQG/GhoAh6+A fw0Z6qBOi1oVzl0pHWW8w/Op81EfA3SUVY3amfOU4oVEP3N6xD1PeYMuryMHu514ugkgvGAhZcLKz qbZm64qDQ==; Received: from relay11.mail.gandi.net ([217.70.178.231]) by merlin.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iFmak-00069X-3j for linux-arm-kernel@lists.infradead.org; Wed, 02 Oct 2019 21:55:27 +0000 Received: from aptenodytes (unknown [132.205.230.6]) (Authenticated sender: paul.kocialkowski@bootlin.com) by relay11.mail.gandi.net (Postfix) with ESMTPSA id AA261100003; Wed, 2 Oct 2019 21:54:44 +0000 (UTC) Date: Wed, 2 Oct 2019 17:54:42 -0400 From: Paul Kocialkowski To: Jernej Skrabec Subject: Re: [PATCH v2 1/3] media: cedrus: Fix decoding for some H264 videos Message-ID: <20191002215442.GA24151@aptenodytes> References: <20191002193553.1633467-1-jernej.skrabec@siol.net> <20191002193553.1633467-2-jernej.skrabec@siol.net> MIME-Version: 1.0 In-Reply-To: <20191002193553.1633467-2-jernej.skrabec@siol.net> User-Agent: Mutt/1.12.2 (2019-09-21) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, mripard@kernel.org, wens@csie.org, hverkuil-cisco@xs4all.nl, mchehab@kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: multipart/mixed; boundary="===============4852577397053941476==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============4852577397053941476== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="3V7upXqbjpZ4EhLz" Content-Disposition: inline --3V7upXqbjpZ4EhLz Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Wed 02 Oct 19, 21:35, Jernej Skrabec wrote: > It seems that for some H264 videos at least one bitstream parsing > trigger must be called in order to be decoded correctly. There is no > explanation why this helps, but it was observed that two sample videos > with this fix are now decoded correctly and there is no regression with > others. I understand there might be some magic going on under the hood here, but I = would be interested in trying to understand what's really going on. For instance, comparing register dumps of the whole H264 block before/after calling the hardware parser could help, and comparing that to using the pre= vious code (without hardware parsing). I could try and have a look if you have an available sample for testing the erroneous case! Another minor thing: do you have some idea of whether the udelay call adds significant delay in the process? Cheers and thanks for the patch! Paul > Signed-off-by: Jernej Skrabec > --- > .../staging/media/sunxi/cedrus/cedrus_h264.c | 30 +++++++++++++++++-- > .../staging/media/sunxi/cedrus/cedrus_regs.h | 3 ++ > 2 files changed, 30 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c b/drivers/s= taging/media/sunxi/cedrus/cedrus_h264.c > index d6a782703c9b..bd848146eada 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c > @@ -6,6 +6,7 @@ > * Copyright (c) 2018 Bootlin > */ > =20 > +#include > #include > =20 > #include > @@ -289,6 +290,28 @@ static void cedrus_write_pred_weight_table(struct ce= drus_ctx *ctx, > } > } > =20 > +/* > + * It turns out that using VE_H264_VLD_OFFSET to skip bits is not reliab= le. In > + * rare cases frame is not decoded correctly. However, setting offset to= 0 and > + * skipping appropriate amount of bits with flush bits trigger always wo= rks. > + */ > +static void cedrus_skip_bits(struct cedrus_dev *dev, int num) > +{ > + int count =3D 0; > + > + while (count < num) { > + int tmp =3D min(num - count, 32); > > + > + cedrus_write(dev, VE_H264_TRIGGER_TYPE, > + VE_H264_TRIGGER_TYPE_FLUSH_BITS | > + VE_H264_TRIGGER_TYPE_N_BITS(tmp)); > + while (cedrus_read(dev, VE_H264_STATUS) & VE_H264_STATUS_VLD_BUSY) > + udelay(1); > + > + count +=3D tmp; > + } > +} > + > static void cedrus_set_params(struct cedrus_ctx *ctx, > struct cedrus_run *run) > { > @@ -299,12 +322,11 @@ static void cedrus_set_params(struct cedrus_ctx *ct= x, > struct vb2_buffer *src_buf =3D &run->src->vb2_buf; > struct cedrus_dev *dev =3D ctx->dev; > dma_addr_t src_buf_addr; > - u32 offset =3D slice->header_bit_size; > - u32 len =3D (slice->size * 8) - offset; > + u32 len =3D slice->size * 8; > u32 reg; > =20 > cedrus_write(dev, VE_H264_VLD_LEN, len); > - cedrus_write(dev, VE_H264_VLD_OFFSET, offset); > + cedrus_write(dev, VE_H264_VLD_OFFSET, 0); > =20 > src_buf_addr =3D vb2_dma_contig_plane_dma_addr(src_buf, 0); > cedrus_write(dev, VE_H264_VLD_END, > @@ -323,6 +345,8 @@ static void cedrus_set_params(struct cedrus_ctx *ctx, > cedrus_write(dev, VE_H264_TRIGGER_TYPE, > VE_H264_TRIGGER_TYPE_INIT_SWDEC); > =20 > + cedrus_skip_bits(dev, slice->header_bit_size); > + > if (((pps->flags & V4L2_H264_PPS_FLAG_WEIGHTED_PRED) && > (slice->slice_type =3D=3D V4L2_H264_SLICE_TYPE_P || > slice->slice_type =3D=3D V4L2_H264_SLICE_TYPE_SP)) || > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_regs.h b/drivers/s= taging/media/sunxi/cedrus/cedrus_regs.h > index 3329f9aaf975..b52926a54025 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus_regs.h > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_regs.h > @@ -538,13 +538,16 @@ > VE_H264_CTRL_SLICE_DECODE_INT) > =20 > #define VE_H264_TRIGGER_TYPE 0x224 > +#define VE_H264_TRIGGER_TYPE_N_BITS(x) (((x) & 0x3f) << 8) > #define VE_H264_TRIGGER_TYPE_AVC_SLICE_DECODE (8 << 0) > #define VE_H264_TRIGGER_TYPE_INIT_SWDEC (7 << 0) > +#define VE_H264_TRIGGER_TYPE_FLUSH_BITS (3 << 0) > =20 > #define VE_H264_STATUS 0x228 > #define VE_H264_STATUS_VLD_DATA_REQ_INT VE_H264_CTRL_VLD_DATA_REQ_INT > #define VE_H264_STATUS_DECODE_ERR_INT VE_H264_CTRL_DECODE_ERR_INT > #define VE_H264_STATUS_SLICE_DECODE_INT VE_H264_CTRL_SLICE_DECODE_INT > +#define VE_H264_STATUS_VLD_BUSY BIT(8) > =20 > #define VE_H264_STATUS_INT_MASK VE_H264_CTRL_INT_MASK > =20 > --=20 > 2.23.0 >=20 --3V7upXqbjpZ4EhLz Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJZpWjZeIetVBefti3cLmz3+fv9EFAl2VHKIACgkQ3cLmz3+f v9Fh/Af9GyVy5KNZkifK5kCwy7+K0g6QPZG35LlJmVdVto99qVx6UcgP9NZS/uBX EebSolJysTj4DgpkXz/vsQy1gdMzMylUQAY0mqb6WCXlyyHkI54vOiXP1TcACSO2 9z2eK1RuJfOxxTxWqoo7CP46Fl5tAKnEGox60Xt8B+ouPDsE4aFTNYhxz9szJj0O E3W5oCWdsoKVnp7zlTwrNTk0rQKJcKxSWVOtE+AvZUYRNqDysIYs1UNje70XLGjM fQKjAP29I8XShgJqRtZVHHGyWS2EooK3r7UJw9dhbGQZ+jJGJuGdd3Bj858sRBC2 5Pxis3T4ttOXAvBWtDX2jBZgqZG78g== =R09t -----END PGP SIGNATURE----- --3V7upXqbjpZ4EhLz-- --===============4852577397053941476== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============4852577397053941476==--