From patchwork Thu Jun 2 03:41:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36050 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3803350pzj; Wed, 1 Jun 2022 20:42:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxj9OeGbaoQ++z14TXqQoRKlWpsdmrXDoqXQeriHuUr3ZD4zTInfpxHImDblI68wngD9cni X-Received: by 2002:a17:907:7745:b0:6f3:674a:339 with SMTP id kx5-20020a170907774500b006f3674a0339mr2387437ejc.207.1654141379385; Wed, 01 Jun 2022 20:42:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654141379; cv=none; d=google.com; s=arc-20160816; b=PsPsp/TmGXZcZRmqtPnjt8oOwAwUR4/1s28rzjglyksM5u+xDhVl8mPH9yG2aHTdMB L2CHD/1W6yC5jtDkx6DUUJvl6fLXKQ1NgdRaAYJryrI/BcIVGtAjaxAtpdv6MnL7FJBa EEJ+mzUvfprcT1s7yGW3Tmi6VGHJL5T3o177Mp0VQdwvosX8GQVshefcjC3WASn9HpVb HP0iAY/Yb2aY2mMos1gtsw+Z59gnoDRcwn7FFp4LIP06Rk477E3h8qDqGMk3bKpo8mBs JcFLf3og1lKg9cFAGvpKflWxoC8nq7txptKJy45HAefYlS+NY6TxlfsD1yoBJ1/57GBY m0Nw== 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=oWQszftaV8k5s43+naUaQID6zlt+3CzRh9/EIWNjQm4=; b=R+3mhxU8sSo/J+uTx/eeoGm6vewzf4yUdavlT8638x9iUztepyu5+D0zVI3LVf+qhE hQLyyOZoDAIGpCcz4s4uCNmhL1gYK0rao9htwRrHHVIjQmrQ9c3HGFZLWrByxJYovZUH t1sP1GbuM/oFuEvwuSQpSM4PBqi+CyyCYlADM9aw/jc5k205MrY82UC6uDxIMEisUpv/ KUZ+wJfWJIdcs3V72isJiyUQs++wLqTNFIkEBqYbhUqhaM3MHME6CTC37C0y1vlGNmR5 YL+duhQCn/vol9cIdlYCPDUmsQ7nZ61AeuPKIfwWj8cHfHRmdKPE9ONrskGvMQOAgSEs /a8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=NyHs3ovV; 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 i3-20020a1709064fc300b006febce228b4si4384393ejw.646.2022.06.01.20.42.59; Wed, 01 Jun 2022 20:42:59 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=NyHs3ovV; 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 A182868B7F9; Thu, 2 Jun 2022 06:42:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84A7E68B803 for ; Thu, 2 Jun 2022 06:42:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654141326; x=1685677326; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Qf5s25BDXcKKDtTzySobaaFxwfruydUQJAt9WKWK6CI=; b=NyHs3ovV5nLPKpxpoFMrNOS6QeBhWGpDPgeiNtUSK0OIpeAy+51cxwjY lvDWBbn8huObG+MrwklNoSeqKzZwJfDvKHU0TYd5ByK77ga92l2c9PZAC vGLOCB+7ghv2XVKtSB6w8sjQQQ4Rkgb5TGqvx5Qs0Dcfbf6db8TAKJM+L PrtpxN+xGCS2r1cwvtWrTFbxAOhuyGatzKqOE5UxdxPX8thQGhz+czfAA k912fz6btXh+EZ6ftbvQyJAsE4/eEvASLHvsjF8pXziHPCwB2pURjqc9v 89N8k7PSMO5XGgYHYZ6oQ4wHCIB5dx6vZWzl+fMJhAFmiLGHCHCinukZF w==; X-IronPort-AV: E=McAfee;i="6400,9594,10365"; a="362181652" X-IronPort-AV: E=Sophos;i="5.91,270,1647327600"; d="scan'208";a="362181652" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2022 20:41:56 -0700 X-IronPort-AV: E=Sophos;i="5.91,270,1647327600"; d="scan'208";a="552629597" Received: from xhh-dg164.sh.intel.com ([10.239.159.54]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2022 20:41:55 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jun 2022 11:41:15 +0800 Message-Id: <20220602034118.22447-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220602034118.22447-1-haihao.xiang@intel.com> References: <20220602034118.22447-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v9 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: rEZ2UDslCAYH 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, 2 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index c2ecd523fa..3aec10504f 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -141,7 +141,9 @@ static const struct { #if QSV_HAVE_VCM { MFX_RATECONTROL_VCM, "VCM" }, #endif +#if !QSV_ONEVPL { MFX_RATECONTROL_LA_EXT, "LA_EXT" }, +#endif { MFX_RATECONTROL_LA_HRD, "LA_HRD" }, { MFX_RATECONTROL_QVBR, "QVBR" }, };