From patchwork Fri May 8 15:18:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 19570 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 4C5AE448FBD for ; Fri, 8 May 2020 18:27:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F9CF68A303; Fri, 8 May 2020 18:27:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 197F768A175 for ; Fri, 8 May 2020 18:27:29 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id x4so10606597wmj.1 for ; Fri, 08 May 2020 08:27:29 -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=bfnd0AzuKMvBl0MydVnltuG6ad8qTz2HHFg1+d51O18=; b=Q8VNCVCqeov3yYdHIriK2CgXLVxaj8OJ1v2LGy8mjdR+dtp+rI8F3osfwl5F6aYSGW Y/YCU9ZNuKzRIOUYisfMfGhgahIAXgW+gC883n2k5mIhsnexyzPD5RdfcWHc4eeretb4 BDpOTuy38mWwJU1kDcei8qWQqw23kqDn06O1VhswgbmKWfwLfIMO6oDoWrBHTmVVA2lZ kjY+s8+5CwLOk9g9rqT0ScLmboPd0KG7K9hUljijrvPz55OKkxHac6JR4qoeq0ikhNiL GiVAq7f6zf5TUt/5bdogbcHH4f9KEVK5QKFkpKzLic9jshz1KUMuvHo+LMj8iGhLC4FW 40eQ== 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=bfnd0AzuKMvBl0MydVnltuG6ad8qTz2HHFg1+d51O18=; b=bFxAUF+fhX+Y8xEUngEB8q17TWvll/M0x8VeEtR/eUIIpOY4fX56Aq2RUxIUBcWYa2 wY+TWf2QwIutme/aBCGJfQv0Kb+Uxg4xf6ZOAXsH4o4bqQO3XNadQ8hAIQ+n/aToL907 os8Kx+Xkx+hxvDuhujbeq7HCwIybd5C1KJIqFfrdBg2OHIfuobuH8SDdqaZpagKKNovs HbAfgrwLqNo1AM3GvySavFgYcDdqNMyyJirDjKpZmwC3pSe7jiCj+P5WQ2E/fLMI/6/3 Ot/h1+mV73XBakUp4xj0kfY6MlEqAxL2poFgGL3w3LJvJ81ubj+6bifx+Jrk/mmc03yA y0CQ== X-Gm-Message-State: AGi0PuYZZWJhjxuAApjuKNLFFSzSvloiwUnVWfbEAHYvHF1vsUsIYgdz 5ojIg4LimbbhmL7GvvpoewyKnUXrey8dlQ== X-Google-Smtp-Source: APiQypLgCN8bpOE0D49klXzqTd31GWaGzJiXYdfjECeQMv4u2FxcgIgNYAzhMKzS/RpNSKYFdKTI3g== X-Received: by 2002:a7b:c10d:: with SMTP id w13mr16285693wmi.78.1588951245147; Fri, 08 May 2020 08:20:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 08:20:44 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 May 2020 16:18:19 +0100 Message-Id: <20200508151821.49051-9-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 09/11] 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 , 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_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; }