From patchwork Mon Jul 25 04:11:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36943 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1814580pzb; Sun, 24 Jul 2022 21:13:12 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sVYC0tOYYgLB3olm/QmqQfCvoz1rOUeT28UUhDY/cptlsNosxunpqD4djuvUGalBcwlXdK X-Received: by 2002:a17:907:a05b:b0:72b:33f9:f927 with SMTP id gz27-20020a170907a05b00b0072b33f9f927mr8766495ejc.707.1658722392359; Sun, 24 Jul 2022 21:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658722392; cv=none; d=google.com; s=arc-20160816; b=v+Xth6ypAsZFrTI1EOBNgdtz5DcoavkTERlnGIWp+M/Ktr4XevZzy1OXQ3Nq6HCRw5 j3w3vypHT3XsJr1rKrb6iWURFLl3KhlnN2JpPTPEfbjIqsJqXE5wSlk5eygB4ihg7qHG 1b7eCsMpneHNEXixDBLncu7TBGdRwPxU2EP7/NKCfA8uivMe9NObNnzwWP70749uAh+/ qWNcIsns20YishaaMi+qTubst1c7ouu3R2SMP19eb+xprpE//3GBmuaYJDhLrnqEEwt2 aE1QuaHVWOX3Mgp114MHaEcOQfoDvTkThK3pBLvIAi612rE57wyos/fIwgPL4YzW3wTC Kttg== 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=MbIOcljK7f99D4KEW9+BlxSe3OCfVTffCZTJcvsSll8=; b=Bxmnv+U6oUKQkOEGwX8KmkmaCsZlweUn2EvLlqxehddeYubERJKEFpugiNU4Gt5Grd M5KMFI06DrzKlM5kWbzTwG00xlF42bnaESmGYJTi5H8XBJrScUVSD+xXNW15o2Tc3Ggz bNc2MIgWgQFUEwqNESElyTxpWeByenLnaLZWOSNGfoqBaFLdwgBMTfnT4cZFUrlSC3oK RLBtqDqrnaCejVfMdcboFztfJf0JISWr6xUlMDQ5cmLMhMtEfxD7h0UXkfErsZ6n8LW1 b4W5rO+56/Whc6uW28so2hnjK/79/wGDAhrFCgQQeMTmT25rek+2TA07wjQCTrYL4EJS JvoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=lKvJIvs2; 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 sd6-20020a1709076e0600b0072f1cccbc62si13233432ejc.641.2022.07.24.21.13.12; Sun, 24 Jul 2022 21:13:12 -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=lKvJIvs2; 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 C2AD068B83C; Mon, 25 Jul 2022 07:12:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0715468B7DB for ; Mon, 25 Jul 2022 07:12:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658722338; x=1690258338; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=i1mR8QdpsiJbS8YxMGnj/fu2UbCa2e+vA4OG4/kMvIg=; b=lKvJIvs2lbFlnct1PJHThw2N+piuBVJ5gt1OnAKSfHQ7KlbFwaoA+TW9 uY7mp+5uFQMF9kIik5f88A0E8D7Ri++cEUFs51rC2zMcwzc0GS6glErIN 4edzP1KuMOcrNok0GOF6d/9QOoP6EspovJTdDBABkj76sGspNtSnTWbo/ 25kp3N8Olmvw/+BU/J+TzsVwmLrEBWo1dZu157QwrCa4tO8XwMTKvj0oz tSNIS/HSnw4pvyshRrAnnTpIAp3P7FhUSIor/YRmipmkVavANppUD2vpv CBZneJQIBPtHq6AY7rDX/1TERIGsOUfTiU2aZApXJ5/5cvasxPiDQlCtn g==; X-IronPort-AV: E=McAfee;i="6400,9594,10418"; a="274468217" X-IronPort-AV: E=Sophos;i="5.93,191,1654585200"; d="scan'208";a="274468217" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2022 21:12:10 -0700 X-IronPort-AV: E=Sophos;i="5.93,191,1654585200"; d="scan'208";a="596544019" Received: from xhh-dg164.sh.intel.com ([10.238.5.169]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2022 21:12:09 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jul 2022 12:11:45 +0800 Message-Id: <20220725041151.7710-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220725041151.7710-1-haihao.xiang@intel.com> References: <20220725041151.7710-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v12 07/13] qsvenc: restrict MFX_RATECONTROL_LA_EXT to 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: x7Ss/C+sozL3 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 e772bd99b5..d3a9a2118e 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" }, };