From patchwork Fri Mar 11 08:16:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 34674 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1484867nkb; Fri, 11 Mar 2022 00:17:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJybq9Yrc5b9Vtql6A/rK+pPfrFWBhy6PejHX2hTaKjQWVE5buEgOu8aQIl9CR/+FsgQPkRX X-Received: by 2002:a17:906:2cce:b0:6ce:e203:d207 with SMTP id r14-20020a1709062cce00b006cee203d207mr7602321ejr.242.1646986672519; Fri, 11 Mar 2022 00:17:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646986672; cv=none; d=google.com; s=arc-20160816; b=A56zW4foIstbvHhqNxo/4Jx8R41bBh1EM3yDm+y3UBythVpgEaQHfJx/vHwowvLJ1y zN2kaTRFKb5CtgjTp+Anyxt0YlUpzwAQbGaUddQP3FHnJ4vF1DP2d9ayy8UYtMs10luN EoB7L1iLvqfbrSfBcrEJB2UhgsfWIN5jRLHtjgZryou/lir1AqdFv1axpNSPufD8JU24 mrn1LQOSG0dvqv9nVbOLFYHiulasJMtMWdxNlYHKKocovPKpUNya79Oo0fQ1Psgn5pCs QVmkgCiDvEl7GT60Wi1PvB2BAhvcSe72bmx/FVke7e3ZRvib7lamix1pZnH0cscqxsaO jRag== 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:dkim-signature:delivered-to; bh=ADWlsN6uB2KohQOC8nvwSu5AyGJrQwGiT00tth68B9E=; b=0/OTo5YpUk/3RMGUCLdflsXhT4CU2kkRRMwaDUCt4HnR2D0Yw6ko3FTFqYzJBEmcGH ErjDPhwsqNoZ6vew7QkSQ3pbdEDT4ePPeRAVJsoqGUgG3q+s3fkA6zbMNgHYofYN4QAP AQGMMgDIa/g7F2aDIn7tu42uzogJw7v0oSzaKfpk8mbEPV2FP/OHOCwrPbbJQE0/+FLS J5WW84maewcB/aI25BxD8y0d+zVR2BLCXPoz8XCqaBzXmkBK6UhCc5eWhmQDTghF/GT1 nGjH1voLkVzQf+cBuWwKUgF05LJ/x4s+iqP02jVnOqLvdKvVurIU+Obhp7ekhVDDaMnC DQKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=a8eC4UxG; 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 h19-20020aa7c953000000b00415c29fb38bsi5533455edt.321.2022.03.11.00.17.52; Fri, 11 Mar 2022 00:17:52 -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=a8eC4UxG; 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 25B0068B26C; Fri, 11 Mar 2022 10:17:07 +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 7F94268B1D9 for ; Fri, 11 Mar 2022 10:17:04 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646986624; x=1678522624; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=7QSHWRpDZP7v0+TfapcvfKI4Gjo7I8agG4jwx/ga9IY=; b=a8eC4UxGc6p8l/za0SY6qGWvG1j5waCTzcTgFnwPgaJMkhWh0XF7Qnk5 z76veMwXEs+Fddr+ihUWYPIEBOKqaGRcVeQ8+M+QiwdOUZqxvYjRoBIdM +AtZTShZ1puj159kN//O857D62qG2aFPekmrIK6sI1l8Sw4CR3mp3Qj4L eYFsuMU48v53onKr2knMBaTZUB+4xUeFBd5VDpQPZXx489f5ayu/RrohJ rqSfHJkYeN58T6QIlorYMstmUqS2IsBy9b4THDKh0/1uFS1pY9com6Hc2 /trKrDyRTOb/pX7iw0XMIo1bxghDCB0v01TzzsoB6wxDelOgpw35OqbFW w==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="237700159" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="237700159" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 00:16:56 -0800 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="688997046" Received: from xhh-dg164.sh.intel.com ([10.239.159.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 00:16:55 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 16:16:27 +0800 Message-Id: <20220311081630.21927-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220311081630.21927-1-haihao.xiang@intel.com> References: <20220311081630.21927-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v7 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: kPg7H0U3FZeP From: Haihao Xiang 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/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 0170ae14e4..47009c3bf2 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -151,7 +151,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