From patchwork Fri Oct 8 07:50:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 30990 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp610087ioa; Fri, 8 Oct 2021 00:52:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeaY2BQq6UrKvFagzEACKH2PsFe+1IsEDZr+crT0rhJshgJP8f6Hebea6peOlO3H9fg3p9 X-Received: by 2002:a17:906:a3c4:: with SMTP id ca4mr2291363ejb.529.1633679561576; Fri, 08 Oct 2021 00:52:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633679561; cv=none; d=google.com; s=arc-20160816; b=k+gXp0qo/EJjffRSa8LssV2hSypG/bDAq3lqBnHoBjFUqNmGMzh1ggVREZ3B+wqbK3 0DhlTyw2rGgJAn9U6Ki79E2YL+efRkq6gD1FHRDKXfXlfZSpmeFEUpTR72k4FzOZP+ya 2fNKANr6G5wdeMI70anMvLBf0MlMcODAXFcS3y8No65Q3lQkTfh9X9QVSkInOt5U+rUf FM/YvLad6sDSCn4tMMYROvOhOgccZAeg9xW2/GkmLihVX+NUrO1fr2HrZTYiFsCqj8wV 5U24f+vQ7pLSWLEu1M1f5WcuE4k3c3w/FMnuEvsXC0AK3Pk36VpdMyR5RikR6GCJJg5C Bh0g== 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:delivered-to; bh=fm8XtoUhMarykFo7b/qESK8aANSZJrtBHk/zHF+G/ko=; b=yy1UrRFsgpd5DJJX1I5iJDvM/luwMqpl9RkZ0iO6ho3kIIJ5mTMWHmZVTP4Kjdw9OU i3AKFFMWuri5GuHImN4HpBRNjdnLLJ8Ap6jktyxnOB4IWSx5vO5kCR1EuLrhlQxLPX1q SoAAkiHfIWmwKesbt+RRu+WbM1S5ys0GET99rjRMSEzApDm7DGpsyOETxlqV0MxhwCzr EKz/zjQmFIVboHAJ5J9Z+rF+ezsHaL0YERQhMAZfLRXL+SgHfUBffak6sxqMXy+1FLJz Oe4pw9x6NkXzIDS220H41wWI3GJjwxmZHfsk9jMHKxFfX97fQ3plmwPVk3rejnYS7atO WcCQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p21si2372906ejy.123.2021.10.08.00.52.41; Fri, 08 Oct 2021 00:52:41 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 287CF68A776; Fri, 8 Oct 2021 10:51:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B34F168A5E6 for ; Fri, 8 Oct 2021 10:51:17 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10130"; a="226409193" X-IronPort-AV: E=Sophos;i="5.85,357,1624345200"; d="scan'208";a="226409193" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2021 00:51:14 -0700 X-IronPort-AV: E=Sophos;i="5.85,357,1624345200"; d="scan'208";a="478885077" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2021 00:51:12 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 15:50:52 +0800 Message-Id: <20211008075056.27151-7-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211008075056.27151-1-haihao.xiang@intel.com> References: <20211008075056.27151-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v5 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: /+76gMc3n0Zp 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/appendix/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 7a71ffe98f..93af4d1198 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -64,7 +64,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