From patchwork Fri Aug 20 21:48:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 29650 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp6114iov; Fri, 20 Aug 2021 14:50:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2/bbJOvDZ4ywpxq4HYaBkXCakx7a+x46wOi+Yl/EHx0jVOTUdmleZrcwfD5uKIthtRQJb X-Received: by 2002:a17:906:2441:: with SMTP id a1mr23834393ejb.550.1629496221019; Fri, 20 Aug 2021 14:50:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629496221; cv=none; d=google.com; s=arc-20160816; b=pPTcYq+0OtCcaSHs2OWY5FQT+Wq4vRRPx+m6FT1zkJ9/lfIQzcgr83t5zoTqwExfbb bG9ZToIfxQtJgj+Rc2og4SQVWbB90U1uJWDXxznuaon+ReGJvsQzrorqTjZ8JX6wHC1n +6n5VFHETlxQfPywhTQxmzbC4pY3qzNBNZ7ttk8j7g1YKeY+MjiZTtFFsUPY7EzqsMnD peFsdkESL/Tsp8IhuNhBTT0P84ii9eZvVA+sYOHUynmKvkpnmkPYEYbuwyKSV8vy7nZW eEElUgpE3Mho9CdCepfHCQffA/MaJuMfzvDk2LYlrDm2fZEyCzWePEVxgTcI68q0r4Po CmPQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=wQSnFAZTjHziNUOJxZphfGdPanfvd7DlBfGTREFAea4=; b=UmMuM2DzssqLvpT9Z1fBpOg6D6OSCyj9RZHLahokxwdtuXPibEuvRqQzNDO9FN59r6 i/N1b881XEXCMtVUaQpUTZAZWc17y7VfikbYSxKD2DL1T8OBhuFY+WEQzJOhP/KiWxwl CTdSTD7E04/Z/9iJWvvq67ruf96oXSNVUJISAbCqLjMCK0YV/ztV1SS5wy9b6SifzmXy XsQm2S3mWZQjcnsaJ0ZPY7B91lE5MTOU4tQeCopWk8P8RkD2u0DRbnz3RbeZkCmvhKcA FmkVQbwBFWzLSvKMXCKtx6itfHBJbwcu87N5GV7fZsqC+Otgcv1jr65UeIWFZnEzGgfJ 4FAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="gmSA/BGl"; 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 ds7si9801897ejc.524.2021.08.20.14.50.20; Fri, 20 Aug 2021 14:50:20 -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="gmSA/BGl"; 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 2704C68A369; Sat, 21 Aug 2021 00:50:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B5EE68924E for ; Sat, 21 Aug 2021 00:50:09 +0300 (EEST) Received: by mail-wr1-f47.google.com with SMTP id f5so16050814wrm.13 for ; Fri, 20 Aug 2021 14:50:09 -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:mime-version :content-transfer-encoding; bh=UwJkUh3N3qHo42GtdZP16Q3B+6J01HA+agMREhdHAOE=; b=gmSA/BGlxQSdK4OW7drNb/ZrsNS42p2ViSWOQwSDAvAe+SNu5fquwzPyRCmOkeTKn8 eac64UiLqsSVtBNvbZX33VLj3t6FLWaGajH0/B4kjJ9uB5dAQa5hsjUZs+zaXDqV2OE8 pN8cIR9ib3KR1FDxJFEB3FqFUjDgr3WUg0LNE60zEd8S76ggwPXRQhElHCXD77jIEv9P SDB0iUJkI1/XfeExW/9VASyIi7KjmePHY1tYTO2ah6lW22YBe19Okhfjkljdz0aUVaDN 4VPjrqv1hvesW+LtmMqp5qssfN926T1xVMtaBhUKFtxNl6WXxH284uguiEaPbKh65Dlh FeGw== 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:mime-version :content-transfer-encoding; bh=UwJkUh3N3qHo42GtdZP16Q3B+6J01HA+agMREhdHAOE=; b=XsAa8AY+qDLyO7xq+Lhf2gXVKHePgSGLeLDrEC+oYZAUl7xeBcJv2rNc/Fw+A6J0CM thHZ0HPGRvh4olBevPEa0JKKp5hUXcuUypcEVbH8kFa6jbY3Bgpx/DuXMFiLGirQjwfe IiPCv4YqK6OLjDV36RgmoWcC/fK10RwusCNvA/YVEUzBpn0Cq/zyGo8Z6Ynp1xF18Unr OUtIVRi44Js5AfVLy+y55SMyAsBj+mzqkYHgqktvx9hW9FGk1e22OkO5u96l5SPRYumw uvk2EU7FBDIML16OgeQR0AKtlrEqvH8Ec7KJ6N4qVgKr0OBSZ3yNCbqKGcULLrstS8us UnQw== X-Gm-Message-State: AOAM531h451NnzlK2Wkt7FiZuvtE6Rp+AXVwLUEl9n2lVWxEU6V1yjHv Hu15fC0keNARnz8LgnfeKvscLlLFcFO2tA== X-Received: by 2002:a5d:618f:: with SMTP id j15mr883451wru.80.1629496208665; Fri, 20 Aug 2021 14:50:08 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7f:3015:4e00:5f5:a7a2:8cb1:892d]) by smtp.googlemail.com with ESMTPSA id x19sm6046796wmi.30.2021.08.20.14.50.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 14:50:08 -0700 (PDT) From: Artem Galin To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Aug 2021 22:48:02 +0100 Message-Id: <20210820214810.9733-1-artem.galin@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/9] libavcodec/qsv: enabling d3d11va support, added mfxhdlpair X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: OgYWah8R5sex 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 c53e2e3b07..139c4971de 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 @@ -230,7 +232,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; @@ -370,7 +374,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 }; @@ -459,7 +467,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; } @@ -636,7 +644,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, @@ -669,7 +677,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; } @@ -677,24 +691,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) @@ -703,13 +712,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 327a8d3385..6b96c413c5 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -62,7 +62,7 @@ typedef struct QSVMid { AVBufferRef *hw_frames_ref; - mfxHDL handle; + mfxHDLPair *handle_pair; AVFrame *locked_frame; AVFrame *hw_frame;