From patchwork Fri Oct 15 13:39:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 31119 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp379736ioa; Fri, 15 Oct 2021 06:41:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyM3d8NWKOyzQZ2j02VTqEb2PUImo46EpVIXSPpFjgAcwWN7+h2EMGUbxrCl3FGmhBbkpR0 X-Received: by 2002:a17:906:6549:: with SMTP id u9mr6769626ejn.514.1634305275858; Fri, 15 Oct 2021 06:41:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634305275; cv=none; d=google.com; s=arc-20160816; b=NZpGMJEMT6Y5B2ZNJnTSrHBRS12gV0kXfXXd9+pN86WzFkrHFQE7JhxJ1ywFBp920D bHyi8WIjmkTK+NIZ5hqjoaNyIfpGz5zu3IpD03W1tAi1A8hxLYCpFppT3tk9zN74un04 XMX3WEVqian7G9WBID6aZyfvf7ptNXS8ZOgL6eG5XCeOqadq7HjV+rDjmLYEpFfkJCVO g5xQ8ludNTumML7WwCxv4ZV7VI2XWfOIq7yndantNXzbD9o7NRzIlHf8+Cc7M9P/6M9Z 6zpGgYH0RumEn4P9SsHEAqujhRCdySn+vvKuV2riLmuyc3S88jbHoJO8PB6CUuLJKZye ByoQ== 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=BQxkGCTbQuNTdBbkVWOKZ03PscauZ1Ju9g7vvLYxH5BQknBn2Kl9zRk2oTh68rJCwc Mng3H2ScHhDusDYxGbQpnlsXRVsw2wcyYOB1TZn5OuKpJV0EFQlcRPb02nQLKSUIAm5k XS/5KOVGv0H3/Ai2uHgR3vWgX7o6oB2key9mpW9cU4gxSlRE+76pLgvbU97sqYTCyrOZ 5eCtueMN3NYNEQ0BkURMOQVRxv6jxY2wvxzAD/DLUE7jfaA9MruJYr7U5hpFRk9VZ9Lv WHpfmaT6CuD1/MlmkdBw3BO3x8vM6BtRG61qvTfoUwWKRFMyBb/2XI1y5yNyCOyK78qq ox4A== 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 j8si8214970ejk.456.2021.10.15.06.41.14; Fri, 15 Oct 2021 06:41:15 -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 8529868A9C4; Fri, 15 Oct 2021 16:39:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A59F68A9C4 for ; Fri, 15 Oct 2021 16:39:42 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10137"; a="226686986" X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="226686986" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 06:39:35 -0700 X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="442524799" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 06:39:34 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Oct 2021 21:39:11 +0800 Message-Id: <20211015133915.13624-7-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211015133915.13624-1-haihao.xiang@intel.com> References: <20211015133915.13624-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v6 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: Vhn0vsJkQ/eq 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