From patchwork Fri Mar 11 08:16:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 34677 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1485179nkb; Fri, 11 Mar 2022 00:18:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIi7NMgAmYU5TroApcJKcp0h6RknZ1/dQhxCO2VK6d13zvKQ8cDhImt6KR0iQR/w+bD7cG X-Received: by 2002:a05:6402:1148:b0:413:11e0:1f58 with SMTP id g8-20020a056402114800b0041311e01f58mr7588686edw.113.1646986710350; Fri, 11 Mar 2022 00:18:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646986710; cv=none; d=google.com; s=arc-20160816; b=mYRJQte9VHBCcXY94TCAzSFnDVCp8RDDSMCJDBKHkgrBdZPyrYpOC2DqXzV2eyAx21 A78/nmVppKE9Auz3X1E5MckWPNXcTeUY0BHR+5p0SWtef4/U8z460bEkRtimPHXsexQU DUtrmiEgAXJRZ7syitkjOD9DtXEXHydD87wuBmGWfrZqs3rK2265fYey8d1Ky2P2ZxP+ aR8UMLD0WbdC+AZVpKf64X+4VSxAKicMXKFVRnRccTX1BBn1GWz/qOgylMWVQmKkNxWr b1V/QujqcGZ0ZXe4UYdhHXRrMQG3/Q4ZLXUxMVWSEiMVoRb+b/PlmAGSkHmsf/4PN0rM uUyQ== 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=eC7KhHEoSD9lu3N51LnMDcXRzrKqOmNNGYvLUbox48Y=; b=bxZiIQcts7jiyYEQ5mKh7u31a9QyH1RSJm5xzo4Qm9g3df9gOYVFHMy3nIJ1zLq0br fNjyZnldstDn6LlZMxfxkBEgrCdheE2SKsNLolEXuNw92uHFePP7g2Jc+kUeM3eu4dq5 4lx3Umx6ZaSQIbYgIOCjoZJt50k2MaLIeEOnzIwf12tPWkcY5VVKe+se9ISy+rWAIXIG /uWiWpUB9RyrkERaxzO5HvM3nKwYotmrAlcQkB7x0KA86sB6tuc7S7n2FRA0lXEy3EBx mYauZRIVb7LyBMSyilrJOAEJ7/DP4z6Gx9FS7yGIqWgZ0WFE3CO8X+1WlhXd2AyErCBj KEtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=RuddHa+O; 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 st9-20020a170907c08900b006dba7815af7si546640ejc.943.2022.03.11.00.18.12; Fri, 11 Mar 2022 00:18:30 -0800 (PST) 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=RuddHa+O; 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 3BB3F68B264; Fri, 11 Mar 2022 10:17:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92EE068B26E for ; Fri, 11 Mar 2022 10:17:02 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646986627; x=1678522627; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Gr8QnmssD+yKTqXR1b+1SAif8bP4tMBnof1Tp4ZPSk0=; b=RuddHa+Onmt7B4gmHRrBBDJuWnKudOB+XYxiRHAvYLd1bjVaLlNnW5/9 SS7pmiZxm66mgO5oT8xNktJbwRwBAbcKax/WZFaLc+ZEiRLemlq57HgKc fxNX2hYpUm3x4fKKssWOL1y5h+QAtjJYbgUcMkRiehLBIs83T4k35CTWf JvrW3Sic7P9a//yidA0FYigI1faKjf2xcdaJuS2+EKldNdKQEcVle2cNK BWb6ro4d00pFVtdiQmkyo1WprtESrLcHNHjqCd24tP1HOzTWV65ExhNhH YNilCsZ1/QxnxLryh9t8l5A1KmeqAlGh6mTDwkwZNT7bZluD8kiPjwJU+ A==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="237700150" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="237700150" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 00:16:55 -0800 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="688997040" Received: from xhh-dg164.sh.intel.com ([10.239.159.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 00:16:54 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 16:16:26 +0800 Message-Id: <20220311081630.21927-7-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220311081630.21927-1-haihao.xiang@intel.com> References: <20220311081630.21927-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v7 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: p7yK2OPKH1d5 From: Haihao Xiang 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 559d7cbe3e..43437c6992 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