From patchwork Thu Sep 23 06:28:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 30481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp158894iob; Wed, 22 Sep 2021 23:29:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycHVFG9nEZblyhsCfc9156L5mAuL8CjkpRmxNJNb6LE9UsKXn7IvLdbRPYQc1sZHrIi8ry X-Received: by 2002:a50:9dcf:: with SMTP id l15mr3754434edk.128.1632378598193; Wed, 22 Sep 2021 23:29:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632378598; cv=none; d=google.com; s=arc-20160816; b=AqjGdOsazmavkZgBhSPBhfqFt6rrfuJmgF/8t1XbNPuxPZvlyzTALaL5wo6q+fkVUR 84Qg8GGhjnRA512B9Av+HDNofZldLmXwRPXbfDLI0m8IH0TRPtqTti43vXLieTk0QJfL wm6iqMmI8qENjR1IaLlOcboez76DzxZ4ajcouLMvCZeNZBjNJ0LgROTQVWpw9FNlhIRt Mym2DrLELPeH99950KBaGdwntrtfOEqA3Q9joTmPkbPEmPHd8VXACmNR/boC1dCAtVK/ JwSCDrMs8ist7LQvAk7svWLUSfU/6qnok1evszszKoRodtaiV2zPLHEUihIUICAGcW9f DgkA== 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=koCX5LG2+fweC/m6+aB1sXnsAo5OHeoiN+CDmPvLDiTJFhX4v+9KOoadiOGG3yRtB/ wztTxURiX/uHHazZGOm7UZgh7mXAOLPWghQJBg0sPF7CsuD5WFeZ4/DHhoMBtdm5U8I+ v0+MFzmEqy8/CmucuY5aqpjn/dp50m8IutYM/p6x3itJuy5mg7kX28Az5P2Pn5DWl6TI bSGXauk21ihEqsV5vooWye1yDb+P4P5EMWI/R5BknuXCkpl+FvUSUhksrUZ+DIxhIICg bSrzEhaScO15u0E7VU1ZMYTIkJJTf54bgYAQ4sNBYUIk1evlH0FPRW2bN51I2qSVhBiO iYng== 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 i5si5093397ejo.605.2021.09.22.23.29.57; Wed, 22 Sep 2021 23:29:58 -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 585C368AA6E; Thu, 23 Sep 2021 09:28:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7443C68AA87 for ; Thu, 23 Sep 2021 09:28:41 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10115"; a="203930135" X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="203930135" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2021 23:28:33 -0700 X-IronPort-AV: E=Sophos;i="5.85,316,1624345200"; d="scan'208";a="550689727" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2021 23:28:32 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 14:28:14 +0800 Message-Id: <20210923062818.18892-7-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210923062818.18892-1-haihao.xiang@intel.com> References: <20210923062818.18892-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v4 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: G0VbqbMp84Ae 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