From patchwork Tue Nov 3 18:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 23368 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 1B218447BBA for ; Tue, 3 Nov 2020 20:48:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 045D968B67A; Tue, 3 Nov 2020 20:48:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9FD668B67D for ; Tue, 3 Nov 2020 20:47:57 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id x7so19619750wrl.3 for ; Tue, 03 Nov 2020 10:47:57 -0800 (PST) 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=rmr+Z8YJessS6VVHupwwcoZZ1MIxfp1Z59u0dLWT13Q=; b=jaC4MqEFcBocxnEKHEyAv+gKjZq1uHkGQ2AgxKC1RyQzUjUtPLAvximzfwaFXltSss 7YlaBRD6jLVqCtDueDK0DlxT4gDne4vDAfcCGQqQfu3GVfMg2S9/SStuBHHkSeh3hByz kfALCgLmjbAwvyIixmtq3mNjsN7r3XN4Sdim0A7XWn0an6iAji3fGqJCHvs2i3cJB9DE Wh/hJXVJaNTUeWZ3i5s7IkW81kko0EaHPNmM6W4bgCe2wQ9sA1iq1yCbHiXvoXor0wRC AZrMpr3IXIYVQu1kdV1f6hoy1NbkKHxGmfuiEKj6iG+GovBN64nT1OKvO+QiYCYxWiW3 YxAw== 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=rmr+Z8YJessS6VVHupwwcoZZ1MIxfp1Z59u0dLWT13Q=; b=icAAucLvsdoczmwHDKtElzdY7/zALihrAQBpQX+InubSbAoxjpMRHupJJUk4K/Ar2A ClplcgzLiM1wBPbjcixJztQtZUGFOItvWLxcvSbIKscV1slQIwvvcbw/76ntQy0knGu3 eJmo7EuRq03t6Y6sSfyelkcq5md4XF0MAF5QS/cH/pj0gORUySpuCbKMdKPR/gt2CiPj 8yz7RP16Jnl43pT0faYnJ7aqoMPL5v0CAgtjlMgK49SKlhuakaufzKcYisY7V2Ilad2Q BNjz3SAQJvqWNmIrZ7IIRekk6Aq5PFY3jdVwGcQ2X1odu/oHpuka9eTW1vRCyd+i5KGI M8fA== X-Gm-Message-State: AOAM533/jc6f24nWqYQesUkrif6sx7oeNDYP0KCdVuNOMQfkTzmXiI4G 302tRe/g8Y2rM/o/KLhU/RwwqlzBpSHBWw== X-Google-Smtp-Source: ABdhPJwqDTwMRXn1w8MI2mUdNmnAtHTS6wHbfxc3xOHJExbIHzezt4DkBkUmlcWHL7UmV5tIqBaNIA== X-Received: by 2002:adf:e9c9:: with SMTP id l9mr2148205wrn.124.1604429276869; Tue, 03 Nov 2020 10:47:56 -0800 (PST) Received: from localhost.localdomain ([2a02:c7f:3015:4e00:e4c4:5a5e:dd23:ce22]) by smtp.googlemail.com with ESMTPSA id z2sm3905249wmf.45.2020.11.03.10.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 10:47:56 -0800 (PST) From: Artem Galin X-Google-Original-From: Artem Galin To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Nov 2020 18:45:55 +0000 Message-Id: <20201103184557.18444-6-artem.galin@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103184557.18444-1-artem.galin@intel.com> References: <20201103184557.18444-1-artem.galin@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 6/8] libavfilter/vf_scale_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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Adding DX11 relevant device type checks and adjusting callback with proper MediaSDK pair type support. Signed-off-by: Artem Galin --- libavfilter/vf_scale_qsv.c | 43 +++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c index 5064dcbb60..47701c20d0 100644 --- a/libavfilter/vf_scale_qsv.c +++ b/libavfilter/vf_scale_qsv.c @@ -70,6 +70,7 @@ enum var_name { }; #define QSV_HAVE_SCALING_CONFIG QSV_VERSION_ATLEAST(1, 19) +#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) typedef struct QSVScaleContext { const AVClass *class; @@ -264,16 +265,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) { @@ -292,28 +293,32 @@ static int init_out_session(AVFilterContext *ctx) mfxIMPL impl; mfxVideoParam par; mfxStatus err; - int i; + int ret, i; s->num_ext_buf = 0; /* 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; }