From patchwork Thu Feb 16 01:32:47 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: 40406 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp116103pzk; Wed, 15 Feb 2023 17:36:39 -0800 (PST) X-Google-Smtp-Source: AK7set+GXaDaj4TocGR61WgU83y+HL2vxm95UJO90cH5sYGmEh3g5dXMAhgykQMZvCvdLOVBey0V X-Received: by 2002:a17:906:4acb:b0:889:5ca0:146e with SMTP id u11-20020a1709064acb00b008895ca0146emr4465635ejt.16.1676511399261; Wed, 15 Feb 2023 17:36:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676511399; cv=none; d=google.com; s=arc-20160816; b=Y5mLukpH8vqusNKe40ido/WMlcl6Uxxi9oK6qHuZ8Y9euCqLc4umPk43oeTMzjXsSx 1ZrhPYhCGFrSNljtrMgm6bgGnUOmz/eIGYUSuTrnjuy2f7FDM05benJlp0F3Bt3y7AN1 0LSoKY2xxV/oyn/9QHyz9aZaTMT3EFdumOSLh3g0PDP18+PmRl8j1lZvUB2rtr/bkm7I 1Y5mYOFr+7M2Rf6hSqkwNuCu1i8NO+fMuNHTf85xDj2CH6oa3LrNo6ST+Qfi9svgsKAx 3n/KGZu8gn+VPB+0OdTRPlNBImLORs87WANsTQn32iRPlf6ZIy4qDe7/WnN6hn0HvlcX WtIA== 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=MQB6ljRNddRhsjFgkfP1QtfuXiE7WojDCuhzwc7iRE/zoppZpfDqHTidp3Gy+hVys+ APwDPUCwTCs8JtTneyxB1iclx+r15ptDNmSVr1CwGqKIsNCeCYOJbtmS+3gdXD65eE5N MDFkWvF0Cs+9Y5TFKmm8A1rljdVIZJYmb70eRP7fun9bL8HZ45+8zF+jh1xoYly/55cO biNwZo5J6Jt4ppj+ihzCIodsr2ll4Ffg446n4px5PA0G09Whusuz00h+n0TviRo9aAci 5zqhwVZlzPKTF1OBm3JjkOD8GCtctTc9TbPsjK8qRVo76nzhoZBNPR1CdVBG9zGiimxD YzFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=avlBXA0k; 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 b10-20020aa7c90a000000b004acc6c2a27csi512737edt.53.2023.02.15.17.36.38; Wed, 15 Feb 2023 17:36:39 -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=avlBXA0k; 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 B5C9268BEF4; Thu, 16 Feb 2023 03:35:37 +0200 (EET) 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 A986268BEB9 for ; Thu, 16 Feb 2023 03:35:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676511334; x=1708047334; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=dCehz39XW/LltSLxS3as6ORj4GttedgPDB3WbxMjABk=; b=avlBXA0k68T0BUxNsYz748C3im+kYQmKWZephxJcXCNPCSHY01oAOJVw +XtJsLtYD1Zy60VoKMZsUYLxRl9zDcS6+AkxEJ08y8s4dRy6Yb88UlHR8 XunvulI7evA2svIduOzgHKy/3tBVBFcIOeO3gYeXNBnEIuJ7+Yk0NJ7Kq zkoRESnubIoKsyRHCOYX+jhTxWQT1LqVJ1k4hodylyRPhO27SjHt+DHQ0 07+y25MRGoEES7Ka14cUMdrSnAiNlJ1wq1BZk9eENOTspOP6jxJL27QDn KU+UULDkK9FklV2vDnbvx9DM6Nm1wdw6JiAhenudCYnzqWLuwiuwSNOM8 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="311223810" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="311223810" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 17:35:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="779168812" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="779168812" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga002.fm.intel.com with ESMTP; 15 Feb 2023 17:35:19 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Feb 2023 09:32:47 +0800 Message-Id: <20230216013248.23044-9-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216013248.23044-1-fei.w.wang@intel.com> References: <20230216013248.23044-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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: 0bY2Vxgbe+4H 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; }