From patchwork Thu Jun 2 03:41:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3803609pzj; Wed, 1 Jun 2022 20:43:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYygVlz4TELWJLLruHhnwj36DQXYPjrPeSZ15XpRAHyArd+KfCrYzcEHXipnIXBgAnzIsZ X-Received: by 2002:a17:906:600c:b0:6fe:9204:959b with SMTP id o12-20020a170906600c00b006fe9204959bmr2399040ejj.417.1654141416654; Wed, 01 Jun 2022 20:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654141416; cv=none; d=google.com; s=arc-20160816; b=R7BOpGRbiUl4KeqeMN7Jm9DLRadGqAxLPoEBJkxEqFImgeaj6ZydgAyXhdRWZyhME8 iWowKfubCHr4xVmKpdm/4hJ2MuJYT53AQZLRtX8kdNpbD7X4RYXKCaxl69mFsvsKwD2R L806WQCWxe6FNmrknbALI6rEkAiMyslWCEg6O485k7yjOcBnZ/Z4MbnqN9M8lXHRPibR CRpqJ1dFSJVGKU6dXpITZmkmoW9HP2zE0unA5uW32k5UUxGxAcCcNOcCRDCXg+n2XbWb bYx1aSRqTVOk2LV7krBcPzcdrM1qaUXiGKykuz23Ab8duQkSjypdyR02unl/GjzG2mPd ZSMQ== 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=U1u+Hjbo1CMd/sEYMTKaU1wMLw6yfHqImadeTRG+Ask=; b=oVotBO+xQO2FFsQ7oZi67pkD87f1tqu1Up5H3lShyUwYlrd4Wqefb0iqtS1dfzHP6i 0YI8cDcp+4QecXTrNJ0B79kYTltR1dFXxl4Tp8G1PVAdGB385F+wPO3hR6zI6PZ0Il4o 1eDLBsrvv7T/rQO2RCLXNANunDvrd82eQoJWBxzE+by1vxiI36pfxqGS9gciVo23TmZL D9kUotPeLGmsH2qyaX0J46jPB7J7Mpr/VxPb03sbUApszpy+xK43SVplr32FUVX2ihM6 c/YOj7LoC7hsJj2j5K2oXKUuFMzDBTyi4B4Tdx1fTCxXuGwR6VzqggEMz/GefhkKgQMY JTXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="T+U88/IS"; 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 v3-20020a056402348300b00427b5cd456fsi4007267edc.0.2022.06.01.20.43.36; Wed, 01 Jun 2022 20:43:36 -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="T+U88/IS"; 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 1A57268B83A; Thu, 2 Jun 2022 06:42:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E75E768B7F9 for ; Thu, 2 Jun 2022 06:42:03 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654141329; x=1685677329; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=y7+pBoDbx7abHJTxxRXJhuNSfi5ybv/Ntu12c9jil2E=; b=T+U88/ISf7jX7NXz1snfqtM6+dGFA2gYSCrGNLvk2Lc55gMrlNH6kLEt vrjjQi97w5Hm9Dh+n6Ro8VrZcSFj6J9LsWN0O8cg2KyPCK9LHii5ihxEN M6yKocqfm0I67uYTbAgyQsGmyuVd9VjP0kli31m8b9w7UQ3kPMrTHYEOr zSzlsJLSTwIJRZMZfifXUBSJBQXSkyDhSdmZ0LjFsaa63ryBFAGwT8MKn WZWXQtsj1myk83cKViWtoktepepse2fNei5nzbpbZ01eb4iLYb2qSG9GC 8e7mzTnLTSjZrAnt2bWuxld5IMb6iWmzIRgawCPlp4AOdYV/PPraxTF8e w==; X-IronPort-AV: E=McAfee;i="6400,9594,10365"; a="362181650" X-IronPort-AV: E=Sophos;i="5.91,270,1647327600"; d="scan'208";a="362181650" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2022 20:41:55 -0700 X-IronPort-AV: E=Sophos;i="5.91,270,1647327600"; d="scan'208";a="552629585" Received: from xhh-dg164.sh.intel.com ([10.239.159.54]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2022 20:41:54 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jun 2022 11:41:14 +0800 Message-Id: <20220602034118.22447-7-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220602034118.22447-1-haihao.xiang@intel.com> References: <20220602034118.22447-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v9 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: x+uKRpC46PKP 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 be0cee491e..187d54e55b 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 \