From patchwork Thu Dec 1 08:14:05 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: 39557 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp196513pzb; Thu, 1 Dec 2022 00:16:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf5DxXTdaZPmjU3AADj12kPCNlCKN7SiLqEc9OQQW9TnRXoa7gSPV+fxcutWqML3VE6rGdwF X-Received: by 2002:a17:907:d48a:b0:7c0:9f24:af95 with SMTP id vj10-20020a170907d48a00b007c09f24af95mr5562695ejc.526.1669882573607; Thu, 01 Dec 2022 00:16:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669882573; cv=none; d=google.com; s=arc-20160816; b=Y9w9eO8x66GTDHhoCpEMc03ODQn4zx3TESxRjiDyteDA5ei6hv9GueUhPHyKDX+doZ 94EEP7hbGtCHhzsAkXaeFX7N0w+AwjnDXjIjGqrGmrm/Psxk+XINADoFWIiMpTa14SsM eGN8/bzJwGOKWFihputMa4fpuVuhTlhhoVONWQDr0hQgbHq7NJh9CubCT8vMOnjH42YE oFU6NVKDhCqY/8YBiCSdjBknEK0X4H5UFX/+fKegA1GL/lJTsJcsJhZnmf2IRxyJg7l9 nshTFxr043Pp2ii+FcvVvVFxHyF9WJD9TXIORlmjqLr3I+SoT/XhIph19cOyTF+3CxPr jhxA== 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=wBEZiqEzkEiVNTfbGcahTxTMXysj/gslBYcYzXRHFl0=; b=qCz9qdUmQTh7qjicOy5zWDo9H4wdI8RT3FHGM7L5L2ROR8ZY3vc12xvT+mTZdFlLC6 8KKGClot+HBtwgxXCbUWIhYyjGOla8POoGupgvUPqjcj/cO/S4PX2Yn2ZvDDoI9nxxId K5WozMBM/AURiqug5Mn/RKr/JR5VAIbAgsmAA5uMFVuAHhePT5ZCsmx+6E/0beJPMhw4 bRps0SgLCYcJODyC04y95h5w9OIra8PVaX1ZoQrXowmGH+CbHYsk5smeZNdDe3lH7jH2 GTXg9xU+FzKda8E9KDauHWldvE9ftY2LbyQFjJawoXAjWh76A6eS3VvbZPrDmZhbXqVS pFKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Vtys3+iv; 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 k14-20020a170906a38e00b007c0a7286cbesi1792618ejz.708.2022.12.01.00.16.04; Thu, 01 Dec 2022 00:16:13 -0800 (PST) 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=Vtys3+iv; 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 DF74968BA6D; Thu, 1 Dec 2022 10:15:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55A8168B834 for ; Thu, 1 Dec 2022 10:15:00 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669882500; x=1701418500; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=p5/cStIiif4By1hMBXhVKX5ovXQz/wqMfXl432s10Tk=; b=Vtys3+ivFp5vv+cXBxu6F/k6EMtKfvr52BgPAlTKWdBxfliyIuMQrxyv MxMyShjeaBRvZdFcZ3VW2TEC+961BNqU1tCAZZ0/YsmlQnIcQygSvwIS5 cvIRxfckvxLJxyNIukckjpa4Hqvag8lEFvmNCeYnPBuOustMJl1e94TdR Iz9jdEpOSbIRDzHBsgFG6tuChJqTWPoySHNiBC+dqVM9bnLpJCElS7vin cMEb/HbK4TOxD0DsEUC4JNhWMIuVmeXcwxxxjgwqqLlTSSLIOoBdb17wZ ok5Iy0DB/Qb5tDNRPjAmyzLm/0bpHC6G4/8kY7rrzBEk6oqRcJGa5pt1X Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="298989864" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="298989864" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2022 00:14:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="675341793" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="675341793" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga008.jf.intel.com with ESMTP; 01 Dec 2022 00:14:54 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Dec 2022 16:14:05 +0800 Message-Id: <20221201081408.2194579-10-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221201081408.2194579-1-fei.w.wang@intel.com> References: <20221201081408.2194579-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 10/13] lavc/vaapi_hevc: Set correct rps type for scc 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: Linjie Fu , Fei Wang , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Csoqr4h1SKgc From: Linjie Fu According to 8.1.3 and 8.3.2. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/vaapi_hevc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index 6ce1e17fa8..005d782819 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -71,6 +71,7 @@ static void fill_vaapi_pic(VAPictureHEVC *va_pic, const HEVCFrame *pic, int rps_ static int find_frame_rps_type(const HEVCContext *h, const HEVCFrame *pic) { VASurfaceID pic_surf = ff_vaapi_get_surface_id(pic->frame); + const HEVCFrame *current_picture = h->ref; int i; for (i = 0; i < h->rps[ST_CURR_BEF].nb_refs; i++) { @@ -88,6 +89,9 @@ static int find_frame_rps_type(const HEVCContext *h, const HEVCFrame *pic) return VA_PICTURE_HEVC_RPS_LT_CURR; } + if (h->ps.pps->pps_curr_pic_ref_enabled_flag && current_picture->poc == pic->poc) + return VA_PICTURE_HEVC_LONG_TERM_REFERENCE; + return 0; }