From patchwork Tue Jan 3 12:59:51 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: 39847 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8050094pzb; Tue, 3 Jan 2023 05:02:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXuG3guNnFlKy0WX24szM71lTOWMaXnf+KZnlT8BKWBYFeX5MnHnIUl6QcwFWappZrX4l5WY X-Received: by 2002:a17:907:9d0e:b0:7c0:c10e:1395 with SMTP id kt14-20020a1709079d0e00b007c0c10e1395mr37921146ejc.1.1672750924117; Tue, 03 Jan 2023 05:02:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672750924; cv=none; d=google.com; s=arc-20160816; b=cxQGYC+dfYlH5BzMhUVIQp3ox3JAeBcHPfBJNpNT7IuA6ntFTjQ8jU9lfXLsQBezZ4 qhLIrLPkR6LalQGRl62+Xudn3pmtyM1YJP4zFLOh5xMIDscriu4lJaG9FzJmtk13tsq1 8NOgNqudHrwjYnUm/Sdqr6IQslCsasIfvNwcuaxJ0NfeGrkXSMYZMVwat/4DOe4fsgTJ v659+R3DTWiq3pL5TWjVBHvE70AHLm7oOMWAkeBPcvUzSrFgNwYkRWnwcJYCFW8NZBkL L7AMjTN8eWzcAvx2DLQkDpsKpE0Bic6LCq1L8Cbdxd5mNCgddkfg39NXe/XI8rQB/BKv /ZYg== 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=RgzCobuQ/eEqn0uBrp5PSNHtjDVQpxXSRgp6LYqikz4=; b=s0saUMbBjsecJWtOnM9F7Ukjdtv/4+9zS+CEBoIjjaMwY8IM7Xats+99lJQmBXaO07 oI9aHgST2jL87aKfBciCap2f7mNWz1UeH7VGG09wBrfYM+FBPFy/1GSWrM79V1MZUEJZ tn4YZNyR0zQJViHe1p/GxkrFHK4HkhQ2Y1s9lcy1uj897orfel8+795eWBTyrJRAH+Tn p1rva514GkmYxwSn2uU79Npw4Gr7XGm/AFLdtzZ+6ZukrPta/7q32bCeIPt4aZnSU2K0 iC2O+8rXpfY5SavRY8QN+6eDRRoOh+5VoEinnc+e7hMDgBIr6BGH31AiyRwZ4nDZji4x IT1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=O8HGKZte; 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 cs17-20020a170906dc9100b007acbaeed9besi30053326ejc.398.2023.01.03.05.02.03; Tue, 03 Jan 2023 05:02:04 -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=O8HGKZte; 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 BEBC568BD84; Tue, 3 Jan 2023 15:00:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F24168BD5E for ; Tue, 3 Jan 2023 15:00:50 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672750850; x=1704286850; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OrqmVquT4gNYxXY0asCupeufez3Gq1bxCbNpQjqR0zg=; b=O8HGKZtexyG3ZrZnriAM5VE+zNBGUulTE2yiSUu6ZcvjbRNXa3Y9ytH7 F60p0nhHkRwKNxzYLiwf9VhOrFQ2vuzVD0WSpbuWMPtwjEIUU9ZDwGAJx IEUgDAkvsjlqx05Ze2mabUJVbBHxekSTsHbNHE5iU7zdpoWQOyas/n0xt XNklV8ZtTy5ZBB1dPXzDrM6G5J9Gb85lZ3iFVxRfZqzUFDIKV4pKRf7AX 5eGc71AqMzKlj/kFNZE7qo6kMflgsHJ5zeJvv1PF1UdAQASNIId+Kg0n9 Csn9MxOLF8ySWpjBDXkHF2dxUEcAjMniqmyBS5VVAtviwgQUW3IpJklWS g==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="302026301" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="302026301" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2023 05:00:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="718091884" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="718091884" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga008.fm.intel.com with ESMTP; 03 Jan 2023 05:00:43 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jan 2023 20:59:51 +0800 Message-Id: <20230103125952.2707824-10-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230103125952.2707824-1-fei.w.wang@intel.com> References: <20230103125952.2707824-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 10/11] 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: k/r/NcG0BBM1 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 c10617a81a..29c75e88f0 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; }