From patchwork Tue Jan 3 12:59:52 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: 39849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8050467pzb; Tue, 3 Jan 2023 05:02:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXsIqaobx4/1AvU8ouHpsJftu2jbPbis9f5dsyaaTSyFikLsiSdnygeIHWFzmvvapMTBJqOp X-Received: by 2002:a05:6402:33a:b0:461:2030:71ce with SMTP id q26-20020a056402033a00b00461203071cemr35999953edw.30.1672750947937; Tue, 03 Jan 2023 05:02:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672750947; cv=none; d=google.com; s=arc-20160816; b=DxKLylG9UQ46/q6QwI9zPQkZBo/v5aubfEJQiVZBKfEvOiq7DUm+bvSMlztJQ/fJ0F SQIuU/GmOYvbLjaM3K+WC8AN4vUFNR6b4qCccZnLFK301HlFeidkz5gzQSNPw/TykP1g ysVqItzOiffMikpz/XVXLEVmApD1xhFWXh1aod6nyyROWerj+Ku/nR5PsLQZ5H8YjZkb 6gMbWJ/yCdShaLr04TEYyweo82VG8CjxlzT9+nl6RQKS5QNiOYB7iu0x2ugsdStYlD6y sDMTEYQavdRKiJS/7yfte7Jp0BWWpYb9GJIOelMpiOBH6auRnPhTJZUmiQjDBdByRNeA nugA== 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=MKiGz9TVO3lfxYTh7MDiRbmSW1UVn8oJ4NeyEgyfsHc=; b=S5uV2KhMaqoCOY3QsVCyKBpy6lrCTTBoDa0qgfuhasFS0P998yRuJ7FYepQsWQTu9/ sgqb7CwGYWk8Uv2VG2yyiaFFUdgr9Q2vABmnFFEmTDFn6d84u0fB96n7v7SuJNgU9Jko boHXs6OVQK5hBkuhk7zPtcF4sWvWENfyOGmnEft3EQBrYfEos35InIW8nyajOq/yDFSX +VxXdfdsRKWHl8rqybWCsDQSg9UG+lReWSOI31sUexjuw/lBc8MdCzGKnEBwez2E1dSF 5wrG3AV1ShHCPRPiNWcnjfmsLVi/dXFSm+zZQ8hx/CCEM5d1u6gVLSDvKJiUM5TuSZ6j aM+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=mzHPvKgN; 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 i14-20020a05640242ce00b0046c53c2be4asi31524454edc.365.2023.01.03.05.02.26; Tue, 03 Jan 2023 05:02:27 -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=mzHPvKgN; 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 9B7E668BD77; Tue, 3 Jan 2023 15:00:55 +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 8806368BD5A for ; Tue, 3 Jan 2023 15:00:51 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672750851; x=1704286851; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wzEJ2FclN5vofO5vdDPQ8kEtO3HApE3Mfv6vZLDqg3k=; b=mzHPvKgNMFCjW9ZCX6AN1RSOkjTHnG81QHwvVI5wgK8YoDPL1EwR1k+e EwQwtf/3IQgn5JJu7AETrLjMVcd6eE6J/tzH9KZ9AGtuQPgUnx0keBjgD SvJDCCb0wtQUoGDWEt4QCduBTXII+9W2sb72AFydrxScjPyZ2pBbfQZ+t HpxqhxKV7V7Kv0CtEcsoEJi+8WOEOEvnQJi34uw7i/agKeDojUhb4aLlu IKAGdcgFJ4hQlwoUM5F5tYkISiWXm4NVeom0ZfDs5SMrvyqN1zGN5Drdw nSIjo88RcJbdKAWbXXHDHMejL3hWTBAFWMflELqeHQBE9n3iLg4wxZOPI Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="302026313" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="302026313" 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:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="718091893" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="718091893" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga008.fm.intel.com with ESMTP; 03 Jan 2023 05:00:45 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jan 2023 20:59:52 +0800 Message-Id: <20230103125952.2707824-11-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 11/11] 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: ucvqISj3FL5G 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 29c75e88f0..42e1b62fc3 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,