From patchwork Thu Jul 22 10:56:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 29008 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp413022ios; Thu, 22 Jul 2021 04:05:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0+r77OhTD/3PdcQJEZWshwaAXynQUv33fHIrgP5aGl6zYKLt2cRXQ7UKPz4PMGPWVGMBo X-Received: by 2002:a17:906:5fc1:: with SMTP id k1mr41717894ejv.360.1626951922918; Thu, 22 Jul 2021 04:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626951922; cv=none; d=google.com; s=arc-20160816; b=liliriB4K++59qRaFO+Wp2wi/AYlzoHCPnxUAGh10LBfs4QQrKwUFjwr6tXT2nsB3J 7PgrJPv/5zkH8U02n2Op+RcA1MfZKt1nukQ0oDiYkJWNpvluifjdWAjiRtVrudPsGe3B 4y46qgla9ics5B1sNV7qpJNVo9x5iYiIMMFxOwmv2V50zTTm4r8OO9FjxhKn7t9PH3Vx V4hGOVigB8tEkekc9bxM0kcNKiYdW6PHhu2XkddFQCOt2WXXYUMSxlhvuueOFgkBgn+J APcTdxdaBtawtLlPN4JccU7WylJqMSr352lpDQGxOuPzN5Eaj0oVV/7KiO+T3o2BJxll PpWQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=gegVio1Gfo6nF5w+JP+PiqUhRdIvh1ixnvlBmzwdKUY=; b=kCmiQkumhNREWggccxq/O+EoFudWfhReolgujx2qwg2DODGRMuoS6QmRvfPjontY6s 77PjOOGaR+KJg+4pImi+ecXyLA7r8zTr1p6BlvHXBHmsWMUT6XxdpXyXiAedrHDw4DMS EEHjVPtT2T4HIAYzC2VmrPa/YG0dLQytJPHndxnI7PIr0ySHCBgm8BoKHI2cNR7zrPgz 2u5oKCmLVF9Coe3zbS3D21w2stMInqxtWQBIRV0N9Zx797udhwfazvLIdAB4ZQqVWlKt QXr8Wlb4q5dxBNb2du1g0Qu0bEDfxbdS1cQzlRMhikVUTAnYV3y8Adzy7IYSJONi1f+S B6NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JeWRTbpj; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r2si14806249edy.605.2021.07.22.04.05.22; Thu, 22 Jul 2021 04:05:22 -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=@gmail.com header.s=20161025 header.b=JeWRTbpj; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADA5468AA4A; Thu, 22 Jul 2021 14:05:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13BA668A867 for ; Thu, 22 Jul 2021 14:05:05 +0300 (EEST) Received: by mail-lf1-f43.google.com with SMTP id f30so7855167lfv.10; Thu, 22 Jul 2021 04:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sqmk/bKBfTyIpfERkgwsMD4duZxJw5ML6RbbF/TKcbg=; b=JeWRTbpj/Zfn7zrIyGaJTkmOC3lCt12W3EXv5h+H+jx5ny65d/A6HDOZ5SFE06wffu ipy+vk/Oy4kjhOG1AlWs7wJrNW0Gn9NWKsulrIUp5PN0eMKbMJbuOVDXG5ISawUbZj/9 5kO2QPxPSI7Sxzzf63AEI0pZqIqK6GkLErnKVGoAquwtwrOgyAr27LLPR8D65uHGiVBc B8a8xosJ2zeCkDebH8xfWT2vhFUGjj6tYpIEJy31bUeQwN2w6Y3dOaitjWTWmRBW/RDl Ge9TPpyaHlNhiQjEpsUrjBqUub3YSBtXvoFPzUdjp5zzjmA5COwiV534Z0sYDRv8CtQt r+0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sqmk/bKBfTyIpfERkgwsMD4duZxJw5ML6RbbF/TKcbg=; b=djHi6zLLpuwRiW9UR2w+J9c+taTMI5y/CJahOaoQSM9vC8zdwpojvb58oc8X4HUNh2 VVgB/7JQ40AF176vZe74MvHZsV1VXGPr/StZAd5xqRE7VfLx6ZJlyaMBvxaa2v9vmIgr L0+nloqe+udCErJJlrpkUq8bjyb9Y0XhcipCa+6+nF1UPaJ2qM7zt2ukPAgqGYeCKv2o maos+UvOSKpYAjqb3Dgt15Dp/Io7TIgR+JW/W4sLQy6DG9qn1Uk3qUDIY5OJb1laYwTx px5rHoY4a57tluvmTBKkLlajqgB6kFM+iaadXKMMosJX4RTxF9l48eNcU3QKr6FMA1d/ Z9aw== X-Gm-Message-State: AOAM533vRSaEPLtjF3d1l5fAVQo09DRqSZOBoQySgc2yVONud15Zsgsf UZgyK0Mw1sTiCQNZqddHIvwSSpaltWnKMDNy X-Received: by 2002:a05:6512:2316:: with SMTP id o22mr29543515lfu.175.1626951411985; Thu, 22 Jul 2021 03:56:51 -0700 (PDT) Received: from localhost.localdomain (37-144-244-78.broadband.corbina.ru. [37.144.244.78]) by smtp.googlemail.com with ESMTPSA id z4sm1951236lfh.2.2021.07.22.03.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 03:56:51 -0700 (PDT) From: Artem Galin To: ffmpeg-devel@ffmpeg.org, ffmpeg-devep@ffmpeg.org Date: Thu, 22 Jul 2021 11:56:32 +0100 Message-Id: <20210722105635.48075-5-artem.galin@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210722105635.48075-1-artem.galin@gmail.com> References: <20210722105635.48075-1-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/8] libavfilter/qsvvpp: enabling d3d11va support, added mfxhdlpair 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: Artem Galin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4zCDYhdDv5C0 From: Artem Galin Adding DX11 relevant device type checks and adjusting callback with proper MediaSDK pair type support. Signed-off-by: Artem Galin --- libavfilter/qsvvpp.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 4768f6208b..7f2f197ce3 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -36,12 +36,7 @@ MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET)) #define IS_OPAQUE_MEMORY(mode) (mode & MFX_MEMTYPE_OPAQUE_FRAME) #define IS_SYSTEM_MEMORY(mode) (mode & MFX_MEMTYPE_SYSTEM_MEMORY) - -static const mfxHandleType handle_types[] = { - MFX_HANDLE_VA_DISPLAY, - MFX_HANDLE_D3D9_DEVICE_MANAGER, - MFX_HANDLE_D3D11_DEVICE, -}; +#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) static const AVRational default_tb = { 1, 90000 }; @@ -202,7 +197,13 @@ static mfxStatus frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr) static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl) { - *hdl = mid; + mfxHDLPair *pair_dst = (mfxHDLPair*)hdl; + mfxHDLPair *pair_src = (mfxHDLPair*)mid; + + pair_dst->first = pair_src->first; + + if (pair_src->second != (mfxMemId)MFX_INFINITE) + pair_dst->second = pair_src->second; return MFX_ERR_NONE; } @@ -572,14 +573,18 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s) return AVERROR_UNKNOWN; } - for (i = 0; i < FF_ARRAY_ELEMS(handle_types); i++) { - ret = MFXVideoCORE_GetHandle(device_hwctx->session, handle_types[i], &handle); - if (ret == MFX_ERR_NONE) { - handle_type = handle_types[i]; - break; - } + if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_VA_DISPLAY; + } else if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_D3D11_DEVICE; + } else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER; + } else { + av_log(avctx, AV_LOG_ERROR, "Error unsupported handle type\n"); + return AVERROR_UNKNOWN; } + ret = MFXVideoCORE_GetHandle(device_hwctx->session, handle_type, &handle); if (ret < 0) return ff_qsvvpp_print_error(avctx, ret, "Error getting the session handle"); else if (ret > 0) {