From patchwork Fri Oct 8 07:50:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 30986 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp610489ioa; Fri, 8 Oct 2021 00:53:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUz0NVbcw8TvUgalp5+LAsebd27LaSxw2oOd+l0zIbYsuTlTO1dzK8oTBfLxuX+uwxRIBi X-Received: by 2002:a17:906:4c55:: with SMTP id d21mr2268621ejw.397.1633679596388; Fri, 08 Oct 2021 00:53:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633679596; cv=none; d=google.com; s=arc-20160816; b=s2PXWPzfcpG45ibhx1j9mSWhPHFq31m+ELaSX9KdVP/O0ZukbQzmywMToXDPsaSaEB UdPPjnbknig6Bt139HkPCqMH1L2lJMN+4svda5hoNB5yqOVQftF0Fc0PLF6j3nwyudn2 23AZZU0dLvUCIP6tSsZSOikrteMWk6NDjw2R2VB5f8/rWhmYrA2CxDmbX9IgNq5eDrJ1 MaRTRP/z13kY7nhN4/8yOMYlvjSZhRURVxueoPrcaUeSIamCopyFRfKVHMnPrDa3ElLv HZFho8iT39COWFvYmXRygDMSJ5FzN+4Ib+cKdsoL+lPp0jzuECVHQCBpb5PAcBlobAoE plRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=ZHUH6Nk/7pbfMxA1BlhTnCHA9m/5j6bqDs0NDew++58=; b=AM0gZqbiGnfcr/A3MqPOrhSryEztlixwsS86cu5wwDVkV3pDxCQY/xjiyBClyBXNFy mFRUbvGzRL9fmmdEU3aHYS6BaIAhDTSALFrr1J5zEqA9uACtXHRGym/xtO6jmME98UWH TpTb9BdlBTL98mZMk9DK0qYTqCG7FcmaI2PjDHy7DzMnbH7HXmDbcLntgjxEXHlRTEBr 8Hgn0reH56AOXQfuWDnNhEfdHFqGYGPPKVTSGlOubP7sxTq3t0XECo7p7was8+oVKGd7 ATzyeq7q1z0PZhwph7E7rCbuQBJwzYVC+vq+3Cdjoc4FVuG0BYe5tMWULLS2nmN+8VJQ qW/w== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y25si2364171edo.177.2021.10.08.00.53.16; Fri, 08 Oct 2021 00:53:16 -0700 (PDT) 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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F92468A7A1; Fri, 8 Oct 2021 10:51:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2C0B68A704 for ; Fri, 8 Oct 2021 10:51:18 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10130"; a="226409194" X-IronPort-AV: E=Sophos;i="5.85,357,1624345200"; d="scan'208";a="226409194" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2021 00:51:14 -0700 X-IronPort-AV: E=Sophos;i="5.85,357,1624345200"; d="scan'208";a="478885080" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2021 00:51:13 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 15:50:53 +0800 Message-Id: <20211008075056.27151-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211008075056.27151-1-haihao.xiang@intel.com> References: <20211008075056.27151-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v5 07/10] qsvenc: support MFX_RATECONTROL_LA_EXT when MFX_VERSION < 2.0 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: Haihao Xiang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aJylYPrRyUu2 MFX_RATECONTROL_LA_EXT isn't supported for MFX_VERSION >= 2.0[1][2]. This is in preparation for oneVPL support [1]: https://spec.oneapi.io/versions/latest/elements/oneVPL/source/appendix/VPL_intel_media_sdk.html#msdk-full-name-feature-removals [2]: https://github.com/oneapi-src/oneVPL --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 7eaa680ae4..6c6494745f 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -100,7 +100,7 @@ static const struct { #if QSV_HAVE_VCM { MFX_RATECONTROL_VCM, "VCM" }, #endif -#if QSV_VERSION_ATLEAST(1, 10) +#if QSV_VERSION_ATLEAST(1, 10) && !QSV_ONEVPL { MFX_RATECONTROL_LA_EXT, "LA_EXT" }, #endif #if QSV_HAVE_LA_HRD