From patchwork Mon Dec 5 06:09:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 39606 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3010581pzb; Sun, 4 Dec 2022 22:11:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf5GIpoyzv1B50K98RSZmpp+gAzfYTYoK5REm6nRe4aNfHRZIsYBcP686pfWfbaCIMpp+6Ko X-Received: by 2002:a05:6402:ea8:b0:462:67bf:c64e with SMTP id h40-20020a0564020ea800b0046267bfc64emr1678724eda.20.1670220676694; Sun, 04 Dec 2022 22:11:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670220676; cv=none; d=google.com; s=arc-20160816; b=QlZEqnQQB3cNEz3e+qvjfrx7/11ttwZqKqQHD66b5P7LoifrWaruRBDeMcdeCvsW2l dRrmgCX/wS3EsQvbn/1UdtCFakW2EoDHaZ1F1yfhDkKJKvbhmoQvGzhMjbGGJSOVAAL/ nMzFWQH5G2CFRx5MQQu6fbUzFr0jNobbvSfKX08YbaGi3iOwhHDciHY5ntRbMoesdnSe JuEDufQWpZne6CRBCo83Ns4QH8Gb6LYnASNZBROAP1KK7qEeJFbi9DtXkzyfUneR/FfH nAOqhKQG1KefN9iEsM1eq2Z++3WbAV3MC3AIvklSt9PtxtBbK8SZ8AJ9YUkCFXZi8o07 hJqQ== 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=CACMbwAk92labDBNC3MJAcZLDsdvqmCyx4hH5748EIY=; b=XZN+gmyBDlCiavUtvMtq5w0p8c+uVpbjQFZmqgf61a4ohyhg7Q7ZjhHn4ePVo+i3hi OObwTantFV51OSmIU0LBfyK/q7lMOffJ3d5PvUV344NB9aAIwcimYrQY/z1hm4EhMgXv gJuVWt01wbZ8gmVjdW09HMsQ0nr+vfhWAan0i+rrfzO7zh8Mqd/VPIZH8PegkfYYPAA0 SCTsp0b9mrY1yHUvEl37JEfael8fvS7RGP4qhdtRHgfGZU6N3ozu/+5Wb/Tfph1yXeod PlJRHEoCWzsN0Zhl9CwXYInfMEF2pBSU5cibHHP2gfyfqoJhtpfT+HTiVCJU0XlqnF4F VrDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LOXK5VmR; 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 w18-20020a056402269200b00463d1e2639fsi5679523edd.363.2022.12.04.22.11.16; Sun, 04 Dec 2022 22:11:16 -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=LOXK5VmR; 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 57D5068BC8C; Mon, 5 Dec 2022 08:10:11 +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 ED9A568BC69 for ; Mon, 5 Dec 2022 08:10:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670220607; x=1701756607; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OAjrQI7H5aWX5rsa3qZxDU6ypz61VZtQrWcH4A2cZMw=; b=LOXK5VmR/rpIdZO5tl5Ar668rCmNuZjz4S418EXnRXsyAzwMeFAtYHCK Vk59aWStdbFL14J5fFoQl+xQihUCrg3vCD7347OukcyS8FQNONzS7mTJx TQmoobUibg1ub6zIBU7Fso0joTkLcKTQUmbrYm1brMXzTifxMac5Kgedy JVAuE7/+ExmlOfXzGpQtNdCvCel5+aTPDvTWgwRPAtzQEOVS6nJZKcDhA jGLsReN5YROiX3MD2jz0VeG0521nBpj+puZ/0LS+QEqJ3qxQs7ERmKUVp MOrkA5/xqye3zLx+2Gpb7fxP4yl0GDJGvRL1rF9aYgMdx+NzoiVK4XX6Y A==; X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="295971408" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="295971408" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2022 22:10:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="645700117" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="645700117" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga002.jf.intel.com with ESMTP; 04 Dec 2022 22:10:00 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2022 14:09:27 +0800 Message-Id: <20221205060929.2511871-11-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221205060929.2511871-1-fei.w.wang@intel.com> References: <20221205060929.2511871-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 11/13] 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 Cc: Linjie Fu , Fei Wang , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: flCSp/a+VFls From: Linjie Fu Allow current picture as the reference picture. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/vaapi_hevc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index 005d782819..ca14052d56 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++; } @@ -222,7 +223,8 @@ static int vaapi_hevc_start_frame(AVCodecContext *avctx, } #if VA_CHECK_VERSION(1, 2, 0) - if (avctx->profile == FF_PROFILE_HEVC_REXT) { + if (avctx->profile == FF_PROFILE_HEVC_REXT || + avctx->profile == FF_PROFILE_HEVC_SCC) { pic->pic_param.rext = (VAPictureParameterBufferHEVCRext) { .range_extension_pic_fields.bits = { .transform_skip_rotation_enabled_flag = sps->transform_skip_rotation_enabled_flag,