From patchwork Fri Jan 31 15:52:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 17635 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 C230C448786 for ; Fri, 31 Jan 2020 18:18:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A19D268AE14; Fri, 31 Jan 2020 18:18:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0F8868ADC1 for ; Fri, 31 Jan 2020 18:18:42 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id b6so9370627wrq.0 for ; Fri, 31 Jan 2020 08:18:42 -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=+XJ6WyQ0o+XgjE5jOJe8C2TDdM7TLmWITF3Km9P2AQ8=; b=EzNxwDSOmkOyR/bbOOU7QfLQF1IjZLQauL3GXYlfuMj0vQV3SrLhvqpCyslHTvXuLh nrYwvGrRsgGl3uoebS1wRDXtCsX3vSoCjNq05lrW6A6Qfm4gYzTrUA+uSL81omYYU6Lk knq1XRxiJ/MZOtznyEOouXoDPIU7AlFl19LKJC9IuzfJMYZSh6cYig8qJHVWkjbYLvut 7HnfbMnMy9zXCezURbQ4U7Mb+HyuiJaUc1sGQPOJK9Bt3s/tZgDeZgZMSrnWKTtMo6Pj oj4wFk7wLHbgVbvir0ycResfEvx0NNPNW2QLx6kUKrPPGZDwAAUZMK+hwZFrykwIn6jG t57Q== 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=+XJ6WyQ0o+XgjE5jOJe8C2TDdM7TLmWITF3Km9P2AQ8=; b=qC78rAQHnDK+UVl7bsN3ynoQ+I1P4eQF5DO0mIPf2lzxgRYCKvIq6bkzMBOJf7kqtY YLWDGCuyv1LO1pP42IwqnM5t9GbJGX3r6bbzu17hW9ZFiAbyf2WvETlu1RJheqXVc5pi hT7grj3px68b+ikqG0EjRJnUKVExxJd5oXl7F145T82Rv3AxvGGTYWDJYDKvwqqBVQbJ nBK5TBpDYTzDA7E26uoEqSpWitb9RWgp2xlRVZ4fZuR6Fw0XzcukdloUyEeddCv+94Nl fl9D4NAtQY4EBI6kuSqgEEFgM4uIYA+FU4gGMYZ4h2QtDEgTogw/5BnyFym7b74whYMO /66A== X-Gm-Message-State: APjAAAWea0kTBPohNFwVk3OVfM7FjQkA7RuoAQayb3/zz7AdOrn0YdcQ 7URIQEF+gPQaDn9Ee9EGEscr19tgxis= X-Google-Smtp-Source: APXvYqxb9HpsiKwDgkCxMJU/JFIpxNQa5IGhDM6DwxLtljssvzQ0rLaUKQr4u1RrC8IelP9tHG69Hw== X-Received: by 2002:a05:6000:1292:: with SMTP id f18mr13150014wrx.10.1580486032935; Fri, 31 Jan 2020 07:53:52 -0800 (PST) Received: from localhost.localdomain ([2a02:c7d:3e2e:7400:1113:20b1:c4b8:587b]) by smtp.gmail.com with ESMTPSA id q1sm6754471wrw.5.2020.01.31.07.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jan 2020 07:53:50 -0800 (PST) From: Artem Galin To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Jan 2020 15:52:25 +0000 Message-Id: <20200131155225.6167-1-artem.galin@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200123151813.31739-1-artem.galin@gmail.com> References: <20200123151813.31739-1-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] lavc/qsv: adding DX11 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This enables DX11 support for QSV with higher priority than DX9. In case of multiple GPUs configuration, DX9 API does not allow to get access to QSV device in some cases - headless. Implementation based on DX11 resolves that restriction by enumerating list of available GPUs and finding device with QSV support. Signed-off-by: Artem Galin --- libavcodec/qsv.c | 38 ++++---- libavcodec/qsv_internal.h | 5 ++ libavcodec/version.h | 2 +- libavfilter/qsvvpp.c | 19 +--- libavutil/hwcontext_d3d11va.c | 55 +++++++++++- libavutil/hwcontext_qsv.c | 160 +++++++++++++++++++++++++++++----- libavutil/hwcontext_qsv.h | 11 ++- libavutil/version.h | 2 +- 8 files changed, 232 insertions(+), 60 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index db98c75073..df622d9c7d 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -362,7 +362,11 @@ static int ff_qsv_set_display_handle(AVCodecContext *avctx, QSVSession *qs) int ff_qsv_init_internal_session(AVCodecContext *avctx, QSVSession *qs, const char *load_plugins, int gpu_copy) { +#ifdef AVCODEC_QSV_LINUX_SESSION_HANDLE mfxIMPL impl = MFX_IMPL_AUTO_ANY; +#else + mfxIMPL impl = MFX_IMPL_AUTO_ANY | MFX_IMPL_VIA_D3D11; +#endif mfxVersion ver = { { QSV_VERSION_MINOR, QSV_VERSION_MAJOR } }; mfxInitParam init_par = { MFX_IMPL_AUTO_ANY }; @@ -452,6 +456,7 @@ static AVBufferRef *qsv_create_mids(AVBufferRef *hw_frames_ref) for (i = 0; i < nb_surfaces; i++) { QSVMid *mid = &mids[i]; mid->handle = frames_hwctx->surfaces[i].Data.MemId; + mid->texture = frames_hwctx->texture; mid->hw_frames_ref = hw_frames_ref1; } @@ -661,7 +666,13 @@ static mfxStatus qsv_frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr) static mfxStatus qsv_frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl) { QSVMid *qsv_mid = (QSVMid*)mid; - *hdl = qsv_mid->handle; + if (qsv_mid->texture) { + mfxHDLPair *pair = (mfxHDLPair*)hdl; + pair->first = qsv_mid->texture; + pair->second = qsv_mid->handle; + } else { + *hdl = qsv_mid->handle; + } return MFX_ERR_NONE; } @@ -669,14 +680,10 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession, AVBufferRef *device_ref, const char *load_plugins, int gpu_copy) { - static const mfxHandleType handle_types[] = { - MFX_HANDLE_VA_DISPLAY, - MFX_HANDLE_D3D9_DEVICE_MANAGER, - MFX_HANDLE_D3D11_DEVICE, - }; AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)device_ref->data; AVQSVDeviceContext *device_hwctx = device_ctx->hwctx; mfxSession parent_session = device_hwctx->session; + mfxHandleType parent_handle_type = device_hwctx->handle_type; mfxInitParam init_par = { MFX_IMPL_AUTO_ANY }; mfxHDL handle = NULL; @@ -686,7 +693,7 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession, mfxHandleType handle_type; mfxStatus err; - int i, ret; + int ret; err = MFXQueryIMPL(parent_session, &impl); if (err == MFX_ERR_NONE) @@ -695,17 +702,12 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession, return ff_qsv_print_error(avctx, err, "Error querying the session attributes"); - for (i = 0; i < FF_ARRAY_ELEMS(handle_types); i++) { - err = MFXVideoCORE_GetHandle(parent_session, handle_types[i], &handle); - if (err == MFX_ERR_NONE) { - handle_type = handle_types[i]; - break; - } - handle = NULL; - } - if (!handle) { - av_log(avctx, AV_LOG_VERBOSE, "No supported hw handle could be retrieved " - "from the session\n"); + err = MFXVideoCORE_GetHandle(parent_session, parent_handle_type, &handle); + if (err == MFX_ERR_NONE) { + handle_type = parent_handle_type; + } else { + return ff_qsv_print_error(avctx, err, + "Error no supported hw handle could be retrieved from the session"); } #if QSV_VERSION_ATLEAST(1, 16) diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 6489836a67..c985f227ec 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -65,6 +65,11 @@ typedef struct QSVMid { AVFrame *locked_frame; AVFrame *hw_frame; mfxFrameSurface1 surf; + /** + * ID3D11Texture2D texture in which the frame is located for D3D11VA device. + * Null in case of DXVA2 device. + */ + void *texture; } QSVMid; typedef struct QSVFrame { diff --git a/libavcodec/version.h b/libavcodec/version.h index 6cf333eeb6..2fba26e8d0 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 66 +#define LIBAVCODEC_VERSION_MINOR 67 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 8d5ff2eb65..298c10718e 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -68,12 +68,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 */ @@ -497,15 +491,10 @@ 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 (ret != MFX_ERR_NONE) { + ret = MFXVideoCORE_GetHandle(device_hwctx->session, device_hwctx->handle_type, &handle); + if (ret == MFX_ERR_NONE) { + handle_type = device_hwctx->handle_type; + } else { av_log(avctx, AV_LOG_ERROR, "Error getting the session handle\n"); return AVERROR_UNKNOWN; } diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index 6670c47579..95e2c7bfe8 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -510,6 +510,45 @@ static void d3d11va_device_uninit(AVHWDeviceContext *hwdev) } } +static int d3d11va_device_find_adapter_by_vendor_id(AVHWDeviceContext *ctx, UINT creationFlags, int vendor_id) +{ + HRESULT hr; + IDXGIAdapter *adapter = NULL; + int adapter_id = 0; + IDXGIFactory2 *factory; + hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&factory); + while (IDXGIFactory2_EnumAdapters(factory, adapter_id++, &adapter) != DXGI_ERROR_NOT_FOUND) + { + ID3D11Device* device = NULL; + DXGI_ADAPTER_DESC adapter_desc; + + hr = mD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, creationFlags, NULL, 0, D3D11_SDK_VERSION, &device, NULL, NULL); + if (FAILED(hr)) { + av_log(ctx, AV_LOG_ERROR, "D3D11CreateDevice returned error\n"); + continue; + } + + hr = IDXGIAdapter2_GetDesc(adapter, &adapter_desc); + if (FAILED(hr)) { + av_log(ctx, AV_LOG_ERROR, "IDXGIAdapter2_GetDesc returned error\n"); + continue; + } + + if(device) + ID3D11Device_Release(device); + + if (adapter) + IDXGIAdapter_Release(adapter); + + if (adapter_desc.VendorId == vendor_id) { + IDXGIFactory2_Release(factory); + return adapter_id - 1; + } + } + IDXGIFactory2_Release(factory); + return -1; +} + static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device, AVDictionary *opts, int flags) { @@ -519,7 +558,9 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device, IDXGIAdapter *pAdapter = NULL; ID3D10Multithread *pMultithread; UINT creationFlags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT; + int adapter = -1; int is_debug = !!av_dict_get(opts, "debug", NULL, 0); + int is_qsv = !!av_dict_get(opts, "d3d11va_qsv", NULL, 0); int ret; // (On UWP we can't check this.) @@ -538,11 +579,23 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device, return AVERROR_UNKNOWN; } + if (is_qsv) { + int vendor_id = 0x8086; + adapter = d3d11va_device_find_adapter_by_vendor_id(ctx, creationFlags, vendor_id); + if (adapter < 0) { + av_log(ctx, AV_LOG_ERROR, "Failed to find DX11 adapter with QSV support\n"); + return AVERROR_UNKNOWN; + } + } + if (device) { + adapter = atoi(device); + } + + if (adapter >= 0) { IDXGIFactory2 *pDXGIFactory; hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&pDXGIFactory); if (SUCCEEDED(hr)) { - int adapter = atoi(device); if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter, &pAdapter))) pAdapter = NULL; IDXGIFactory2_Release(pDXGIFactory); diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index b1b67400de..55171b6ba5 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -27,9 +27,13 @@ #include #endif +#define COBJMACROS #if CONFIG_VAAPI #include "hwcontext_vaapi.h" #endif +#if CONFIG_D3D11VA +#include "hwcontext_d3d11va.h" +#endif #if CONFIG_DXVA2 #include "hwcontext_dxva2.h" #endif @@ -89,6 +93,9 @@ static const struct { #if CONFIG_VAAPI { MFX_HANDLE_VA_DISPLAY, AV_HWDEVICE_TYPE_VAAPI, AV_PIX_FMT_VAAPI }, #endif +#if CONFIG_D3D11VA + { MFX_HANDLE_D3D11_DEVICE, AV_HWDEVICE_TYPE_D3D11VA, AV_PIX_FMT_D3D11 }, +#endif #if CONFIG_DXVA2 { MFX_HANDLE_D3D9_DEVICE_MANAGER, AV_HWDEVICE_TYPE_DXVA2, AV_PIX_FMT_DXVA2_VLD }, #endif @@ -124,18 +131,21 @@ static int qsv_device_init(AVHWDeviceContext *ctx) int i; for (i = 0; supported_handle_types[i].handle_type; i++) { - err = MFXVideoCORE_GetHandle(hwctx->session, supported_handle_types[i].handle_type, - &s->handle); - if (err == MFX_ERR_NONE) { - s->handle_type = supported_handle_types[i].handle_type; - s->child_device_type = supported_handle_types[i].device_type; - s->child_pix_fmt = supported_handle_types[i].pix_fmt; - break; + if (supported_handle_types[i].handle_type == hwctx->handle_type) { + err = MFXVideoCORE_GetHandle(hwctx->session, supported_handle_types[i].handle_type, + &s->handle); + if (err == MFX_ERR_NONE) { + s->handle_type = supported_handle_types[i].handle_type; + s->child_device_type = supported_handle_types[i].device_type; + s->child_pix_fmt = supported_handle_types[i].pix_fmt; + break; + } } } if (!s->handle) { av_log(ctx, AV_LOG_VERBOSE, "No supported hw handle could be retrieved " "from the session\n"); + return AVERROR_UNKNOWN; } err = MFXQueryIMPL(hwctx->session, &s->impl); @@ -229,6 +239,13 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx) child_device_hwctx->display = (VADisplay)device_priv->handle; } #endif +#if CONFIG_D3D11VA + if (child_device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { + AVD3D11VADeviceContext *child_device_hwctx = child_device_ctx->hwctx; + ID3D11Device_AddRef((ID3D11Device*)device_priv->handle); + child_device_hwctx->device = (ID3D11Device*)device_priv->handle; + } +#endif #if CONFIG_DXVA2 if (child_device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) { AVDXVA2DeviceContext *child_device_hwctx = child_device_ctx->hwctx; @@ -255,6 +272,16 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx) child_frames_ctx->width = FFALIGN(ctx->width, 16); child_frames_ctx->height = FFALIGN(ctx->height, 16); +#if CONFIG_D3D11VA + if (child_device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { + AVD3D11VAFramesContext *child_frames_hwctx = child_frames_ctx->hwctx; + child_frames_hwctx->MiscFlags |= D3D11_RESOURCE_MISC_SHARED; + if (hwctx->frame_type & MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET) + child_frames_hwctx->BindFlags = D3D11_BIND_RENDER_TARGET ; + else + child_frames_hwctx->BindFlags = D3D11_BIND_DECODER; + } +#endif #if CONFIG_DXVA2 if (child_device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) { AVDXVA2FramesContext *child_frames_hwctx = child_frames_ctx->hwctx; @@ -279,6 +306,18 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx) hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET; } #endif +#if CONFIG_D3D11VA + if (child_device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { + AVD3D11VAFramesContext *child_frames_hwctx = child_frames_ctx->hwctx; + hwctx->texture = child_frames_hwctx->texture; + for (i = 0; i < ctx->initial_pool_size; i++) + s->surfaces_internal[i].Data.MemId = (mfxMemId)(int64_t)i; + if (child_frames_hwctx->BindFlags == D3D11_BIND_DECODER) + hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET; + else + hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET; + } +#endif #if CONFIG_DXVA2 if (child_device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) { AVDXVA2FramesContext *child_frames_hwctx = child_frames_ctx->hwctx; @@ -421,7 +460,16 @@ static mfxStatus frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr) static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl) { - *hdl = mid; + AVHWFramesContext *ctx = pthis; + AVQSVFramesContext *hwctx = ctx->hwctx; + + if (hwctx->texture) { + mfxHDLPair *pair = (mfxHDLPair*)hdl; + pair->first = hwctx->texture; + pair->second = mid; + } else { + *hdl = mid; + } return MFX_ERR_NONE; } @@ -492,7 +540,7 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, err = MFXVideoVPP_Init(*session, &par); if (err != MFX_ERR_NONE) { - av_log(ctx, AV_LOG_VERBOSE, "Error opening the internal VPP session." + av_log(ctx, AV_LOG_ERROR, "Error opening the internal VPP session." "Surface upload/download will not be possible\n"); MFXClose(*session); *session = NULL; @@ -668,6 +716,11 @@ static int qsv_map_from(AVHWFramesContext *ctx, child_data = (uint8_t*)(intptr_t)*(VASurfaceID*)surf->Data.MemId; break; #endif +#if CONFIG_D3D11VA + case AV_HWDEVICE_TYPE_D3D11VA: + child_data = surf->Data.MemId; + break; +#endif #if CONFIG_DXVA2 case AV_HWDEVICE_TYPE_DXVA2: child_data = surf->Data.MemId; @@ -972,6 +1025,27 @@ static int qsv_frames_derive_to(AVHWFramesContext *dst_ctx, } break; #endif +#if CONFIG_D3D11VA + case AV_HWDEVICE_TYPE_D3D11VA: + { + AVD3D11VAFramesContext *src_hwctx = src_ctx->hwctx; + s->surfaces_internal = av_mallocz_array(src_ctx->initial_pool_size, + sizeof(*s->surfaces_internal)); + if (!s->surfaces_internal) + return AVERROR(ENOMEM); + dst_hwctx->texture = src_hwctx->texture; + for (i = 0; i < src_ctx->initial_pool_size; i++) { + qsv_init_surface(dst_ctx, &s->surfaces_internal[i]); + s->surfaces_internal[i].Data.MemId = (mfxMemId)(int64_t)i; + } + dst_hwctx->nb_surfaces = src_ctx->initial_pool_size; + if (src_hwctx->BindFlags == D3D11_BIND_DECODER) + dst_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET; + else + dst_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET; + } + break; +#endif #if CONFIG_DXVA2 case AV_HWDEVICE_TYPE_DXVA2: { @@ -1009,14 +1083,26 @@ static int qsv_map_to(AVHWFramesContext *dst_ctx, for (i = 0; i < hwctx->nb_surfaces; i++) { #if CONFIG_VAAPI - if (*(VASurfaceID*)hwctx->surfaces[i].Data.MemId == - (VASurfaceID)(uintptr_t)src->data[3]) - break; + if (AV_PIX_FMT_VAAPI == src->format) { + if (*(VASurfaceID*)hwctx->surfaces[i].Data.MemId == + (VASurfaceID)(uintptr_t)src->data[3]) + break; + } +#endif +#if CONFIG_D3D11VA + if (AV_PIX_FMT_D3D11 == src->format) { + if ((hwctx->texture == (ID3D11Texture2D*)(uintptr_t)src->data[0]) && + ((ID3D11Texture2D*)hwctx->surfaces[i].Data.MemId == + (ID3D11Texture2D*)(uintptr_t)src->data[1])) + break; + } #endif #if CONFIG_DXVA2 - if ((IDirect3DSurface9*)hwctx->surfaces[i].Data.MemId == - (IDirect3DSurface9*)(uintptr_t)src->data[3]) - break; + if (AV_PIX_FMT_DXVA2_VLD == src->format) { + if ((IDirect3DSurface9*)hwctx->surfaces[i].Data.MemId == + (IDirect3DSurface9*)(uintptr_t)src->data[3]) + break; + } #endif } if (i >= hwctx->nb_surfaces) { @@ -1074,7 +1160,7 @@ static void qsv_device_free(AVHWDeviceContext *ctx) av_freep(&priv); } -static mfxIMPL choose_implementation(const char *device) +static mfxIMPL choose_implementation(const char *device, enum AVHWDeviceType child_device_type) { static const struct { const char *name; @@ -1103,6 +1189,10 @@ static mfxIMPL choose_implementation(const char *device) impl = strtol(device, NULL, 0); } + if ( (child_device_type == AV_HWDEVICE_TYPE_D3D11VA) && (impl != MFX_IMPL_SOFTWARE) ) { + impl |= MFX_IMPL_VIA_D3D11; + } + return impl; } @@ -1129,6 +1219,15 @@ static int qsv_device_derive_from_child(AVHWDeviceContext *ctx, } break; #endif +#if CONFIG_D3D11VA + case AV_HWDEVICE_TYPE_D3D11VA: + { + AVD3D11VADeviceContext *child_device_hwctx = child_device_ctx->hwctx; + handle_type = MFX_HANDLE_D3D11_DEVICE; + handle = (mfxHDL)child_device_hwctx->device; + } + break; +#endif #if CONFIG_DXVA2 case AV_HWDEVICE_TYPE_DXVA2: { @@ -1180,6 +1279,7 @@ static int qsv_device_derive_from_child(AVHWDeviceContext *ctx, goto fail; } + hwctx->handle_type = handle_type; return 0; fail: @@ -1191,7 +1291,9 @@ fail: static int qsv_device_derive(AVHWDeviceContext *ctx, AVHWDeviceContext *child_device_ctx, int flags) { - return qsv_device_derive_from_child(ctx, MFX_IMPL_HARDWARE_ANY, + mfxIMPL impl; + impl = choose_implementation("hw_any", child_device_ctx->type); + return qsv_device_derive_from_child(ctx, impl, child_device_ctx, flags); } @@ -1226,23 +1328,35 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device, // possible, even when multiple devices and drivers are available. av_dict_set(&child_device_opts, "kernel_driver", "i915", 0); av_dict_set(&child_device_opts, "driver", "iHD", 0); - } else if (CONFIG_DXVA2) + } else if (CONFIG_D3D11VA) { + child_device_type = AV_HWDEVICE_TYPE_D3D11VA; + av_dict_set(&child_device_opts, "d3d11va_qsv", "enabled", 0); + } else if (CONFIG_DXVA2) { child_device_type = AV_HWDEVICE_TYPE_DXVA2; - else { + } else { av_log(ctx, AV_LOG_ERROR, "No supported child device type is enabled\n"); return AVERROR(ENOSYS); } ret = av_hwdevice_ctx_create(&priv->child_device_ctx, child_device_type, e ? e->value : NULL, child_device_opts, 0); - av_dict_free(&child_device_opts); - if (ret < 0) - return ret; + if (ret < 0) { + if (CONFIG_DXVA2 && (child_device_type == AV_HWDEVICE_TYPE_D3D11VA)) { + // in case of d3d11va fail, try one more chance to create device via dxva2 + child_device_type = AV_HWDEVICE_TYPE_DXVA2; + child_device_opts = NULL; + ret = av_hwdevice_ctx_create(&priv->child_device_ctx, child_device_type, + e ? e->value : NULL, child_device_opts, 0); + } + if (ret < 0) { + return ret; + } + } child_device = (AVHWDeviceContext*)priv->child_device_ctx->data; - impl = choose_implementation(device); + impl = choose_implementation(device, child_device_type); return qsv_device_derive_from_child(ctx, impl, child_device, 0); } diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h index b98d611cfc..13af8e36d9 100644 --- a/libavutil/hwcontext_qsv.h +++ b/libavutil/hwcontext_qsv.h @@ -34,6 +34,15 @@ */ typedef struct AVQSVDeviceContext { mfxSession session; + /** + * Need to store actual handle type that session uses + * MFXVideoCORE_GetHandle() function returns mfxHandleType + * always equal to MFX_HANDLE_D3D9_DEVICE_MANAGER + * even when MFX_HANDLE_D3D11_DEVICE was set as handle before by + * MFXVideoCORE_SetHandle() to mfx session. + * Fixed already but will be available only with latest driver. + */ + mfxHandleType handle_type; } AVQSVDeviceContext; /** @@ -42,11 +51,11 @@ typedef struct AVQSVDeviceContext { typedef struct AVQSVFramesContext { mfxFrameSurface1 *surfaces; int nb_surfaces; - /** * A combination of MFX_MEMTYPE_* describing the frame pool. */ int frame_type; + void *texture; } AVQSVFramesContext; #endif /* AVUTIL_HWCONTEXT_QSV_H */ diff --git a/libavutil/version.h b/libavutil/version.h index af8f614aff..2bc1b98615 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 38 +#define LIBAVUTIL_VERSION_MINOR 39 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \