From patchwork Mon Aug 1 12:35:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 37074 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2476378pzb; Mon, 1 Aug 2022 05:36:00 -0700 (PDT) X-Google-Smtp-Source: AA6agR6PivASKhwYGz6XH/rEg+OuhMcSLJndZGKOROGyygKvL6OPe8w2nSzbIxQam6yGSH2ls8vt X-Received: by 2002:a17:907:2be3:b0:730:6866:a9b1 with SMTP id gv35-20020a1709072be300b007306866a9b1mr5392124ejc.693.1659357360397; Mon, 01 Aug 2022 05:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659357360; cv=none; d=google.com; s=arc-20160816; b=gki1/mwl+IJDkb9jrw16loWp2RIuaLiLDLbygkgDJSzawnFd9Y33sdD0jugLvWbprA Z1pEB12r6JGTbUlM8376+9JwaQaWeEkAsCfq7fxI+Py7bLtRbEvhbT3U+dFA/7JUqSWL yj75HnUvuVkmejT+LN7kSwJC4M9a45OSb9D8JcfGEi+ldgHGpIlsnPB9G1zHpeuh3qAy aVO3UzKdWcOoZoGAmUiERaSN193ft5LZ9c80d6+iy6Pr1WIAmryG/B632WEfNXQJ6O8J 6ArCC5b2qiFiP8dTE+BqELWNiV+gPJcD9phQ9VECNNctiXxsoHoaDvVh+YoPvJ8H9mdE g9gA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=TfS45LauuGkgAzghxwOpHNN1nw7Dij/kkyoboz76T80=; b=pq01gt/B7kBRvM2yJvO9PLf+dCevd1AVNFZ4mYTQIvSY+Vh4nhYuqLj+og0jEfs3xx sK9xM8BS/grRbIS0kn6b+bMVysRq5NFZoRLiLSIqwxpCCvkOERrV4aezZa40STXvTHkb uxKG7RPVYZb1V6q57EfuG2WRukwEZbMmGtB9BrEUa30e8mPc9oEWU3a829GYgoFA/xCj RGxJ4ZwXY4ukl8l3NiGlQaxfRBFL7RqNxp1S4Go78QP14b4YnXw3iL+cRzQ+xri2naiV O+lUMTZNO76W0zQ/6qseEaOtDjpZwI5rqYfdUyKpo+lgeH4eyGmFRyxQ2Q5MFmmDP1Ar VRCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=KNyg1rRa; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sh15-20020a1709076e8f00b007305be31ad6si4815525ejc.688.2022.08.01.05.35.58; Mon, 01 Aug 2022 05:36:00 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=KNyg1rRa; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4682C68B9D4; Mon, 1 Aug 2022 15:35:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D82D68B964 for ; Mon, 1 Aug 2022 15:35:49 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id t22so17079831lfg.1 for ; Mon, 01 Aug 2022 05:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Bw3zZu9ouduyplu7dCV5uXNsVqaAXn9osM7kKwsrXJc=; b=KNyg1rRa0rlOe1wNfEQajsKKcch3H7QxkMJook69OxDs9UHYn4LWdOF8xoTfq8ZXVm CdvNQkh2RjSR8kmSNz8BVP+OywMlNvn64fpjWuxy1jMFCjHuZdrQJtHWarrzXmsth86x MpgBlDvTa/+ClVJo9HVqVVDWlHSnDU43CvnjNWFxVeaOTPZ/yDzaCzWWrRz+pMiUmA/U aatAWM+UQ1JlsMcf0FaS06hu+LAbCvCEc8H7va5X5BgVxS84HMv/G+3MyvFelyXdyL1/ 3cPXgQi3hygyZ6fGxITOmHT4AZK6iLhFLUyEKTNZ2pWn5mfRyEp219BtEpU49KYUX5cz 1GjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Bw3zZu9ouduyplu7dCV5uXNsVqaAXn9osM7kKwsrXJc=; b=ARwzZvn6XbGzeOv87eEd50wZB3BvMXc5XD1yHhOlxABCT/W41gYbfo2es3GPE1IHGG t8OCOaHNjxSnHGwLJgSvi9fwBF/tqrDJWiBwQi0EOzqu/KLAaofFWvOS8kJfTwAMXvBS 3IYkPEUs70kNFhYgceYqixl6kPAFY3w9NsysOdt5jKNavq+YSUBDLfEGCkrkaay1og6i 5xdId+0MZ7h9i2wMksQGH6ZLeYeJe9poA9lMZYXf0jaWj7wdoeDzBudi5XwepFvmDw8e 2cXUxya+7HmaCWaFkW5/PEqFkfFdcIBk3Fbot2YqVOmdnmc/g7N2Uc/857BRCYmxIPqT FaEw== X-Gm-Message-State: AJIora8nEGV2mj7C6YsGnCkzkDSxk3QaWgX9QirSEtaSnvUO1KLUhZjQ PcMV1gXhHU9fvJVwN3ppM3raEQXD7L50c7z6 X-Received: by 2002:ac2:4ec7:0:b0:48a:c05b:d408 with SMTP id p7-20020ac24ec7000000b0048ac05bd408mr5398841lfr.588.1659357348383; Mon, 01 Aug 2022 05:35:48 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id d26-20020ac24c9a000000b0048a78d5c4b5sm1729083lfl.165.2022.08.01.05.35.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Aug 2022 05:35:47 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Aug 2022 15:35:42 +0300 Message-Id: <20220801123543.3873437-1-martin@martin.st> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: Check for DXGI_OUTDUPL_FRAME_INFO for the ddagrab filter 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: =?utf-8?q?Martin_Storsj=C3=B6?= , Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jVazVLoxMsBO The DXGI_OUTDUPL_FRAME_INFO type isn't available in Windows API subsets other than "desktop", while the IDXGIOutput1 interface is available for all API subsets. This fixes compilation for UWP/"Windows Store" configurations (and older API subsets like Windows Phone). Signed-off-by: Martin Storsjö --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 8c7e8c9d1d..eb413a6716 100755 --- a/configure +++ b/configure @@ -3158,7 +3158,7 @@ overlay_cuda_filter_deps="ffnvcodec" overlay_cuda_filter_deps_any="cuda_nvcc cuda_llvm" sharpen_npp_filter_deps="ffnvcodec libnpp" -ddagrab_filter_deps="d3d11va IDXGIOutput1" +ddagrab_filter_deps="d3d11va IDXGIOutput1 DXGI_OUTDUPL_FRAME_INFO" amf_deps_any="libdl LoadLibrary" nvenc_deps="ffnvcodec" @@ -6395,6 +6395,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_type "windows.h dxva.h" "DXVA_PicParams_AV1" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0 check_type "windows.h dxva.h" "DXVA_PicParams_HEVC" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0 check_type "windows.h dxva.h" "DXVA_PicParams_VP9" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0 +check_type "windows.h dxgi1_2.h" "DXGI_OUTDUPL_FRAME_INFO" check_type "windows.h dxgi1_2.h" "IDXGIOutput1" check_type "windows.h dxgi1_5.h" "IDXGIOutput5" check_type "windows.h d3d11.h" "ID3D11VideoDecoder"