From patchwork Wed Jul 20 08:39:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36862 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2255363pzb; Wed, 20 Jul 2022 01:41:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1trr4rkB5Sr+j7g+JwZQzEUnvJgbPcckdPWzcUw2KeK0lPx2yPZYwAYmo2tGf1aXczkzJz3 X-Received: by 2002:a17:907:8a0e:b0:72b:9ca3:507 with SMTP id sc14-20020a1709078a0e00b0072b9ca30507mr35249634ejc.477.1658306503044; Wed, 20 Jul 2022 01:41:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658306503; cv=none; d=google.com; s=arc-20160816; b=ygmWajhztCUkBypmyc54VZLgXQWqmD4ehtXA8IdaExqZFzsjVBMDwhFk4njA/msxLJ 36/Ee9Old+leJc1apHtHl5nXwjFzIc5Mr5pd6D/XfP26a1U8JmvZ+i31HX6NInEWzjHS /qc5DdCUnNW0nLGFtGc4bUV4kF9jhAmRvmV650Dg7S/iMi4FoXMxUItzGdj6sBB8/QeK IM1u+w1Rt5hiv62jKoN5V4tubTmI2C/vte6l2llMPboQb0TvflCWuIIPeKPwx0ONqMF6 yOQ6+bWBOdsOBLeclyDjGyca6gT2kEid+lmS0zT2m3pMu9AN+SDvuVWlII3dKffDMhGr tPVA== 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=RHFgSf07JClSF0WvLIe+RGE7OsX3ofsMzvj0MkM9Xa8=; b=StL9k0ebeT8CtZouW3sKPHv/h8x5QoWCzX+4noAHpujTXV7kyPdPExmjRY56MipI3x bEWSzS5ukmyRBT24zhGaHy2iCPvJaJ9QEKgc/jLixnfyIeUCNP6vSD26rlCcVTGve0v9 UCmusZG5qkQ7skksEoeXYtoi4isIBfIW6d/6pSkzgmTFUQfdqkA2W7XXpViqAHodh2ZP hnG/2DKtOQOmiibh3FrfXs0xrAR12xnyNAAIT6+vwD08ncTyapEpH9EDMKc+NJDlyq4e 8T4TTo/w4z4oYAqIzjDY8Z7AuY6MrFpvbh6TWJV+0v5QLe/5P7ITQe3e1sz6PjDXGI9n 7jSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=ji+YpJqe; 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 nd39-20020a17090762a700b006ff6c9f7081si22030836ejc.738.2022.07.20.01.41.42; Wed, 20 Jul 2022 01:41:43 -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=ji+YpJqe; 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 C94C468B88E; Wed, 20 Jul 2022 11:40:44 +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 7DAE768B800 for ; Wed, 20 Jul 2022 11:40:36 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658306441; x=1689842441; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=K0hg8uWa+SqFdbpqf4Shkmjy9DmGbZOcxp4gyL+3SSw=; b=ji+YpJqeTx50YBoZxswTKvDWGBRWQqnglPRz6pHRI3kqKlLBF8lkfHUC n9lzcyVGT3MknXGpWvSMdAHvKB7s68jklkTHe8164Dm4KeQzVA8UnCi5y rvi5n1LCx0EwEyjbHoFluGGuma7WRsIWUs0xtsPAMzi6NSzpp5BTYZp7K 4+3xGrHLOZDcHEDG4UPqky1UA39zCu1o2Hkt7ur8SPqgwnAao/y1WJwdE iWHyRhH73zDXeYu/lLCUbKsYE79UBjcHaKIdGKyuMkooTGavqx9sFVBGL 04V05kp7957GUXkupgWkgL7x1J1y8eOhBzJukAHZZou03hBp7Gg/FXzaa g==; X-IronPort-AV: E=McAfee;i="6400,9594,10413"; a="348412510" X-IronPort-AV: E=Sophos;i="5.92,286,1650956400"; d="scan'208";a="348412510" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2022 01:40:32 -0700 X-IronPort-AV: E=Sophos;i="5.92,286,1650956400"; d="scan'208";a="625574666" Received: from xhh-dg164.sh.intel.com ([10.238.5.169]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2022 01:40:30 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Jul 2022 16:39:59 +0800 Message-Id: <20220720084006.5033-7-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220720084006.5033-1-haihao.xiang@intel.com> References: <20220720084006.5033-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v11 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: g7s+Tc6PCCaD 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 4cadc38a59..40e2f65eff 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 \