From patchwork Thu Apr 28 09:23:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 35462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp3473689pzh; Thu, 28 Apr 2022 02:28:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqiSXvYInG9n7AUSa5oe7wZmIyCq2+/YB/itnS8005/5bE87UcYiQP15Qs7nL4utgx8bfj X-Received: by 2002:a17:907:97c9:b0:6ef:f282:fe94 with SMTP id js9-20020a17090797c900b006eff282fe94mr30238824ejc.531.1651138082749; Thu, 28 Apr 2022 02:28:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651138082; cv=none; d=google.com; s=arc-20160816; b=GEDORcdkui9gv1/qIKS14CExqODiys3iwv1mElfXb3FYL6iV7sHY8J89EeoaLXJOWX +98sToC4qagedI4GckR6Vtjed7AgY5zpJKDl+6xEiEwSZnn9zXGqAZQgKhsoIqdCdkp0 flwFnp44z4bPlO505cA2LJ1W5xk6c270mUldumBFu4NQ3+JK4D7fwjXGRjy3NDLpFjoK spNOQIQI4x+tuLts9nhTChv8LmbQxrbezxaxcannC7yONV9ayI8/5iPyCY4ZiLjuE9qm SRCP+c2gI2k7Tr0NtHoL3WAzzSLoyXlXhtaINGjgPKddSbjWtQB0y6YnnL9SmwCaLe7E EWcQ== 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=zs2IhPKnjR3b4RBUOm3gRSWYlfyPtAIynsWDlaclzyY=; b=DH+pTYM/K9c+SQmuLkjzhZrxIZUQIJmyYLxQ2ffPwjN5vNRNJy/djlpoLGCX8v+cuS Xg6SiiJJNtcjjxFh4+zFS1bEe9T4DIsBnwTmJo+Q0t4y/v0q53GH0Gomc2UYpDkh3+Xb kQQb7XD/CbMzVGkcLUpf7wB60gBQhJToFhySSAJEz7YtYXlUTe1kdwo2S4gAxJE+Fxml 4yjPomoDaOYVf8mvbqw+934Ih5zMGqgkkfyJD15z814v1/n1TnXEpLWJyyV9XuPgEoZV /Roc91/hKWBaHNv7+q+Y5qXQEbMElYSi3/qA6yAXb7jWP3mjMXk4qnXxssOTiLbk+QnB vORw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=N6NxtVfv; 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 sd15-20020a170906ce2f00b006f38749d9f0si3305851ejb.457.2022.04.28.02.28.02; Thu, 28 Apr 2022 02:28:02 -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=N6NxtVfv; 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 7ACAD68B3B4; Thu, 28 Apr 2022 12:26:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7193668B3B8 for ; Thu, 28 Apr 2022 12:26:45 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651138010; x=1682674010; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=64r5COxmgUqZ06B1H2zutxBuObGLCuF6aYavKLwALM8=; b=N6NxtVfvdRsdThKnRJJzTF1coxObv0JGRyPPOZRuvEHqRIQ25LP+d03i KY2NiwfbCzSShqzjSgRokD8gyQrazhI29jxzl4Ky0tAhnKGl6U4mGVNyp /0QubtdpZAqoMKw2E/fRZqbpRsaJqAehd2E+vyO/XAh3o3KjnmfFUi86v bDxbSA/a7OgyQqWe5cxOQtTUwZIdTePDz8A+GU6lV/5f7wkHolh15Wu0S qBTusvdz4U/uhHxhz6JhlKRS9aB9HNoeNcaUFrU8OLk70QGqYyX6D1g7W 8VsTbL8tphUELsjSsyWaJfGCB4Mv5vDi8IWZCOiBs0ZEVxmu5eZpHsnCD Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10330"; a="266381454" X-IronPort-AV: E=Sophos;i="5.90,295,1643702400"; d="scan'208";a="266381454" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2022 02:26:44 -0700 X-IronPort-AV: E=Sophos;i="5.90,295,1643702400"; d="scan'208";a="581176031" Received: from zhao12-mobl.ccr.corp.intel.com (HELO hxiang-desk.ccr.corp.intel.com) ([10.254.214.89]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2022 02:26:42 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Apr 2022 17:23:24 +0800 Message-Id: <20220428092327.16558-8-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220428092327.16558-1-haihao.xiang@intel.com> References: <20220428092327.16558-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v08 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: CI/xVGm8F5Wh 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, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 2ba4b8e90c..fa8960a0ad 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -153,7 +153,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