From patchwork Fri May 8 15:18:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 19568 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 CFE3244A590 for ; Fri, 8 May 2020 18:20:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B04FC68A67E; Fri, 8 May 2020 18:20:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F34668A3F5 for ; Fri, 8 May 2020 18:20:41 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id i15so2320355wrx.10 for ; Fri, 08 May 2020 08:20:41 -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=myeJOp4q6Mdw2hOYXQrTvUR1G6QRxluLe8flEyNctHg=; b=d9mD8Vbc+TQUiJuagtdkC0ik6DyrWqlF9qMU/ftsxTCWHZGBzdVT5wMfPTy8m2Z88S mYqcx3H7+6FxoskQ7ESw5bmtjBwlVLG9zpYZl6/fR/Wwdsk6t0VB+QRwVWWMRMb56tD5 AZHoDVXwGxgI1uSIdVyGu8VXcSoK4LilattmusIgaPL8/RQKhg80p2Ty+TZeDS9CFi0t zKHHBerHsSwz+2NZyO8UDw+vgtX0FMWOEb4OIoERsRtNZDfTa0s7ZhwJnnhmePWTlh1w U+uFFOaD0D/IFsbSzBmSH3FK4SaJXBDQCYB5tjjogydkwhNnWQ8bBoMpqnfnAonKoDCU 7ChQ== 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=myeJOp4q6Mdw2hOYXQrTvUR1G6QRxluLe8flEyNctHg=; b=QTpbMy8FNhZNFLlV0SLjpyhWhdymn5a2Vb01LU0bvEptFSvlpfPjP7rIjS1J/Lcavj DuCAZTN0rRF3V2gGi7MlI/kOvAukJfdOXn+TR55b1hXAbMxc6dDd45eg2LzPeWdHaEyL 7ACuN8wVp5oYmwSkUs5htR54sHumVpkn5fwowwf5SV6kkrckk+jJIQ+J6R9s4ougWJ+G b/kmprOYrOlTHnd6JSYHnu76VhW8nCcuvPw0dOKqRi2oeIpns0R/Br/Ex1cxN0PXDsa4 tqGa66KwURG8tzWl+MbGD12si9oLB2nlQ1P8uHyK6GElm7fzeE4/u2W8xiNqppnf8xvx d5BQ== X-Gm-Message-State: AGi0Pub30ZXAo0zsXEAsV/8R7ra89qb5bDAM77KoAt2fBcyyUrzJlXeM 8fSvW69U71JwgJrLUVSpnKlQODCamRpxvg== X-Google-Smtp-Source: APiQypIn7drm8oVdRMXNjQyYPqQe+2H9vqQFVcfZ46v4uKiehM3oopQv2eUSsJIwjsivP0aMWwGG7g== X-Received: by 2002:adf:de81:: with SMTP id w1mr3414463wrl.353.1588951240363; Fri, 08 May 2020 08:20:40 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:3e2e:7400:c904:d18e:fdcb:4131]) by smtp.googlemail.com with ESMTPSA id u24sm7339937wmm.47.2020.05.08.08.20.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 08:20:39 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 May 2020 16:18:17 +0100 Message-Id: <20200508151821.49051-7-artem.galin@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200508151821.49051-1-artem.galin@gmail.com> References: <20200424145219.54067-4-artem.galin@gmail.com> <20200508151821.49051-1-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 07/11] 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 , robux4@ycbcr.xyz 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 | 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;