From patchwork Tue Nov 3 18:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 23370 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 4D4894486F8 for ; Tue, 3 Nov 2020 20:56:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A0C368B66C; Tue, 3 Nov 2020 20:56:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C79F468AA85 for ; Tue, 3 Nov 2020 20:55:59 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id o9so23671580ejg.1 for ; Tue, 03 Nov 2020 10:55:59 -0800 (PST) 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=IVP760uBZfXy6Tyt9Ctc0mRMVdekJxk7WFzjrYBbr34=; b=XVuwxf3AYZRcCDBC0DELHtfaVwpBtk7pnccu1gTbxYKFWMxnqfPDD9WH/GWYL67xQv xnQvC7NzlIHnsQcl8wewxYE3rASQwsfZrUy2ajqAmbWRlY6/4oJNOb5zuVoVMidj9lIW vbot8MJNqbVG55CRz0Aa+loIHE4VogNrRxQM+MtLh7LTfx8lonUI2JSenrxL3fNSeqvU zUvWIOfaLCLEI4GHLgqjqdBnMP4wCh+zqRsdIIs1pJbibUOeUAMtzxzbxQMZNWWMn4Cg ANX01TnMNKyuA50qyVJ30unL2842Vi7lj7YdnzDBVzd1K/P75OuXjKgvPS9dA+/P6eO4 +25g== 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=IVP760uBZfXy6Tyt9Ctc0mRMVdekJxk7WFzjrYBbr34=; b=FPRrE09EsTnfW/A/HaTWQUd4s43UfBd3f8im0piMYrzTGxQEK1chijsaEZivg0W2BE wf/rcEenhI00Rq67cqCMCzMUm4kVAOfRLoc+Lib0uTeo6EORQUazBJXg3d2AgWQbFVuo x/vD0moROmpwNRVUOTiMvFUYwAb4RadU4htzTphtN8ZcIXNIZqCbIcOEloF3Cvy1TdfL w2eCLx+AWscb+/2Vqb15LrOg1coUF6CPdyMKRzk115FdVWG1ioJe2z/jUJwnSpgxEVJJ O2aDHRhiugBvr8zX9PTLwd5Tj5nT163bIJezyWFRidNQnX5VWwihaXlYDN1v6u68qmfe lcAQ== X-Gm-Message-State: AOAM532Eai+Yx1QbuT2vQZ/ncnwoExPy28GlJ0T1mRs1eUM6Jv+RuS5P DHVbZMjyAkdkMlRslekmzHSFwTXzyYb5lA== X-Google-Smtp-Source: ABdhPJxugIe7t4fCuqN5/B36z5Kxi8r1u/4am5y70LQYCZMtnul02JvDrf0kETUuEHZp5jGWdWqsQQ== X-Received: by 2002:adf:f247:: with SMTP id b7mr29780241wrp.56.1604429275544; Tue, 03 Nov 2020 10:47:55 -0800 (PST) Received: from localhost.localdomain ([2a02:c7f:3015:4e00:e4c4:5a5e:dd23:ce22]) by smtp.googlemail.com with ESMTPSA id z2sm3905249wmf.45.2020.11.03.10.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 10:47:55 -0800 (PST) From: Artem Galin X-Google-Original-From: Artem Galin To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Nov 2020 18:45:54 +0000 Message-Id: <20201103184557.18444-5-artem.galin@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103184557.18444-1-artem.galin@intel.com> References: <20201103184557.18444-1-artem.galin@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 5/8] libavfilter/qsvvpp: enabling d3d11va support, added mfxhdlpair 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 8d5ff2eb65..0d3f7fb2f9 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,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; } @@ -497,14 +498,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;