From patchwork Thu Sep 23 06:28:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 30479 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp159205iob; Wed, 22 Sep 2021 23:30:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyC+okxemdYiagpzb2fsL9t3E3V5e6dMhrpmmfABe8lOEg3+cA/JZCUcAISY9j+47+xZa5 X-Received: by 2002:a17:906:48e:: with SMTP id f14mr3135443eja.433.1632378630285; Wed, 22 Sep 2021 23:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632378630; cv=none; d=google.com; s=arc-20160816; b=cp1OPZyXs+ehdVukfQ+aB+k58X8+ZshXHfJbgUcb0Reh+p6efSgtd8g9FVvkIBbZP9 td7SJlThEr+yl3US2shToT+n1ZrmTodz6hrn4tQ59fw7NhDSQpDmqvlvJHlNu/BdHwZD 5jse/cfaBTZtzvx+bFuuwySS09gBkeetAGnb/PwC8yvgvGCSbnXJrS0+HxniH21wK8+U OMNk/hgZ4gK4pd/nz4fUufA0kQwVmv0YCUh6eHXmSbz/l2DrhVQqY2kkc9GpLP0WXNv/ +X6SIPg7Kwnzc3CzJJgC+khBmg/W0T8KXnDRGmHFiya3A0cNRCfAwJXD4uekl/Qybuqd H0qQ== 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=tzmITKsXu5SXObFqJVtiWG9RtemQiQGtBkVYImy7TwA=; b=kTMpW8P1mGExQ21xsICA9DRcP34tFqZHRc69lbHVfCmzQ9GgXO/EKYYfgnm5AqcGhi nCK6I9aPUrWQnKolCSjc0SypqP2FnhwmJkCGuX2OF/JECHXWkx7FiIi9CSQlhovS4dp7 5cYFbDKUsbr1vEe45GrRiLAeEhdF+X7YC5AikzB+CPX9kJVgopssR2vQdcfX+ZgMB5bu lT5FFFZXeKvtrXK9qKO61feYyUO63LWCkZmtrQtmWeW8k9u42fQOs2Jux8FsrXl9qZC/ iiYy2oG3D+BnNDs/TQQV98Wo+C7cIMGgrYfXwm+viYsksjyo633uDS8rB2zhjMLvnQlP 3k2Q== 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 e9si5983999edz.119.2021.09.22.23.30.29; Wed, 22 Sep 2021 23:30:30 -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 0EBC368AAE8; Thu, 23 Sep 2021 09:28:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 678BE68AB29 for ; Thu, 23 Sep 2021 09:28:44 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10115"; a="203930147" X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="203930147" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2021 23:28:34 -0700 X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="550689730" 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; 22 Sep 2021 23:28:33 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 14:28:15 +0800 Message-Id: <20210923062818.18892-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210923062818.18892-1-haihao.xiang@intel.com> References: <20210923062818.18892-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v4 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: Y3zU00oowLmV 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 5e76299372..69fbc2b53b 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