From patchwork Sat Sep 18 02:30:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 30332 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2752731iov; Fri, 17 Sep 2021 19:31:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwv1KmD/iLn0y2hdCz3zeaCQ54fuV17X32EsaAAu/YGW57i3Sw4BISsbP0OW/6rhwVXBlQb X-Received: by 2002:aa7:dcc2:: with SMTP id w2mr16006342edu.192.1631932294322; Fri, 17 Sep 2021 19:31:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631932294; cv=none; d=google.com; s=arc-20160816; b=FbhpzAV1GvYKVQHpfVtwLDQ002y26NeNUzoPMnNpK+DCAzlKqLlxmdrw20KdDMN0ya E2w2Fztq4S0YzHR/vSi2UUcd+/Pwf4xAO9sfm85u1j5rJHfHcf9FNH3a7qkOtwoBk8AV Yptvwq85JLaBf+PEhUsMZWIEtcSiwpwn/TKNt++6zMrUT8Ms5MUr5aW8+AeATojz/Rt0 oKCZYExoil1J9RXr0pQm4H0Swgk4DTSc+GFDTXgqsFwhoxoDuHUnEsUbb2VBZW53AmTh jSkbFCNUzGiLed234lFKfq5CMKwLbEDqVM5AFDwjwGt/Mr1yQqaVF0UqBsiCzJpzeKQS QzoA== 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=pZSdD2oOft7rF4zhLCns5QcQ25nNfbbpiHvx1LOkD0mk1D5lWJcbASZqj3u4TiDYdV gHaz2qsJYfSDxjXcfekC2dmV6ZSuhvSEpbjwFOAhXLiYsDVvgAMpVxox45ZQnCCVwFG0 f7EP+lRR+J7PW7Fla/LGzej0xx97SlsNuLz+0HTqSKkMCSqcVKYH2koepzNdWbL5JXfR ECWdddOTKUoWD/kOsZN1s4Kx/pvM3pYY5zP8iOZp98nHmSXM94NZcmyfSSpDYXxbs4NO a6zzlu/EtG31o6hNWQXZbUNA4i9Ksa3F7pQq6pU6N0/YdwC3enuc+ti4ZzzFe4nMeFpK NQdw== 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 e3si7801180edc.457.2021.09.17.19.31.33; Fri, 17 Sep 2021 19:31:34 -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 BF47F68B18A; Sat, 18 Sep 2021 05:30:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 813E468B095 for ; Sat, 18 Sep 2021 05:30:37 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10110"; a="222563144" X-IronPort-AV: E=Sophos;i="5.85,303,1624345200"; d="scan'208";a="222563144" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 19:30:30 -0700 X-IronPort-AV: E=Sophos;i="5.85,303,1624345200"; d="scan'208";a="473303713" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 19:30:29 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Sep 2021 10:30:01 +0800 Message-Id: <20210918023005.30128-7-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210918023005.30128-1-haihao.xiang@intel.com> References: <20210918023005.30128-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 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: HDNj6a4jFXWp 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