From patchwork Tue Jul 12 06:27:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36745 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1811674pzb; Mon, 11 Jul 2022 23:29:08 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uTBpenFPqwBc/YLfWQd07ojZ0dxruDDxPgn0bmlRKJ5m9myfB2nXcc3bBeyNRZCoZ8bdpE X-Received: by 2002:a17:907:97d0:b0:726:ccd3:1757 with SMTP id js16-20020a17090797d000b00726ccd31757mr22417856ejc.399.1657607348396; Mon, 11 Jul 2022 23:29:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657607348; cv=none; d=google.com; s=arc-20160816; b=ejhpscuGu5vGdeNViHgMIZdAIaPif8sIF5QPI4kxOh4KuAPWhPjMvKzN0h3PHuQ6Rc 6x7b2XikdkUgK5m8oSiTUrnTNiJE2knq9isC9yFOt9Cq/Wt1azLvkCVKN2bcBag09GJ4 dVU4Ed/8gqxdqWtz2oZ4TTYhaUn4Qlw5CxASDzbRA9TtDQxOGFcs1Qo8Cyn/0MRvbxGL b4W6DVKUmEpm3L/j7Vr5RgQRNITHoO/5zslqZc78MNyqxeu1+gme0d/4qp5sVlAMY8WR tr1+J4Mtw4fguFjJO3hG3duByTV66eAhM9icIC5+fRb9EkmAYml1geqnpHpLkfecaUvf Xtnw== 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=pQOasNyg/KQn8B0jo+OJmC17Adc4FUMojUFvXqeks64=; b=uNv9qbVMAIOEC6GiwCOYlAR1eCcD73BWxOGz7xi0A3/McrqIkQXTcbHtGXWxtYU/XS Kh5NrpKOH0BQ2/dhRfijIEuCA+dKU3B9/nfDj1VJ20wW+qPZNZz2zqPWrq/AU+dMstgY Xt+xMTI7Snh7VdEKjH6ShykdT3e8Ty68lOHG8wh09pu1z3xT6ce8SfhIohEx1nGafHeZ RdQEcwrcJfXe0vd7g0tbdBx0zyKmS6QFx6UA+gM0Wea+C8gQNI39wkYmUX8YRNl1e6CO Kaw3soyBgn4JzRU4BG7mX5fDSz2YKiks1WCG3ktpK3UoaPJk36r36CQqQxAw5Rz8KHEy j3rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="DjnklOQ/"; 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 oy12-20020a170907104c00b006ff0fb360ffsi12168417ejb.10.2022.07.11.23.29.08; Mon, 11 Jul 2022 23:29:08 -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="DjnklOQ/"; 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 61FAA68B8BE; Tue, 12 Jul 2022 09:28:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FB0968B7E8 for ; Tue, 12 Jul 2022 09:28:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657607320; x=1689143320; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=dIh7qkh6S2iDMDr9ZRLSEMsiB7/lgkaMl9Fphi2Dk6E=; b=DjnklOQ/N8a+MWNrzKjHQrcWX3pU+EYftgPkV/0dx5dlOd/EdD0Pgrkd T0cIWBJw82CIir+i8efdp0d+hwwqV9Q9cxo+W1I9NLuNgt34Xotg4puC1 ZU4oCO64pKDmRqpqW75lLC4QLMvHvJLoKclDsSW5V2b+9DwHt28SQQs3A kvTsoSW/aVrFXrG0dh5yJDLy1whBsfy1N8x4L0H04ln9GbCFLA40j7jMV p72QKwNvNOw7iBphgwPc/iSvDQJ1srs2k5JUfqwV7QPb0coE2582QBmM1 oFInYQ5USnBxs++OpXLXXeKZ5Z7tqbJFe/xY8KBzy+dUvceejZxFNwZkW A==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="346534439" X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="346534439" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2022 23:28:14 -0700 X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="622382009" Received: from xhh-dg164.sh.intel.com ([10.239.159.146]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2022 23:28:13 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Jul 2022 14:27:28 +0800 Message-Id: <20220712062735.20339-7-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220712062735.20339-1-haihao.xiang@intel.com> References: <20220712062735.20339-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v10 06/13] 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: ABrLrGUgZlIt 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 ad6ac70f72..97a5ad46dd 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -44,7 +44,7 @@ #else #define QSV_HAVE_AVBR 0 #define QSV_HAVE_VCM 0 -#define QSV_HAVE_MF 1 +#define QSV_HAVE_MF !QSV_ONEVPL #endif #define QSV_COMMON_OPTS \