From patchwork Mon May 18 20:29:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 19765 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bac9:0:0:0:0:0 with SMTP id a9csp3078892ybk; Mon, 18 May 2020 13:31:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzK70nqWpaOwl2DQmf/FUrWnV8p6pxOica6RFOn3A0LNBIM1MrgQ4dz/QWEluk3AS1ebINJ X-Received: by 2002:adf:e4d0:: with SMTP id v16mr21779010wrm.294.1589833876420; Mon, 18 May 2020 13:31:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589833876; cv=none; d=google.com; s=arc-20160816; b=aD2nyEcCZVTWYJXRgksXYfLksRtJoFFrqwPNoc9nHH5ezQg6CZOeu87JOhXeR4j07g UcS7XP4InjXm5LhLsy36WxKj+FBBvGlcK4ebpRo5AaxHyi+lUiRRXAm1saKBrw+HqVUI ggY59CHLkvSkddpcr90NkTh1NW8k5GYvmzXyjMJTzJsYfKKRnFMQvCGoGM4j87bQl9cb +kxZFBZZXe77Tv0OAZOeA6wK+VtG2mebz6Gdh5NLJZPhXRXnlt6rCfLnZImdPLAxrmqn 05HpKcEfLF+z3504i8KeQrgYhRSWGV9X2pF2LqFyOnjleZNO9FFrmCH1ARu/WxMpMGnu 9DiA== 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=PmRmNEx84q4WzldDfPPbzTsP6Dz+nQdnF0eejIgC2Gk=; b=NeSu15D6nj1yyODBzKe+0ch4NGorI+N1gbyZzcfJehEPU47k/svvesQKPVJGLthTfE Lv61OiqWWoyWeQAfyaqmQD8As1ME41Dlyg0ahZjXJHU35LzncDncvXU+VxJ7X62LNZ0F Pn+PiCpv50fpCgdD25g9mrVEpcotuu1smhLrdhRIHYWCzpvpxdF39MuTGfzIPbewPWf9 nGtEYGlsIRMkWD2hfLciVfcA60ZmKhOcCX+XBVT6mLQCSTujEKE15uxihVaoOHhdWER1 a/zDvj+TmTk1gDyomUDw3GwfGYnQe0Yph0DF+vDCJ9TxPHtMtwV+bGSjNPRL5shXgTRr ntVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WzOH5Zyu; 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 y18si11726474wrm.528.2020.05.18.13.31.16; Mon, 18 May 2020 13:31:16 -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=WzOH5Zyu; 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 6BDD068AABE; Mon, 18 May 2020 23:31:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBB1F68AA92 for ; Mon, 18 May 2020 23:30:55 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id h4so801264wmb.4 for ; Mon, 18 May 2020 13:30:55 -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=J2/3DBV2RGiSE2/ITrlryXNF7/V2EdLxCAUkbnrwSXg=; b=WzOH5Zyuu92Q2gMIpP5aY3C13vAxGfmsZVu8jxYlQiOulGDZy4NXEx3CfBL1SRBpkX Eirxba9fWtTOUUKxJ5FGy3C/peYB4OpOb0vCoj2kIA72SMhYcUOrxZvAFqONmYIlcb9N jypWD5o0uf9ulUVOYSXhSFVr0gAvWlZ0D1oeKskNwVlSnw+WHnzzQBsSLYBlL1ReGbn9 ihUG6GgdwH/1kCGcANkvcf2+p6EszwRuBsOLs64rzUpr69ZvuMr90LV6aMxy4b7AHiWP U7wiS8knH9yYKGeMJ1Q114vUUlxrQdRoDqeKQNzYAxSo+WHn7qGkRBTqxIJv3O6lic7o cLWQ== 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=J2/3DBV2RGiSE2/ITrlryXNF7/V2EdLxCAUkbnrwSXg=; b=BEThedSubjm9A9K2iEu5izJdqm5TwooAIF/hTJbwFqZxD1UwzgAFvEs39dQheolZ8R 5GtBoiSKRtVXvWvZcAHvFUxe4C2PszD0lIh4yswhd0x90KSr2mALOVIKZG7+35wLd9Ts tTV0V1NiBoKgqNy7vvc9Ix3GIbezxy8Ea1n7kDKWlIOoyHn4b/ZIwN4/FiN4oH26OQGF UZz3oBm95eu9RGvCsGIxWkVsEyoyyMfk5LIlk/aVZOd7RzzSojohf6cuWS/GZ2ylXdyF fELnhtY+1wBATWDNYBdeHEO/b0RlBXV7pLrvMX83HPB5oZex0kuvdhJ7nuB7hIQJcaHn qI7g== X-Gm-Message-State: AOAM530SZK2K2TgF1ktZtVYXQMz+Ano851McZZYrxe9yl90hoToRUAgo 3fSJEKIQRo/A1x9OwGKT3eOTmYsVSIXd0Q== X-Received: by 2002:a1c:19c1:: with SMTP id 184mr1129504wmz.29.1589833854912; Mon, 18 May 2020 13:30:54 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:3e2e:7400:bc2c:26b1:105a:3e19]) by smtp.googlemail.com with ESMTPSA id q4sm884330wma.9.2020.05.18.13.30.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2020 13:30:54 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 21:29:27 +0100 Message-Id: <20200518202934.49601-2-artem.galin@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518202934.49601-1-artem.galin@gmail.com> References: <20200415130741.27263-1-artem.galin@gmail.com> <20200518202934.49601-1-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 2/9] libavcodec/qsv: 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 , robux4@ycbcr.xyz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tzRyPUaYM+jM Content-Length: 8053 From: Artem Galin Adding DX11 relevant device type checks and adjusting callbacks with proper MediaSDK pair type support. Extending structure for proper MediaSDK pair type support. Signed-off-by: Artem Galin --- libavcodec/qsv.c | 53 ++++++++++++++++++++++++++------------- libavcodec/qsv_internal.h | 2 +- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 17720070f1..ef57b92a9f 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -36,6 +36,8 @@ #include "avcodec.h" #include "qsv_internal.h" +#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) + #if QSV_VERSION_ATLEAST(1, 12) #include "mfx/mfxvp8.h" #endif @@ -239,7 +241,9 @@ int ff_qsv_find_surface_idx(QSVFramesContext *ctx, QSVFrame *frame) int i; for (i = 0; i < ctx->nb_mids; i++) { QSVMid *mid = &ctx->mids[i]; - if (mid->handle == frame->surface.Data.MemId) + mfxHDLPair *pair = (mfxHDLPair*)frame->surface.Data.MemId; + if ((mid->handle_pair.first == pair->first) && + (mid->handle_pair.second == pair->second)) return i; } return AVERROR_BUG; @@ -380,7 +384,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) { +#if CONFIG_D3D11VA + mfxIMPL impl = MFX_IMPL_AUTO_ANY | MFX_IMPL_VIA_D3D11; +#else mfxIMPL impl = MFX_IMPL_AUTO_ANY; +#endif mfxVersion ver = { { QSV_VERSION_MINOR, QSV_VERSION_MAJOR } }; mfxInitParam init_par = { MFX_IMPL_AUTO_ANY }; @@ -469,7 +477,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->handle_pair = *((mfxHDLPair*)frames_hwctx->surfaces[i].Data.MemId); mid->hw_frames_ref = hw_frames_ref1; } @@ -646,7 +654,7 @@ static mfxStatus qsv_frame_lock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr) goto fail; qsv_mid->surf.Info = hw_frames_hwctx->surfaces[0].Info; - qsv_mid->surf.Data.MemId = qsv_mid->handle; + qsv_mid->surf.Data.MemId = &qsv_mid->handle_pair; /* map the data to the system memory */ ret = av_hwframe_map(qsv_mid->locked_frame, qsv_mid->hw_frame, @@ -679,7 +687,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; + mfxHDLPair *pair_dst = (mfxHDLPair*)hdl; + mfxHDLPair *pair_src = (mfxHDLPair*)&qsv_mid->handle_pair; + + pair_dst->first = pair_src->first; + + if (pair_src->second != (mfxMemId)MFX_INFINITE) + pair_dst->second = pair_src->second; return MFX_ERR_NONE; } @@ -687,24 +701,19 @@ 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; mfxInitParam init_par = { MFX_IMPL_AUTO_ANY }; mfxHDL handle = NULL; + int hw_handle_supported = 0; mfxSession session; mfxVersion ver; mfxIMPL impl; mfxHandleType handle_type; mfxStatus err; - - int i, ret; + int ret; err = MFXQueryIMPL(parent_session, &impl); if (err == MFX_ERR_NONE) @@ -713,13 +722,23 @@ 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; + if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_VA_DISPLAY; + hw_handle_supported = 1; + } else if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_D3D11_DEVICE; + hw_handle_supported = 1; + } else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER; + hw_handle_supported = 1; + } + + if (hw_handle_supported) { + err = MFXVideoCORE_GetHandle(parent_session, handle_type, &handle); + if (err != MFX_ERR_NONE) { + return ff_qsv_print_error(avctx, err, + "Error getting handle session"); } - handle = NULL; } if (!handle) { av_log(avctx, AV_LOG_VERBOSE, "No supported hw handle could be retrieved " diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 6489836a67..370ab464e7 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -60,7 +60,7 @@ typedef struct QSVMid { AVBufferRef *hw_frames_ref; - mfxHDL handle; + mfxHDLPair handle_pair; AVFrame *locked_frame; AVFrame *hw_frame;