From patchwork Thu Apr 28 09:23:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 35460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp3473564pzh; Thu, 28 Apr 2022 02:27:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9YySsQ/ziIVGfpOU3JtSc3ZZyeAOB6ZEKfUGqs4Tic0C3Zx9LydsFS+EzPil5A5PlAtYX X-Received: by 2002:a17:906:99c1:b0:6ef:d995:11ac with SMTP id s1-20020a17090699c100b006efd99511acmr29581964ejn.244.1651138062475; Thu, 28 Apr 2022 02:27:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651138062; cv=none; d=google.com; s=arc-20160816; b=S2QwjKUOIA3iYGG9dvfUwHH7PZDw+yWVWuHFbj7fPx2hLtCZLBRrHw6UzyCc/NxUrF YUM5xfLSXPDdE6Mm4pN4B3tvHfXsH+eoGkoRyZsKSiRecFaYSAO+mMx5Iio8GvuaSLvY BMRp73m883xa3CRni1QVJyAYxIFv0jzcVGaow3B+fX8bJ4owI4VEMdG7G13AsZgbbLsZ rjhilS+iu409ikqagfcUOBTXGZVJG3/U9wKoAuiWVyhDPPux+cdc0JRlJ4SL4ZYgNsSc vqDMXhJW2IJ8kctRPE3iyBhAhiHtjLGg40szZ+TKRnWphLP5jln4RtZY9KsIN0iVHDpE sdqg== 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=94Ar7YbdEDUsetcZFbX5xdeFcjZZie1uiiZ5AGCYSNo=; b=QS98G4Op98XbDRyNMGnl/IeKDB+sxYuR498y7bevP/+DzipLsAxFTjAiqQIPnm+kKv snIQU4BFzfV1jb5goPgosVNq/h5F6YisqkUxSVVfVBN7bIeWPtTky3RwNo3ABbd4O/fL na8KtnbeZU5oajEalkQwVQKm+QWd/sqoF8f/YaXK0wyCstiNCivvLJz7J565t4mhplo6 pdlnGBV8xDUsSmdSIxjr5WrzcOXcfaNFPwK7ejlv0inAgQ7GCDQ2ZiTt6txVS05l+ZDd /h3jR9EmPvpEeZtsRCYm+WrFQpbbMaRvx5j/D6jnvyMTAhEGwwhnOP2UeK1JVGVYPWZ9 mE7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=conChjGk; 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 cm7-20020a0564020c8700b00425d8c74949si3585967edb.417.2022.04.28.02.27.42; Thu, 28 Apr 2022 02:27:42 -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=conChjGk; 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 98AC668B388; Thu, 28 Apr 2022 12:26:49 +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 D353768B375 for ; Thu, 28 Apr 2022 12:26:42 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651138008; x=1682674008; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=EQUpEyynET71PJjhC9TVskvoi2B/Ikbz7z6uj17wzEU=; b=conChjGkkf3ZeB5eeKO0n5t2WdLeytQ1R51uQqVxZytw4tKW4HkGN335 vKM+GwGm9N7jTckL3QeBlubbwvJ9TAdgDhy9gDOo3ZCJI5iDRa5/dqNCf CrJo3qr+8W7TdgFGWsGZU77jbYjmucKzUH6WzUJmvrA5/GusDfw+hs+CP g+ZErQiI6s3EFov5y6f5Pepx5i9WNZ5o/s88LdnNg7lYnJIMVbCV/R5Du /Wugk5xqUt0CpHalR6ZDVWf0bE3eTDjkWYMK6X3nEJqR2Cz17UPPjN7a8 J1WWuMBGRYcRjJyGJfBTYEFQG43mPXpVihd1Q9N6oOh5n2M9K9Vrpqspo w==; X-IronPort-AV: E=McAfee;i="6400,9594,10330"; a="266381435" X-IronPort-AV: E=Sophos;i="5.90,295,1643702400"; d="scan'208";a="266381435" 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:42 -0700 X-IronPort-AV: E=Sophos;i="5.90,295,1643702400"; d="scan'208";a="581176022" 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:40 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Apr 2022 17:23:23 +0800 Message-Id: <20220428092327.16558-7-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 06/10] qsvenc: support multi-frame encode 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: qET2OINq5F4r Multi-frame encode 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.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 58d1ab346c..8aa1e251b3 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -67,7 +67,7 @@ #define QSV_HAVE_ICQ QSV_VERSION_ATLEAST(1, 28) #define QSV_HAVE_VCM 0 #define QSV_HAVE_QVBR QSV_VERSION_ATLEAST(1, 28) -#define QSV_HAVE_MF QSV_VERSION_ATLEAST(1, 25) +#define QSV_HAVE_MF QSV_VERSION_ATLEAST(1, 25) && !QSV_ONEVPL #endif #if !QSV_HAVE_LA_DS