From patchwork Sat Sep 18 02:30:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 30334 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2752830iov; Fri, 17 Sep 2021 19:31:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjDf/O4HKF/UtWhau30H4n+zCC69zejAMy3ws8kMOvvfDyxfIgmfp1NQ6bXR9NDzfTfSjR X-Received: by 2002:a05:6402:452:: with SMTP id p18mr16306830edw.34.1631932312251; Fri, 17 Sep 2021 19:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631932312; cv=none; d=google.com; s=arc-20160816; b=kwka2ATRk03xKRuA+eqHwcgssMZjqynN4FLua2l9pWJcQvPb3K1bxI+u6NqkS5Z6eJ /GH9NUZTYSlcAQ3+BZU06uDMYec5AXKc8nrV8YEp/UiX7+UHfg16hxempxso7ql2+BL0 cVKFcUaWalUtzSzqS5hc8HkF/hnI0vnwrnzPL8It1PzIwsAFAAYqVZXIYrUq/Of60FcF BF6OMh4BjK0A8ESR8m9x4liwoIRz4H9kuO1F9hE4w6F3n0LYHrv36RZ7lgCPALHiXDSu QE6IIZNMVuIZr+JwyXy4Z9IZO0tLa6fh7DS7Rc4vxAGsihvILYiYrPKn0GqZK9LxH+pS YTDw== 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=T+OktNnfIULiT3N5AUSsNFv+QBt3Le571G0dMY+yzws=; b=cEHtxNqkhAUx4jVcDqGjw9q4FZwMxPmiB+yd0VDElwEcYFzxru10xN49WHQa6ac4K7 Ccg/9gZKMfSAe/fzCiXkGXOmLsk/0z+Jp9alkZQcSPeROO/1dJmPPW3Pvx4djbLvyGUz xxd/Ufg3RlYUEEiMnrycxZ9/g6NX+MI0bGENu08qY1cl7h0BdxD2PgntkTEYeFTUuWQ7 vOQf26H55CPHWXMqdmuYov3WQmcoiB4uXYT3TM/C1zvJ+fur7Op0YCxSKL8jOq1NiWDi 7W2NI4z3IFC335HDeJ3c61EfC3pZD7zoOwuRtYLBFYfvCC5DaX9JUvo16fAN0OuKHsPb Y+sA== 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 n26si8588886ejd.436.2021.09.17.19.31.51; Fri, 17 Sep 2021 19:31:52 -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 750D168B189; Sat, 18 Sep 2021 05:30:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 226EA68B18A for ; Sat, 18 Sep 2021 05:30:38 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10110"; a="222563148" X-IronPort-AV: E=Sophos;i="5.85,303,1624345200"; d="scan'208";a="222563148" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 19:30:31 -0700 X-IronPort-AV: E=Sophos;i="5.85,303,1624345200"; d="scan'208";a="473303718" 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; 17 Sep 2021 19:30:30 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Sep 2021 10:30:02 +0800 Message-Id: <20210918023005.30128-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210918023005.30128-1-haihao.xiang@intel.com> References: <20210918023005.30128-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 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: cqwWO013CC4L 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 d977ed6ab3..57e95a2aa1 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