From patchwork Mon May 18 18:55:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 19750 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 D9D7344B459 for ; Mon, 18 May 2020 21:56:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C96A368AA6D; Mon, 18 May 2020 21:56:09 +0300 (EEST) 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 0905B68A821 for ; Mon, 18 May 2020 21:56:03 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id v12so13043624wrp.12 for ; Mon, 18 May 2020 11:56:03 -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=B/VxyoN9Ia/dACDO1xEWJ6JCQ8bC5a9VbCAqVTF4TI4=; b=mE8FPMFaEwv5/o5sMx/1d+WXw85N/hUvKxnizcKCmYv9jaYwkgcACBix6WuIzNo/Xj 9LLYR9CFmpjIFWz4UkIvUQnjtIRNgtLki+sbl3lLy9FCp30GMvZeAFwABdxgkV2td1BG SurtVCW70IKdM19iCeS5hmGk4JeuroXK6hrN+ZLw2KgAkMSkzpJIqysNgnMXgUKKKa2s q1A+wAhBGX+bN0p6LTyylyQ3s4KM13egP9k/T6hp/NWtSQ5Ld6DBSBztvynwON6O5i+l Q8FLtQ4o8ZfzfbAewOkQr1Ohi3eNu9kuSJNao4m6AQUc22wxceVSV0SrZoN9F5NH1UxE SeNw== 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=B/VxyoN9Ia/dACDO1xEWJ6JCQ8bC5a9VbCAqVTF4TI4=; b=H/AfqDgQgMAhyf4KX4zBC/FrAkFRdysnv2fc8Ft0TELpPkALVfLl5zhRFwiFqRWybM tnJtrruXghldiyIoTxrtKVmk9wF8FwWbLWW9M6s6nITGKBqVIWbQDDG6gPHFZOi2+snb lTVaIjNlrJYhhULbfJCfOyWkxnLCug3nRxsHFo7KtGW4X29XUO158i7PuL+BxHK0NUNK p4zftLuoh+RFlcUM0Rppfv0BTQuE/NEe7wtFH+RRtzrXvTQ53dqBOG1OSvmgp3rpkNEh gmnCe3vF5JYAUdyUrrxI193dOj60bsgoEiFpy5b8xvbBvxno0aBcR5PJ+MrvWZ+YoCKr vikg== X-Gm-Message-State: AOAM532INZPwL9EYM62Pubjbf4LAvigxm2qq/OPo2N9nZnWqjiYQzreU lknA4m03rb2cusi2VlOCXMt3cKCKImaYJQ== X-Google-Smtp-Source: ABdhPJzcOhr3dbh7die28nw+TtBOQ2dDgqQPixKaP7qDZj3zSIca2aXvH0YH8hZT0o6AxTfCb8cd2w== X-Received: by 2002:a5d:46cf:: with SMTP id g15mr22969347wrs.276.1589828162147; Mon, 18 May 2020 11:56:02 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:3e2e:7400:bc2c:26b1:105a:3e19]) by smtp.googlemail.com with ESMTPSA id x17sm17241863wrp.71.2020.05.18.11.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2020 11:56:01 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 19:55:08 +0100 Message-Id: <20200518185508.44779-9-artem.galin@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518185508.44779-1-artem.galin@gmail.com> References: <20200415130741.27263-1-artem.galin@gmail.com> <20200518185508.44779-1-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 9/9] libavfilter/vf_deinterlace_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" From: Artem Galin Adding DX11 relevant device type checks and adjusting callback with proper MediaSDK pair type support. Signed-off-by: Artem Galin --- libavfilter/vf_deinterlace_qsv.c | 44 ++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c index 80217c8419..f7f9d916db 100644 --- a/libavfilter/vf_deinterlace_qsv.c +++ b/libavfilter/vf_deinterlace_qsv.c @@ -42,6 +42,8 @@ #include "internal.h" #include "video.h" +#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) + enum { QSVDEINT_MORE_OUTPUT = 1, QSVDEINT_MORE_INPUT, @@ -157,16 +159,16 @@ 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; } -static const mfxHandleType handle_types[] = { - MFX_HANDLE_VA_DISPLAY, - MFX_HANDLE_D3D9_DEVICE_MANAGER, - MFX_HANDLE_D3D11_DEVICE, -}; - static int init_out_session(AVFilterContext *ctx) { @@ -183,26 +185,30 @@ static int init_out_session(AVFilterContext *ctx) mfxIMPL impl; mfxVideoParam par; mfxStatus err; - int i; + int ret, i; /* extract the properties of the "master" session given to us */ - err = MFXQueryIMPL(device_hwctx->session, &impl); - if (err == MFX_ERR_NONE) - err = MFXQueryVersion(device_hwctx->session, &ver); - if (err != MFX_ERR_NONE) { + ret = MFXQueryIMPL(device_hwctx->session, &impl); + if (ret == MFX_ERR_NONE) + ret = MFXQueryVersion(device_hwctx->session, &ver); + if (ret != MFX_ERR_NONE) { av_log(ctx, AV_LOG_ERROR, "Error querying the session attributes\n"); return AVERROR_UNKNOWN; } - for (i = 0; i < FF_ARRAY_ELEMS(handle_types); i++) { - err = MFXVideoCORE_GetHandle(device_hwctx->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; + } 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(ctx, AV_LOG_ERROR, "Error unsupported handle type\n"); + return AVERROR_UNKNOWN; } - if (err != MFX_ERR_NONE) { + ret = MFXVideoCORE_GetHandle(device_hwctx->session, handle_type, &handle); + if (ret != MFX_ERR_NONE) { av_log(ctx, AV_LOG_ERROR, "Error getting the session handle\n"); return AVERROR_UNKNOWN; }