From patchwork Fri Aug 20 21:48:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 29654 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp6540iov; Fri, 20 Aug 2021 14:51:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeBzzg97YlQPHYWXqy5Q0C6ZVv03Jm9IyUjp0dfwgg1lnt5a85s9DNr6is2V2finXqoUag X-Received: by 2002:a05:6402:30b6:: with SMTP id df22mr23765148edb.375.1629496262301; Fri, 20 Aug 2021 14:51:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629496262; cv=none; d=google.com; s=arc-20160816; b=zMfuOKzY2Wu8MGzCLNk1k6VvxSDK9PZMJPTd1y1PlHB+BUxWGFcv4HnmOTRuiX+3X5 +pWmyaIA+pfPJEsfq5jAD+uyJPyAoMXfsaxYGMkqGC+45gz5Esqf4iYnF9hsLiQCh1aU jD21MajM86LalKaCxkyspy8vKYxYx2wQeKKY8HPXlJtRHKXl0wSJrX967nh7z0gFxvYG c7OEjLXOMfjpwU48ey+PVu06purGqTVbsbRXX+LH/gNtqtmkT+yc4B99Q0mR7h2b+Ulo L04A0p9Pu3OiI+NrzYjp6tF8ojsJXssirxNZbXq/glfozmdnxEA+Z7ZLWc4Mb57DY4GL FPIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=wkRVDA00jri1dKcD/R5sM1q6dtj9M9KA5R8dLjUq/Qg=; b=mfSTsFQEUNLu7W+A0fb51YvqcU0SPoxhSkJpS/T4femW7JLFi6VQ1AJI5L7XwlrQtS 6jqbV3sSvOHDSyLfYjjl3rsV35+BoV19mqK443bp4rpHkTk7d/OoT+c9M0l4aO45dTP6 QlFXPNLQAUuCHsvf2wmw0clU2P+/EwSxZ72+iAH6Qs/0Tt9YzXaK0N0nR74K95YBorYt IVsr9SbsSHJ6dmDl1FdHDxd68QvOlyCeCLUlc/oiH7mXxlQh5jWAHRPk8oC6xxO/C3LL pXMzHWGrw6oQGOtB5MM0UtdDQSQB9j4mFuH+VmvQH7Y/k/md4MHBI3V1rjRwmdS3/7WR uApw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mkYOUXex; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc18si679766ejc.461.2021.08.20.14.51.02; Fri, 20 Aug 2021 14:51:02 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mkYOUXex; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E2AC68A3B3; Sat, 21 Aug 2021 00:50:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 787C168A3B0 for ; Sat, 21 Aug 2021 00:50:11 +0300 (EEST) Received: by mail-wr1-f43.google.com with SMTP id r7so16213766wrs.0 for ; Fri, 20 Aug 2021 14:50:11 -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=OvoyQnYP/H816ySu/hRJISwY6NtpkTVPQPx3fs1BQe4=; b=mkYOUXex00F2BFGyfCB5hzDVDBBg6ZhRQbZ6rugfTBuyb4zVyOA6Vo/HfcPap+OJTn u53BEZX/PbiJW/Egq1o5nVEBWzioc1s6VGfSMiK5vHyWN7yjUUG7xqCrLYSOxz07J9iO cNyPepRaQrrGJKkGfNDteGtMGp8LWkBkUy3SCUT7Q+0ftTB2ZBEi1S5PdlJeCSRz6nop v5MiVyMW3RmOIZ18y/2v4Ji4cyQJ6Ck81o8l9rstf5TotFJ8nphhmwT1qC12MJZCNAk6 EvaRcnq2tu5Lgi4d2a/rIUI0DtPjGj1KVOZGp437eNayQtrR363nTxJC4DEfUSlEkdcY jCjg== 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=OvoyQnYP/H816ySu/hRJISwY6NtpkTVPQPx3fs1BQe4=; b=FpRZtsqarG/96z0qg67186o1Mx2pHZ1i7wZMcbkSsi75Ix9rpWTz3tGr70CFvfBqg6 U3he/4tdtFSPaXVfsYQ2mndVbhqldQ+FTkwnll17LiK64TC03h1n6PpStUc54liffAHx f0VbPV5sn3yJqgugnRTcPH4NsAXY9Kj/RhCbiJdhUD+YSYSZkbQUDB4kyXhDsyhE9X6W ZnASUTThQAvvrGVbRfjYlh8gU60OdfLL2JpNX1NJ61Q2Zfl2gJvrvmx0MCjCidsPt808 ev6hnC9sLbDhBfF6bnaHmXMSHvr7Lq9y6HTg2p7xdXqWDnuICdFkKgB9dT8/T4pY0BBx E1pg== X-Gm-Message-State: AOAM531FZp4J16/oWsZ1/bxfUjllslAgU0wraHImpKH4nvssO2ORs5S7 0ygQFzQOeO3fseh9jzHEkEwykrL8poi1pw== X-Received: by 2002:a5d:4c4e:: with SMTP id n14mr862539wrt.226.1629496210849; Fri, 20 Aug 2021 14:50:10 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7f:3015:4e00:5f5:a7a2:8cb1:892d]) by smtp.googlemail.com with ESMTPSA id x19sm6046796wmi.30.2021.08.20.14.50.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 14:50:10 -0700 (PDT) From: Artem Galin To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Aug 2021 22:48:06 +0100 Message-Id: <20210820214810.9733-5-artem.galin@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210820214810.9733-1-artem.galin@gmail.com> References: <20210820214810.9733-1-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/9] libavfilter/qsvvpp: enabling d3d11va support, added mfxhdlpair X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: aRYl9igCqADd 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 c7ef8a915f..66b8673d4e 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -36,12 +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) - -static const mfxHandleType handle_types[] = { - MFX_HANDLE_VA_DISPLAY, - MFX_HANDLE_D3D9_DEVICE_MANAGER, - MFX_HANDLE_D3D11_DEVICE, -}; +#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) static const AVRational default_tb = { 1, 90000 }; @@ -202,7 +197,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; } @@ -572,14 +573,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 < 0) return ff_qsvvpp_print_error(avctx, ret, "Error getting the session handle"); else if (ret > 0) {