From patchwork Mon Mar 11 04:56:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 46950 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1016417pzb; Sun, 10 Mar 2024 21:56:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXMFCRECDtu7hX8CZvwve5ZRTLjl7KBWLlQwGPGlbsjgurc15MWZb1rYC9aC5otsqGy262spPUYzonQ9VIi/7+iXmoOe1Zp80L1SA== X-Google-Smtp-Source: AGHT+IHBpuZyUa7X8pM1hDgxvipUYq6WkzKuq93fcjRw1dhWFHBdQYeyW/00wvu8FBcl7x9mTPkA X-Received: by 2002:a2e:320d:0:b0:2d3:56df:ea46 with SMTP id y13-20020a2e320d000000b002d356dfea46mr3051863ljy.31.1710132984653; Sun, 10 Mar 2024 21:56:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710132984; cv=none; d=google.com; s=arc-20160816; b=UFKqhDUSfSdosKgJS7Tb4x0+A51u1gjdUSn9x60mdjMdc5VW3s9QT7DqISqT1Rr7fZ r6FFRgLNFeQn+cFOlU2bMcBzQOx/oEHfHJJKi8eM1Fllwoc75eT+x5xBSrIlFtEqdgQ/ U1A7H8zsbLA7U8ACFepIgAQ/4oPBhvQh7Kzxwc6zSU3tftxvdap40sOzpE3dA+n3Kk6J Tm9mxKcZ7ijUMYGhC04J/OpGjp/8ed/w/1Sm0hubsT+OpRwINYe+MmrzIwkMva7LnQyZ oXf63gV/G8gUQFv62UYUQwo7OfOfFbwZYmAb/d1K9VO149yeyj3AdHfCUaoZxSQ3ERZ2 kNyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=dUlDqgS2KZncaej22NC32ltA55DGXUyjYhlOQBpDVoM=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=c7AHX2DW+e3voEqUAYhAXhbAi493ReWCMG/z2QtwxL0FrSHqu+wRgOB3Ko8PU//BdX pQz7YLDOA69y0MBRX7QX2FW/opwGPyEKTaTKDe4MXSYNb6Gah9KWEJtuVieIAZs1UXgV bJrl1X9VlpmxDN58Ov7Wzr2gbqgpdQPG35zLJwsm5kT5MBWL2j9ZO5n8cGv/JlBFFCNL 7e6fZsSMVfGUmaW787NmWxcPmK99891fwOLRBeE+pBDrgYRHKknaBkoAf8zLXnrJbMWq B4U+MjEZejVeSMapjs0CtGswBNau0WR8VJxezJVXVGjLMvvKcbimLdHdlWIC/PVK5f6T pzMA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=g235Tk9R; 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 n17-20020aa7db51000000b0056813bac619si2098162edt.522.2024.03.10.21.56.24; Sun, 10 Mar 2024 21:56:24 -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=g235Tk9R; 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 226AF68D01E; Mon, 11 Mar 2024 06:56:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BFE168CD83 for ; Mon, 11 Mar 2024 06:56:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710132980; x=1741668980; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=sd0DmQBJSN9K+oM5hUwOKtegxeTHgtoHKXBpyGOSn6w=; b=g235Tk9RDm1bmrFwZyOMY0chsCMcjtVLpAimJEoing/vSi5XnTwVDXxE AD0XCMHeWUdbKgIWRW2MKXnNq2g9uOAkhbHjUZujwaXec41j2Ev6ymy9I tN9nmVymtxCSkPH8fIC5LKvdU+O3THnUCTcnlMxe/PF6CrXtjiNdMmR/5 aTTesHfC82+gJPw434jRXgsVLJzHImsAMy//dZH8aDzwctePAIPqxHLZT CgObp7pKAwez+bQKmz+qUSiG7QhQQufJShlcE41NHqp3VU5H1kpk32xkt ZlUBMYGnF4wixZlAtwlcgj0hPX7/9JwfIBFMJk2uHrvZmIt2GufZgm2F/ w==; X-IronPort-AV: E=McAfee;i="6600,9927,11009"; a="27248958" X-IronPort-AV: E=Sophos;i="6.07,115,1708416000"; d="scan'208";a="27248958" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2024 21:56:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,115,1708416000"; d="scan'208";a="34183022" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2024 21:56:10 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2024 12:56:02 +0800 Message-Id: <20240311045602.3086332-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/hwcontext_qsv: Join the download/upload session to the main session 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TapaUT/9SJBU From: Haihao Xiang This may reduce the number of internal threads when using hwupload or hwdownload filter. Signed-off-by: Haihao Xiang --- libavutil/hwcontext_qsv.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 378cd5e826..e5e043d2d1 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -55,6 +55,10 @@ (MFX_VERSION_MAJOR > (MAJOR) || \ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR)) +#define QSV_RUNTIME_VERSION_ATLEAST(MFX_VERSION, MAJOR, MINOR) \ + ((MFX_VERSION.Major > (MAJOR)) || \ + (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR))) + #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) #define QSV_ONEVPL QSV_VERSION_ATLEAST(2, 0) #define QSV_HAVE_OPAQUE !QSV_ONEVPL @@ -1136,6 +1140,17 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, int ret = AVERROR_UNKNOWN; /* hwctx->loader is non-NULL for oneVPL user and NULL for non-oneVPL user */ void **loader = &hwctx->loader; + mfxSession parent_session = hwctx->session; + mfxIMPL impl; + mfxVersion ver; + + err = MFXQueryIMPL(parent_session, &impl); + if (err == MFX_ERR_NONE) + err = MFXQueryVersion(parent_session, &ver); + if (err != MFX_ERR_NONE) { + av_log(ctx, AV_LOG_ERROR, "Error querying the session attributes.\n"); + return AVERROR_UNKNOWN; + } #if QSV_HAVE_OPAQUE QSVFramesContext *s = ctx->hwctx; @@ -1156,6 +1171,15 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, } } + if (QSV_RUNTIME_VERSION_ATLEAST(ver, 1, 25)) { + err = MFXJoinSession(parent_session, *session); + if (err != MFX_ERR_NONE) { + av_log(ctx, AV_LOG_ERROR, "Error joining session.\n"); + ret = AVERROR_UNKNOWN; + goto fail; + } + } + if (!opaque) { err = MFXVideoCORE_SetFrameAllocator(*session, &frame_allocator); if (err != MFX_ERR_NONE) {