From patchwork Tue Jul 12 06:27:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36747 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1811818pzb; Mon, 11 Jul 2022 23:29:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uYkToFFH0T2TE8b8NR/15bOpKL6p4LNjcWujTlcbjf7OUFDAJ/MDevaxOpbaMNmlv3M4gM X-Received: by 2002:a17:906:99c5:b0:6fe:b069:4ab6 with SMTP id s5-20020a17090699c500b006feb0694ab6mr22276003ejn.436.1657607379026; Mon, 11 Jul 2022 23:29:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657607379; cv=none; d=google.com; s=arc-20160816; b=VlHdOy8t8LNt7wZjfPyhmWvN+PAGVG2wL/ODdHFQavazJmuk5b+hx2tkIR23mQbC9P x8p/ekE3UEpxL0RnNCCqM/OQGVs+MauyypCKdZ6eMXA2wZb3ynvQLgI0E3b4BHOSvuTt tkVsGW+HChqtjxnUYmwlL76aGU3bBm5k/OmacsoXq9pwbv4DcHRwgEmkOXU1L04G3m0s fnht+l7qcCTUuptvrZ4FqLWmfQV4UixU2Y4S4Vd66unyrQmmUd9Bifv/PmVJuaViiWoa avtRq7NWqHlUYQjQJWaGjKtm6YUKLG+2BBWDEHryhOmETFfSsued1vkmeKXtoTLIhTqp amtw== 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=NcIEuOXlKTfWjMsssITtedGAggyiYdpl7TcJpwBF8Bg=; b=Wnr7yHMzQ0UgU6BKldOnpGDu41yUZ64Qxn3vQFYgbF+VmEgH03k30X/zITM+Ay9S6c xnO7yBqPRRm79E5baB/7SOgcro9SRdz7q3CtVOEYU0p7cLMoHw7xl+iAKiHujjFsxU/r RRY3Jzns0TOsW+sTal39X/TpPV/wrOKQ1SIRKcNGhR5FCM55l2o8H67D6k456VrkFo+s J02Dat+iro5vTt3bmled3cNnlMfV/T+Uof2Goi0eB2pQdkYgfiA6hoAl8uUa+YCSUbUj FY7XZVgEBYEh/M//00+C7kaQC2GgAE3v1aJOp1K+cr14ByF4N2XiIqD8dByS4wUXnq5E RN2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=NZqDAspV; 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 um11-20020a170906cf8b00b007262c304034si515835ejb.759.2022.07.11.23.29.38; Mon, 11 Jul 2022 23:29:39 -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=NZqDAspV; 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 AF28768B8C1; Tue, 12 Jul 2022 09:28:47 +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 8A21168B88C for ; Tue, 12 Jul 2022 09:28:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657607321; x=1689143321; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=HZNebQ8YGspoRRxlgQLIZyPcaMjnfVO0uFfQcqy6bZ0=; b=NZqDAspVzNLJaEP8sX3qM+wzSuJVDCTECzXq83kgC3pQgRD5bzyRBO1+ ECuDkZz0Jb2oAqbZFHd4j4KGr0WXcLBjMbqKyC0lsgr0x3+dJq+rcUUG0 ek15Y0kYVviWH2ZFNMlhPEdtm9O5v0ZqD/CINRY1gw4luy01EyqxkL0Pl hgRd7Th0QfCM0qCjM8WDAP9Qr5SSojZD1Vbn7rVTLMpgQLE733pbYYhI4 pEKMNlLXafbRS6kqA/b0GP6Q/mzJaRSGSa5stLYvA8OUqx73ol1bQjSfC gxdlSI3iS+/UrOH8pibbwMmHy4G14R0+Ic6SxQIBtijuB1a8gj5dEcq63 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="346534443" X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="346534443" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2022 23:28:16 -0700 X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="622382017" Received: from xhh-dg164.sh.intel.com ([10.239.159.146]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2022 23:28:14 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Jul 2022 14:27:29 +0800 Message-Id: <20220712062735.20339-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220712062735.20339-1-haihao.xiang@intel.com> References: <20220712062735.20339-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v10 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: TySPykPi95uP 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 0c699d3b04..0d4d8b3347 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" }, };