From patchwork Thu Feb 16 01:32:48 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: 40405 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp116017pzk; Wed, 15 Feb 2023 17:36:30 -0800 (PST) X-Google-Smtp-Source: AK7set88QwBfpNe0DOjpSZPBbZlvllVycDdfMzu86OMalPLvKW0GmaCUuhzVdH4VqFq/+0atGfM6 X-Received: by 2002:aa7:c2c9:0:b0:4ac:bf55:7d61 with SMTP id m9-20020aa7c2c9000000b004acbf557d61mr3736976edp.9.1676511390362; Wed, 15 Feb 2023 17:36:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676511390; cv=none; d=google.com; s=arc-20160816; b=JQulYiRcNkkDBmGnGUBooVcjqcQ/AkFzfir8YvjeGjAqbhD/dFu9Wm0tGF2Y4cApCN s73xzCQciRJvOsvLgcTVhlivF3I8b1FBiTw3yDzGuoh3uC/2nULhLegW6U83qtiq9AAL mTSF9d6OjYzbsBvaYGsASwEZvbiJtXH2j4pnsCq4OiX0H4YTB50LlogqB227+UXcFh+S o1rOPWb25LfIj8IQqLbb+56BoRws4RjDPoSHmPrzK5PoyLKy68P/3u6x886NwcuYWN5Z 1ErYiuJ9HMyWLT3lpEgK4/Yih/x0NL9NnPZFBd6Zs4PO/OZJq662PiXceMsztI6aSAkE x8xw== 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=qrHys0go/VOVaHhcenT2s8JBKGf1thS7PNItt+9Ahdk=; b=C5VxltZkO5SeFng8VIWMS4QLTKyYAPl56Q7CKMbQTLWGks/GY7B5++W62CVIsHiSvQ 1g/LWxuKY7ZKsCLGcBCxYPLt6hW1YDWlys4kw0/y51LDmHY2cx1243HUJsK4KOMVDoqP C7C9uNcKjOFszdwfO7KA3Tml6tpKentMLoHGaht+7QF1T7S2C5BClqOyb7VzgfOdwdkY NT2jc0GJ+HPorGlZbhNGiLybp6YhHQtvzY33tHO0EcjUHhnSNOWDlrUMeOvsqTuYxY/1 nEnsuSBZv+HzSzy51cMnf2UndIyBB0o+60W3arU5MsulW/sIG2gdkeJznyohXn9e2ywN DORw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=DSDjzsve; 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 m13-20020a50ef0d000000b004acede4d6cesi525707eds.175.2023.02.15.17.36.30; Wed, 15 Feb 2023 17:36:30 -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=DSDjzsve; 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 E229368BECA; Thu, 16 Feb 2023 03:35:36 +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 B710F68BEE7 for ; Thu, 16 Feb 2023 03:35:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676511333; x=1708047333; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=+Hp2FerR/3cmkCrSr+EIqBF0Q7jK+14hzILZnF+fmJk=; b=DSDjzsvecGOoslDHA0YzFvw9/PsvTIVnkg8nZb0Kh7JauIaCICK7GO7i jVoS8yHkD7l5G4obNZmo/ZQqjZY/sA3VSCS67FUOrCBj/1FNvaPZjS/o8 90SBH8n/uxlxEg1GC0bQKQpUszbI3FnpRHDziFr7keDjxQEkyQUM/BCIB w+Iy7BtavcE41RqEWFD+W6Ff0H4xvdw9Z5jb7nz81fPmdMAFs2+/222go Fy340gsWgB05a3DNzcBv2pc4JZMjjjqD97N+J8csmJXXjExwV59rJhdgg GkupVrQeBqBs4DOnFGZPVUKB8d8bScXKIvgy8OOAmxbYFil+zTj8mZ8Lc Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="311223812" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="311223812" 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:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="779168814" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="779168814" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga002.fm.intel.com with ESMTP; 15 Feb 2023 17:35:20 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Feb 2023 09:32:48 +0800 Message-Id: <20230216013248.23044-10-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 10/10] lavc/vaapi_hevc: Loose the restricts for SCC decoding 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: hqxb60PvrmGM From: Linjie Fu Allow current picture as the reference picture. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/vaapi_hevc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index a06785f7a6..0e5da15e53 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -104,7 +104,8 @@ static void fill_vaapi_reference_frames(const HEVCContext *h, VAPictureParameter const HEVCFrame *frame = NULL; while (!frame && j < FF_ARRAY_ELEMS(h->DPB)) { - if (&h->DPB[j] != current_picture && (h->DPB[j].flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF))) + if ((&h->DPB[j] != current_picture || h->ps.pps->pps_curr_pic_ref_enabled_flag) && + (h->DPB[j].flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF))) frame = &h->DPB[j]; j++; }