From patchwork Thu Apr 9 17:50:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 18797 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 814DD4497A5 for ; Thu, 9 Apr 2020 20:51:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55F8268B897; Thu, 9 Apr 2020 20:51:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4A6C68B6D8 for ; Thu, 9 Apr 2020 20:51:22 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id h2so637747wmb.4 for ; Thu, 09 Apr 2020 10:51:22 -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; bh=v9dNu3MStEWEsdnI/cd1b0QQW4TIEb7QPvyMSUKqjfs=; b=I7Qq7cZ/1W7YD/oT0gyp80WZAVtR5VtRqrW7GEWB4kbWu3hZVB1ctq6axyQwtNMz/x mJrWcVMs1E80SRla9JDb16bSaZb4hY5WRXXTyxCj1hrTsNlf8HInINlOxX9vzfSx4AJt aj+IsArm+XNyX7dRsSmzQTv22EELfhxXi1Gyv5Oa1hvUPLwC5ReZY0D//5frlchaoXeT hNSxpSD6khu5QldZUwLfWNOzUR09XfQzwZaTAQqBDUb4TI5DjVmbfvXw5KChmG4TLUEX 3mHvk9lCBQdwfSq6qPQ64rsG7ivaiB/t4P7D2pL+LChwsmDMhJsiy+CzccNSlhlf19wX vu/Q== 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; bh=v9dNu3MStEWEsdnI/cd1b0QQW4TIEb7QPvyMSUKqjfs=; b=DX2tNWRa7UGpmNe8S/G/xYQwPGWXLv4xOIuLlGVaagn5fqIlgOfYNqdSRyPPX99//b tzWyouHB3xySnd0AzRDhXtjuf4K9sqB5gMv5wNk2yiyMV8+JHaL1sOd5UImgEV0y73qC EXbJOoXlTbUOR/7mMV7UCkwRHrSCh4Mwn8xrXG9Hx8Gtq7+3I6aPysxpGUNGHWG+VxO5 W46m8IFmj36lJAsRgmitP1jvXxdsUUYXJpuujolBZUCxQmtKOapIr/epEpynHVFOtmhE o+Vg9WcLuiDUm54aQppZfulvAS0D4Bn1So6pPz4lS9nj0kAzVMgMPSUzI59RYtW8RAKt zx/A== X-Gm-Message-State: AGi0PuZ7zTu33qfCivZ6R5tlQHfcazTrd0wEMbeml4KNcmlUW8lnHWni hnOvCdIaviLS8JrxjXgoD7u2MgPFO7A= X-Google-Smtp-Source: APiQypIzQfeBcdngdih+RMxwQiO9F1uuqqVGYRabOO20yim/dFWtcDEcr9bZoIMSFxacx3N6h1T0Vg== X-Received: by 2002:a1c:9ad7:: with SMTP id c206mr1005409wme.48.1586454681918; Thu, 09 Apr 2020 10:51:21 -0700 (PDT) Received: from galinart-MOBL.ger.corp.intel.com ([90.219.218.77]) by smtp.googlemail.com with ESMTPSA id z11sm25622574wrv.58.2020.04.09.10.51.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2020 10:51:21 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Apr 2020 18:50:52 +0100 Message-Id: <20200409175054.23468-2-artem.galin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200409175054.23468-1-artem.galin@gmail.com> References: <20200409175054.23468-1-artem.galin@gmail.com> Subject: [FFmpeg-devel] [PATCH 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 MIME-Version: 1.0 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 | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 8d5ff2eb65..8c6c878bac 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -32,10 +32,11 @@ #include "qsvvpp.h" #include "video.h" -#define IS_VIDEO_MEMORY(mode) (mode & (MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | \ +#define IS_VIDEO_MEMORY(mode) (mode & (MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | \ 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 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; @@ -129,7 +130,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 +462,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,15 +508,24 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s) return AVERROR_UNKNOWN; } + 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 if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_VA_DISPLAY; + } + 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 (handle_types[i] == handle_type) { + ret = MFXVideoCORE_GetHandle(device_hwctx->session, handle_types[i], &handle); + if (ret == MFX_ERR_NONE) { + break; + } } + handle = NULL; } - - if (ret != MFX_ERR_NONE) { + if (!handle) { av_log(avctx, AV_LOG_ERROR, "Error getting the session handle\n"); return AVERROR_UNKNOWN; }