From patchwork Thu Dec 1 08:14:06 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: 39558 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp196561pzb; Thu, 1 Dec 2022 00:16:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf6A0M3mi4C2w7O8PXpZ/GJOiO7FUsbC90Sb8Ba57m2VBGX9n8RRG5QiSNX2uj9WVBOQm2IC X-Received: by 2002:a17:906:a113:b0:7b2:7c9a:1849 with SMTP id t19-20020a170906a11300b007b27c9a1849mr54478166ejy.733.1669882579480; Thu, 01 Dec 2022 00:16:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669882579; cv=none; d=google.com; s=arc-20160816; b=jBAcaH1fSdAMgcD7dSd/SA9QrOEtEXSU2qMgiQqqE//D2qFPm3fTDKrKL/AvXKOsre YnzLbLBGOwbvdFg+GHQbLhj9fDhaeo3/bqmKi8rDo+cs97dMXoFZS7NsZWj7971ZUHhT vEajAPAXnxGeZRoN4qQ7RgnZHka3RePQ/4C/m7COU3+64cpW39EiTxU6uXM7MTt0yf0p lAPuc7rvlk6J5zzt7w/EAbJIhI6zIBK7RD4IE+TTzE2y8wdke8rJ16eJvkyLZVpkMGHQ 1sxtYf40kXsp8exin3x4mQTRS8jxVdAQaRWVKSFze0sTEAEHsXJ59f8wQAqL4pGcXKWK 5bqQ== 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=obKv2hzK7qGaqag9vKO+9ZscfBDB6d/IJFyZr3njyviYsfXvlHkqOBpIvH8an9+LZ/ jXxgL6dN7oCwueHU7iFEP5dTsbgOV8L+uSJnaPPV9LAHOQYcvJQqteomCw0VG46xarLf S4ZeQ6jOZo1Gv09Q/DOpVSZERn5myRneQ/oSqXtAWq/9cfG+XK00WjwV0TZ6jNREpAmo A+CWI1P7tNoJXfIeKZAK9EXdeIlPT6zWrWGBpd0c1LkLjidZGaMjFb19JCfi6LqbjqJF hWK4nRpTOIHs1m8GwOLpkMRoKK+E8qyM1YKP32B4O7pJdOBppwFRD2MfDGvDoJCgz1Na OYGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=OQC2AiLa; 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 o18-20020aa7c7d2000000b0046aeb223d08si2702192eds.450.2022.12.01.00.16.13; Thu, 01 Dec 2022 00:16:19 -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=OQC2AiLa; 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 D1C6068BAE1; Thu, 1 Dec 2022 10:15:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8D6268B081 for ; Thu, 1 Dec 2022 10:15:00 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669882501; x=1701418501; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OAjrQI7H5aWX5rsa3qZxDU6ypz61VZtQrWcH4A2cZMw=; b=OQC2AiLa4NVFuY10P/Kr4ypIJoTLE8y35eZR1mVI4AKP+r45bmhi3x3a P2CiMpL+qKuFmYlCZdXVA8ix7bptnCsNiSw13ri1WSzjgA3yX/Knvk9kq Svt+jD/+a7IvVstmzhrF3nGRlL0CSBGfLh8WJEYrznlG+LeCRkhfYLVed I16vBsl4ndG8du3OhCO5FM1GonFUBt0jpD9uUGhWDCP71dHXTBbnRM/f6 Wndvd++yMpD+2tmSe5yhSvcBVoYfrGDJvU6NoqXG6iKTxto+hIkmVb762 ocJ9BYYCcn07Sdf14TeB4wz6GlwqiS2xz9z5whDUGOKz/Xd5ApN1Gr5bt g==; X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="298989867" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="298989867" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2022 00:14:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="675341796" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="675341796" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga008.jf.intel.com with ESMTP; 01 Dec 2022 00:14:56 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Dec 2022 16:14:06 +0800 Message-Id: <20221201081408.2194579-11-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221201081408.2194579-1-fei.w.wang@intel.com> References: <20221201081408.2194579-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 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: hs2hzYJOUegn 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,