From patchwork Fri Oct 15 13:39:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 31124 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp379883ioa; Fri, 15 Oct 2021 06:41:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweTJoqdvvfP7+VJfwOD3CWILJzqxqjcH2o7zYHp3nnxRaPqSz7Ki3RlKWUeoR40YMVc1go X-Received: by 2002:a17:907:7691:: with SMTP id jv17mr6636831ejc.378.1634305285452; Fri, 15 Oct 2021 06:41:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634305285; cv=none; d=google.com; s=arc-20160816; b=mLEFHnja0HV/d0Gjp0QNyKOwiY2AUC8bNFSt+47429lgsUtVRNhb3wrO+j+VnAxHO9 iJL+fuKKm74iwfTcxtLOkbQeFDhsiHdpOjM0KD7Txm1tltHahnQY3zrMdTMVBfVNHoZe oazKgXLop5C2OGnWqJc7wTZN2R4X4MHb6Gz0n7PJx0cRCIZYNsFKhVWwXagh6a857VnR wyBL6av3+m/IXtrU+QNiO0hiOqnOCLKowcEnaaDbvI+uSjdgBQhyC/VWymRZmkgtsJgE MfjAdWxNlTQ/fvVO3fZvA8tRkdr0Emi+j0o4TBrCpf+f/0T68CNmovbjnDJnX253uZJC eJcQ== 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=ZHUH6Nk/7pbfMxA1BlhTnCHA9m/5j6bqDs0NDew++58=; b=QvU05Q3aOurKXtUpSPDj48zxv8q/9sYZUZlRQDQWTKFde4ji3LTggwoYB1UdtUFE+1 aRg0IbjpOWJHKhG8TSeUJkzZ0ZjLnM8fczLw9t1Z04S6L3zGiDbSSnRxWFKhP0JChy3S ljrrMiqttkcCINw2fsW87eUtwfVUEfgwUOF8zajAs6r7pXuqcmUe2VL5Qz5QJsOxJlmp pmRsQAyKR2mqyXQFaP+VlffvEfW/nwYy/la/zrAfbyJ6UgAgSEtzrCYScu6Ud92cGEEH KUL57yCIJzfUYAz08o7AeNXXQVJ0xLb9VnPgH7RBYlKNdOb5SFw1MTi+n5enCUTYioq1 rBqg== 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 b11si9636858edd.254.2021.10.15.06.41.25; Fri, 15 Oct 2021 06:41:25 -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 76D4B68AA78; Fri, 15 Oct 2021 16:39:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B30C968A940 for ; Fri, 15 Oct 2021 16:39:43 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10137"; a="226686990" X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="226686990" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 06:39:36 -0700 X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="442524807" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 06:39:35 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Oct 2021 21:39:12 +0800 Message-Id: <20211015133915.13624-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211015133915.13624-1-haihao.xiang@intel.com> References: <20211015133915.13624-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v6 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: 47by/e3hx5dK 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 7eaa680ae4..6c6494745f 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