From patchwork Wed Jul 20 08:40:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36867 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2255687pzb; Wed, 20 Jul 2022 01:42:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v+JYFfz+rmodSw2bDLn3rBukP8aFX9rqLs+NmmMTfVxHgQV2RQ+4su8NHbA2MdwYfp6EgD X-Received: by 2002:a05:6402:11cb:b0:43a:b592:efbb with SMTP id j11-20020a05640211cb00b0043ab592efbbmr49055088edw.157.1658306550353; Wed, 20 Jul 2022 01:42:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658306550; cv=none; d=google.com; s=arc-20160816; b=xa3xZowg0c1gRqyOp35Zc03yIAT+GPT066Rt7guyE4W+wKJY46cwGPiJ2PG0PYZN3o uAH/5wrtNXDnhCDMV67OJTmzE31ZEbR6iOSD85s19XdavuYZ876CD6TGxg2MNg/Td4Qr 8AS7TGbUKFi3gyjBQeRqO+JbO3FqJshm/HL6gZJxOZmnSiQCixpX+etfMyFOCmutx4HA OQr2AsJMMniNGAW6dKbFxzpqgsuhrVPkaDQagsrLccXTP+rVGaj2QwZhRIs7lH5Lk+8L +DauQF5Za56vB6IqlGVJF0M2cq79akx7es6TF6arNNWEpCC8r1dductXKgE81tGtIw96 P2Iw== 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=JzDXqg1WrB1MQ68HzxAAYVJ/Fl/p3ZjdpuFq3SBjb7rlz3pJTxsPOeddjC9gFzU7t4 8GH05M0YocnEPzlE1QRegaPqbtCSLvcjRh3i0m+O+WK93pk5RBuw26PecZ66Yzc4ITMN Z4dplZAvxbGBLFaM2uEs0fNb01nD9JAO2QU4tVc9SyRx6MmTFnRu8xF2doPBBugOoraV PNvstMGctTM12x3dcOvaNM7OFZLdem4GaGRbvgWpaxMCgHM44wY2ysZsePhRKMnz67lx +iOBCYINlDUw4vtjlqH69HUVgX0vE9DSrLiVvLzFegtU5fNZ3Ol2GY+imWN781pn/GTD qWOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=TGeZDyri; 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 w10-20020a170906480a00b00710e9e0a239si18430582ejq.919.2022.07.20.01.42.29; Wed, 20 Jul 2022 01:42: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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=TGeZDyri; 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 7AB3968B8BE; Wed, 20 Jul 2022 11:40:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C47E68B852 for ; Wed, 20 Jul 2022 11:40:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658306444; x=1689842444; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=i1mR8QdpsiJbS8YxMGnj/fu2UbCa2e+vA4OG4/kMvIg=; b=TGeZDyricU0pALbsFbuOdqcx3K0+pV4RPWI88Co2fM9SwRx3nzldFT/g I5NFb5jKSUfg2klQ8+BSlDZmIeg6I9WCsknMkeKYItKannwGkcg00IWy3 kLK2OzJQSY7naHbyO1gelhZVktwYkwjwfdGeaQIF+Xnwt3JSSYKrvXXi9 4fjPoTVQeufPTzNJFfFDY5Uzq/dptCMlZ/IkG4yPKBddKDltxg4gKu84x WT1s/5li5X2/Hrt7F0orD7lnQtSCHsVFsZdv4qwaY/tYM9tldAlzcsvie i6q9co1qq7ThqyY6oy+kCRLEybtEg8oilkLWJjK2y/nN7IXAFfxPdtRo/ A==; X-IronPort-AV: E=McAfee;i="6400,9594,10413"; a="348412523" X-IronPort-AV: E=Sophos;i="5.92,286,1650956400"; d="scan'208";a="348412523" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2022 01:40:34 -0700 X-IronPort-AV: E=Sophos;i="5.92,286,1650956400"; d="scan'208";a="625574678" Received: from xhh-dg164.sh.intel.com ([10.238.5.169]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2022 01:40:32 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Jul 2022 16:40:00 +0800 Message-Id: <20220720084006.5033-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220720084006.5033-1-haihao.xiang@intel.com> References: <20220720084006.5033-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v11 07/13] 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: LQ/x+JTnQzxC 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" }, };