From patchwork Mon Jul 25 04:11:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36948 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1814800pzb; Sun, 24 Jul 2022 21:14:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uQbeTIf9mIdLQOoLFpVBFMVNy4PSJhqpBqq7j8iSvafBQza9dI3vl7r7+pbeW2OPw5FjiB X-Received: by 2002:a17:907:2cf6:b0:72b:9d9b:2404 with SMTP id hz22-20020a1709072cf600b0072b9d9b2404mr8300067ejc.171.1658722440212; Sun, 24 Jul 2022 21:14:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658722440; cv=none; d=google.com; s=arc-20160816; b=sTPo4XwWOUgCmGf3MlHprcxa6OuB+6smInnEB3ooxSrs55tl6CGoIpkjlbswZ3ZR4x enoNToQSHWrR8zkm/fbitRRp0dGEMOUjx9dKQMpz+oXTeNY9cAmqwvzDbwVkD/Oc8+V3 KB+E/6VIbxCTjzrnVCexQ/0EO5wrcRRSWo0WAdZJUZb+ory1yfJXfuGbLZXbf+sKCK6B kPEcGcPFWp3avsu8srrlsWBKXFU6EDRhJ87ZNKDeMYJvp/e6Ge5w5nvkExVHWuZ/LK2L 0m5rtLWy9PZXyXtJnz2aTLaFq5fXxMm0lEG1HXBldUW+esOFl8mrVg5ZuHaIPcN2o9W7 Wvdw== 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=dWvRQXtqnH6ZQrWF+2FB4PQMZSzIVwTtr8SAw6osdoEsZjpYS5SJU0J9ir++TwVWV+ 4M34VxRCRZxi09FNf+Qd6o24sEFsbUn0zuQLg3CQZWCbFHKZFclsXxs/QvPiSqFbwlOd p2OVIssp/rhX+NCv1uCeNsyMs0k4f8+uODk/e23olJeq8WblBa264Cbua9CpVxL2Q22g OpZwWMp3rVkGdUY2STl/XDLu062m9ZhA7P4AGbJwn1FQGZufYOkc5yzFr4+NT8Xpe7s4 ppNGvX+3I1fQWX2S2XCuRT+v8xQi63uEME47mZ0+AXrH9FnvJyi9v1g3eGvZsTYJsErS /HNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=fQLoZXhL; 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 hg3-20020a1709072cc300b006fe8fdac65dsi12612301ejc.745.2022.07.24.21.13.59; Sun, 24 Jul 2022 21:14:00 -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=fQLoZXhL; 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 85A2168B7DB; Mon, 25 Jul 2022 07:12:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55E1F68B7E6 for ; Mon, 25 Jul 2022 07:12:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658722340; x=1690258340; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=K0hg8uWa+SqFdbpqf4Shkmjy9DmGbZOcxp4gyL+3SSw=; b=fQLoZXhLlrzIpjkK2C8D2sTu5excfnv5ExGO4qDv9LxVltPepxfbdfL7 aAucxDr9iV0fZe/9+1ZZaFGOc1PEZ1rWX6XZglXk8yogSUuoIFnsven9E T5qFP48Ru3xkzlGVv8/viRhoTaVRJ7uza1OQ4eeAuwu3qdgJ+EVEJ3IIb R1jY5BQTF3vEgqtENVaTSvTgY9y3G31QTwRmIKJC2asN3XPudJDmr6ojg idziJaaDrAUpIxHIihjCH9cteWvu0GFvR6zeMcwXIfXmVYb0DxJQNnDW+ HLcyw1FWV2MiDe5FtzVuwSdx1GiM6dS8GxkTQJDhtTpRg2CMYQHT2l9VF w==; X-IronPort-AV: E=McAfee;i="6400,9594,10418"; a="274468216" X-IronPort-AV: E=Sophos;i="5.93,191,1654585200"; d="scan'208";a="274468216" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2022 21:12:08 -0700 X-IronPort-AV: E=Sophos;i="5.93,191,1654585200"; d="scan'208";a="596544014" Received: from xhh-dg164.sh.intel.com ([10.238.5.169]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2022 21:12:07 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jul 2022 12:11:44 +0800 Message-Id: <20220725041151.7710-7-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220725041151.7710-1-haihao.xiang@intel.com> References: <20220725041151.7710-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v12 06/13] qsvenc: restrict multi-frame encode to 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: DyrVnDjnZLOe 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 \