Merge pull request #7 from FrostNovaHD/patch-7

Patch 7

.github/workflows/CI.yml

@@ -758,27 +758,22 @@ jobs:
       - name: Setup Dependencies Windows
         uses: msys2/setup-msys2@v2
         with:
+          msystem: ucrt64
           update: true
           install: >-
-            base-devel
-            diffutils
             git
-            make
-            mingw-w64-x86_64-binutils
-            mingw-w64-x86_64-boost
-            mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-curl
-            mingw-w64-x86_64-miniupnpc
-            mingw-w64-x86_64-nlohmann-json
-            mingw-w64-x86_64-nodejs
-            mingw-w64-x86_64-nsis
-            mingw-w64-x86_64-onevpl
-            mingw-w64-x86_64-openssl
-            mingw-w64-x86_64-opus
-            mingw-w64-x86_64-toolchain
-            nasm
-            wget
-            yasm
+            mingw-w64-ucrt-x86_64-boost
+            mingw-w64-ucrt-x86_64-cmake
+            mingw-w64-ucrt-x86_64-cppwinrt
+            mingw-w64-ucrt-x86_64-curl
+            mingw-w64-ucrt-x86_64-miniupnpc
+            mingw-w64-ucrt-x86_64-nlohmann-json
+            mingw-w64-ucrt-x86_64-nodejs
+            mingw-w64-ucrt-x86_64-nsis
+            mingw-w64-ucrt-x86_64-onevpl
+            mingw-w64-ucrt-x86_64-openssl
+            mingw-w64-ucrt-x86_64-opus
+            mingw-w64-ucrt-x86_64-toolchain
 
       - name: Build Windows
         shell: msys2 {0}

README.rst

@@ -1,5 +1,5 @@
 Overview
-========
+======== 
 LizardByte has the full documentation hosted on `Read the Docs <https://sunshinestream.readthedocs.io/>`__.
 
 About

cmake/compile_definitions/windows.cmake

@@ -57,6 +57,7 @@ set(PLATFORM_TARGET_FILES
         "${CMAKE_SOURCE_DIR}/src/platform/windows/display_base.cpp"
         "${CMAKE_SOURCE_DIR}/src/platform/windows/display_vram.cpp"
         "${CMAKE_SOURCE_DIR}/src/platform/windows/display_ram.cpp"
+        "${CMAKE_SOURCE_DIR}/src/platform/windows/display_wgc.cpp"
         "${CMAKE_SOURCE_DIR}/src/platform/windows/audio.cpp"
         "${CMAKE_SOURCE_DIR}/third-party/ViGEmClient/src/ViGEmClient.cpp"
         "${CMAKE_SOURCE_DIR}/third-party/ViGEmClient/include/ViGEm/Client.h"

cmake/targets/common.cmake

@@ -2,6 +2,9 @@
 # this file will also load platform specific macros
 
 add_executable(sunshine ${SUNSHINE_TARGET_FILES})
+set_target_properties(sunshine PROPERTIES CXX_STANDARD 17
+        VERSION ${PROJECT_VERSION}
+        SOVERSION ${PROJECT_VERSION_MAJOR})
 
 # platform specific target definitions
 if(WIN32)
@@ -24,9 +27,6 @@ endif()
 
 target_link_libraries(sunshine ${SUNSHINE_EXTERNAL_LIBRARIES} ${EXTRA_LIBS})
 target_compile_definitions(sunshine PUBLIC ${SUNSHINE_DEFINITIONS})
-set_target_properties(sunshine PROPERTIES CXX_STANDARD 17
-        VERSION ${PROJECT_VERSION}
-        SOVERSION ${PROJECT_VERSION_MAJOR})
 
 # CLion complains about unknown flags after running cmake, and cannot add symbols to the index for cuda files
 if(CUDA_INHERIT_COMPILE_OPTIONS)

cmake/targets/windows.cmake

@@ -1,6 +1,9 @@
 # windows specific target definitions
-set_target_properties(sunshine PROPERTIES LINK_SEARCH_START_STATIC 1)
+set_target_properties(sunshine PROPERTIES
+        CXX_STANDARD 20
+        LINK_SEARCH_START_STATIC 1)
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
 find_library(ZLIB ZLIB1)
 list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
+        Windowsapp.lib
         Wtsapi32.lib)

docs/source/building/windows.rst

@@ -3,7 +3,7 @@ Windows
 
 Requirements
 ------------
-First you need to install `MSYS2 <https://www.msys2.org>`__, then startup "MSYS2 MinGW 64-bit" and execute the following
+First you need to install `MSYS2 <https://www.msys2.org>`__, then startup "MSYS2 UCRT64" and execute the following
 codes.
 
 Update all packages:
@@ -15,23 +15,18 @@ Install dependencies:
    .. code-block:: bash
 
       pacman -S \
-        base-devel \
-        cmake \
-        diffutils \
-        gcc \
         git \
-        make \
-        mingw-w64-x86_64-binutils \
-        mingw-w64-x86_64-boost \
-        mingw-w64-x86_64-cmake \
-        mingw-w64-x86_64-curl \
-        mingw-w64-x86_64-miniupnpc \
-        mingw-w64-x86_64-nlohmann-json \
-        mingw-w64-x86_64-nodejs \
-        mingw-w64-x86_64-onevpl \
-        mingw-w64-x86_64-openssl \
-        mingw-w64-x86_64-opus \
-        mingw-w64-x86_64-toolchain
+        mingw-w64-ucrt-x86_64-boost \
+        mingw-w64-ucrt-x86_64-cmake \
+        mingw-w64-ucrt-x86_64-cppwinrt \
+        mingw-w64-ucrt-x86_64-curl \
+        mingw-w64-ucrt-x86_64-miniupnpc \
+        mingw-w64-ucrt-x86_64-nlohmann-json \
+        mingw-w64-ucrt-x86_64-nodejs \
+        mingw-w64-ucrt-x86_64-onevpl \
+        mingw-w64-ucrt-x86_64-openssl \
+        mingw-w64-ucrt-x86_64-opus \
+        mingw-w64-ucrt-x86_64-toolchain
 
 Build
 -----

src/platform/windows/display.h

@@ -11,6 +11,9 @@
 #include <dxgi.h>
 #include <dxgi1_6.h>
 
+#include <Unknwn.h>
+#include <winrt/Windows.Graphics.Capture.h>
+
 #include "src/platform/common.h"
 #include "src/utility.h"
 #include "src/video.h"
@@ -153,22 +156,6 @@ namespace platf::dxgi {
     bool visible;
   };
 
-  class duplication_t {
-  public:
-    dup_t dup;
-    bool has_frame {};
-    std::chrono::steady_clock::time_point last_protected_content_warning_time {};
-
-    capture_e
-    next_frame(DXGI_OUTDUPL_FRAME_INFO &frame_info, std::chrono::milliseconds timeout, resource_t::pointer *res_p);
-    capture_e
-    reset(dup_t::pointer dup_p = dup_t::pointer());
-    capture_e
-    release_frame();
-
-    ~duplication_t();
-  };
-
   class display_base_t: public display_t {
   public:
     int
@@ -185,7 +172,6 @@ namespace platf::dxgi {
     output_t output;
     device_t device;
     device_ctx_t device_ctx;
-    duplication_t dup;
     DXGI_RATIONAL display_refresh_rate;
     int display_refresh_rate_rounded;
 
@@ -253,30 +239,29 @@ namespace platf::dxgi {
     virtual bool
     get_hdr_metadata(SS_HDR_METADATA &metadata) override;
 
+    const char *
+    dxgi_format_to_string(DXGI_FORMAT format);
+    const char *
+    colorspace_to_string(DXGI_COLOR_SPACE_TYPE type);
+    virtual std::vector<DXGI_FORMAT>
+    get_supported_capture_formats() = 0;
+
   protected:
     int
     get_pixel_pitch() {
       return (capture_format == DXGI_FORMAT_R16G16B16A16_FLOAT) ? 8 : 4;
     }
 
-    const char *
-    dxgi_format_to_string(DXGI_FORMAT format);
-    const char *
-    colorspace_to_string(DXGI_COLOR_SPACE_TYPE type);
-
     virtual capture_e
     snapshot(const pull_free_image_cb_t &pull_free_image_cb, std::shared_ptr<platf::img_t> &img_out, std::chrono::milliseconds timeout, bool cursor_visible) = 0;
+    virtual capture_e
+    release_snapshot() = 0;
     virtual int
     complete_img(img_t *img, bool dummy) = 0;
-    virtual std::vector<DXGI_FORMAT>
-    get_supported_capture_formats() = 0;
   };
 
   class display_ram_t: public display_base_t {
   public:
-    virtual capture_e
-    snapshot(const pull_free_image_cb_t &pull_free_image_cb, std::shared_ptr<platf::img_t> &img_out, std::chrono::milliseconds timeout, bool cursor_visible) override;
-
     std::shared_ptr<img_t>
     alloc_img() override;
     int
@@ -286,22 +271,15 @@ namespace platf::dxgi {
     std::vector<DXGI_FORMAT>
     get_supported_capture_formats() override;
 
-    int
-    init(const ::video::config_t &config, const std::string &display_name);
-
     std::unique_ptr<avcodec_encode_device_t>
     make_avcodec_encode_device(pix_fmt_e pix_fmt) override;
 
-    cursor_t cursor;
     D3D11_MAPPED_SUBRESOURCE img_info;
     texture2d_t texture;
   };
 
   class display_vram_t: public display_base_t, public std::enable_shared_from_this<display_vram_t> {
   public:
-    virtual capture_e
-    snapshot(const pull_free_image_cb_t &pull_free_image_cb, std::shared_ptr<platf::img_t> &img_out, std::chrono::milliseconds timeout, bool cursor_visible) override;
-
     std::shared_ptr<img_t>
     alloc_img() override;
     int
@@ -311,9 +289,6 @@ namespace platf::dxgi {
     std::vector<DXGI_FORMAT>
     get_supported_capture_formats() override;
 
-    int
-    init(const ::video::config_t &config, const std::string &display_name);
-
     bool
     is_codec_supported(std::string_view name, const ::video::config_t &config) override;
 
@@ -323,6 +298,50 @@ namespace platf::dxgi {
     std::unique_ptr<nvenc_encode_device_t>
     make_nvenc_encode_device(pix_fmt_e pix_fmt) override;
 
+    std::atomic<uint32_t> next_image_id;
+  };
+
+  class duplication_t {
+  public:
+    dup_t dup;
+    bool has_frame {};
+    std::chrono::steady_clock::time_point last_protected_content_warning_time {};
+
+    int
+    init(display_base_t *display, const ::video::config_t &config);
+    capture_e
+    next_frame(DXGI_OUTDUPL_FRAME_INFO &frame_info, std::chrono::milliseconds timeout, resource_t::pointer *res_p);
+    capture_e
+    reset(dup_t::pointer dup_p = dup_t::pointer());
+    capture_e
+    release_frame();
+
+    ~duplication_t();
+  };
+
+  class display_ddup_ram_t: public display_ram_t {
+  public:
+    int
+    init(const ::video::config_t &config, const std::string &display_name);
+    capture_e
+    snapshot(const pull_free_image_cb_t &pull_free_image_cb, std::shared_ptr<platf::img_t> &img_out, std::chrono::milliseconds timeout, bool cursor_visible) override;
+    capture_e
+    release_snapshot() override;
+
+    duplication_t dup;
+    cursor_t cursor;
+  };
+
+  class display_ddup_vram_t: public display_vram_t {
+  public:
+    int
+    init(const ::video::config_t &config, const std::string &display_name);
+    capture_e
+    snapshot(const pull_free_image_cb_t &pull_free_image_cb, std::shared_ptr<platf::img_t> &img_out, std::chrono::milliseconds timeout, bool cursor_visible) override;
+    capture_e
+    release_snapshot() override;
+
+    duplication_t dup;
     sampler_state_t sampler_linear;
 
     blend_t blend_alpha;
@@ -338,7 +357,55 @@ namespace platf::dxgi {
     texture2d_t old_surface_delayed_destruction;
     std::chrono::steady_clock::time_point old_surface_timestamp;
     std::variant<std::monostate, texture2d_t, std::shared_ptr<platf::img_t>> last_frame_variant;
+  };
 
-    std::atomic<uint32_t> next_image_id;
+  class wgc_capture_t {
+    winrt::Windows::Graphics::DirectX::Direct3D11::IDirect3DDevice uwp_device { nullptr };
+    winrt::Windows::Graphics::Capture::GraphicsCaptureItem item { nullptr };
+    winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool frame_pool { nullptr };
+    winrt::Windows::Graphics::Capture::GraphicsCaptureSession capture_session { nullptr };
+    winrt::Windows::Graphics::Capture::Direct3D11CaptureFrame produced_frame { nullptr }, consumed_frame { nullptr };
+    SRWLOCK frame_lock = SRWLOCK_INIT;
+    CONDITION_VARIABLE frame_present_cv;
+
+    void
+    on_frame_arrived(winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool const &sender, winrt::Windows::Foundation::IInspectable const &);
+
+  public:
+    wgc_capture_t();
+    ~wgc_capture_t();
+
+    int
+    init(display_base_t *display, const ::video::config_t &config);
+    capture_e
+    next_frame(std::chrono::milliseconds timeout, ID3D11Texture2D **out, uint64_t &out_time);
+    capture_e
+    release_frame();
+    int
+    set_cursor_visible(bool);
+  };
+
+  class display_wgc_ram_t: public display_ram_t {
+    wgc_capture_t dup;
+
+  public:
+    int
+    init(const ::video::config_t &config, const std::string &display_name);
+    capture_e
+    snapshot(const pull_free_image_cb_t &pull_free_image_cb, std::shared_ptr<platf::img_t> &img_out, std::chrono::milliseconds timeout, bool cursor_visible) override;
+    capture_e
+    release_snapshot() override;
+  };
+
+  class display_wgc_vram_t: public display_vram_t {
+    wgc_capture_t dup;
+
+  public:
+    int
+    init(const ::video::config_t &config, const std::string &display_name);
+    capture_e
+    snapshot(const pull_free_image_cb_t &pull_free_image_cb, std::shared_ptr<platf::img_t> &img_out, std::chrono::milliseconds timeout, bool cursor_visible) override;
+    capture_e
+    release_snapshot() override;
   };
 }  // namespace platf::dxgi