From patchwork Mon May 18 20:29:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 19764 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 3C06744B999 for ; Mon, 18 May 2020 23:31:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16CDC68ABD5; Mon, 18 May 2020 23:31:14 +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 F2F8C68ABC4 for ; Mon, 18 May 2020 23:31:04 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id k13so11292658wrx.3 for ; Mon, 18 May 2020 13:31:04 -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=nVmcODXny2sPtqELhYK7+ySCBdEi5kYcLPFkZPJ89xU=; b=HwuGgznbGeP1D1BWCOVDl1Wg/NyTfpJo1tTYR4FTPzyYdTAJh6w2RRnkR/8JOqPESg suJu9270O9O4dSD7Mw+Aro8QKb36s7rZ5vUot9guAxd4XE+tw7oKf1nng3s1y6URldIO 0joLlRqO9FB/lIlb0lxkaK9I5Af924z2foGle7UC7TxPJpztcEMLYzTX0xO1CqClXg5w Qj6R8sPkeRTvYZZvNJYH2OJmEOT0OcfoSXoC2CGNl92rAoQ7uMwCxgzrEmaNrRxHjXAj kKxhRj3ixQP3khrxetq5U2Vio3ZTrs1UV4HcAj+os2TtYe1ikUwhLj+yFTzEEidxZ4ZB JwsQ== 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=nVmcODXny2sPtqELhYK7+ySCBdEi5kYcLPFkZPJ89xU=; b=U+7PkxOOr9ve6LUWJw72nP4Lhaz3cdYmI2GKBQ91uK9eaOwGdB/zBDj2TtVtGufS1k W4DD32X+7EN3oFvwuxjKDr0mx9bf2sTww9amI150Szu3UbmGCZ18EIBj/92jvXUSBZ9m zRxFDvhz5PTL4+IJbg8v6SGLvG2Izzyr3GAEWgl1JP3D4dHf7tGIZ4aUuQsXZBAgIHHw 65+hL35lFJeFf9k9M+GuWVKIy2v8TsSSunghDB8ca3Z1QVdrP3B9Q+9R9tRnnCLfRyzj duoP2JA9RsvX6HfZpfnXarERsC0rmTaE9t7W4nIVCZ3V1GAA4BDBEC//5rSDX4cOCCbm eBVQ== X-Gm-Message-State: AOAM533H8/1S64R8qy4pFV6f4SEF6OJJHEeTazzK/ggXkkGgANq3TJij rboCECbGGqoWqoHbkTFnwdarcg+mDUnsvg== X-Google-Smtp-Source: ABdhPJzYAPe8c67uJv3H0YrrT2NOIuDzoet7OBcXwC0h8cgdT60BEjPCOkJS1bL+7lqZDYMONRhDGA== X-Received: by 2002:a5d:4447:: with SMTP id x7mr20921208wrr.424.1589833864111; Mon, 18 May 2020 13:31:04 -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.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2020 13:31:03 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 21:29:32 +0100 Message-Id: <20200518202934.49601-7-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 7/9] 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;