From patchwork Tue Jun 14 01:23:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 36214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp801259pzb; Mon, 13 Jun 2022 18:30:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkDCOhbHVaTr5uXFF/0g/Q/comp2K0gAy5LY2XGWJb163nASfkjScl/lt1dHe+4q0Rrywl X-Received: by 2002:a05:6402:3489:b0:431:3565:4cb0 with SMTP id v9-20020a056402348900b0043135654cb0mr2918261edc.135.1655170227387; Mon, 13 Jun 2022 18:30:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655170227; cv=none; d=google.com; s=arc-20160816; b=Ez1qg/Ku0fMw7SuB9S1lVYFsKllF54ukhu71Cn/iwruvQWcmcmEcs6xpYRJmN6pbSP 3cpzIJEGG8yfGUZHaKxQ+p00IonAtpKIvPo8Yb3kN8XtxXO5SDPaTRDid44fcCFvgrYf D0Se3XnZgPGDta1X16KqeuzuPPS0Sv6aqqCkabu/3NOwMNDxHhRroUxINJmRjv1cL8Jo ecTFeVCPjp6TXWAjzEqpL5KD12+eThFFRr4sUpU8k4IzPWwadpbevflpZF/5lxZIMjQU BuOUggLIBfXPxj9po69IL1w4cR1EdRT9rURnqQYAqgIBGrRWLhOsBnTC34fEc1y/M52+ SOyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=JOEEBRQWTzuXRZRbVkBKPDRY2/NzqjI4klFsWlM3M90=; b=xbvGJthexXKSxiEI7ALyjnzN8/Dzo/vzpzsBtOL9DQ8ahQaPNJU/CYqYBMSNcEL+4r fehzgjEFXXzpXU2r9r35QaxubooRdFInIQq9VJ+Odpnm00yQMqQHb1wa4lGTBOmvftxu xufS0U++GR9lUnjZCip1xfD+WTGNYfjZ/yJFY/7XUT+vOjg2bepr6lIW+pMdO90KUpk+ ywPiTiCZOrxzic7fvsCMLWWkjoGgecWjcG82htOFHt2YPIdp2diYiPYUpFLkvqXze81i KOCglTeuhob+Lj31HrVls2/h927hHt4amHBx4mmaMBgPUvryLiJYdD3NTx3y31rvxhaT eXjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LU24prE5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq30-20020a1709073f1e00b00718bf486a1csi5563689ejc.782.2022.06.13.18.30.27; Mon, 13 Jun 2022 18:30:27 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LU24prE5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E10068B63B; Tue, 14 Jun 2022 04:30:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BB1C68B635 for ; Tue, 14 Jun 2022 04:30:03 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655170209; x=1686706209; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xrDuAkUQinydNcA32sTqNMa87dRrKEtcFfDYYv8LHkg=; b=LU24prE5Uu3rG6dynREYnXVZva/1kFgrMZTnvtEMYWxR2TVdbTMij/GQ IYZMp/Uk7OLlfx6qiWU77vr6X8sW0+/txhBdj9Jy9dT1xZrEGWPEv5GF5 GbBSVrRe4GA7r7aDFA+F87Qzk7QGBtT2N6AyuxJP06SOy5gpnEYP7yh/K CfqaqnYG/qlhOhBIOUxEfprEsTYT9mzW+n6e5FFgT4TSiH9i5WY1ZGjlQ u1IhiExnCs5rm9fLx8VmGLScvzurz+3UYRBmLrfMDzp5KtNaFTspSRruz yx18rqeK7QCgFyJeWX7KkFNGVyX1Zid1rtkg0VKjmW6sI9SdL/GSsGp1Y g==; X-IronPort-AV: E=McAfee;i="6400,9594,10377"; a="342432972" X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="342432972" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2022 18:29:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="686378080" Received: from t.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 13 Jun 2022 18:29:52 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jun 2022 09:23:01 +0800 Message-Id: <20220614012302.2808428-3-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220614012302.2808428-1-fei.w.wang@intel.com> References: <20220614012302.2808428-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/4] lavc/hevc_refs: exclude current frame from long term refs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Xu Guangxin , Fei Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: szainKFOfhoU From: Xu Guangxin suppose a. You have 3 frames, 0, 1, 4096. b. The ltMask is 0xfff and use_msb is 0. c. The 0, 1 are lt refs for 4096. d. you are decoding frame 4096, and get the 0 frame. Since 4096 & ltMask is 0 too, even you want get 0, find_ref_idx may give you 4096. add_candidate_ref will report an error for this Tested-by: Fei Wang Signed-off-by: Xu Guangxin --- libavcodec/hevc_refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 89053fd1a2..b3d5f96043 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -386,7 +386,7 @@ static HEVCFrame *find_ref_idx(HEVCContext *s, int poc, uint8_t use_msb) for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { HEVCFrame *ref = &s->DPB[i]; if (ref->frame->buf[0] && ref->sequence == s->seq_decode) { - if ((ref->poc & mask) == poc) + if ((ref->poc & mask) == poc && (use_msb || ref->poc != s->poc)) return ref; } }