From patchwork Fri Jul 15 05:06:43 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: 36795 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:43a1:b0:8b:53c6:bec9 with SMTP id i33csp63725pzl; Thu, 14 Jul 2022 22:08:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t+gWA0gJ3dwz9qwi/wpTCoPChfmi95cL52CIH1E5ZCoojSiGvPY2Ag7D/IYfpYgvyu+E32 X-Received: by 2002:a17:906:5a5b:b0:72b:39cf:6042 with SMTP id my27-20020a1709065a5b00b0072b39cf6042mr11726968ejc.301.1657861712642; Thu, 14 Jul 2022 22:08:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657861712; cv=none; d=google.com; s=arc-20160816; b=ovXgoOqliZgutxrvDormLh3ntipMVP9TszA8LXxHjmvLTXmftvJR+Ym0qXjelyAC5F wQP/sPyKR+RSPfMxU6HM4F3Po16TINtHGSmDRyf2RNhTVTwKaeL/bQd2tj8wofPnkudR piu1l5OIDu/X7h/dPy2pw6UKkt30K9TQ+ORSJ13lj7J6N4w9rFY+yqkld3MO+srCNU8U xWY/gQ8l7PgGdOHzF/OhMz91XWS6vnyNQsvNl4UtgBSxcmztjcMr11kCdSwK6E6T6ttu oczIvGI6UW+XlTvY5nGmPnYDBiU/Duit1BWItBv4VV47+fsXz4TouCP9Q5Ol0Fp1OGtU dmhQ== 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=upBLCYdh5iJcUGORz7OM8EETONzpykhoZoDldP+p/Tg=; b=S2FB8+cRMT3c6S3Mhqvch8dnwV2PZhnxlzDAWeu4HI7zSPI34g7a+UbWZS6Mxyh6ae kIi70z7HDJ1JU9Ge8UwHV6rCZaIgUQVpBlEJFZH+LMDP0bEiA68CtrDMxmkIVmvYfs7+ 3B7Hp572UJHB7wWHHsJfqqG1eAfaAzAgaNhqyZIribKac9QidZyQ7HGH4yDIzYoQK5Qm 8qEz0T6EzsHwfXoMtlc/cL6PpdmcmbxJTR6Dgk4p9vNwI1LCsjKaZgp9SLK1IfPQs0va yhDNMTckOMY7xrDxApjOv3mBEc3Fv64VBYpXfxUwoJckCATkErkLB57gtssm1jhN4t27 fe7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=JapqHXts; 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 f26-20020a50d55a000000b0043743ad1af8si3437366edj.356.2022.07.14.22.08.32; Thu, 14 Jul 2022 22:08:32 -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=JapqHXts; 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 52E8868B800; Fri, 15 Jul 2022 08:08:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9333F68B78C for ; Fri, 15 Jul 2022 08:08: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=1657861688; x=1689397688; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dqZjY8+21UDy3woIV/K1+z2xGrTmYkS1yygskZyJoAo=; b=JapqHXtsBsTzKKH4lkZZMP6OfvW2VBrFy7UzpjDtXK7dQP1AEQJwIQ6j Udg2Fd8d5+vUVu8K5rXP10fSAB8j4pGxByB5QdzC1fairZCSGJfk1C+Ho 0CDZtM0GbgwYDElr7QzwmVgUN0xWU+1DqIyzFVisG+4PSfllJtLkRrRRb tz+Kq/rT6IqKnupR2aVYHZ8a3XbR6YucfJ2/Vq0hxZAqpDhtMO0Ii1xBA mUEBPBom0nvk/Q6ksS4p0Wqtqq8PFelLfmL9MhwuI4N19WNfL33hIUFZH NdIo7tNea65yEQS9hKevc+5SOtpeo+AkJwrlqhwu40nuHrdA1/nuLa1Bw w==; X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="265490997" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="265490997" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 22:07:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="654183813" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga008.fm.intel.com with ESMTP; 14 Jul 2022 22:07:55 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Jul 2022 13:06:43 +0800 Message-Id: <20220715050644.879488-3-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220715050644.879488-1-fei.w.wang@intel.com> References: <20220715050644.879488-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: Cwoj7Xpb9fkv 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 5282716a61..811e8feff8 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -387,7 +387,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; } }