From patchwork Fri Apr 24 14:52:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 19214 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A9C6F44A379 for ; Fri, 24 Apr 2020 17:54:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81C8E68BFB1; Fri, 24 Apr 2020 17:54:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA57C68BF81 for ; Fri, 24 Apr 2020 17:54:14 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id k13so11209351wrw.7 for ; Fri, 24 Apr 2020 07:54:14 -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=Oj24E9wN1F2/LAGJHbR4DuwbpvtSapXZZyBn2hejP6o=; b=mCJNngfRTWldRbmGcFTeW1E2enQROoFsvagwUIqJClzCJYBVmGKp1SBMUcXVET2Son gF06Ojg70EcnF1aRHGFw7Yer0okpDKQ6oIjmBWw4IC59bkWc8ix6Go53kuJ23V9mnWxs ZvICl+igqApQPfUW6eb9pIQ+bCmZ6bPPR90DxumfV3bZ5Se4NQ3I9MxnDvGgV9qDY20g VBaJFR+sLYdSGUZjixB/SAz9p/pfwGvYVZ0RNmOftuVAqvqa5NL4pW0JO/iGFSOOMZyx FEgFgAFEQZWtkzthJ+44mGWspntQRwq4qV2/IhznLdYKz4LZf+yvGcAjnyxiBqqS319F k38A== 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=Oj24E9wN1F2/LAGJHbR4DuwbpvtSapXZZyBn2hejP6o=; b=I1cnJlVuu+QKhiGeMPvb00AL8/w2nS2I1zHNYXHkUvBXRnr6qikhnUekfElR7OQI+H xwqFoVD0Vy1WmcXOVShUDcAEoEcVZ3bYafrr5UVlx2gOtsoFkysytMRlOwyHTCsEb1SI IODpIoWrl8kaFUeE72ToENeYlqko1g2Ccet+n4OSGoqQEw8NghVsowy45Xvm+jDqrSss rD/v+FWjPWhyAuLJcrBy5cOGOnuN/fkV08xcyVRPVXpd3V+VJ7ktmgpa+9l/RBVF9Guc u3cuZjTrU456iDYe1zNS9wgHJBilXpi/5rfYmxF8MsOepI1kwNq72YyewYjRWrvaVrG2 JZxw== X-Gm-Message-State: AGi0PuY9UnFtfLsXb2X6xtSYlZfTrYyZnSNAuQnDsRNPtNdQBqgZzH1P kg3Xzy3FE0TXPRUBW6TRKBfa2QtJC8s= X-Google-Smtp-Source: APiQypK+rwrK5He40VZysrkgtH4F7Ztnjn/Kmjn7MZR5M3z2vbgr4wJroT8VDppdIUtVbIQ6khQDHA== X-Received: by 2002:adf:e5c8:: with SMTP id a8mr12540525wrn.56.1587740054105; Fri, 24 Apr 2020 07:54:14 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:3e2e:7400:d810:daa5:1027:e125]) by smtp.googlemail.com with ESMTPSA id p190sm3180552wmp.38.2020.04.24.07.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 07:54:13 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Apr 2020 15:52:17 +0100 Message-Id: <20200424145219.54067-2-artem.galin@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200424145219.54067-1-artem.galin@gmail.com> References: <20200415130741.27263-1-artem.galin@gmail.com> <20200424145219.54067-1-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/4] libavfilter/qsvvpp: enabling d3d11va support X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 , robux4@ycbcr.xyz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 8d5ff2eb65..f74b504990 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -36,6 +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) +#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) typedef struct QSVFrame { AVFrame *frame; @@ -68,12 +69,6 @@ struct QSVVPPContext { int nb_ext_buffers; }; -static const mfxHandleType handle_types[] = { - MFX_HANDLE_VA_DISPLAY, - MFX_HANDLE_D3D9_DEVICE_MANAGER, - MFX_HANDLE_D3D11_DEVICE, -}; - static const AVRational default_tb = { 1, 90000 }; /* functions for frameAlloc */ @@ -129,7 +124,17 @@ static mfxStatus frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr) static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl) { +#if CONFIG_VAAPI *hdl = mid; +#else + 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; +#endif return MFX_ERR_NONE; } @@ -451,7 +456,7 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s) s->out_mem_mode = IS_OPAQUE_MEMORY(s->in_mem_mode) ? MFX_MEMTYPE_OPAQUE_FRAME : - MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET; + MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | MFX_MEMTYPE_FROM_VPPOUT; out_frames_ctx = (AVHWFramesContext *)out_frames_ref->data; out_frames_hwctx = out_frames_ctx->hwctx; @@ -497,14 +502,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 != MFX_ERR_NONE) { av_log(avctx, AV_LOG_ERROR, "Error getting the session handle\n"); return AVERROR_UNKNOWN;