From patchwork Mon Feb 6 05:44:58 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: 40297 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3090304pzk; Sun, 5 Feb 2023 21:47:25 -0800 (PST) X-Google-Smtp-Source: AK7set/6RsDIihShhJ8Y2I3UNcUcIMNc439cfxllwePPRU8rjb74W/FS7ODuMKDG2av2dxauogN8 X-Received: by 2002:aa7:cd4e:0:b0:4a2:331e:85f2 with SMTP id v14-20020aa7cd4e000000b004a2331e85f2mr17809528edw.26.1675662445534; Sun, 05 Feb 2023 21:47:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675662445; cv=none; d=google.com; s=arc-20160816; b=F0K2fU5ViFfwFHSGFyfj+xucDznRIa4QSTmCFwAwCCX4qZgBfDWbQsSeLBYq+gw9S7 CyWQT3+OjV4DbhyxCT84Gyk45m1EaOg91+uer02QvIzUdACHEZmUKpP1RMXeJRxtHH9r HqrX6MOCthfJoHdCm5awjHa1VSk2JUiiLLcfMEn7tO9SFmN2+ruE6+EzeA7t2KlqDwR4 KwFRbW8FvoQoxTE5WGCXv4lgu1/Yys+QCNOF4zUWViKX1J6GfYVRDr7iJvJbMCdWc4J+ EH8ruh8BCIwAXjGxQvchv5xr5oYnrPSeqP27XIJu2Zbw/2TAtHZR1a9wPW9FN1gp/Vgz jf1Q== 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=bLQmsAF2KOJzFto2lZc5Zc9Gdnq4nOGuwAdWE/rgfIBst8ixzS5hUWoi6tG5Klbtu4 EZkHhbAdpF8Wgd8aZbWL0ux0qL1zX4lpOzow0SqGzEg+ATxHbuQWMrlNcgQz8bMwC3Om jve+G6ik6s4wedryU+58cjy1s8gRuBuK1g/BG/LDJ4SeB9ojzL9K0dxjmF0DQFbOm/tj 6Mrh9CqimiKjlD6YUPUjMTs+DzA9bgYTsn1S8IFrR+EAQJbAk5V7LWuU7DrstFXjpFGZ 6ABIsUlrBy3cg3WSh+hFXH4j+FwWDYRxiADiW12LEUjL2sr4KW3Vr7fO7si6XUJOtNOP rMVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="f9Ec7a/S"; 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 d17-20020a056402401100b004a12b1e8297si11702424eda.525.2023.02.05.21.47.25; Sun, 05 Feb 2023 21:47:25 -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="f9Ec7a/S"; 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 7801668BED2; Mon, 6 Feb 2023 07:46:25 +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 401CE68BE85 for ; Mon, 6 Feb 2023 07:46:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675662381; x=1707198381; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=+Hp2FerR/3cmkCrSr+EIqBF0Q7jK+14hzILZnF+fmJk=; b=f9Ec7a/S3IKY1IPtJj8Bijz2ojn6VngzZaytOQ2xS6fEgQr5+MTIF0mQ 6/d2VV6sI9F8MW3tJmIFmWJOH+ORvj4DdUMtvpJOFJD11xpGm8hzwngmO 4Bb98pkY80wQvYnFNYbCRb7jQX3cRXtyNBmKe5ye8eOkClZwmBVBN/gtw p+ZTcbjlGthSPIYoYCpVc66AQWQ2VEDjwOJu69QsyuTvFYmYNPHKhdgYx Hskw7G7P0W/5gRrGGuHfnz8cl7qUr0pdGOArpQAkdmH1q0Lndr4h47xiy cms7mZ4NnqJKPuQMotYgLYqYXp64ueMXjzM3AVDPHl5yS/lfJd/Hph1yf A==; X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="317144215" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="317144215" 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:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="698737431" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="698737431" 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:58 +0800 Message-Id: <20230206054458.907060-10-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 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: bEhmJoi6qIOy 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++; }