From patchwork Thu Jul 22 10:56:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 29009 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp411808ios; Thu, 22 Jul 2021 04:04:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0OTriF3ZzQ3AdCiUz7Xg5hXP9Dp4YHGhucHXLV4fL02fCy/vTYDvn/VryZKPk/pd8TXg4 X-Received: by 2002:aa7:c952:: with SMTP id h18mr54280174edt.18.1626951841273; Thu, 22 Jul 2021 04:04:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626951841; cv=none; d=google.com; s=arc-20160816; b=jQ1jZJe7v3x/O0S2+AEtNyEMFOA0ai45305MsITitVE0Y9uXIW9Hr26m6TtaPvFrLN 90Y8wIpo4RxbxIi7fFiEdsB6uHe+TLKTUJQXyKOOkIfWgOKD1xNWpK8VciYtMBV44fkl BehTxkMroPgsaULkemVYfslFKPGNBInDAhzyauf15zk7QILWsgKTGyKGYCoMep4cNi4L L9mqmJG5eWFgt5ou8G9Xvh2hKdKTREx5CA1Sm96qWIof9fK3l+lsJTfpplWkjc5m/ICt 7TXsrbh1e4QBgkpw5+LxfOlpkl3EiHhaUyd2gpzUAROcE+H9acrOb3op+OnNxWwLFGqY p4sA== 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=KKxZLPG+uJEUq9OFZw4ysNBVdZpDYjCHFMdOFTO+BCY=; b=FtFIdpLtvX30tCOPlkwF1pbE5nB3/cH2gZcZYZVaZmlIHHWKSHox9ZQrUpbBOobKlX d8pjC3v1y845orW8V9PWgdNYBkiiqYIcrVx2XHqNsb0PP8wJ/qS4gMQhBOQgubpN9QcK h5SyJMbU/2RtlTOyjXLkidTD+TIKA+F42DeeSvzGWUhFkIeRSa6UmMVHBdreFX+arp15 J3LSPxOSf5v+ksKhiM7katpNm7qmatwzhQ7u8NSF0zKU/1sdMWHAhdWaHp06A+AkiaUp YY07bLvapCbkgyDp8+QgpfZBRvVzohcSd99T2DdpJ2dqaov4vC2S9r1c1M4YDA9vd6vp V6DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=trGWFZ0y; 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 c12si38036075edx.372.2021.07.22.04.04.00; Thu, 22 Jul 2021 04:04:01 -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=trGWFZ0y; 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 9A25A68A784; Thu, 22 Jul 2021 14:03:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 540AB68A834 for ; Thu, 22 Jul 2021 14:03:40 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id c15so5479994wrs.5; Thu, 22 Jul 2021 04:03:40 -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=iJQn+/WINeAUsEtEks41aeFFUXEvYB8iUsfaKyMhy6w=; b=trGWFZ0yIlyooDfnyCSBeiUrurikWAMZAZIHkrzoVaIT/t270F2vjxegzqv4CoLcUQ hiuIPIngi2slYqUKZnQWXb+wYBR2x6qJ4kT6DWr4id3nGHUxjVcDLrsqgTqT2PDlxEdX 05R80nSXkRgUOqr3lc+ElbIRiKCNtj7XqIegzKvIhX71MkWhg2/iWp4Bfe4Go2s1UOLT +5hb0adTp5BHXEFewsRMewNXhSwXx/G202L5kEm7ysN7kBnWH/BYb525HsTfh/PjzFxo 8Zw5+hG+wz5kSnve3vCIfbGUaWwlB5mk/UM73+2HvPkoxOsJmKLUZuW6GxpAwQLN6jEA 2q2A== 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=iJQn+/WINeAUsEtEks41aeFFUXEvYB8iUsfaKyMhy6w=; b=GGXgokAJlc3zm+9/bHYbxeASfFOQ49YPJdGWzzpodIRQZgXvAY58dN0TGD9kKWzij2 fUbLkxjRjoobYKsteP8Xpy0s/EsrzW0t7UNx51MFTCz/sPoRWCMegDVqxXj+FocRQGNr 6xgXkmxHlIT05IELl2SNGzZ674qyGyvjUzrku6tf/TcGCvy4MadW9/Gwh/3o1IhAnBpa TQnSztXX1xqMn3f7hciRA/fUHvElbi9a2XP2ZmF8euyudkKCGBsoPgBYRXaH+9jTuhye keAUpKkF6wpvd9JxlpTW3tdElaPve5BnvlLaSqwODHiwUXDNWKvq0IjneOAOH2XRTffD jctw== X-Gm-Message-State: AOAM532JH70Q42EjYHbTU2q234bE6R6cb754KQUmid5qtHFl4LuS2C0r q8gEYfq4gLI5iaHpYYtgG6aY6ezyY2ymGqaM X-Received: by 2002:a2e:834e:: with SMTP id l14mr34252817ljh.458.1626951413864; Thu, 22 Jul 2021 03:56:53 -0700 (PDT) Received: from localhost.localdomain (37-144-244-78.broadband.corbina.ru. [37.144.244.78]) by smtp.googlemail.com with ESMTPSA id z4sm1951236lfh.2.2021.07.22.03.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 03:56:53 -0700 (PDT) From: Artem Galin To: ffmpeg-devel@ffmpeg.org, ffmpeg-devep@ffmpeg.org Date: Thu, 22 Jul 2021 11:56:35 +0100 Message-Id: <20210722105635.48075-8-artem.galin@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210722105635.48075-1-artem.galin@gmail.com> References: <20210722105635.48075-1-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8] libavfilter/vf_deinterlace_qsv: 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: sFIUJOLiIc8B 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 | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c index 3c2d87c7c8..238e83bfd3 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, @@ -149,16 +151,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) { @@ -186,14 +188,18 @@ static int init_out_session(AVFilterContext *ctx) 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; } + err = MFXVideoCORE_GetHandle(device_hwctx->session, handle_type, &handle); if (err < 0) return ff_qsvvpp_print_error(ctx, err, "Error getting the session handle"); else if (err > 0) {