From patchwork Mon May 18 20:29:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 19763 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 4216544B999 for ; Mon, 18 May 2020 23:31:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2280F68ABC2; Mon, 18 May 2020 23:31:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E55D668ABB0 for ; Mon, 18 May 2020 23:31:08 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id u188so975079wmu.1 for ; Mon, 18 May 2020 13:31:08 -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=WknOe/5qtCOg+HQq4mS1HWdqtzSbllrXynic0LTz2GbhvOFBd7mkJpzDKwdWaLO7Vy zYghl3DYHsTtcIgysoquCVdZWt0VZUjPxtAujYv8T5atFmv0bkHcFcrKqFhpIrhtCqtg EyxYxNwJO8ijym+IKboPXzNfBWg6JDj8O7GIgMWK0AsCLsdaXSNbTs+zAWBf3qYN/8AJ VQI6ik31ijZurg6SEnTmE1qALqHfzbRfNu8SYTI9HvXNDkH6fvdt3+Z+Mr+81RH3Dhnk 1DOMw2SRkACbZRMh6qlpAGMvKwcIlPXlXO/uFTUQeIFykVoOoDyK86ilwbtEy7DSA8+1 z2nA== 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=otWLmn+ZtGs18UXApP9ISnW1fuRwgJ0iBm+M7bBTGdGZObPHeVlD+7DgsXLhIYjILC vDXQrSY6XGuCSL2a1wSAIoODomfb5jkGhQ3a1aPMN+OBPzr28hiQwHEd4vP8Njmo7WeR elQhbXUdiRHdQAqdCB0NTyt7sBhAhtFzb5666bIH+4LemgTaGUI7MNJMIJ/4SZLGV67B CrnqolnugV7unqV6XhlqaP1KiGqzElqXXmmCDI1jQ3vTlpISu5v6UlHV/ib8Ad+oVicR JjANRyU/BrCSvYvYCSy/kxVKifiyNCvi8bk69+CBXwREIyIeIFdKxjJkNrTG4zYgLmLt /p/w== X-Gm-Message-State: AOAM533KLRn5YIas0CzbHQA32nnuTWOsPQ1wPpV9YBpZxG3L+mvLZO4+ PTZOl+DWO7yILSdbyAdZmT52FHCO4BVR9A== X-Google-Smtp-Source: ABdhPJzWVMGei/tNHhqZ4mkqIu0+zuOASfZr1mGt2zqyTK7L77dc/L9+Q6eedWlfwvgKZsFm+9xEmA== X-Received: by 2002:a05:600c:2c0c:: with SMTP id q12mr1219306wmg.36.1589833867783; Mon, 18 May 2020 13:31:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2020 13:31:07 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 21:29:34 +0100 Message-Id: <20200518202934.49601-9-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 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; }