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.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 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 B8692C433EF for ; Mon, 9 Sep 2019 07:31:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E4B921A4A for ; Mon, 9 Sep 2019 07:31:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732353AbfIIHbf (ORCPT ); Mon, 9 Sep 2019 03:31:35 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:54514 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732347AbfIIHbf (ORCPT ); Mon, 9 Sep 2019 03:31:35 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 7A1B528C273; Mon, 9 Sep 2019 08:31:33 +0100 (BST) Date: Mon, 9 Sep 2019 09:31:30 +0200 From: Boris Brezillon To: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Sakari Ailus , linux-media@vger.kernel.org Cc: Philipp Zabel , Ezequiel Garcia , Nicolas Dufresne , Tomasz Figa , Jonas Karlman , Francois Buergisser Subject: Re: [PATCH 3/3] media: hantro: h264: Fix the frame_num wraparound case Message-ID: <20190909093130.64bcfa02@collabora.com> In-Reply-To: <20190909072815.23981-3-boris.brezillon@collabora.com> References: <20190909072815.23981-1-boris.brezillon@collabora.com> <20190909072815.23981-3-boris.brezillon@collabora.com> Organization: Collabora X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Mon, 9 Sep 2019 09:28:15 +0200 Boris Brezillon wrote: > Step '8.2.4.1 Decoding process for picture numbers' was missing in the > reflist creation logic, leading to invalid P reflists when a > ->frame_num wraparound happens. > > Fixes: a9471e25629b ("media: hantro: Add core bits to support H264 decoding") > Reported-by: Francois Buergisser > Signed-off-by: Boris Brezillon > --- For those who would like to test this patch, here is a video [1] showing artifacts without this change. [1]http://crosvideo.commondatastorage.googleapis.com/1080.mp4 > drivers/staging/media/hantro/hantro_h264.c | 23 +++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/media/hantro/hantro_h264.c b/drivers/staging/media/hantro/hantro_h264.c > index 881d73977ff6..e3f757a7de34 100644 > --- a/drivers/staging/media/hantro/hantro_h264.c > +++ b/drivers/staging/media/hantro/hantro_h264.c > @@ -271,6 +271,7 @@ struct hantro_h264_reflist_builder { > const struct v4l2_h264_dpb_entry *dpb; > s32 pocs[HANTRO_H264_DPB_SIZE]; > u8 unordered_reflist[HANTRO_H264_DPB_SIZE]; > + int frame_nums[HANTRO_H264_DPB_SIZE]; > s32 curpoc; > u8 num_valid; > }; > @@ -294,13 +295,20 @@ static void > init_reflist_builder(struct hantro_ctx *ctx, > struct hantro_h264_reflist_builder *b) > { > + const struct v4l2_ctrl_h264_slice_params *slice_params; > const struct v4l2_ctrl_h264_decode_params *dec_param; > + const struct v4l2_ctrl_h264_sps *sps; > struct vb2_v4l2_buffer *buf = hantro_get_dst_buf(ctx); > const struct v4l2_h264_dpb_entry *dpb = ctx->h264_dec.dpb; > struct vb2_queue *cap_q = &ctx->fh.m2m_ctx->cap_q_ctx.q; > + int cur_frame_num, max_frame_num; > unsigned int i; > > dec_param = ctx->h264_dec.ctrls.decode; > + slice_params = &ctx->h264_dec.ctrls.slices[0]; > + sps = ctx->h264_dec.ctrls.sps; > + max_frame_num = 1 << (sps->log2_max_frame_num_minus4 + 4); > + cur_frame_num = slice_params->frame_num; > > memset(b, 0, sizeof(*b)); > b->dpb = dpb; > @@ -318,6 +326,18 @@ init_reflist_builder(struct hantro_ctx *ctx, > continue; > > buf = to_vb2_v4l2_buffer(vb2_get_buffer(cap_q, buf_idx)); > + > + /* > + * Handle frame_num wraparound as described in section > + * '8.2.4.1 Decoding process for picture numbers' of the spec. > + * TODO: This logic will have to be adjusted when we start > + * supporting interlaced content. > + */ > + if (dpb[i].frame_num > cur_frame_num) > + b->frame_nums[i] = (int)dpb[i].frame_num - max_frame_num; > + else > + b->frame_nums[i] = dpb[i].frame_num; > + > b->pocs[i] = get_poc(buf->field, dpb[i].top_field_order_cnt, > dpb[i].bottom_field_order_cnt); > b->unordered_reflist[b->num_valid] = i; > @@ -353,7 +373,8 @@ static int p_ref_list_cmp(const void *ptra, const void *ptrb, const void *data) > * ascending order. > */ > if (!(a->flags & V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM)) > - return HANTRO_CMP(b->frame_num, a->frame_num); > + return HANTRO_CMP(builder->frame_nums[idxb], > + builder->frame_nums[idxa]); > > return HANTRO_CMP(a->pic_num, b->pic_num); > }