From patchwork Thu Feb 16 05:46:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 40414 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp244638pzk; Wed, 15 Feb 2023 21:50:18 -0800 (PST) X-Google-Smtp-Source: AK7set8FnsMIuMMB/bcWJylRUV4XUlw29X2b+qHZBqzKMBUgIzgq52rlYYLURp03iOat3xGml/HS X-Received: by 2002:aa7:c592:0:b0:4ac:d34b:c2aa with SMTP id g18-20020aa7c592000000b004acd34bc2aamr4257015edq.10.1676526618013; Wed, 15 Feb 2023 21:50:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676526617; cv=none; d=google.com; s=arc-20160816; b=NkzK/LpY/T/34J2M85DM3gpJQO5klsm8ghiS6DEzzPxMHz53jS3+KfjWktiQ717vkA WCF//yIl2sdOAO4i4WVAahJMGjA6iLJBNe0zQEo30U9zIlL5QzV7zrgSNDrRh52nhuGW mH4vWxyTXt3AvVgpE6RF+CW410g0rW1MMfZkDc4QVq6K7ebQta4kd+NBhSdj+4LQFhsG mYjAUlmxIWwHVqQAY9L6nkQSyLoGG/qreRdLTSqw8R9Qj7atWqf53Fe4G3pGv2RNsdFl flPFzxIM/RrFgS2wlckEw8HeE640zxWYu/A7pEhuTykoyGxdj/0LOmmoR5LKlvhez5g2 3fnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=yL4HEKNOoOVwqXmnPbWG8bsK3pSLhN16Zf5LSKaYiCc=; b=smXUBShYmUMjv0DkShPkVLz81fXmUe5wq9CI21WE0wBobMlxetsnLpSFkFlbbuyneM Idl8DMhqV1P+VYFJ3nkcyrVp0Lk3E3Cvp9nktaM4F7q1YXT+yuN6unfQZd7Nze7c7Y3J NiwefYSeoAvbl2VpGil/YbXLk1tbT1Ql8WwfFMrMiVg86iiyuacK3cfiKEJqNp26/jZO 3KINjCABoYddBaO4cdUmvTVh2rRO3VXsqsmpPpRIG5mAh3ygNAAtHl05WQVbgkIbZWl8 /u9RYS6L1SJS+a3TxtPu8d46d1GkYb7g1yYNcke2QovHK+1+YQwvaJLueTfuhUKKdI2E c86g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=ndahSnGg; 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 w12-20020a056402070c00b004acc68a5878si1239380edx.274.2023.02.15.21.50.17; Wed, 15 Feb 2023 21:50:17 -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=ndahSnGg; 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 1FC8168BF1D; Thu, 16 Feb 2023 07:49:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 084EC68BF1E for ; Thu, 16 Feb 2023 07:49:22 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676526563; x=1708062563; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=dCehz39XW/LltSLxS3as6ORj4GttedgPDB3WbxMjABk=; b=ndahSnGg4JkWGNeLJrlzWFUysy709YXmCtFoh3f8AVwQyhotT7nGaEys f7i/xqoKDdM9SMdDZTJ/xB9H+qTQ9nR+9BtEnc+jhuMfG5AHG6PssP0pq JQC9RbBMzYX5jwgdAyBNz57PonhBhPsL2ok2iuFhWALfcwG5MYGP9wDnD 6lwuV5uGswzivcRLobQL6+YOzbaH78/qH6X6fOBM0WwFKHTkGcu6p1Die /QHN9lUuZ3Ld3aeyYZFnbWkrJ43pc+9cloD290R3J5htBY3/lQ07tj2MY QVWWzhrDWkFZbCF90H+7+6WdqNbN2sexFeTtu2yU6w6SpGqYJWerOp7ja g==; X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="331633195" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="331633195" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 21:49:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="915547523" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="915547523" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga006.fm.intel.com with ESMTP; 15 Feb 2023 21:49:08 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Feb 2023 13:46:36 +0800 Message-Id: <20230216054637.159397-9-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216054637.159397-1-fei.w.wang@intel.com> References: <20230216054637.159397-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 09/10] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wsZwEcAGajVD 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 1cf43bd4dc..a06785f7a6 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; }