From patchwork Mon Aug 16 07:33:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 29558 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1800057iov; Mon, 16 Aug 2021 00:35:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfbP5j6Q57Kj1Iws3SyGabjZjtE91j3SBSgsiqP3+4Z3FWmqIxVgA+CtDUr0csZD17KR+C X-Received: by 2002:a17:907:1199:: with SMTP id uz25mr14736411ejb.448.1629099300485; Mon, 16 Aug 2021 00:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629099300; cv=none; d=google.com; s=arc-20160816; b=M/R7SXjb7oiPQKNHhEEo37Zjd6w8FfNsCLJChLfqXu0G5dJ+sRiBZ87ju9nAnlO64o 3l+UFDdxn90N0WjDr3Yj45OUQu831kYB6lUqnhcaY24djrmamVf2HmhJfd4ZC+QJ8sLA uljnwZDS8G2XoIsASucDmBFItbQ78y3QN2pbjw8Z5/mTKDwuBJoeZC0TUWwU21yFsKit m/u5TgqkLG6zwFCrN4JVq9ZiQXrdyDUV+LxUPntWMyLw8SxEkanFACaR7sWljeZvQ2y+ Afg8bubT4S4+y/bUioDTBJZAFoY8WWrXU+Jzym/CHU9x/jDuU5bJnwjTtE3y+8L+NOXo xrTw== 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=ANxRg9jDAYhlzmzDM6L4C2dUfOx21LTkqKYpewBg32M=; b=YbYrc587lwhNYS9G3M8HsxOln4CQLD8D6iKojfHm8CyExd8WU8nDtWnVT+b8Dta72X c3pRhCWFnNzYv7rSVFKgkdNYolR7/vQQTdd0s6pchUGl9x8Tfjt+neMP1AuPP7N4STOo sSZYMfv8AppwftcfR8qPQPz5K+1Dn3vsVjBdvmDJWn8AZjfw/i8qmyB97sgQ3xZTK5Zf HujQ5SkCO2Ienlr9j4dDTes0AZLaBt55D100txfsyRtLpTbEeO5C8nzAHFq+CDmD4jsT 2Wu3L+pMc+tvblUOYuQ8RUtPC3GVWXPSkBmnUXiFV9BtFVfydPoO7N5VoJBP8zU3PIGf MoHA== 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 lk15si9484384ejb.563.2021.08.16.00.35.00; Mon, 16 Aug 2021 00:35:00 -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 21CCC68A61A; Mon, 16 Aug 2021 10:34:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AD2368A5AA for ; Mon, 16 Aug 2021 10:33:54 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10077"; a="279553919" X-IronPort-AV: E=Sophos;i="5.84,324,1620716400"; d="scan'208";a="279553919" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2021 00:33:47 -0700 X-IronPort-AV: E=Sophos;i="5.84,324,1620716400"; d="scan'208";a="519461876" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2021 00:33:46 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 15:33:22 +0800 Message-Id: <20210816073325.27020-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210816073325.27020-1-haihao.xiang@intel.com> References: <20210816073325.27020-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 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: UmJxYTKD07my 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 b561e20971..542eaca7a4 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