From patchwork Mon Feb 6 05:44:57 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: 40295 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3090151pzk; Sun, 5 Feb 2023 21:47:07 -0800 (PST) X-Google-Smtp-Source: AK7set98vHmyt9aB3AQiks0IJ+iiTaMEcqbobn4/Z3DDGHnxwqrs5PGJ0r8Qyjn2zUhszgMYlNtR X-Received: by 2002:a17:907:1607:b0:87b:6aa1:c87f with SMTP id hb7-20020a170907160700b0087b6aa1c87fmr23999316ejc.26.1675662427378; Sun, 05 Feb 2023 21:47:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675662427; cv=none; d=google.com; s=arc-20160816; b=wf+qW0649kqSF3T9cq6wpGxtZKpiqOm5ZTqNzB9NG3XYZRd5RBRxQrt6uAsJOQ0ts2 wSEFVOkXA0od65xhBzLIumQSrokpwdjj7910gzDJD7lBwdTBcojnFmCA3J+kNlFE/YqY Zz+4rvF8UN1hRit0z9IK0w9ErgzvnYWuNvYSh5xIRSev0omcMWR4f7baBWkfmiNKzSZj 2Tkv5kPr5Q2fm7/dNTON+vdNSsDRjBKER0OIVIrsKp0196oe0QmgsLp7CbF7tpRKsUTK yMvXvUGTwHzR53YUDDqtnltiaN5MjVYKP4p4aOcPboPF24rh68+bgKKLhGfuks8BviAC wovw== 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=BuoR7evO8q0DrfP3WqBVVVZtitlzfsYd1XeHrJ3nd3hmQGjRu4ZQOj3rOjU8lSyS4H lC9hvMFg/bTcV48cGft4q41lAJNuDXt4p5VZBUGgLKt8lbsk0T3T243mshjWaRpTy+fk iE91uSgsArz2ViZ0UsswzDuEwK9lQBNhAlTx1uMxZYWr5AV8JsVqmcTnHsKwTFemUSkT vkUZ6dRDlz3kqyi5Rl6mZqAqFck5AzGf3/VtWse92x4/hFfi7J1qywOXBIoKrOlfCwu1 x4RjWk6AP3XyiMYJ21Cz9TQWGu9iCsaJzclyktDLW/Jf96WEvM6Halw7QevY8xEmjT6G GG7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=c1lv5VM5; 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 c9-20020a1709063f0900b0088da09e62d6si14195287ejj.538.2023.02.05.21.47.06; Sun, 05 Feb 2023 21:47:07 -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=c1lv5VM5; 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 20A2B68BEBF; Mon, 6 Feb 2023 07:46:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40CC568BE6F for ; Mon, 6 Feb 2023 07:46:20 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675662380; x=1707198380; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=dCehz39XW/LltSLxS3as6ORj4GttedgPDB3WbxMjABk=; b=c1lv5VM57kHYEvD26xbucoQtjL1PpasmjIa/xMYjm1admvbct3/wzzp5 dsbQ4GFTpSPLrbHziBMVMA2QngrNOvk2p/Y05t+HXNbFaVUJQS5JipOR6 FE8ZbXf+JmOe0Bibs29+MNLCYV+KGDpR+HLbr8N+sZRjInNoAYl606xrV 3X8obBDjs9uBqo9OqR8+ILRSTBg1kbwk9XloXIAm+uzA7Wy7khX/bRbfS Sii++Qibtjtir5sF4iqcTxERp30U9lX0blClZqw6j3aZ3JTHrqFAXo/f9 x3AeLPFGFHf8p1bqtNHbjegmFThuQhrH4Km8+UKacciwc55JAqqtBQ9X7 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="317144213" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="317144213" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2023 21:46:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="698737428" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="698737428" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga001.jf.intel.com with ESMTP; 05 Feb 2023 21:46:08 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Feb 2023 13:44:57 +0800 Message-Id: <20230206054458.907060-9-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230206054458.907060-1-fei.w.wang@intel.com> References: <20230206054458.907060-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: u0uObiS5Kcm0 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; }