update debian package version

Force IDR frames for libx265 encoder

.clang-format

@@ -0,0 +1,67 @@
+# Generated from CLion C/C++ Code Style settings
+BasedOnStyle: LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: DontAlign
+AlignConsecutiveAssignments: true
+AlignOperands: Align
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterUnion: false
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: true
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+ColumnLimit: 0
+CompactNamespaces: false
+ContinuationIndentWidth: 2
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth: 2
+KeepEmptyLinesAtTheStartOfBlocks: true
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PointerAlignment: Right
+ReflowComments: false
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: Never
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 2
+Cpp11BracedListStyle: false
+UseTab: Never

.gitignore

@@ -1,8 +1,10 @@
 build
-cmake-build-*
+cmake-build*
 .DS_Store
-
+.vscode
+.vs
 *.swp
 *.kdev4
 
-.idea
+.cache
+.idea

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "ViGEmClient"]
 	path = ViGEmClient
 	url = https://github.com/ViGEm/ViGEmClient
-[submodule "pre-compiled"]
-	path = pre-compiled
-	url = https://bitbucket.org/Loki-47-6F-64/pre-compiled.git

CMakeLists.txt

@@ -1,77 +1,90 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 
 project(Sunshine)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
-# On MSYS2, building a stand-alone binary that links with ffmpeg is not possible,
-# Therefore, ffmpeg, libx264 and libx265 must be build from source
-if(WIN32)
-	option(SUNSHINE_STANDALONE "Compile stand-alone binary of Sunshine" OFF)
-	if(SUNSHINE_STANDALONE)
-		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-	
-		if(NOT DEFINED SUNSHINE_PREPARED_BINARIES)
-			set(SUNSHINE_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/pre-compiled/windows")
-		endif()
-		list(PREPEND PLATFORM_LIBRARIES
-			C:/msys64/mingw64/lib/gcc/x86_64-w64-mingw32/${CMAKE_CXX_COMPILER_VERSION}/libstdc++.a
-			C:/msys64/mingw64/x86_64-w64-mingw32/lib/libwinpthread.a
-			)
-
-		set(FFMPEG_INCLUDE_DIRS
-			${SUNSHINE_PREPARED_BINARIES}/include)
-		set(FFMPEG_LIBRARIES
-			${SUNSHINE_PREPARED_BINARIES}/lib/libavcodec.a
-			${SUNSHINE_PREPARED_BINARIES}/lib/libavdevice.a
-			${SUNSHINE_PREPARED_BINARIES}/lib/libavfilter.a
-			${SUNSHINE_PREPARED_BINARIES}/lib/libavformat.a
-			${SUNSHINE_PREPARED_BINARIES}/lib/libavutil.a
-			${SUNSHINE_PREPARED_BINARIES}/lib/libpostproc.a
-			${SUNSHINE_PREPARED_BINARIES}/lib/libswresample.a
-			${SUNSHINE_PREPARED_BINARIES}/lib/libswscale.a
-			${SUNSHINE_PREPARED_BINARIES}/lib/libx264.a
-			${SUNSHINE_PREPARED_BINARIES}/lib/libx265.a
-			z lzma bcrypt C:/msys64/mingw64/lib/libiconv.a)
-	endif()
-else()
-	set(SUNSHINE_STANDALONE OFF)
-endif()
-
 add_subdirectory(Simple-Web-Server)
+
+if(WIN32)
+	# Ugly hack to compile with #include <qos2.h>
+	add_compile_definitions(
+		QOS_FLOWID=UINT32
+		PQOS_FLOWID=UINT32*
+		QOS_NON_ADAPTIVE_FLOW=2)
+endif()
 add_subdirectory(moonlight-common-c/enet)
 
 find_package(Threads REQUIRED)
 find_package(OpenSSL REQUIRED)
 
-if(NOT SUNSHINE_STANDALONE)
-	find_package(FFmpeg REQUIRED)
-endif()
-
 list(APPEND SUNSHINE_COMPILE_OPTIONS -fPIC -Wall -Wno-missing-braces -Wno-maybe-uninitialized -Wno-sign-compare)
 
 if(WIN32)
+	file(
+		DOWNLOAD "https://github.com/TheElixZammuto/sunshine-prebuilt/releases/download/1.0.0/pre-compiled.zip" "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip"
+		TIMEOUT 60
+		EXPECTED_HASH SHA256=5d59986bd7f619eaaf82b2dd56b5127b747c9cbe8db61e3b898ff6b485298ed6)
+
+	file(ARCHIVE_EXTRACT
+		INPUT "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip"
+		DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/pre-compiled)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+	
+	if(NOT DEFINED SUNSHINE_PREPARED_BINARIES)
+		set(SUNSHINE_PREPARED_BINARIES "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled/windows")
+	endif()
+
 	add_subdirectory(tools) #This is temporary, only tools for Windows are needed, for now
 
 	list(APPEND SUNSHINE_DEFINITIONS APPS_JSON="apps_windows.json")
-	include_directories(
-		ViGEmClient/include)
+
+	include_directories(ViGEmClient/include)
+
 	set(PLATFORM_TARGET_FILES
-		sunshine/platform/windows.cpp
-		sunshine/platform/windows_dxgi.cpp
-		sunshine/platform/windows_wasapi.cpp
+		sunshine/platform/windows/input.cpp
+		sunshine/platform/windows/display.h
+		sunshine/platform/windows/display_base.cpp
+		sunshine/platform/windows/display_vram.cpp
+		sunshine/platform/windows/display_ram.cpp
+		sunshine/platform/windows/audio.cpp
 		ViGEmClient/src/ViGEmClient.cpp
 		ViGEmClient/include/ViGEm/Client.h
 		ViGEmClient/include/ViGEm/Common.h
 		ViGEmClient/include/ViGEm/Util.h
 		ViGEmClient/include/ViGEm/km/BusShared.h)
+
+	set(OPENSSL_LIBRARIES
+		libssl.a
+		libcrypto.a)
+
+	set(FFMPEG_INCLUDE_DIRS
+		${SUNSHINE_PREPARED_BINARIES}/include)
+	set(FFMPEG_LIBRARIES
+		${SUNSHINE_PREPARED_BINARIES}/lib/libavcodec.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libavdevice.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libavfilter.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libavformat.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libavutil.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libpostproc.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libswresample.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libswscale.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libx264.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libx265.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libhdr10plus.a
+		z lzma bcrypt libiconv.a)
+
 	list(PREPEND PLATFORM_LIBRARIES
+		libstdc++.a
+		libwinpthread.a
+		libssp.a
+		Qwave
 		winmm
 		ksuser
 		wsock32
 		ws2_32
 		iphlpapi
-		d3d11 dxgi
+		d3d11 dxgi D3DCompiler
 		setupapi
 		)
 
@@ -81,9 +94,11 @@ else()
 	list(APPEND SUNSHINE_DEFINITIONS APPS_JSON="apps_linux.json")
 
 	find_package(X11 REQUIRED)
+	find_package(FFmpeg REQUIRED)
 	set(PLATFORM_TARGET_FILES
-		sunshine/platform/linux.cpp
-		sunshine/platform/linux_evdev.cpp)
+		sunshine/platform/linux/display.cpp
+		sunshine/platform/linux/audio.cpp
+		sunshine/platform/linux/input.cpp)
 	
 	set(PLATFORM_LIBRARIES
 		Xfixes
@@ -91,6 +106,7 @@ else()
 		xcb
 		xcb-shm
 		xcb-xfixes
+		Xrandr
 		${X11_LIBRARIES}
 		evdev
 		pulse
@@ -148,6 +164,7 @@ set(SUNSHINE_TARGET_FILES
 	sunshine/thread_pool.h
 	sunshine/thread_safe.h
 	sunshine/sync.h
+	sunshine/round_robin.h
 	${PLATFORM_TARGET_FILES})
 
 include_directories(
@@ -174,12 +191,6 @@ if(NOT SUNSHINE_ASSETS_DIR)
 	set(SUNSHINE_ASSETS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
 endif()
 
-if(SUNSHINE_STANDALONE)
-	set(OPENSSL_LIBRARIES
-		C:/msys64/mingw64/lib/libssl.a
-		C:/msys64/mingw64/lib/libcrypto.a)
-endif()
-
 list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
 		${CMAKE_THREAD_LIBS_INIT}
 		stdc++fs

README.md

@@ -0,0 +1,195 @@
+# Introduction
+Sunshine is a Gamestream host for Moonlight
+
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/cgrtw2g3fq9b0b70/branch/master?svg=true)](https://ci.appveyor.com/project/loki-47-6F-64/sunshine/branch/master)
+[![Downloads](https://img.shields.io/github/downloads/Loki-47-6F-64/sunshine/total)](https://github.com/Loki-47-6F-64/sunshine/releases)
+
+- [Building](README.md#building)
+- [Credits](README.md#credits)
+
+# Building
+- [Linux](README.md#linux)
+- [Windows](README.md#windows-10)
+
+## Linux
+
+### Requirements:
+Ubuntu 20.04:
+Install the following
+```
+sudo apt install cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev
+```
+
+### Compilation:
+- `git clone https://github.com/loki-47-6F-64/sunshine.git --recurse-submodules`
+- `cd sunshine && mkdir build && cd build`
+- `cmake ..`
+- `make -j ${nproc}`
+
+
+### Setup:
+sunshine needs access to uinput to create mouse and gamepad events:
+- Add user to group 'input':
+	`usermod -a -G input $USER`
+- Create udev rules:
+	- Run the following command: 
+	`nano /etc/udev/rules.d/85-sunshine-input.rules`
+	- Input the following contents:
+	`KERNEL=="uinput", GROUP="input", mode="0660"`
+	- Save the file and exit
+		1. `CTRL+X` to start exit
+		2. `Y` to save modifications
+- `assets/sunshine.conf` is an example configuration file. Modify it as you see fit, then use it by running: 
+	`sunshine path/to/sunshine.conf`
+- Configure autostart service
+	`path/to/build/dir/sunshine.service` is used to start sunshine in the background. To use it, do the following:
+	1. Copy it to the users systemd, `cp sunshine.service ~/.config/systemd/user/`
+	2. Starting
+		- Onetime: 
+			`systemctl --user start sunshine`
+		- Always on boot:
+			`systemctl --user enable sunshine`
+
+- `assets/apps.json` is an [example](README.md#application-list) of a list of applications that are started just before running a stream
+
+### Trouleshooting:
+- If you get "Could not create Sunshine Gamepad: Permission Denied", ensure you are part of the group "input":
+	- `groups $USER`
+	
+- If Sunshine sends audio from the microphone instead of the speaker, try the following steps:
+ 	1. pacmd list-sources | grep "name:"
+	2. Copy the name to the configuration option "audio_sink"
+	3. restart sunshine
+
+## Windows 10
+
+### Requirements:
+
+	mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make
+
+### Compilation:
+- `git clone https://github.com/loki-47-6F-64/sunshine.git --recursive`
+- `cd sunshine && mkdir build && cd build`
+- `cmake -G"Unix Makefiles" ..`
+- `make`
+
+### Setup:
+- **OPTIONAL** Gamepad support: Download and run 'ViGEmBus_Setup_1.16.116.exe' from [https://github.com/ViGEm/ViGEmBus/releases]
+
+
+
+# Common 
+
+## Usage:
+- run "sunshine path/to/sunshine.conf"
+- In Moonlight: Add PC manually
+- When Moonlight request you insert the correct pin on sunshine, either:
+	- Type in the URL bar of your browser: `xxx.xxx.xxx.xxx:47989/pin/####`
+	- `wget xxx.xxx.xxx.xxx:47989/pin/####` 
+	  - The x's are the IP of your instance, `####` is the pin
+- Click on one of the Applications listed
+- Have fun :)
+
+
+## Note:
+- The Windows key is not passed through by Moonlight, therefore Sunshine maps Right-Alt key to the Windows key
+- If you set Video Bitrate to 0.5Mb/s:
+	- Sunshine will use CRF or QP to controll the quality of the stream. (See example configuration file for more details)
+	- This is less CPU intensive and it has lower average bandwith requirements compared to manually setting bitrate to acceptable quality
+	- However, it has higher peak bitrates, forcing Sunshine to drop entire frames when streaming 1080P due to their size.
+	- When this happens, the video portion of the stream appears to be frozen.
+	- This is rare enough that using this for the desktop environment is tolerable (in my opinion), however for gaming not so much.
+
+
+## Credits:
+- [Simple-Web-Server](https://gitlab.com/eidheim/Simple-Web-Server)
+- [Moonlight](https://github.com/moonlight-stream)
+- [Looking-Glass](https://github.com/gnif/LookingGlass) (For showing me how to properly capture frames on Windows, saving me a lot of time :)
+- [Eretik](http://eretik.omegahg.com/) (For creating PolicyConfig.h, allowing me to change the default audio device on Windows programmatically)
+
+## Application List:
+- You can use Environment variables in place of values
+	- $(HOME) will be replaced by the value of $HOME
+	- $$ will be replaced by $ --> $$(HOME) will be replaced by $(HOME)
+- env: Adds or overwrites Environment variables for the commands/applications run by Sunshine.
+	- "Variable name":"Variable value"
+- apps: The list of applications
+	- Example:
+	```json
+	{
+	"name":"An App",
+	"cmd":"command to open app",
+	"prep-cmd":[
+			{
+				"do":"some-command",
+				"undo":"undo-that-command"
+			}
+		],
+	"detached":[
+		"some-command",
+		"another-command"
+		]
+	}
+	```
+	- name: Self explanatory
+	- output <optional>: The file where the output of the command is stored
+		- If it is not specified, the output is ignored
+	- detached: A list of commands to be run and forgotten about
+	- prep-cmd: A list of commands to be run before/after the application
+		- If any of the prep-commands fail, starting the application is aborted
+		- do: Run before the application
+			- If it fails, all 'undo' commands of the previously succeeded 'do' commands are run
+		- undo <optional>: Run after the application has terminated
+			- This should not fail considering it is supposed to undo the 'do' commands.
+			- If it fails, Sunshine is terminated
+	- cmd <optional>: The main application
+		- If not specified, a processs is started that sleeps indefinitely
+
+1. When an application is started, if there is an application already running, it will be terminated.
+2. When the application has been shutdown, the stream shuts down as well.
+3. In addition to the apps listed, one app "Desktop" is hardcoded into Sunshine. It does not start an application, instead it simply starts a stream.
+
+Linux
+```json
+{
+	"env":{ 
+		"DISPLAY":":0",
+		"DRI_PRIME":"1",
+		"XAUTHORITY":"$(HOME)/.Xauthority",
+		"PATH":"$(PATH):$(HOME)/.local/bin"
+	},
+	"apps":[
+	{
+		"name":"Low Res Desktop",
+		"prep-cmd":[
+		{ "do":"xrandr --output HDMI-1 --mode 1920x1080", "undo":"xrandr --output HDMI-1 --mode 1920x1200" }
+		]
+	},
+	{
+		"name":"Steam BigPicture",
+
+		"output":"steam.txt",
+		"cmd":"steam -bigpicture",
+		"prep-cmd":[]
+	}
+	]
+}
+```
+Windows
+```json
+{
+	"env":{
+		"PATH":"$(PATH);C:\\Program Files (x86)\\Steam"
+	},
+	"apps":[
+	{
+		"name":"Steam BigPicture",
+
+		"output":"steam.txt",
+		"prep-cmd":[
+			{"do":"steam \"steam://open/bigpicture\""}
+		]
+	}
+	]
+}
+```

README.txt

@@ -1,117 +0,0 @@
-######### Linux ##############
-
-Requirements:
-	Ubuntu 19.10: cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev
-
-Compilation:
-	* git clone https://github.com/loki-47-6F-64/sunshine.git --recurse-submodules
-	* cd sunshine && mkdir build && cd build
-	* cmake ..
-	* make
-
-
-Setup:
-	* sunshine needs access to uinput to create mouse and gamepad events:
-		* Add user to group 'input': "usermod -a -G input username
-		* Create a file: "/etc/udev/rules.d/85-sunshine-input.rules"
-		* The contents of the file is as follows:
-			KERNEL=="uinput", GROUP="input", mode="0660"
-	* assets/sunshine.conf is an example configuration file. Modify it as you see fit and use it by running: "sunshine path/to/sunshine.conf"
-	* path/to/build/dir/sunshine.service is used to start sunshine in the background:
-		* cp sunshine.service $HOME/.config/systemd/user/
-		* Modify $HOME/.config/systemd/user/sunshine.conf to point to the sunshine executable
-		* systemctl --user start sunshine
-
-	* assets/apps.json is an example of a list of applications that are started just before running a stream:
-		* See below for a detailed explanation
-
-Trouleshooting:
-	* If you get "Could not create Sunshine Gamepad: Permission Denied", ensure you are part of the group "input":
-		* groups
-	* If Sunshine sends audio from the microphone instead of the speaker, try the following steps:
-		* pacmd list-sources | grep "name:"
-		* Copy the name to the configuration option "audio_sink"
-		* restart sunshine
-
-
-
-######### Windows 10 ############
-
-Requirements:
-	MSYS2 : mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-boost
-
-Compilation:
-	* git clone https://github.com/loki-47-6F-64/sunshine.git --recurse-submodules
-	* cd sunshine && mkdir build && cd build
-	* cmake -G"Unix Makefiles" ..
-	* make
-
-Setup:
-	* <optional> Gamepad support: Download and run 'ViGEmBus_Setup_1.16.116.exe' from [https://github.com/ViGEm/ViGEmBus/releases]
-
-== Static build ==
-Requirements:
-	MSYS2 : mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-boost git-lfs
-
-Compilation:
-	* git lfs install
-	* git clone https://github.com/loki-47-6F-64/sunshine.git --recurse-submodules
-	* cd sunshine && mkdir build && cd build
-	* cmake -DSUNSHINE_STANDALONE=ON -DSUNSHINE_ASSETS_DIR=assets -G"Unix Makefiles" ..
-	* make
-
-
-
-######### Common #############
-
-Usage:
-	* run "sunshine path/to/sunshine.conf"
-	* In Moonlight: Add PC manually
-	* When Moonlight request you insert the correct pin on sunshine:
-		wget xxx.xxx.xxx.xxx:47989/pin/xxxx -- where the first few x's are substituted by the ip of Sunshine and the final 4 x'es are substituted by the pin
-			or
-		Type in the URL bar of your browser: xxx.xxx.xxx.xxx:47989/pin/xxxx -- where the first few x's are substituted by the ip of the final 4 x'es are subsituted by the pin
-	* Click on one of the Applications listed
-	* Have fun :)
-
-
-Note:
-	* The Windows key is not passed through by Moonlight, therefore Sunshine maps Right-Alt key to the Windows key
-	* If you set Video Bitrate to 0.5Mb/s:
-		* Sunshine will use CRF or QP to controll the quality of the stream. (See example configuration file for more details)
-		* This is less CPU intensive and it has lower average bandwith requirements compared to manually setting bitrate to acceptable quality
-		* However, it has higher peak bitrates, forcing Sunshine to drop entire frames when streaming 1080P due to their size.
-		* When this happens, the video portion of the stream appears to be frozen.
-		* This is rare enough that using this for the desktop environment is tolerable (in my opinion), however for gaming not so much.
-
-
-Credits:
-	* Simple-Web-Server [https://gitlab.com/eidheim/Simple-Web-Server]
-	* Moonlight [https://github.com/moonlight-stream]
-	* Looking-Glass [https://github.com/gnif/LookingGlass] (For showing me how to properly capture frames on Windows, saving me a lot of time :)
-
-
-
-Application List:
-	* You can use Environment variables in place of values
-		* $(HOME) will be replaced by the value of $HOME
-		* $$ will be replaced by $ --> $$(HOME) will be replaced by $(HOME)
-	* env: Adds or overwrites Environment variables for the commands/applications run by Sunshine.
-		* "Variable name":"Variable value"
-	* apps: The list of applications
-		* name: Self explanatory
-		* output <optional>: The file where the output of the command is stored
-			* If it is not specified, the output is ignored
-		* prep-cmd: A list of commands to be run before/after the application
-			* If any of the prep-commands fail, starting the application is aborted
-			* do: Run before the application
-				* If it fails, all 'undo' commands of the previously succeeded 'do' commands are run
-			* undo <optional>: Run after the application has terminated
-				* This should not fail considering it is supposed to undo the 'do' commands.
-				* If it fails, Sunshine is terminated
-		* cmd <optional>: The main application
-			* If not specified, a processs is started that sleeps indefinitely
-
-When an application is started, if there is an application already running, it will be terminated.
-When the application has been shutdown, the stream shuts down as well.
-In addition to the apps listed, one app "Desktop" is hardcoded into Sunshine. It does not start an application, instead it simply starts a stream.

appveyor.yml

@@ -1,5 +1,5 @@
 image:
-  - Ubuntu
+  - Ubuntu2004
   - Visual Studio 2019
 
 environment:
@@ -8,18 +8,8 @@ environment:
     - BUILD_TYPE: Release
 
 install:
-  - sh: sudo add-apt-repository ppa:hnakamur/icu
-  - sh: sudo add-apt-repository ppa:hnakamur/boost
-
-  - sh: sudo add-apt-repository ppa:savoury1/build-tools
-  - sh: sudo add-apt-repository ppa:savoury1/backports
-  - sh: sudo add-apt-repository ppa:savoury1/graphics
-  - sh: sudo add-apt-repository ppa:savoury1/multimedia
-  - sh: sudo add-apt-repository ppa:savoury1/ffmpeg4
-
-  - sh: sudo apt update
-  - sh: sudo apt install -y fakeroot cmake libssl-dev libavdevice-dev libboost-thread1.67-dev libboost-filesystem1.67-dev libboost-log1.67-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev
-  - sh: sudo update-alternatives --set gcc /usr/bin/gcc-8
+  - sh: sudo apt update --ignore-missing
+  - sh: sudo apt install -y build-essential fakeroot gcc-10 g++-10 cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev
   - cmd: C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make"
 
 before_build:
@@ -30,8 +20,8 @@ before_build:
 build_script:
   - cmd: set OLDPATH=%PATH%
   - cmd: set PATH=C:\msys64\mingw64\bin
-  - sh: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSUNSHINE_EXECUTABLE_PATH=sunshine -DSUNSHINE_ASSETS_DIR=/etc/sunshine ..
-  - cmd: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSUNSHINE_STANDALONE=ON -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" ..
+  - sh: cmake -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSUNSHINE_EXECUTABLE_PATH=sunshine -DSUNSHINE_ASSETS_DIR=/etc/sunshine ..
+  - cmd: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" ..
   - sh: make -j$(nproc)
   - cmd: mingw32-make -j2
   - cmd: set PATH=%OLDPATH%

assets/apps_linux.json

@@ -1,8 +1,5 @@
 {
 	"env":{ 
-		"DISPLAY":":0",
-		"DRI_PRIME":"1",
-		"XAUTHORITY":"$(HOME)/.Xauthority",
 		"PATH":"$(PATH):$(HOME)/.local/bin"
 	},
 	"apps":[
@@ -16,8 +13,7 @@
 		"name":"Steam BigPicture",
 
 		"output":"steam.txt",
-		"cmd":"steam -bigpicture",
-		"prep-cmd":[]
+		"detached":["setsid steam steam://open/bigpicture"]
 	}
 	]
 }

assets/apps_windows.json

@@ -7,9 +7,7 @@
 		"name":"Steam BigPicture",
 
 		"output":"steam.txt",
-		"prep-cmd":[
-			{"do":"steam \"steam://open/bigpicture\""}
-		]
+		"detached":["steam steam://open/bigpicture"]
 	}
 	]
 }

assets/shaders/ConvertUVPS.hlsl

@@ -0,0 +1,33 @@
+Texture2D image : register(t0);
+
+SamplerState def_sampler : register(s0);
+
+struct FragTexWide {
+	float3 uuv : TEXCOORD0;
+};
+
+cbuffer ColorMatrix : register(b0) {
+	float4 color_vec_y;
+	float4 color_vec_u;
+	float4 color_vec_v;
+	float2 range_y;
+	float2 range_uv;
+};
+
+//--------------------------------------------------------------------------------------
+// Pixel Shader
+//--------------------------------------------------------------------------------------
+float2 main_ps(FragTexWide input) : SV_Target
+{
+	float3 rgb_left = image.Sample(def_sampler, input.uuv.xz).rgb;
+	float3 rgb_right = image.Sample(def_sampler, input.uuv.yz).rgb;
+	float3 rgb = (rgb_left + rgb_right) * 0.5;
+	
+	float u = dot(color_vec_u.xyz, rgb) + color_vec_u.w;
+	float v = dot(color_vec_v.xyz, rgb) + color_vec_v.w;
+
+	u = u * range_uv.x + range_uv.y;
+	v = v * range_uv.x + range_uv.y;
+
+	return float2(u, v * 224.0f/256.0f + 0.0625);
+}

assets/shaders/ConvertUVVS.hlsl

@@ -0,0 +1,29 @@
+struct VertTexPosWide {
+	float3 uuv : TEXCOORD;
+	float4 pos : SV_POSITION;
+};
+
+cbuffer info : register(b0) {
+	float width_i;
+};
+
+//--------------------------------------------------------------------------------------
+// Vertex Shader
+//--------------------------------------------------------------------------------------
+VertTexPosWide main_vs(uint vI : SV_VERTEXID)
+{
+	float idHigh = float(vI >> 1);
+	float idLow = float(vI & uint(1));
+
+	float x = idHigh * 4.0 - 1.0;
+	float y = idLow * 4.0 - 1.0;
+
+	float u_right = idHigh * 2.0;
+	float u_left = u_right - width_i;
+	float v = 1.0 - idLow * 2.0;
+
+	VertTexPosWide vert_out;
+	vert_out.uuv = float3(u_left, u_right, v);
+	vert_out.pos = float4(x, y, 0.0, 1.0);
+	return vert_out;
+}

assets/shaders/ConvertYPS.hlsl

@@ -0,0 +1,25 @@
+Texture2D image : register(t0);
+
+SamplerState def_sampler : register(s0);
+
+cbuffer ColorMatrix : register(b0) {
+	float4 color_vec_y;
+	float4 color_vec_u;
+	float4 color_vec_v;
+	float2 range_y;
+	float2 range_uv;
+};
+
+struct PS_INPUT
+{
+	float4 pos : SV_POSITION;
+	float2 tex : TEXCOORD;
+};
+
+float main_ps(PS_INPUT frag_in) : SV_Target
+{
+	float3 rgb = image.Sample(def_sampler, frag_in.tex, 0).rgb;
+	float y = dot(color_vec_y.xyz, rgb);
+
+	return y * range_y.x + range_y.y;
+}

assets/shaders/ScenePS.hlsl

@@ -0,0 +1,14 @@
+Texture2D image : register(t0);
+
+SamplerState def_sampler : register(s0);
+
+struct PS_INPUT
+{
+	float4 pos : SV_POSITION;
+	float2 tex : TEXCOORD;
+};
+
+float4 main_ps(PS_INPUT frag_in) : SV_Target
+{
+	return image.Sample(def_sampler, frag_in.tex, 0);
+}

assets/shaders/SceneVS.hlsl

@@ -0,0 +1,22 @@
+struct PS_INPUT
+{
+	float4 pos : SV_POSITION;
+	float2 tex : TEXCOORD;
+};
+
+PS_INPUT main_vs(uint vI : SV_VERTEXID)
+{
+	float idHigh = float(vI >> 1);
+	float idLow = float(vI & uint(1));
+
+	float x = idHigh * 4.0 - 1.0;
+	float y = idLow * 4.0 - 1.0;
+
+	float u = idHigh * 2.0;
+	float v = 1.0 - idLow * 2.0;
+
+	PS_INPUT vert_out;
+	vert_out.pos = float4(x, y, 0.0, 1.0);
+	vert_out.tex = float2(u, v);
+	return vert_out;
+}

assets/sunshine.conf

@@ -37,6 +37,26 @@
 # The file where current state of Sunshine is stored
 # file_state = sunshine_state.json
 
+# The display modes advertised by Sunshine
+#
+# Some versions of Moonlight, such as Moonlight-nx (Switch),
+# rely on this list to ensure that the requested resolutions and fps
+# are supported.
+#
+# fps = [10, 30, 60, 90, 120]
+# resolutions = [
+#     352x240,
+#     480x360,
+#     858x480,
+#     1280x720,
+#     1920x1080,
+#     2560x1080,
+#     3440x1440,
+#     1920x1200,
+#     3860x2160,
+#     3840x1600,
+# ]
+
 # How long to wait in milliseconds for data from moonlight before shutting down the stream
 # ping_timeout = 2000
 
@@ -65,18 +85,30 @@
 # If back_button_timeout < 0, then the Home/Guide button will not be emulated
 # back_button_timeout = 2000
 
+# !! Windows only !!
+# Control how fast keys will repeat themselves
+# The initial delay in milliseconds before repeating keys
+# key_repeat_delay = 500
+#
+# How often keys repeat every second
+# This configurable option supports decimals
+# key_repeat_frequency = 24.9
 
 # The name of the audio sink used for Audio Loopback
 # If you do not specify this variable, pulseaudio will select the default monitor device.
 #
 # You can find the name of the audio sink using the following command:
 # !! Linux only !!
-# pacmd list-sources | grep "name:"
-# audio_sink = alsa_output.pci-0000_09_00.3.analog-stereo.monitor
+# pacmd list-sinks | grep "name:"
+# audio_sink = alsa_output.pci-0000_09_00.3.analog-stereo
 #
 # !! Windows only !!
 # tools\audio-info.exe
-# audio_sink = {0.0.0.00000000}.{FD47D9CC-4218-4135-9CE2-0C195C87405B}
+# audio_sink   = {0.0.0.00000000}.{FD47D9CC-4218-4135-9CE2-0C195C87405B}
+#
+# The virtual sink, is the audio device that's virtual (Like Steam Streaming Speakers), it allows Sunshine
+# to stream audio, while muting the speakers.
+# virtual_sink = {0.0.0.00000000}.{8edba70c-1125-467c-b89c-15da389bc1d4}
 
 # !! Windows only !!
 # You can select the video card you want to stream:
@@ -85,6 +117,9 @@
 # adapter_name = Radeon RX 580 Series
 # output_name  = \\.\DISPLAY1
 
+# !! Linux only !!
+# Set the display number to stream. I have no idea how they are numbered. They start from 0, usually.
+# output_name = 0
 
 ###############################################
 # FFmpeg software encoding parameters
@@ -105,20 +140,88 @@
 # Increasing the value slightly reduces encoding efficiency, but the tradeoff is usually
 # worth it to gain the use of more CPU cores for encoding. The ideal value is the lowest
 # value that can reliably encode at your desired streaming settings on your hardware.
-# min_threads = 2
+# min_threads = 1
 
 # Allows the client to request HEVC Main or HEVC Main10 video streams.
-# HEVC is more CPU-intensive to encode, so enabling this may reduce performance.
-# If set to 0 (default), Sunshine will not advertise support for HEVC
-# If set to 1, Sunshine will advertise support for HEVC Main profile
-# If set to 2, Sunshine will advertise support for HEVC Main and Main10 (HDR) profiles
+# HEVC is more CPU-intensive to encode, so enabling this may reduce performance when using software encoding.
+# If set to 0 (default), Sunshine will specify support for HEVC based on encoder
+# If set to 1, Sunshine will not advertise support for HEVC
+# If set to 2, Sunshine will advertise support for HEVC Main profile
+# If set to 3, Sunshine will advertise support for HEVC Main and Main10 (HDR) profiles
 # hevc_mode = 2
 
+# Force a specific encoder, otherwise Sunshine will use the first encoder that is available
+# supported encoders:
+#   nvenc
+#   amdvce # NOTE: alpha stage. The cursor is not yet displayed
+#   software
+#
+# encoder = nvenc
+##################################### Software #####################################
 # See x264 --fullhelp for the different presets
-# preset  = superfast
-# tune    = zerolatency
+# sw_preset  = superfast
+# sw_tune    = zerolatency
 #
+
+##################################### NVENC #####################################
+###### presets ###########
+# default
+# hp     -- high performance
+# hq     -- high quality
+# slow   -- hq 2 passes
+# medium -- hq 1 pass
+# fast   -- hp 1 pass
+# bd
+# ll     -- low latency
+# llhq
+# llhp
+# lossless
+# losslesshp
+##########################
+# nv_preset = llhq
 #
+####### rate control #####
+# auto      -- let ffmpeg decide rate control
+# constqp   -- constant QP mode
+# vbr       -- variable bitrate
+# cbr       -- constant bitrate
+# cbr_hq    -- cbr high quality
+# cbr_ld_hq -- cbr low delay high quality
+# vbr_hq    -- vbr high quality
+##########################
+# nv_rc = auto
+
+###### h264 entropy ######
+# auto -- let ffmpeg nvenc decide the entropy encoding
+# cabac
+# cavlc
+##########################
+# nv_coder = auto
+
+##################################### AMD #####################################
+###### presets ###########
+# default
+# speed
+# balanced
+##########################
+# amd_preset = balanced
+#
+####### rate control #####
+# auto        -- let ffmpeg decide rate control
+# constqp     -- constant QP mode
+# vbr_latency -- Latency Constrained Variable Bitrate
+# vbr_peak    -- Peak Contrained Variable Bitrate
+# cbr         -- constant bitrate
+##########################
+# amd_rc = auto
+
+###### h264 entropy ######
+# auto -- let ffmpeg nvenc decide the entropy encoding
+# cabac
+# cavlc
+##########################
+# amd_coder = auto
+
 ##############################################
 # Some configurable parameters, are merely toggles for specific features
 # The first occurrence turns it on, the second occurence turns it off, the third occurence turns it on again, etc, etc
@@ -127,4 +230,4 @@
 # To set the initial state of flags -0 and -1 to on, set the following flags:
 # flags = 01
 #
-# See: sunshine --help for all options under the header: flags
+# See: sunshine --help for all options under the header: flags

gen-deb.in

@@ -35,8 +35,8 @@ Package: sunshine
 Architecture: amd64
 Maintainer: @loki
 Priority: optional
-Version: 0.1.1
-Depends: libssl | libavdevice | libboost-thread (>= 1.67) | libboost-filesystem (>= 1.67) | libboost-log (>= 1.67) | libpulse | libopus | libxtst | libx11 | libxfixes | libevdev | libxcb1 | libxcb-shm0 | libxcb-xfixes0
+Version: 0.4.1
+Depends: libssl1.1, libavdevice58, libboost-thread1.71.0, libboost-filesystem1.71.0, libboost-log1.71.0, libpulse0, libopus0, libxcb-shm0, libxcb-xfixes0
 Description: Gamestream host for Moonlight
 EOF
 
@@ -54,10 +54,6 @@ if [ -f /etc/group ]; then
 else
         echo "Warning: /etc/group not found"
 fi
-
-# Prevent necessity of rebooting system
-chmod 0660 /dev/uinput
-chown root:$GROUP_INPUT /dev/uinput
 EOF
 
 cat << 'EOF' > $RULES/85-sunshine-rules.rules

sunshine.service.in

@@ -2,12 +2,7 @@
 Description=Sunshine Gamestream Server for Moonlight
 
 [Service]
-WorkingDirectory=/home/%u
-Environment="DISPLAY=:0"
-Type=simple
-# wait for Xorg
-ExecStartPre=/bin/sh -c 'while ! pgrep Xorg; do sleep 2; done'
 ExecStart=@SUNSHINE_EXECUTABLE_PATH@
 
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target

sunshine/audio.cpp

@@ -4,68 +4,90 @@
 
 #include "platform/common.h"
 
-#include "utility.h"
-#include "thread_safe.h"
 #include "audio.h"
+#include "config.h"
 #include "main.h"
+#include "thread_safe.h"
+#include "utility.h"
 
 namespace audio {
 using namespace std::literals;
-using opus_t = util::safe_ptr<OpusMSEncoder, opus_multistream_encoder_destroy>;
+using opus_t         = util::safe_ptr<OpusMSEncoder, opus_multistream_encoder_destroy>;
 using sample_queue_t = std::shared_ptr<safe::queue_t<std::vector<std::int16_t>>>;
 
-struct opus_stream_config_t {
-  std::int32_t sampleRate;
-  int channelCount;
-  int streams;
-  int coupledStreams;
-  const std::uint8_t *mapping;
+struct audio_ctx_t {
+  // We want to change the sink for the first stream only
+  std::unique_ptr<std::atomic_bool> sink_flag;
+
+  std::unique_ptr<platf::audio_control_t> control;
+
+  bool restore_sink;
+  platf::sink_t sink;
 };
 
-constexpr std::uint8_t map_stereo[] { 0, 1 };
-constexpr std::uint8_t map_surround51[] {0, 4, 1, 5, 2, 3};
-constexpr std::uint8_t map_high_surround51[] {0, 1, 2, 3, 4, 5};
+static int start_audio_control(audio_ctx_t &ctx);
+static void stop_audio_control(audio_ctx_t &);
+
+int map_stream(int channels, bool quality);
+
 constexpr auto SAMPLE_RATE = 48000;
-static opus_stream_config_t stereo = {
+
+opus_stream_config_t stream_configs[MAX_STREAM_CONFIG] {
+  {
     SAMPLE_RATE,
     2,
     1,
     1,
-    map_stereo
-};
-
-static opus_stream_config_t Surround51 = {
+    platf::speaker::map_stereo,
+  },
+  {
     SAMPLE_RATE,
     6,
     4,
     2,
-    map_surround51
-};
-
-static opus_stream_config_t HighSurround51 = {
+    platf::speaker::map_surround51,
+  },
+  {
     SAMPLE_RATE,
     6,
     6,
     0,
-    map_high_surround51
+    platf::speaker::map_surround51,
+  },
+  {
+    SAMPLE_RATE,
+    8,
+    5,
+    3,
+    platf::speaker::map_surround71,
+  },
+  {
+    SAMPLE_RATE,
+    8,
+    8,
+    0,
+    platf::speaker::map_surround71,
+  },
 };
 
+auto control_shared = safe::make_shared<audio_ctx_t>(start_audio_control, stop_audio_control);
+
 void encodeThread(packet_queue_t packets, sample_queue_t samples, config_t config, void *channel_data) {
   //FIXME: Pick correct opus_stream_config_t based on config.channels
-  auto stream = &stereo;
-   opus_t opus { opus_multistream_encoder_create(
-     stream->sampleRate,
-     stream->channelCount,
-     stream->streams,
-     stream->coupledStreams,
-     stream->mapping,
-     OPUS_APPLICATION_AUDIO,
-     nullptr)
-   };
+  auto stream = &stream_configs[map_stream(config.channels, config.flags[config_t::HIGH_QUALITY])];
+
+  opus_t opus { opus_multistream_encoder_create(
+    stream->sampleRate,
+    stream->channelCount,
+    stream->streams,
+    stream->coupledStreams,
+    stream->mapping,
+    OPUS_APPLICATION_AUDIO,
+    nullptr) };
 
   auto frame_size = config.packetDuration * stream->sampleRate / 1000;
   while(auto sample = samples->pop()) {
-    packet_t packet { 16*1024 }; // 16KB
+    packet_t packet { 16 * 1024 }; // 16KB
 
     int bytes = opus_multistream_encode(opus.get(), sample->data(), frame_size, std::begin(packet), packet.size());
     if(bytes < 0) {
@@ -76,56 +98,141 @@ void encodeThread(packet_queue_t packets, sample_queue_t samples, config_t confi
     }
 
     packet.fake_resize(bytes);
-    packets->raise(std::make_pair(channel_data, std::move(packet)));
+    packets->raise(channel_data, std::move(packet));
   }
 }
 
 void capture(safe::signal_t *shutdown_event, packet_queue_t packets, config_t config, void *channel_data) {
-  auto samples = std::make_shared<sample_queue_t::element_type>();
+  //FIXME: Pick correct opus_stream_config_t based on config.channels
+  auto stream = &stream_configs[map_stream(config.channels, config.flags[config_t::HIGH_QUALITY])];
+
+  auto ref = control_shared.ref();
+  if(!ref) {
+    return;
+  }
+
+  auto &control = ref->control;
+  if(!control) {
+    BOOST_LOG(error) << "Couldn't create audio control"sv;
+
+    return;
+  }
+
+  std::string *sink =
+    config::audio.sink.empty() ? &ref->sink.host : &config::audio.sink;
+  if(ref->sink.null) {
+    auto &null = *ref->sink.null;
+    switch(stream->channelCount) {
+    case 2:
+      sink = &null.stereo;
+      break;
+    case 6:
+      sink = &null.surround51;
+      break;
+    case 8:
+      sink = &null.surround71;
+      break;
+    }
+  }
+
+  // Only the first to start a session may change the default sink
+  if(!ref->sink_flag->exchange(true, std::memory_order_acquire)) {
+    ref->restore_sink = !config.flags[config_t::HOST_AUDIO];
+
+    // If the client requests audio on the host, don't change the default sink
+    if(!config.flags[config_t::HOST_AUDIO] && control->set_sink(*sink)) {
+      return;
+    }
+  }
+
+  auto samples = std::make_shared<sample_queue_t::element_type>(30);
   std::thread thread { encodeThread, packets, samples, config, channel_data };
 
   auto fg = util::fail_guard([&]() {
     samples->stop();
     thread.join();
+
+    shutdown_event->view();
   });
 
-  //FIXME: Pick correct opus_stream_config_t based on config.channels
-  auto stream = &stereo;
+  auto frame_size       = config.packetDuration * stream->sampleRate / 1000;
+  int samples_per_frame = frame_size * stream->channelCount;
 
-  auto mic = platf::microphone(stream->sampleRate);
+  auto mic = control->microphone(stream->mapping, stream->channelCount, stream->sampleRate, frame_size);
   if(!mic) {
-    BOOST_LOG(error) << "Couldn't create audio input"sv ;
+    BOOST_LOG(error) << "Couldn't create audio input"sv;
 
     return;
   }
 
-  auto frame_size = config.packetDuration * stream->sampleRate / 1000;
-  int samples_per_frame = frame_size * stream->channelCount;
-
   while(!shutdown_event->peek()) {
     std::vector<std::int16_t> sample_buffer;
     sample_buffer.resize(samples_per_frame);
 
     auto status = mic->sample(sample_buffer);
     switch(status) {
-      case platf::capture_e::ok:
-        break;
-      case platf::capture_e::timeout:
-        continue;
-      case platf::capture_e::reinit:
-        mic.reset();
-        mic = platf::microphone(stream->sampleRate);
-        if(!mic) {
-          BOOST_LOG(error) << "Couldn't re-initialize audio input"sv ;
+    case platf::capture_e::ok:
+      break;
+    case platf::capture_e::timeout:
+      continue;
+    case platf::capture_e::reinit:
+      mic.reset();
+      mic = control->microphone(stream->mapping, stream->channelCount, stream->sampleRate, frame_size);
+      if(!mic) {
+        BOOST_LOG(error) << "Couldn't re-initialize audio input"sv;
 
-          return;
-        }
-        return;
-      default:
         return;
+      }
+      return;
+    default:
+      return;
     }
 
     samples->raise(std::move(sample_buffer));
   }
 }
+
+int map_stream(int channels, bool quality) {
+  int shift = quality ? 1 : 0;
+  switch(channels) {
+  case 2:
+    return STEREO;
+  case 6:
+    return SURROUND51 + shift;
+  case 8:
+    return SURROUND71 + shift;
+  }
+  return STEREO;
 }
+
+int start_audio_control(audio_ctx_t &ctx) {
+  ctx.sink_flag = std::make_unique<std::atomic_bool>(false);
+
+  if(!(ctx.control = platf::audio_control())) {
+    return -1;
+  }
+
+  auto sink = ctx.control->sink_info();
+  if(!sink) {
+    return -1;
+  }
+
+  // The default sink has not been replaced yet.
+  ctx.restore_sink = false;
+
+  ctx.sink = std::move(*sink);
+  return 0;
+}
+void stop_audio_control(audio_ctx_t &ctx) {
+  // restore audio-sink if applicable
+  if(!ctx.restore_sink) {
+    return;
+  }
+
+  const std::string &sink = config::audio.sink.empty() ? ctx.sink.host : config::audio.sink;
+  if(!sink.empty()) {
+    // Best effort, it's allowed to fail
+    ctx.control->set_sink(sink);
+  }
+}
+} // namespace audio

sunshine/audio.h

@@ -1,18 +1,45 @@
 #ifndef SUNSHINE_AUDIO_H
 #define SUNSHINE_AUDIO_H
 
-#include "utility.h"
 #include "thread_safe.h"
+#include "utility.h"
 namespace audio {
+enum stream_config_e : int {
+  STEREO,
+  SURROUND51,
+  HIGH_SURROUND51,
+  SURROUND71,
+  HIGH_SURROUND71,
+  MAX_STREAM_CONFIG
+};
+
+struct opus_stream_config_t {
+  std::int32_t sampleRate;
+  int channelCount;
+  int streams;
+  int coupledStreams;
+  const std::uint8_t *mapping;
+};
+
+extern opus_stream_config_t stream_configs[MAX_STREAM_CONFIG];
+
 struct config_t {
+  enum flags_e : int {
+    HIGH_QUALITY,
+    HOST_AUDIO,
+    MAX_FLAGS
+  };
+
   int packetDuration;
   int channels;
   int mask;
+
+  std::bitset<MAX_FLAGS> flags;
 };
 
-using packet_t = util::buffer_t<std::uint8_t>;
-using packet_queue_t = std::shared_ptr<safe::queue_t<std::pair<void*, packet_t>>>;
+using packet_t       = util::buffer_t<std::uint8_t>;
+using packet_queue_t = std::shared_ptr<safe::queue_t<std::pair<void *, packet_t>>>;
 void capture(safe::signal_t *shutdown_event, packet_queue_t packets, config_t config, void *channel_data);
-}
+} // namespace audio
 
 #endif

sunshine/config.cpp

@@ -1,12 +1,13 @@
+#include <algorithm>
 #include <fstream>
-#include <iostream>
 #include <functional>
+#include <iostream>
 #include <unordered_map>
 
 #include <boost/asio.hpp>
 
-#include "utility.h"
 #include "config.h"
+#include "utility.h"
 
 #define CA_DIR "credentials"
 #define PRIVATE_KEY_FILE CA_DIR "/cakey.pem"
@@ -15,17 +16,155 @@
 #define APPS_JSON_PATH SUNSHINE_ASSETS_DIR "/" APPS_JSON
 namespace config {
 using namespace std::literals;
+
+namespace nv {
+enum preset_e : int {
+  _default = 0,
+  slow,
+  medium,
+  fast,
+  hp,
+  hq,
+  bd,
+  ll_default,
+  llhq,
+  llhp,
+  lossless_default, // lossless presets must be the last ones
+  lossless_hp,
+};
+
+enum rc_e : int {
+  constqp   = 0x0,  /**< Constant QP mode */
+  vbr       = 0x1,  /**< Variable bitrate mode */
+  cbr       = 0x2,  /**< Constant bitrate mode */
+  cbr_ld_hq = 0x8,  /**< low-delay CBR, high quality */
+  cbr_hq    = 0x10, /**< CBR, high quality (slower) */
+  vbr_hq    = 0x20  /**< VBR, high quality (slower) */
+};
+
+enum coder_e : int {
+  _auto = 0,
+  cabac,
+  cavlc
+};
+
+std::optional<preset_e> preset_from_view(const std::string_view &preset) {
+#define _CONVERT_(x) \
+  if(preset == #x##sv) return x
+  _CONVERT_(slow);
+  _CONVERT_(medium);
+  _CONVERT_(fast);
+  _CONVERT_(hp);
+  _CONVERT_(bd);
+  _CONVERT_(ll_default);
+  _CONVERT_(llhq);
+  _CONVERT_(llhp);
+  _CONVERT_(lossless_default);
+  _CONVERT_(lossless_hp);
+  if(preset == "default"sv) return _default;
+#undef _CONVERT_
+  return std::nullopt;
+}
+
+std::optional<rc_e> rc_from_view(const std::string_view &rc) {
+#define _CONVERT_(x) \
+  if(rc == #x##sv) return x
+  _CONVERT_(constqp);
+  _CONVERT_(vbr);
+  _CONVERT_(cbr);
+  _CONVERT_(cbr_hq);
+  _CONVERT_(vbr_hq);
+  _CONVERT_(cbr_ld_hq);
+#undef _CONVERT_
+  return std::nullopt;
+}
+
+int coder_from_view(const std::string_view &coder) {
+  if(coder == "auto"sv) return _auto;
+  if(coder == "cabac"sv || coder == "ac"sv) return cabac;
+  if(coder == "cavlc"sv || coder == "vlc"sv) return cavlc;
+
+  return -1;
+}
+} // namespace nv
+
+namespace amd {
+enum quality_e : int {
+  _default = 0,
+  speed,
+  balanced,
+  //quality2,
+};
+
+enum rc_e : int {
+  constqp,     /**< Constant QP mode */
+  vbr_latency, /**< Latency Constrained Variable Bitrate */
+  vbr_peak,    /**< Peak Contrained Variable Bitrate */
+  cbr,         /**< Constant bitrate mode */
+};
+
+enum coder_e : int {
+  _auto = 0,
+  cabac,
+  cavlc
+};
+
+std::optional<quality_e> quality_from_view(const std::string_view &quality) {
+#define _CONVERT_(x) \
+  if(quality == #x##sv) return x
+  _CONVERT_(speed);
+  _CONVERT_(balanced);
+  //_CONVERT_(quality2);
+  if(quality == "default"sv) return _default;
+#undef _CONVERT_
+  return std::nullopt;
+}
+
+std::optional<rc_e> rc_from_view(const std::string_view &rc) {
+#define _CONVERT_(x) \
+  if(rc == #x##sv) return x
+  _CONVERT_(constqp);
+  _CONVERT_(vbr_latency);
+  _CONVERT_(vbr_peak);
+  _CONVERT_(cbr);
+#undef _CONVERT_
+  return std::nullopt;
+}
+
+int coder_from_view(const std::string_view &coder) {
+  if(coder == "auto"sv) return _auto;
+  if(coder == "cabac"sv || coder == "ac"sv) return cabac;
+  if(coder == "cavlc"sv || coder == "vlc"sv) return cavlc;
+
+  return -1;
+}
+} // namespace amd
+
 video_t video {
-  0, // crf
+  0,  // crf
   28, // qp
 
-  2, // min_threads
-
   0, // hevc_mode
-  "superfast"s, // preset
-  "zerolatency"s, // tune
+
+  1, // min_threads
+  {
+    "superfast"s,   // preset
+    "zerolatency"s, // tune
+  },                // software
+
+  {
+    nv::llhq,
+    std::nullopt,
+    -1 }, // nv
+
+  {
+    amd::balanced,
+    std::nullopt,
+    -1 }, // amd
+
+  {}, // encoder
   {}, // adapter_name
-  {} // output_name
+  {}, // output_name
 };
 
 audio_t audio {};
@@ -36,7 +175,7 @@ stream_t stream {
   APPS_JSON_PATH,
 
   10, // fecPercentage
-  1 // channels
+  1   // channels
 };
 
 nvhttp_t nvhttp {
@@ -45,40 +184,113 @@ nvhttp_t nvhttp {
   CERTIFICATE_FILE,
 
   boost::asio::ip::host_name(), // sunshine_name,
-  "sunshine_state.json"s // file_state
+  "sunshine_state.json"s,       // file_state
+  {},                           // external_ip
+  {
+    "352x240"s,
+    "480x360"s,
+    "858x480"s,
+    "1280x720"s,
+    "1920x1080"s,
+    "2560x1080"s,
+    "3440x1440"s
+    "1920x1200"s,
+    "3860x2160"s,
+    "3840x1600"s,
+  }, // supported resolutions
+
+  { 10, 30, 60, 90, 120 }, // supported fps
 };
 
 input_t input {
-  2s
+  2s,                                        // back_button_timeout
+  500ms,                                     // key_repeat_delay
+  std::chrono::duration<double> { 1 / 24.9 } // key_repeat_period
 };
 
 sunshine_t sunshine {
   2, // min_log_level
-  0 // flags
+  0  // flags
 };
 
-bool whitespace(char ch) {
+bool endline(char ch) {
+  return ch == '\r' || ch == '\n';
+}
+
+bool space_tab(char ch) {
   return ch == ' ' || ch == '\t';
 }
 
-std::string to_string(const char *begin, const char *end) {
-  return { begin, (std::size_t)(end - begin) };
+bool whitespace(char ch) {
+  return space_tab(ch) || endline(ch);
 }
 
-std::optional<std::pair<std::string, std::string>> parse_line(std::string_view::const_iterator begin, std::string_view::const_iterator end) {
-  begin = std::find_if(begin, end, std::not_fn(whitespace));
-  end   = std::find(begin, end, '#');
-  end   = std::find_if(std::make_reverse_iterator(end), std::make_reverse_iterator(begin), std::not_fn(whitespace)).base();
+std::string to_string(const char *begin, const char *end) {
+  std::string result;
 
-  auto eq = std::find(begin, end, '=');
-  if(eq == end || eq == begin) {
-    return std::nullopt;
+  KITTY_WHILE_LOOP(auto pos = begin, pos != end, {
+    auto comment = std::find(pos, end, '#');
+    auto endl    = std::find_if(comment, end, endline);
+
+    result.append(pos, comment);
+
+    pos = endl;
+  })
+
+  return result;
+}
+
+template<class It>
+It skip_list(It skipper, It end) {
+  int stack = 1;
+  while(skipper != end && stack) {
+    if(*skipper == '[') {
+      ++stack;
+    }
+    if(*skipper == ']') {
+      --stack;
+    }
+
+    ++skipper;
   }
 
-  auto end_name = std::find_if(std::make_reverse_iterator(eq), std::make_reverse_iterator(begin), std::not_fn(whitespace)).base();
-  auto begin_val = std::find_if(eq + 1, end, std::not_fn(whitespace));
+  return skipper;
+}
 
-  return std::pair { to_string(begin, end_name), to_string(begin_val, end) };
+std::pair<
+  std::string_view::const_iterator,
+  std::optional<std::pair<std::string, std::string>>>
+parse_option(std::string_view::const_iterator begin, std::string_view::const_iterator end) {
+  begin     = std::find_if_not(begin, end, whitespace);
+  auto endl = std::find_if(begin, end, endline);
+  auto endc = std::find(begin, endl, '#');
+  endc      = std::find_if(std::make_reverse_iterator(endc), std::make_reverse_iterator(begin), std::not_fn(whitespace)).base();
+
+  auto eq = std::find(begin, endc, '=');
+  if(eq == endc || eq == begin) {
+    return std::make_pair(endl, std::nullopt);
+  }
+
+  auto end_name  = std::find_if_not(std::make_reverse_iterator(eq), std::make_reverse_iterator(begin), space_tab).base();
+  auto begin_val = std::find_if_not(eq + 1, endc, space_tab);
+
+  if(begin_val == endl) {
+    return std::make_pair(endl, std::nullopt);
+  }
+
+  // Lists might contain newlines
+  if(*begin_val == '[') {
+    endl = skip_list(begin_val + 1, end);
+    if(endl == end) {
+      std::cout << "Warning: Config option ["sv << to_string(begin, end_name) << "] Missing ']'"sv;
+
+      return std::make_pair(endl, std::nullopt);
+    }
+  }
+
+  return std::make_pair(
+    endl,
+    std::make_pair(to_string(begin, end_name), to_string(begin_val, endl)));
 }
 
 std::unordered_map<std::string, std::string> parse_config(std::string_view file_content) {
@@ -88,10 +300,14 @@ std::unordered_map<std::string, std::string> parse_config(std::string_view file_
   auto end = std::end(file_content);
 
   while(pos < end) {
-    auto newline = std::find_if(pos, end, [](auto ch) { return ch == '\n' || ch == '\r'; });
-    auto var = parse_line(pos, newline);
+    // auto newline = std::find_if(pos, end, [](auto ch) { return ch == '\n' || ch == '\r'; });
+    TUPLE_2D(endl, var, parse_option(pos, end));
+
+    pos = endl;
+    if(pos != end) {
+      pos += (*pos == '\r') ? 2 : 1;
+    }
 
-    pos = (*newline == '\r') ? newline + 2 : newline + 1;
     if(!var) {
       continue;
     }
@@ -133,11 +349,42 @@ void int_f(std::unordered_map<std::string, std::string> &vars, const std::string
   }
 
   auto &val = it->second;
-  input = util::from_chars(&val[0], &val[0] + val.size());
+  input     = util::from_chars(&val[0], &val[0] + val.size());
 
   vars.erase(it);
 }
 
+void int_f(std::unordered_map<std::string, std::string> &vars, const std::string &name, std::optional<int> &input) {
+  auto it = vars.find(name);
+
+  if(it == std::end(vars)) {
+    return;
+  }
+
+  auto &val = it->second;
+  input     = util::from_chars(&val[0], &val[0] + val.size());
+
+  vars.erase(it);
+}
+
+template<class F>
+void int_f(std::unordered_map<std::string, std::string> &vars, const std::string &name, int &input, F &&f) {
+  std::string tmp;
+  string_f(vars, name, tmp);
+  if(!tmp.empty()) {
+    input = f(tmp);
+  }
+}
+
+template<class F>
+void int_f(std::unordered_map<std::string, std::string> &vars, const std::string &name, std::optional<int> &input, F &&f) {
+  std::string tmp;
+  string_f(vars, name, tmp);
+  if(!tmp.empty()) {
+    input = f(tmp);
+  }
+}
+
 void int_between_f(std::unordered_map<std::string, std::string> &vars, const std::string &name, int &input, const std::pair<int, int> &range) {
   int temp = input;
 
@@ -149,30 +396,134 @@ void int_between_f(std::unordered_map<std::string, std::string> &vars, const std
   }
 }
 
+bool to_bool(std::string &boolean) {
+  std::for_each(std::begin(boolean), std::end(boolean), [](char ch) { return (char)std::tolower(ch); });
+
+  return boolean == "true"sv ||
+         boolean == "yes"sv ||
+         boolean == "enable"sv ||
+         (std::find(std::begin(boolean), std::end(boolean), '1') != std::end(boolean));
+}
+void bool_f(std::unordered_map<std::string, std::string> &vars, const std::string &name, int &input) {
+  std::string tmp;
+  string_f(vars, name, tmp);
+
+  if(tmp.empty()) {
+    return;
+  }
+
+  input = to_bool(tmp) ? 1 : 0;
+}
+
+void double_f(std::unordered_map<std::string, std::string> &vars, const std::string &name, double &input) {
+  std::string tmp;
+  string_f(vars, name, tmp);
+
+  if(tmp.empty()) {
+    return;
+  }
+
+  char *c_str_p;
+  auto val = std::strtod(tmp.c_str(), &c_str_p);
+
+  if(c_str_p == tmp.c_str()) {
+    return;
+  }
+
+  input = val;
+}
+
+void double_between_f(std::unordered_map<std::string, std::string> &vars, const std::string &name, double &input, const std::pair<double, double> &range) {
+  double temp = input;
+
+  double_f(vars, name, temp);
+
+  TUPLE_2D_REF(lower, upper, range);
+  if(temp >= lower && temp <= upper) {
+    input = temp;
+  }
+}
+
+void list_string_f(std::unordered_map<std::string, std::string> &vars, const std::string &name, std::vector<std::string> &input) {
+  std::string string;
+  string_f(vars, name, string);
+
+  if(string.empty()) {
+    return;
+  }
+
+  input.clear();
+
+  auto begin = std::cbegin(string);
+  if(*begin == '[') {
+    ++begin;
+  }
+
+  begin = std::find_if_not(begin, std::cend(string), whitespace);
+  if(begin == std::cend(string)) {
+    return;
+  }
+
+  auto pos = begin;
+  while(pos < std::cend(string)) {
+    if(*pos == '[') {
+      pos = skip_list(pos + 1, std::cend(string)) + 1;
+    }
+    else if(*pos == ']') {
+      break;
+    }
+    else if(*pos == ',') {
+      input.emplace_back(begin, pos);
+      pos = begin = std::find_if_not(pos + 1, std::cend(string), whitespace);
+    }
+    else {
+      ++pos;
+    }
+  }
+
+  if(pos != begin) {
+    input.emplace_back(begin, pos);
+  }
+}
+
+void list_int_f(std::unordered_map<std::string, std::string> &vars, const std::string &name, std::vector<int> &input) {
+  std::vector<std::string> list;
+  list_string_f(vars, name, list);
+
+  for(auto &el : list) {
+    input.emplace_back(util::from_view(el));
+  }
+}
+
 void print_help(const char *name) {
-  std::cout <<
-    "Usage: "sv << name << " [options] [/path/to/configuration_file]"sv << std::endl <<
-    "    Any configurable option can be overwritten with: \"name=value\""sv << std::endl << std::endl <<
-    "    --help | print help"sv << std::endl << std::endl <<
-    "    flags"sv << std::endl <<
-    "        -0 | Read PIN from stdin"sv << std::endl <<
-    "        -1 | Do not load previously saved state and do retain any state after shutdown"sv << std::endl <<
-    "           | Effectively starting as if for the first time without overwriting any pairings with your devices"sv;
+  std::cout
+    << "Usage: "sv << name << " [options] [/path/to/configuration_file]"sv << std::endl
+    << "    Any configurable option can be overwritten with: \"name=value\""sv << std::endl
+    << std::endl
+    << "    --help | print help"sv << std::endl
+    << std::endl
+    << "    flags"sv << std::endl
+    << "        -0 | Read PIN from stdin"sv << std::endl
+    << "        -1 | Do not load previously saved state and do retain any state after shutdown"sv << std::endl
+    << "           | Effectively starting as if for the first time without overwriting any pairings with your devices"sv;
 }
 
 int apply_flags(const char *line) {
   int ret = 0;
   while(*line != '\0') {
     switch(*line) {
-      case '0':
-        config::sunshine.flags[config::flag::PIN_STDIN].flip();
-        break;
-      case '1':
-        config::sunshine.flags[config::flag::FRESH_STATE].flip();
-        break;
-      default:
-        std::cout << "Warning: Unrecognized flag: ["sv << *line << ']' << std::endl;
-        ret = -1;
+    case '0':
+      config::sunshine.flags[config::flag::PIN_STDIN].flip();
+      break;
+    case '1':
+      config::sunshine.flags[config::flag::FRESH_STATE].flip();
+      break;
+    case 'p':
+      config::sunshine.flags[config::flag::CONST_PIN].flip();
+      break;
+    default:
+      std::cout << "Warning: Unrecognized flag: ["sv << *line << ']' << std::endl;
+      ret = -1;
     }
 
     ++line;
@@ -189,11 +540,18 @@ void apply_config(std::unordered_map<std::string, std::string> &&vars) {
   int_f(vars, "crf", video.crf);
   int_f(vars, "qp", video.qp);
   int_f(vars, "min_threads", video.min_threads);
-  int_between_f(vars, "hevc_mode", video.hevc_mode, {
-    0, 2
-  });
-  string_f(vars, "preset", video.preset);
-  string_f(vars, "tune", video.tune);
+  int_between_f(vars, "hevc_mode", video.hevc_mode, { 0, 3 });
+  string_f(vars, "sw_preset", video.sw.preset);
+  string_f(vars, "sw_tune", video.sw.tune);
+  int_f(vars, "nv_preset", video.nv.preset, nv::preset_from_view);
+  int_f(vars, "nv_rc", video.nv.rc, nv::rc_from_view);
+  int_f(vars, "nv_coder", video.nv.coder, nv::coder_from_view);
+
+  int_f(vars, "amd_quality", video.amd.quality, amd::quality_from_view);
+  int_f(vars, "amd_rc", video.amd.rc, amd::rc_from_view);
+  int_f(vars, "amd_coder", video.amd.coder, amd::coder_from_view);
+
+  string_f(vars, "encoder", video.encoder);
   string_f(vars, "adapter_name", video.adapter_name);
   string_f(vars, "output_name", video.output_name);
 
@@ -202,29 +560,24 @@ void apply_config(std::unordered_map<std::string, std::string> &&vars) {
   string_f(vars, "sunshine_name", nvhttp.sunshine_name);
   string_f(vars, "file_state", nvhttp.file_state);
   string_f(vars, "external_ip", nvhttp.external_ip);
+  list_string_f(vars, "resolutions"s, nvhttp.resolutions);
+  list_int_f(vars, "fps"s, nvhttp.fps);
 
   string_f(vars, "audio_sink", audio.sink);
+  string_f(vars, "virtual_sink", audio.virtual_sink);
 
-  string_restricted_f(vars, "origin_pin_allowed", nvhttp.origin_pin_allowed, {
-    "pc"sv, "lan"sv, "wan"sv
-  });
+  string_restricted_f(vars, "origin_pin_allowed", nvhttp.origin_pin_allowed, { "pc"sv, "lan"sv, "wan"sv });
 
   int to = -1;
-  int_between_f(vars, "ping_timeout", to, {
-    -1, std::numeric_limits<int>::max()
-  });
+  int_between_f(vars, "ping_timeout", to, { -1, std::numeric_limits<int>::max() });
   if(to != -1) {
     stream.ping_timeout = std::chrono::milliseconds(to);
   }
 
-  int_between_f(vars, "channels", stream.channels, {
-    1, std::numeric_limits<int>::max()
-  });
+  int_between_f(vars, "channels", stream.channels, { 1, std::numeric_limits<int>::max() });
 
   string_f(vars, "file_apps", stream.file_apps);
-  int_between_f(vars, "fec_percentage", stream.fec_percentage, {
-    1, 100
-  });
+  int_between_f(vars, "fec_percentage", stream.fec_percentage, { 1, 100 });
 
   to = std::numeric_limits<int>::min();
   int_f(vars, "back_button_timeout", to);
@@ -233,10 +586,21 @@ void apply_config(std::unordered_map<std::string, std::string> &&vars) {
     input.back_button_timeout = std::chrono::milliseconds { to };
   }
 
+  double repeat_frequency { 0 };
+  double_between_f(vars, "key_repeat_frequency", repeat_frequency, { 0, std::numeric_limits<double>::max() });
+
+  if(repeat_frequency > 0) {
+    config::input.key_repeat_period = std::chrono::duration<double> { 1 / repeat_frequency };
+  }
+
+  to = -1;
+  int_f(vars, "key_repeat_delay", to);
+  if(to >= 0) {
+    input.key_repeat_delay = std::chrono::milliseconds { to };
+  }
+
   std::string log_level_string;
-  string_restricted_f(vars, "min_log_level", log_level_string, {
-    "verbose"sv, "debug"sv, "info"sv, "warning"sv, "error"sv, "fatal"sv, "none"sv
-  });
+  string_restricted_f(vars, "min_log_level", log_level_string, { "verbose"sv, "debug"sv, "info"sv, "warning"sv, "error"sv, "fatal"sv, "none"sv });
 
   if(!log_level_string.empty()) {
     if(log_level_string == "verbose"sv) {
@@ -270,7 +634,7 @@ void apply_config(std::unordered_map<std::string, std::string> &&vars) {
   }
 
   if(sunshine.min_log_level <= 3) {
-    for(auto &[var,_] : vars) {
+    for(auto &[var, _] : vars) {
       std::cout << "Warning: Unrecognized configurable option ["sv << var << ']' << std::endl;
     }
   }
@@ -281,7 +645,7 @@ int parse(int argc, char *argv[]) {
 
   std::unordered_map<std::string, std::string> cmd_vars;
 
-  for(auto x = argc -1; x > 0; --x) {
+  for(auto x = argc - 1; x > 0; --x) {
     auto line = argv[x];
 
     if(line == "--help"sv) {
@@ -302,7 +666,7 @@ int parse(int argc, char *argv[]) {
         config_file = line;
       }
       else {
-        auto var = parse_line(line, line_end);
+        TUPLE_EL(var, 1, parse_option(line, line_end));
         if(!var) {
           print_help(*argv);
           return -1;
@@ -324,15 +688,14 @@ int parse(int argc, char *argv[]) {
   auto vars = parse_config(std::string {
     // Quick and dirty
     std::istreambuf_iterator<char>(in),
-    std::istreambuf_iterator<char>()
-  });
+    std::istreambuf_iterator<char>() });
 
-  for(auto &var : cmd_vars) {
-    vars.emplace(std::move(var));
+  for(auto &[name, value] : cmd_vars) {
+    vars.insert_or_assign(std::move(name), std::move(value));
   }
 
   apply_config(std::move(vars));
 
   return 0;
 }
-}
+} // namespace config

sunshine/config.h

@@ -1,28 +1,46 @@
 #ifndef SUNSHINE_CONFIG_H
 #define SUNSHINE_CONFIG_H
 
-#include <chrono>
-#include <string>
 #include <bitset>
+#include <chrono>
+#include <optional>
+#include <string>
+#include <vector>
 
 namespace config {
 struct video_t {
   // ffmpeg params
   int crf; // higher == more compression and less quality
-  int qp; // higher == more compression and less quality, ignored if crf != 0
-
-  int min_threads; // Minimum number of threads/slices for CPU encoding
+  int qp;  // higher == more compression and less quality, ignored if crf != 0
 
   int hevc_mode;
-  std::string preset;
-  std::string tune;
 
+  int min_threads; // Minimum number of threads/slices for CPU encoding
+  struct {
+    std::string preset;
+    std::string tune;
+  } sw;
+
+  struct {
+    std::optional<int> preset;
+    std::optional<int> rc;
+    int coder;
+  } nv;
+
+  struct {
+    std::optional<int> quality;
+    std::optional<int> rc;
+    int coder;
+  } amd;
+
+  std::string encoder;
   std::string adapter_name;
   std::string output_name;
 };
 
 struct audio_t {
   std::string sink;
+  std::string virtual_sink;
 };
 
 struct stream_t {
@@ -49,16 +67,21 @@ struct nvhttp_t {
   std::string file_state;
 
   std::string external_ip;
+  std::vector<std::string> resolutions;
+  std::vector<int> fps;
 };
 
 struct input_t {
   std::chrono::milliseconds back_button_timeout;
+  std::chrono::milliseconds key_repeat_delay;
+  std::chrono::duration<double> key_repeat_period;
 };
 
 namespace flag {
 enum flag_e : std::size_t {
   PIN_STDIN = 0, // Read PIN from stdin instead of http
-  FRESH_STATE, // Do not load or save state
+  FRESH_STATE,   // Do not load or save state
+  CONST_PIN = 4, // Use "universal" pin
   FLAG_SIZE
 };
 }
@@ -77,6 +100,6 @@ extern input_t input;
 extern sunshine_t sunshine;
 
 int parse(int argc, char *argv[]);
-}
+} // namespace config
 
 #endif

sunshine/crypto.cpp

@@ -2,14 +2,14 @@
 // Created by loki on 5/31/19.
 //
 
-#include <openssl/pem.h>
 #include "crypto.h"
+#include <openssl/pem.h>
 namespace crypto {
-using big_num_t = util::safe_ptr<BIGNUM, BN_free>;
+using big_num_t     = util::safe_ptr<BIGNUM, BN_free>;
 //using rsa_t = util::safe_ptr<RSA, RSA_free>;
 using asn1_string_t = util::safe_ptr<ASN1_STRING, ASN1_STRING_free>;
 
-cert_chain_t::cert_chain_t() : _certs {}, _cert_ctx {X509_STORE_CTX_new() } {}
+cert_chain_t::cert_chain_t() : _certs {}, _cert_ctx { X509_STORE_CTX_new() } {}
 void cert_chain_t::add(x509_t &&cert) {
   x509_store_t x509_store { X509_STORE_new() };
 
@@ -26,7 +26,7 @@ void cert_chain_t::add(x509_t &&cert) {
  */
 const char *cert_chain_t::verify(x509_t::element_type *cert) {
   int err_code = 0;
-  for(auto &[_,x509_store] : _certs) {
+  for(auto &[_, x509_store] : _certs) {
     auto fg = util::fail_guard([this]() {
       X509_STORE_CTX_cleanup(_cert_ctx.get());
     });
@@ -36,7 +36,7 @@ const char *cert_chain_t::verify(x509_t::element_type *cert) {
 
     auto err = X509_verify_cert(_cert_ctx.get());
 
-    if (err == 1) {
+    if(err == 1) {
       return nullptr;
     }
 
@@ -46,7 +46,7 @@ const char *cert_chain_t::verify(x509_t::element_type *cert) {
     if(err_code == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY) {
       return nullptr;
     }
-    if (err_code != X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT && err_code != X509_V_ERR_INVALID_CA) {
+    if(err_code != X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT && err_code != X509_V_ERR_INVALID_CA) {
       return X509_verify_cert_error_string(err_code);
     }
   }
@@ -63,7 +63,7 @@ int cipher_t::decrypt(const std::string_view &cipher, std::vector<std::uint8_t>
   });
 
   // Gen 7 servers use 128-bit AES ECB
-  if (EVP_DecryptInit_ex(ctx.get(), EVP_aes_128_ecb(), nullptr, key.data(), nullptr) != 1) {
+  if(EVP_DecryptInit_ex(ctx.get(), EVP_aes_128_ecb(), nullptr, key.data(), nullptr) != 1) {
     return -1;
   }
 
@@ -72,11 +72,11 @@ int cipher_t::decrypt(const std::string_view &cipher, std::vector<std::uint8_t>
   plaintext.resize((cipher.size() + 15) / 16 * 16);
   auto size = (int)plaintext.size();
   // Encrypt into the caller's buffer, leaving room for the auth tag to be prepended
-  if (EVP_DecryptUpdate(ctx.get(), plaintext.data(), &size, (const std::uint8_t*)cipher.data(), cipher.size()) != 1) {
+  if(EVP_DecryptUpdate(ctx.get(), plaintext.data(), &size, (const std::uint8_t *)cipher.data(), cipher.size()) != 1) {
     return -1;
   }
 
-  if (EVP_DecryptFinal_ex(ctx.get(), plaintext.data(), &len) != 1) {
+  if(EVP_DecryptFinal_ex(ctx.get(), plaintext.data(), &len) != 1) {
     return -1;
   }
 
@@ -85,7 +85,7 @@ int cipher_t::decrypt(const std::string_view &cipher, std::vector<std::uint8_t>
 }
 
 int cipher_t::decrypt_gcm(aes_t &iv, const std::string_view &tagged_cipher,
-                          std::vector<std::uint8_t> &plaintext) {
+  std::vector<std::uint8_t> &plaintext) {
   auto cipher = tagged_cipher.substr(16);
   auto tag    = tagged_cipher.substr(0, 16);
 
@@ -93,15 +93,15 @@ int cipher_t::decrypt_gcm(aes_t &iv, const std::string_view &tagged_cipher,
     EVP_CIPHER_CTX_reset(ctx.get());
   });
 
-  if (EVP_DecryptInit_ex(ctx.get(), EVP_aes_128_gcm(), nullptr, nullptr, nullptr) != 1) {
+  if(EVP_DecryptInit_ex(ctx.get(), EVP_aes_128_gcm(), nullptr, nullptr, nullptr) != 1) {
     return -1;
   }
 
-  if (EVP_CIPHER_CTX_ctrl(ctx.get(), EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr) != 1) {
+  if(EVP_CIPHER_CTX_ctrl(ctx.get(), EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr) != 1) {
     return -1;
   }
 
-  if (EVP_DecryptInit_ex(ctx.get(), nullptr, nullptr, key.data(), iv.data()) != 1) {
+  if(EVP_DecryptInit_ex(ctx.get(), nullptr, nullptr, key.data(), iv.data()) != 1) {
     return -1;
   }
 
@@ -109,16 +109,16 @@ int cipher_t::decrypt_gcm(aes_t &iv, const std::string_view &tagged_cipher,
   plaintext.resize((cipher.size() + 15) / 16 * 16);
 
   int size;
-  if (EVP_DecryptUpdate(ctx.get(), plaintext.data(), &size, (const std::uint8_t*)cipher.data(), cipher.size()) != 1) {
+  if(EVP_DecryptUpdate(ctx.get(), plaintext.data(), &size, (const std::uint8_t *)cipher.data(), cipher.size()) != 1) {
     return -1;
   }
 
-  if (EVP_CIPHER_CTX_ctrl(ctx.get(), EVP_CTRL_GCM_SET_TAG, tag.size(), const_cast<char*>(tag.data())) != 1) {
+  if(EVP_CIPHER_CTX_ctrl(ctx.get(), EVP_CTRL_GCM_SET_TAG, tag.size(), const_cast<char *>(tag.data())) != 1) {
     return -1;
   }
 
   int len = size;
-  if (EVP_DecryptFinal_ex(ctx.get(), plaintext.data() + size, &len) != 1) {
+  if(EVP_DecryptFinal_ex(ctx.get(), plaintext.data() + size, &len) != 1) {
     return -1;
   }
 
@@ -134,7 +134,7 @@ int cipher_t::encrypt(const std::string_view &plaintext, std::vector<std::uint8_
   });
 
   // Gen 7 servers use 128-bit AES ECB
-  if (EVP_EncryptInit_ex(ctx.get(), EVP_aes_128_ecb(), nullptr, key.data(), nullptr) != 1) {
+  if(EVP_EncryptInit_ex(ctx.get(), EVP_aes_128_ecb(), nullptr, key.data(), nullptr) != 1) {
     return -1;
   }
 
@@ -143,11 +143,11 @@ int cipher_t::encrypt(const std::string_view &plaintext, std::vector<std::uint8_
   cipher.resize((plaintext.size() + 15) / 16 * 16);
   auto size = (int)cipher.size();
   // Encrypt into the caller's buffer
-  if (EVP_EncryptUpdate(ctx.get(), cipher.data(), &size, (const std::uint8_t*)plaintext.data(), plaintext.size()) != 1) {
+  if(EVP_EncryptUpdate(ctx.get(), cipher.data(), &size, (const std::uint8_t *)plaintext.data(), plaintext.size()) != 1) {
     return -1;
   }
 
-  if (EVP_EncryptFinal_ex(ctx.get(), cipher.data() + size, &len) != 1) {
+  if(EVP_EncryptFinal_ex(ctx.get(), cipher.data() + size, &len) != 1) {
     return -1;
   }
 
@@ -187,10 +187,10 @@ x509_t x509(const std::string_view &x) {
 
   BIO_write(io.get(), x.data(), x.size());
 
-  X509 *p = nullptr;
+  x509_t p;
   PEM_read_bio_X509(io.get(), &p, nullptr, nullptr);
 
-  return x509_t { p };
+  return p;
 }
 
 pkey_t pkey(const std::string_view &k) {
@@ -198,10 +198,10 @@ pkey_t pkey(const std::string_view &k) {
 
   BIO_write(io.get(), k.data(), k.size());
 
-  EVP_PKEY *p = nullptr;
+  pkey_t p = nullptr;
   PEM_read_bio_PrivateKey(io.get(), &p, nullptr, nullptr);
 
-  return pkey_t { p };
+  return p;
 }
 
 std::string pem(x509_t &x509) {
@@ -230,14 +230,14 @@ std::string_view signature(const x509_t &x) {
   const ASN1_BIT_STRING *asn1 = nullptr;
   X509_get0_signature(&asn1, nullptr, x.get());
 
-  return { (const char*)asn1->data, (std::size_t)asn1->length };
+  return { (const char *)asn1->data, (std::size_t)asn1->length };
 }
 
 std::string rand(std::size_t bytes) {
   std::string r;
   r.resize(bytes);
 
-  RAND_bytes((uint8_t*)r.data(), r.size());
+  RAND_bytes((uint8_t *)r.data(), r.size());
 
   return r;
 }
@@ -297,8 +297,8 @@ creds_t gen_creds(const std::string_view &cn, std::uint32_t key_bits) {
   X509_set_pubkey(x509.get(), pkey.get());
 
   auto name = X509_get_subject_name(x509.get());
-  X509_NAME_add_entry_by_txt(name,"CN", MBSTRING_ASC,
-    (const std::uint8_t*)cn.data(), cn.size(),
+  X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC,
+    (const std::uint8_t *)cn.data(), cn.size(),
     -1, 0);
 
   X509_set_issuer_name(x509.get(), name);
@@ -324,7 +324,7 @@ bool verify(const x509_t &x509, const std::string_view &data, const std::string_
     return false;
   }
 
-  if(EVP_DigestVerifyFinal(ctx.get(), (const uint8_t*)signature.data(), signature.size()) != 1) {
+  if(EVP_DigestVerifyFinal(ctx.get(), (const uint8_t *)signature.data(), signature.size()) != 1) {
     return false;
   }
 
@@ -338,4 +338,4 @@ bool verify256(const x509_t &x509, const std::string_view &data, const std::stri
 void md_ctx_destroy(EVP_MD_CTX *ctx) {
   EVP_MD_CTX_destroy(ctx);
 }
-}
+} // namespace crypto

sunshine/crypto.h

@@ -5,12 +5,12 @@
 #ifndef SUNSHINE_CRYPTO_H
 #define SUNSHINE_CRYPTO_H
 
-#include <cassert>
 #include <array>
+#include <cassert>
 #include <openssl/evp.h>
+#include <openssl/rand.h>
 #include <openssl/sha.h>
 #include <openssl/x509.h>
-#include <openssl/rand.h>
 
 #include "utility.h"
 
@@ -25,14 +25,14 @@ void md_ctx_destroy(EVP_MD_CTX *);
 
 using sha256_t = std::array<std::uint8_t, SHA256_DIGEST_LENGTH>;
 
-using aes_t = std::array<std::uint8_t, 16>;
-using x509_t = util::safe_ptr<X509, X509_free>;
-using x509_store_t = util::safe_ptr<X509_STORE, X509_STORE_free>;
+using aes_t            = std::array<std::uint8_t, 16>;
+using x509_t           = util::safe_ptr<X509, X509_free>;
+using x509_store_t     = util::safe_ptr<X509_STORE, X509_STORE_free>;
 using x509_store_ctx_t = util::safe_ptr<X509_STORE_CTX, X509_STORE_CTX_free>;
-using cipher_ctx_t = util::safe_ptr<EVP_CIPHER_CTX, EVP_CIPHER_CTX_free>;
-using md_ctx_t = util::safe_ptr<EVP_MD_CTX, md_ctx_destroy>;
-using bio_t = util::safe_ptr<BIO, BIO_free_all>;
-using pkey_t = util::safe_ptr<EVP_PKEY, EVP_PKEY_free>;
+using cipher_ctx_t     = util::safe_ptr<EVP_CIPHER_CTX, EVP_CIPHER_CTX_free>;
+using md_ctx_t         = util::safe_ptr<EVP_MD_CTX, md_ctx_destroy>;
+using bio_t            = util::safe_ptr<BIO, BIO_free_all>;
+using pkey_t           = util::safe_ptr<EVP_PKEY, EVP_PKEY_free>;
 
 sha256_t hash(const std::string_view &plaintext);
 aes_t gen_aes_key(const std::array<uint8_t, 16> &salt, const std::string_view &pin);
@@ -58,6 +58,7 @@ public:
   void add(x509_t &&cert);
 
   const char *verify(x509_t::element_type *cert);
+
 private:
   std::vector<std::pair<x509_t, x509_store_t>> _certs;
   x509_store_ctx_t _cert_ctx;
@@ -66,13 +67,14 @@ private:
 class cipher_t {
 public:
   cipher_t(const aes_t &key);
-  cipher_t(cipher_t&&) noexcept = default;
-  cipher_t &operator=(cipher_t&&) noexcept = default;
+  cipher_t(cipher_t &&) noexcept = default;
+  cipher_t &operator=(cipher_t &&) noexcept = default;
 
   int encrypt(const std::string_view &plaintext, std::vector<std::uint8_t> &cipher);
 
   int decrypt_gcm(aes_t &iv, const std::string_view &cipher, std::vector<std::uint8_t> &plaintext);
   int decrypt(const std::string_view &cipher, std::vector<std::uint8_t> &plaintext);
+
 private:
   cipher_ctx_t ctx;
   aes_t key;
@@ -80,6 +82,6 @@ private:
 public:
   bool padding;
 };
-}
+} // namespace crypto
 
 #endif //SUNSHINE_CRYPTO_H

sunshine/input.cpp

@@ -2,21 +2,27 @@
 // Created by loki on 6/20/19.
 //
 
+// define uint32_t for <moonlight-common-c/src/Input.h>
+#include <cstdint>
 extern "C" {
 #include <moonlight-common-c/src/Input.h>
 }
 
 #include <bitset>
 
-#include "main.h"
 #include "config.h"
-#include "utility.h"
+#include "input.h"
+#include "main.h"
 #include "platform/common.h"
 #include "thread_pool.h"
+#include "utility.h"
 
 namespace input {
 
-constexpr auto MAX_GAMEPADS = std::min((std::size_t)platf::MAX_GAMEPADS, sizeof(std::int16_t)*8);
+constexpr auto MAX_GAMEPADS = std::min((std::size_t)platf::MAX_GAMEPADS, sizeof(std::int16_t) * 8);
+#define DISABLE_LEFT_BUTTON_DELAY ((util::ThreadPool::task_id_t)0x01)
+#define ENABLE_LEFT_BUTTON_DELAY nullptr
+
 enum class button_state_e {
   NONE,
   DOWN,
@@ -40,6 +46,12 @@ void free_id(std::bitset<N> &gamepad_mask, int id) {
   gamepad_mask[id] = false;
 }
 
+touch_port_event_t touch_port_event;
+platf::touch_port_t touch_port {
+  0, 0, 0, 0
+};
+
+static util::TaskPool::task_id_t task_id {};
 static std::unordered_map<short, bool> key_press {};
 static std::array<std::uint8_t, 5> mouse_press {};
 
@@ -47,7 +59,7 @@ static platf::input_t platf_input;
 static std::bitset<platf::MAX_GAMEPADS> gamepadMask {};
 
 void free_gamepad(platf::input_t &platf_input, int id) {
-  platf::gamepad(platf_input, id, platf::gamepad_state_t{});
+  platf::gamepad(platf_input, id, platf::gamepad_state_t {});
   platf::free_gamepad(platf_input, id);
 
   free_id(gamepadMask, id);
@@ -56,7 +68,7 @@ struct gamepad_t {
   gamepad_t() : gamepad_state {}, back_timeout_id {}, id { -1 }, back_button_state { button_state_e::NONE } {}
   ~gamepad_t() {
     if(id >= 0) {
-      task_pool.push([id=this->id]() {
+      task_pool.push([id = this->id]() {
         free_gamepad(platf_input, id);
       });
     }
@@ -77,20 +89,32 @@ struct gamepad_t {
 };
 
 struct input_t {
-  input_t() : active_gamepad_state {}, gamepads (MAX_GAMEPADS) { }
+  input_t() : active_gamepad_state {}, gamepads(MAX_GAMEPADS), mouse_left_button_timeout {} {}
 
   std::uint16_t active_gamepad_state;
   std::vector<gamepad_t> gamepads;
+
+  util::ThreadPool::task_id_t mouse_left_button_timeout;
 };
 
 using namespace std::literals;
 
-void print(PNV_MOUSE_MOVE_PACKET packet) {
+void print(PNV_REL_MOUSE_MOVE_PACKET packet) {
   BOOST_LOG(debug)
-    << "--begin mouse move packet--"sv << std::endl
+    << "--begin relative mouse move packet--"sv << std::endl
     << "deltaX ["sv << util::endian::big(packet->deltaX) << ']' << std::endl
     << "deltaY ["sv << util::endian::big(packet->deltaY) << ']' << std::endl
-    << "--end mouse move packet--"sv;
+    << "--end relative mouse move packet--"sv;
+}
+
+void print(PNV_ABS_MOUSE_MOVE_PACKET packet) {
+  BOOST_LOG(debug)
+    << "--begin absolute mouse move packet--"sv << std::endl
+    << "x      ["sv << util::endian::big(packet->x) << ']' << std::endl
+    << "y      ["sv << util::endian::big(packet->y) << ']' << std::endl
+    << "width  ["sv << util::endian::big(packet->width) << ']' << std::endl
+    << "height ["sv << util::endian::big(packet->height) << ']' << std::endl
+    << "--end absolute mouse move packet--"sv;
 }
 
 void print(PNV_MOUSE_BUTTON_PACKET packet) {
@@ -134,68 +158,190 @@ void print(PNV_MULTI_CONTROLLER_PACKET packet) {
 
 constexpr int PACKET_TYPE_SCROLL_OR_KEYBOARD = PACKET_TYPE_SCROLL;
 void print(void *input) {
-  int input_type = util::endian::big(*(int*)input);
+  int input_type = util::endian::big(*(int *)input);
 
   switch(input_type) {
-    case PACKET_TYPE_MOUSE_MOVE:
-      print((PNV_MOUSE_MOVE_PACKET)input);
-      break;
-    case PACKET_TYPE_MOUSE_BUTTON:
-      print((PNV_MOUSE_BUTTON_PACKET)input);
-      break;
-    case PACKET_TYPE_SCROLL_OR_KEYBOARD:
-    {
-      char *tmp_input = (char*)input + 4;
-      if(tmp_input[0] == 0x0A) {
-        print((PNV_SCROLL_PACKET)input);
-      }
-      else {
-        print((PNV_KEYBOARD_PACKET)input);
-      }
-
-      break;
+  case PACKET_TYPE_REL_MOUSE_MOVE:
+    print((PNV_REL_MOUSE_MOVE_PACKET)input);
+    break;
+  case PACKET_TYPE_ABS_MOUSE_MOVE:
+    print((PNV_ABS_MOUSE_MOVE_PACKET)input);
+    break;
+  case PACKET_TYPE_MOUSE_BUTTON:
+    print((PNV_MOUSE_BUTTON_PACKET)input);
+    break;
+  case PACKET_TYPE_SCROLL_OR_KEYBOARD: {
+    char *tmp_input = (char *)input + 4;
+    if(tmp_input[0] == 0x0A) {
+      print((PNV_SCROLL_PACKET)input);
     }
-    case PACKET_TYPE_MULTI_CONTROLLER:
-      print((PNV_MULTI_CONTROLLER_PACKET)input);
-      break;
+    else {
+      print((PNV_KEYBOARD_PACKET)input);
+    }
+
+    break;
+  }
+  case PACKET_TYPE_MULTI_CONTROLLER:
+    print((PNV_MULTI_CONTROLLER_PACKET)input);
+    break;
   }
 }
 
-void passthrough(platf::input_t &input, PNV_MOUSE_MOVE_PACKET packet) {
+void passthrough(std::shared_ptr<input_t> &input, PNV_REL_MOUSE_MOVE_PACKET packet) {
   display_cursor = true;
 
-  platf::move_mouse(input, util::endian::big(packet->deltaX), util::endian::big(packet->deltaY));
+  input->mouse_left_button_timeout = DISABLE_LEFT_BUTTON_DELAY;
+  platf::move_mouse(platf_input, util::endian::big(packet->deltaX), util::endian::big(packet->deltaY));
+}
+
+void passthrough(std::shared_ptr<input_t> &input, PNV_ABS_MOUSE_MOVE_PACKET packet) {
+  display_cursor = true;
+
+  if(input->mouse_left_button_timeout == DISABLE_LEFT_BUTTON_DELAY) {
+    input->mouse_left_button_timeout = ENABLE_LEFT_BUTTON_DELAY;
+  }
+
+  if(touch_port_event->peek()) {
+    touch_port = *touch_port_event->pop();
+  }
+
+  float x = util::endian::big(packet->x);
+  float y = util::endian::big(packet->y);
+
+  // Prevent divide by zero
+  // Don't expect it to happen, but just in case
+  if(!packet->width || !packet->height) {
+    BOOST_LOG(warning) << "Moonlight passed invalid dimensions"sv;
+
+    return;
+  }
+
+  float width  = util::endian::big(packet->width);
+  float height = util::endian::big(packet->height);
+
+  auto scale_x = (float)touch_port.width / width;
+  auto scale_y = (float)touch_port.height / height;
+
+  platf::abs_mouse(platf_input, touch_port, x * scale_x, y * scale_y);
 }
 
 void passthrough(std::shared_ptr<input_t> &input, PNV_MOUSE_BUTTON_PACKET packet) {
   auto constexpr BUTTON_RELEASED = 0x09;
 
+  auto constexpr BUTTON_LEFT  = 0x01;
+  auto constexpr BUTTON_RIGHT = 0x03;
+
   display_cursor = true;
 
+  auto release = packet->action == BUTTON_RELEASED;
+
   auto button = util::endian::big(packet->button);
   if(button > 0 && button < mouse_press.size()) {
-    mouse_press[button] = packet->action != BUTTON_RELEASED;
+    if(mouse_press[button] != release) {
+      // button state is already what we want
+      return;
+    }
+
+    mouse_press[button] = !release;
+  }
+  ///////////////////////////////////
+  /*/
+    * When Moonlight sends mouse input through absolute coordinates,
+    * it's possible that BUTTON_RIGHT is pressed down immediately after releasing BUTTON_LEFT.
+    * As a result, Sunshine will left click on hyperlinks in the browser before right clicking
+    *
+    * This can be solved by delaying BUTTON_LEFT, however, any delay on input is undesirable during gaming
+    * As a compromise, Sunshine will only put delays on BUTTON_LEFT when
+    * absolute mouse coordinates have been send.
+    *
+    * Try to make sure BUTTON_RIGHT gets called before BUTTON_LEFT is released.
+    *
+    * input->mouse_left_button_timeout can only be nullptr
+    * when the last mouse coordinates were absolute
+   /*/
+  if(button == BUTTON_LEFT && release && !input->mouse_left_button_timeout) {
+    auto f = [=]() {
+      auto left_released = mouse_press[BUTTON_LEFT];
+      if(left_released) {
+        // Already released left button
+        return;
+      }
+      platf::button_mouse(platf_input, BUTTON_LEFT, release);
+
+      mouse_press[BUTTON_LEFT]         = false;
+      input->mouse_left_button_timeout = nullptr;
+    };
+
+    input->mouse_left_button_timeout = task_pool.pushDelayed(std::move(f), 10ms).task_id;
+
+    return;
+  }
+  if(
+    button == BUTTON_RIGHT && !release &&
+    input->mouse_left_button_timeout > DISABLE_LEFT_BUTTON_DELAY) {
+    platf::button_mouse(platf_input, BUTTON_RIGHT, false);
+    platf::button_mouse(platf_input, BUTTON_RIGHT, true);
+
+    mouse_press[BUTTON_RIGHT] = false;
+
+    return;
+  }
+  ///////////////////////////////////
+
+  platf::button_mouse(platf_input, button, release);
+}
+
+void repeat_key(short key_code) {
+  // If key no longer pressed, stop repeating
+  if(!key_press[key_code]) {
+    task_id = nullptr;
+    return;
   }
 
-  platf::button_mouse(platf_input, button, packet->action == BUTTON_RELEASED);
+  platf::keyboard(platf_input, key_code & 0x00FF, false);
+
+  task_id = task_pool.pushDelayed(repeat_key, config::input.key_repeat_period, key_code).task_id;
 }
 
 void passthrough(std::shared_ptr<input_t> &input, PNV_KEYBOARD_PACKET packet) {
   auto constexpr BUTTON_RELEASED = 0x04;
 
-  key_press[packet->keyCode] = packet->keyAction != BUTTON_RELEASED;
-  platf::keyboard(platf_input, packet->keyCode & 0x00FF, packet->keyAction == BUTTON_RELEASED);
+  auto release = packet->keyAction == BUTTON_RELEASED;
+
+  auto &pressed = key_press[packet->keyCode];
+  if(!pressed) {
+    if(!release) {
+      if(task_id) {
+        task_pool.cancel(task_id);
+      }
+
+      if(config::input.key_repeat_delay.count() > 0) {
+        task_id = task_pool.pushDelayed(repeat_key, config::input.key_repeat_delay, packet->keyCode).task_id;
+      }
+    }
+    else {
+      // Already released
+      return;
+    }
+  }
+  else if(!release) {
+    // Already pressed down key
+    return;
+  }
+
+  pressed = !release;
+  platf::keyboard(platf_input, packet->keyCode & 0x00FF, release);
 }
 
-void passthrough(platf::input_t &input, PNV_SCROLL_PACKET packet) {
+void passthrough(PNV_SCROLL_PACKET packet) {
   display_cursor = true;
 
-  platf::scroll(input, util::endian::big(packet->scrollAmt1));
+  platf::scroll(platf_input, util::endian::big(packet->scrollAmt1));
 }
 
 int updateGamepads(std::vector<gamepad_t> &gamepads, std::int16_t old_state, std::int16_t new_state) {
   auto xorGamepadMask = old_state ^ new_state;
-  if (!xorGamepadMask) {
+  if(!xorGamepadMask) {
     return 0;
   }
 
@@ -204,7 +350,7 @@ int updateGamepads(std::vector<gamepad_t> &gamepads, std::int16_t old_state, std
       auto &gamepad = gamepads[x];
 
       if((old_state >> x) & 1) {
-        if (gamepad.id < 0) {
+        if(gamepad.id < 0) {
           return -1;
         }
 
@@ -264,7 +410,7 @@ void passthrough(std::shared_ptr<input_t> &input, PNV_MULTI_CONTROLLER_PACKET pa
   display_cursor = false;
 
   std::uint16_t bf = packet->buttonFlags;
-  platf::gamepad_state_t gamepad_state{
+  platf::gamepad_state_t gamepad_state {
     bf,
     packet->leftTrigger,
     packet->rightTrigger,
@@ -276,30 +422,30 @@ void passthrough(std::shared_ptr<input_t> &input, PNV_MULTI_CONTROLLER_PACKET pa
 
   auto bf_new = gamepad_state.buttonFlags;
   switch(gamepad.back_button_state) {
-    case button_state_e::UP:
-      if(!(platf::BACK & bf_new)) {
-        gamepad.back_button_state = button_state_e::NONE;
-      }
-      gamepad_state.buttonFlags &= ~platf::BACK;
-      break;
-    case button_state_e::DOWN:
-      if(platf::BACK & bf_new) {
-        gamepad.back_button_state = button_state_e::NONE;
-      }
-      gamepad_state.buttonFlags |= platf::BACK;
-      break;
-    case button_state_e::NONE:
-      break;
+  case button_state_e::UP:
+    if(!(platf::BACK & bf_new)) {
+      gamepad.back_button_state = button_state_e::NONE;
+    }
+    gamepad_state.buttonFlags &= ~platf::BACK;
+    break;
+  case button_state_e::DOWN:
+    if(platf::BACK & bf_new) {
+      gamepad.back_button_state = button_state_e::NONE;
+    }
+    gamepad_state.buttonFlags |= platf::BACK;
+    break;
+  case button_state_e::NONE:
+    break;
   }
 
-  bf = gamepad_state.buttonFlags ^ gamepad.gamepad_state.buttonFlags;
+  bf     = gamepad_state.buttonFlags ^ gamepad.gamepad_state.buttonFlags;
   bf_new = gamepad_state.buttonFlags;
 
-  if (platf::BACK & bf) {
-    if (platf::BACK & bf_new) {
+  if(platf::BACK & bf) {
+    if(platf::BACK & bf_new) {
       // Don't emulate home button if timeout < 0
       if(config::input.back_button_timeout >= 0ms) {
-        gamepad.back_timeout_id = task_pool.pushDelayed([input, controller=packet->controllerNumber]() {
+        auto f = [input, controller = packet->controllerNumber]() {
           auto &gamepad = input->gamepads[controller];
 
           auto &state = gamepad.gamepad_state;
@@ -318,10 +464,12 @@ void passthrough(std::shared_ptr<input_t> &input, PNV_MULTI_CONTROLLER_PACKET pa
           platf::gamepad(platf_input, gamepad.id, state);
 
           gamepad.back_timeout_id = nullptr;
-        }, config::input.back_button_timeout).task_id;
+        };
+
+        gamepad.back_timeout_id = task_pool.pushDelayed(std::move(f), config::input.back_button_timeout).task_id;
       }
     }
-    else if (gamepad.back_timeout_id) {
+    else if(gamepad.back_timeout_id) {
       task_pool.cancel(gamepad.back_timeout_id);
       gamepad.back_timeout_id = nullptr;
     }
@@ -335,30 +483,32 @@ void passthrough(std::shared_ptr<input_t> &input, PNV_MULTI_CONTROLLER_PACKET pa
 void passthrough_helper(std::shared_ptr<input_t> input, std::vector<std::uint8_t> &&input_data) {
   void *payload = input_data.data();
 
-  int input_type = util::endian::big(*(int*)payload);
+  int input_type = util::endian::big(*(int *)payload);
 
   switch(input_type) {
-    case PACKET_TYPE_MOUSE_MOVE:
-      passthrough(platf_input, (PNV_MOUSE_MOVE_PACKET)payload);
-      break;
-    case PACKET_TYPE_MOUSE_BUTTON:
-      passthrough(input, (PNV_MOUSE_BUTTON_PACKET)payload);
-      break;
-    case PACKET_TYPE_SCROLL_OR_KEYBOARD:
-    {
-      char *tmp_input = (char*)payload + 4;
-      if(tmp_input[0] == 0x0A) {
-        passthrough(platf_input, (PNV_SCROLL_PACKET)payload);
-      }
-      else {
-        passthrough(input, (PNV_KEYBOARD_PACKET)payload);
-      }
-
-      break;
+  case PACKET_TYPE_REL_MOUSE_MOVE:
+    passthrough(input, (PNV_REL_MOUSE_MOVE_PACKET)payload);
+    break;
+  case PACKET_TYPE_ABS_MOUSE_MOVE:
+    passthrough(input, (PNV_ABS_MOUSE_MOVE_PACKET)payload);
+    break;
+  case PACKET_TYPE_MOUSE_BUTTON:
+    passthrough(input, (PNV_MOUSE_BUTTON_PACKET)payload);
+    break;
+  case PACKET_TYPE_SCROLL_OR_KEYBOARD: {
+    char *tmp_input = (char *)payload + 4;
+    if(tmp_input[0] == 0x0A) {
+      passthrough((PNV_SCROLL_PACKET)payload);
     }
-    case PACKET_TYPE_MULTI_CONTROLLER:
-      passthrough(input, (PNV_MULTI_CONTROLLER_PACKET)payload);
-      break;
+    else {
+      passthrough(input, (PNV_KEYBOARD_PACKET)payload);
+    }
+
+    break;
+  }
+  case PACKET_TYPE_MULTI_CONTROLLER:
+    passthrough(input, (PNV_MULTI_CONTROLLER_PACKET)payload);
+    break;
   }
 }
 
@@ -366,8 +516,29 @@ void passthrough(std::shared_ptr<input_t> &input, std::vector<std::uint8_t> &&in
   task_pool.push(passthrough_helper, input, util::cmove(input_data));
 }
 
+void reset(std::shared_ptr<input_t> &input) {
+  task_pool.cancel(task_id);
+  task_pool.cancel(input->mouse_left_button_timeout);
+
+  // Ensure input is synchronous, by using the task_pool
+  task_pool.push([]() {
+    for(int x = 0; x < mouse_press.size(); ++x) {
+      if(mouse_press[x]) {
+        platf::button_mouse(platf_input, x, true);
+        mouse_press[x] = false;
+      }
+    }
+
+    for(auto &kp : key_press) {
+      platf::keyboard(platf_input, kp.first & 0x00FF, true);
+      key_press[kp.first] = false;
+    }
+  });
+}
+
 void init() {
-  platf_input = platf::input();
+  touch_port_event = std::make_unique<touch_port_event_t::element_type>();
+  platf_input      = platf::input();
 }
 
 std::shared_ptr<input_t> alloc() {
@@ -377,8 +548,9 @@ std::shared_ptr<input_t> alloc() {
   task_pool.pushDelayed([]() {
     platf::move_mouse(platf_input, 1, 1);
     platf::move_mouse(platf_input, -1, -1);
-  }, 100ms);
+  },
+    100ms);
 
   return input;
 }
-}
+} // namespace input

sunshine/input.h

@@ -5,17 +5,23 @@
 #ifndef SUNSHINE_INPUT_H
 #define SUNSHINE_INPUT_H
 
-
+#include "platform/common.h"
+#include "thread_safe.h"
 namespace input {
 
 struct input_t;
 
 void print(void *input);
+void reset(std::shared_ptr<input_t> &input);
 void passthrough(std::shared_ptr<input_t> &input, std::vector<std::uint8_t> &&input_data);
 
+
 void init();
 
 std::shared_ptr<input_t> alloc();
-}
+
+using touch_port_event_t = std::unique_ptr<safe::event_t<platf::touch_port_t>>;
+extern touch_port_event_t touch_port_event;
+} // namespace input
 
 #endif //SUNSHINE_INPUT_H

sunshine/main.cpp

@@ -4,24 +4,25 @@
 
 #include "process.h"
 
-#include <thread>
-#include <filesystem>
-#include <iostream>
 #include <csignal>
+#include <iostream>
+#include <thread>
 
+#include <boost/log/attributes/clock.hpp>
 #include <boost/log/common.hpp>
-#include <boost/log/sinks.hpp>
 #include <boost/log/expressions.hpp>
+#include <boost/log/sinks.hpp>
 #include <boost/log/sources/severity_logger.hpp>
 
-#include "input.h"
+#include "config.h"
 #include "nvhttp.h"
 #include "rtsp.h"
-#include "config.h"
 #include "thread_pool.h"
+#include "video.h"
 
 #include "platform/common.h"
 extern "C" {
+#include <libavutil/log.h>
 #include <rs.h>
 }
 
@@ -68,38 +69,48 @@ int main(int argc, char *argv[]) {
     return 0;
   }
 
+  if(config::sunshine.min_log_level >= 2) {
+    av_log_set_level(AV_LOG_QUIET);
+  }
+
   sink = boost::make_shared<text_sink>();
 
   boost::shared_ptr<std::ostream> stream { &std::cout, NoDelete {} };
   sink->locked_backend()->add_stream(stream);
   sink->set_filter(severity >= config::sunshine.min_log_level);
 
-  sink->set_formatter([severity="Severity"s](const bl::record_view &view, bl::formatting_ostream &os) {
+  sink->set_formatter([message = "Message"s, severity = "Severity"s](const bl::record_view &view, bl::formatting_ostream &os) {
+    constexpr int DATE_BUFFER_SIZE = 21 + 2 + 1; // Full string plus ": \0"
+
     auto log_level = view.attribute_values()[severity].extract<int>().get();
 
     std::string_view log_type;
     switch(log_level) {
-      case 0:
-        log_type = "Verbose: "sv;
-        break;
-      case 1:
-        log_type = "Debug: "sv;
-        break;
-      case 2:
-        log_type = "Info: "sv;
-        break;
-      case 3:
-        log_type = "Warning: "sv;
-        break;
-      case 4:
-        log_type = "Error: "sv;
-        break;
-      case 5:
-        log_type = "Fatal: "sv;
-        break;
+    case 0:
+      log_type = "Verbose: "sv;
+      break;
+    case 1:
+      log_type = "Debug: "sv;
+      break;
+    case 2:
+      log_type = "Info: "sv;
+      break;
+    case 3:
+      log_type = "Warning: "sv;
+      break;
+    case 4:
+      log_type = "Error: "sv;
+      break;
+    case 5:
+      log_type = "Fatal: "sv;
+      break;
     };
 
-    os << log_type << view.attribute_values()["Message"].extract<std::string>();
+    char _date[DATE_BUFFER_SIZE];
+    std::time_t t = std::time(nullptr);
+    strftime(_date, DATE_BUFFER_SIZE, "[%Y:%m:%d:%H:%M:%S]: ", std::localtime(&t));
+
+    os << _date << log_type << view.attribute_values()[message].extract<std::string>();
   });
 
   bl::core::get()->add_sink(sink);
@@ -126,8 +137,14 @@ int main(int argc, char *argv[]) {
   proc::proc = std::move(*proc_opt);
 
   auto deinit_guard = platf::init();
-  input::init();
+  if(!deinit_guard) {
+    return 4;
+  }
+
   reed_solomon_init();
+  if(video::init()) {
+    return 2;
+  }
 
   task_pool.start(1);
 
@@ -135,6 +152,8 @@ int main(int argc, char *argv[]) {
   stream::rtpThread(shutdown_event);
 
   httpThread.join();
+  task_pool.stop();
+  task_pool.join();
 
   return 0;
 }

sunshine/main.h

@@ -5,8 +5,8 @@
 #ifndef SUNSHINE_MAIN_H
 #define SUNSHINE_MAIN_H
 
-#include <boost/log/common.hpp>
 #include "thread_pool.h"
+#include <boost/log/common.hpp>
 
 extern util::ThreadPool task_pool;
 extern bool display_cursor;

sunshine/move_by_copy.h

@@ -11,23 +11,24 @@ template<class T>
 class MoveByCopy {
 public:
   typedef T move_type;
+
 private:
   move_type _to_move;
-public:
 
-  explicit MoveByCopy(move_type &&to_move) : _to_move(std::move(to_move)) { }
+public:
+  explicit MoveByCopy(move_type &&to_move) : _to_move(std::move(to_move)) {}
 
   MoveByCopy(MoveByCopy &&other) = default;
-  
+
   MoveByCopy(const MoveByCopy &other) {
     *this = other;
   }
 
-  MoveByCopy& operator=(MoveByCopy &&other) = default;
-  
-  MoveByCopy& operator=(const MoveByCopy &other) {
-    this->_to_move = std::move(const_cast<MoveByCopy&>(other)._to_move);
-    
+  MoveByCopy &operator=(MoveByCopy &&other) = default;
+
+  MoveByCopy &operator=(const MoveByCopy &other) {
+    this->_to_move = std::move(const_cast<MoveByCopy &>(other)._to_move);
+
     return *this;
   }
 
@@ -44,7 +45,7 @@ MoveByCopy<T> cmove(T &movable) {
 // Do NOT use this unless you are absolutely certain the object to be moved is no longer used by the caller
 template<class T>
 MoveByCopy<T> const_cmove(const T &movable) {
-  return MoveByCopy<T>(std::move(const_cast<T&>(movable)));
-}
+  return MoveByCopy<T>(std::move(const_cast<T &>(movable)));
 }
+} // namespace util
 #endif

sunshine/network.cpp

@@ -2,9 +2,9 @@
 // Created by loki on 12/27/19.
 //
 
-#include <algorithm>
 #include "network.h"
 #include "utility.h"
+#include <algorithm>
 
 namespace net {
 using namespace std::literals;
@@ -21,17 +21,17 @@ std::vector<std::tuple<std::uint32_t, std::uint32_t>> lan_ips {
 };
 
 std::uint32_t ip(const std::string_view &ip_str) {
-  auto begin = std::begin(ip_str);
-  auto end = std::end(ip_str);
+  auto begin    = std::begin(ip_str);
+  auto end      = std::end(ip_str);
   auto temp_end = std::find(begin, end, '.');
 
   std::uint32_t ip = 0;
-  auto shift = 24;
+  auto shift       = 24;
   while(temp_end != end) {
     ip += (util::from_chars(begin, temp_end) << shift);
     shift -= 8;
 
-    begin = temp_end + 1;
+    begin    = temp_end + 1;
     temp_end = std::find(begin, end, '.');
   }
 
@@ -43,7 +43,7 @@ std::uint32_t ip(const std::string_view &ip_str) {
 // In the format "xxx.xxx.xxx.xxx/x"
 std::pair<std::uint32_t, std::uint32_t> ip_block(const std::string_view &ip_str) {
   auto begin = std::begin(ip_str);
-  auto end = std::find(begin, std::end(ip_str), '/');
+  auto end   = std::find(begin, std::end(ip_str), '/');
 
   auto addr = ip({ begin, (std::size_t)(end - begin) });
 
@@ -82,12 +82,12 @@ net_e from_address(const std::string_view &view) {
 
 std::string_view to_enum_string(net_e net) {
   switch(net) {
-    case PC:
-      return "pc"sv;
-    case LAN:
-      return "lan"sv;
-    case WAN:
-      return "wan"sv;
+  case PC:
+    return "pc"sv;
+  case LAN:
+    return "lan"sv;
+  case WAN:
+    return "wan"sv;
   }
 
   // avoid warning
@@ -112,4 +112,4 @@ void free_host(ENetHost *host) {
 
   enet_host_destroy(host);
 }
-}
+} // namespace net

sunshine/network.h

@@ -14,8 +14,8 @@
 namespace net {
 void free_host(ENetHost *host);
 
-using host_t = util::safe_ptr<ENetHost, free_host>;
-using peer_t = ENetPeer*;
+using host_t   = util::safe_ptr<ENetHost, free_host>;
+using peer_t   = ENetPeer *;
 using packet_t = util::safe_ptr<ENetPacket, enet_packet_destroy>;
 
 enum net_e : int {
@@ -30,6 +30,6 @@ std::string_view to_enum_string(net_e net);
 net_e from_address(const std::string_view &view);
 
 host_t host_create(ENetAddress &addr, std::size_t peers, std::uint16_t port);
-}
+} // namespace net
 
 #endif //SUNSHINE_NETWORK_H

sunshine/nvhttp.cpp

@@ -2,13 +2,15 @@
 // Created by loki on 6/3/19.
 //
 
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+
 #include "process.h"
 
 #include <filesystem>
 
+#include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
-#include <boost/property_tree/json_parser.hpp>
 
 #include <boost/asio/ssl/context.hpp>
 
@@ -17,14 +19,14 @@
 #include <boost/asio/ssl/context_base.hpp>
 
 #include "config.h"
-#include "utility.h"
-#include "rtsp.h"
 #include "crypto.h"
+#include "main.h"
+#include "network.h"
 #include "nvhttp.h"
 #include "platform/common.h"
-#include "network.h"
+#include "rtsp.h"
+#include "utility.h"
 #include "uuid.h"
-#include "main.h"
 
 
 namespace nvhttp {
@@ -33,7 +35,7 @@ constexpr auto PORT_HTTP  = 47989;
 constexpr auto PORT_HTTPS = 47984;
 
 constexpr auto VERSION     = "7.1.400.0";
-constexpr auto GFE_VERSION = "2.0.0.1";
+constexpr auto GFE_VERSION = "3.12.0.1";
 
 namespace fs = std::filesystem;
 namespace pt = boost::property_tree;
@@ -69,8 +71,8 @@ struct pair_session_t {
   struct {
     util::Either<
       std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTP>::Response>,
-      std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTPS>::Response>
-    > response;
+      std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTPS>::Response>>
+      response;
     std::string salt;
   } async_insert_pin;
 };
@@ -81,11 +83,11 @@ std::unordered_map<std::string, client_t> map_id_client;
 std::string unique_id;
 net::net_e origin_pin_allowed;
 
-using args_t = SimpleWeb::CaseInsensitiveMultimap;
+using args_t       = SimpleWeb::CaseInsensitiveMultimap;
 using resp_https_t = std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTPS>::Response>;
-using req_https_t = std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTPS>::Request>;
-using resp_http_t = std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTP>::Response>;
-using req_http_t = std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTP>::Request>;
+using req_https_t  = std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTPS>::Request>;
+using resp_http_t  = std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTP>::Response>;
+using req_http_t   = std::shared_ptr<typename SimpleWeb::ServerBase<SimpleWeb::HTTP>::Request>;
 
 enum class op_e {
   ADD,
@@ -97,7 +99,7 @@ void save_state() {
 
   root.put("root.uniqueid", unique_id);
   auto &nodes = root.add_child("root.devices", pt::ptree {});
-  for(auto &[_,client] : map_id_client) {
+  for(auto &[_, client] : map_id_client) {
     pt::ptree node;
 
     node.put("uniqueid"s, client.uniqueID);
@@ -117,9 +119,7 @@ void save_state() {
 }
 
 void load_state() {
-  auto file_state = fs::current_path() / config::nvhttp.file_state;
-
-  if(!fs::exists(file_state)) {
+  if(!fs::exists(config::nvhttp.file_state)) {
     unique_id = util::uuid_t::generate().string();
     return;
   }
@@ -127,17 +127,18 @@ void load_state() {
   pt::ptree root;
   try {
     pt::read_json(config::nvhttp.file_state, root);
-  } catch (std::exception &e) {
+  }
+  catch(std::exception &e) {
     BOOST_LOG(warning) << e.what();
 
     return;
   }
 
-  unique_id = root.get<std::string>("root.uniqueid");
+  unique_id         = root.get<std::string>("root.uniqueid");
   auto device_nodes = root.get_child("root.devices");
 
-  for(auto &[_,device_node] : device_nodes) {
-    auto uniqID = device_node.get<std::string>("uniqueid");
+  for(auto &[_, device_node] : device_nodes) {
+    auto uniqID  = device_node.get<std::string>("uniqueid");
     auto &client = map_id_client.emplace(uniqID, client_t {}).first->second;
 
     client.uniqueID = uniqID;
@@ -150,16 +151,14 @@ void load_state() {
 
 void update_id_client(const std::string &uniqueID, std::string &&cert, op_e op) {
   switch(op) {
-    case op_e::ADD:
-    {
-      auto &client = map_id_client[uniqueID];
-      client.certs.emplace_back(std::move(cert));
-      client.uniqueID = uniqueID;
-    }
-      break;
-    case op_e::REMOVE:
-      map_id_client.erase(uniqueID);
-      break;
+  case op_e::ADD: {
+    auto &client = map_id_client[uniqueID];
+    client.certs.emplace_back(std::move(cert));
+    client.uniqueID = uniqueID;
+  } break;
+  case op_e::REMOVE:
+    map_id_client.erase(uniqueID);
+    break;
   }
 
   if(!config::sunshine.flags[config::flag::FRESH_STATE]) {
@@ -167,10 +166,32 @@ void update_id_client(const std::string &uniqueID, std::string &&cert, op_e op)
   }
 }
 
-void getservercert(pair_session_t &sess, pt::ptree &tree, const std::string &pin) {
-  auto salt = util::from_hex<std::array<uint8_t, 16>>(sess.async_insert_pin.salt, true);
+stream::launch_session_t make_launch_session(bool host_audio, const args_t &args) {
+  stream::launch_session_t launch_session;
 
-  auto key = crypto::gen_aes_key(*salt, pin);
+  launch_session.host_audio = host_audio;
+  launch_session.gcm_key    = *util::from_hex<crypto::aes_t>(args.at("rikey"s), true);
+  uint32_t prepend_iv       = util::endian::big<uint32_t>(util::from_view(args.at("rikeyid"s)));
+  auto prepend_iv_p         = (uint8_t *)&prepend_iv;
+
+  auto next = std::copy(prepend_iv_p, prepend_iv_p + sizeof(prepend_iv), std::begin(launch_session.iv));
+  std::fill(next, std::end(launch_session.iv), 0);
+
+  return launch_session;
+}
+
+void getservercert(pair_session_t &sess, pt::ptree &tree, const std::string &pin) {
+  if(sess.async_insert_pin.salt.size() < 32) {
+    tree.put("root.paired", 0);
+    tree.put("root.<xmlattr>.status_code", 400);
+    return;
+  }
+
+  std::string_view salt_view { sess.async_insert_pin.salt.data(), 32 };
+
+  auto salt = util::from_hex<std::array<uint8_t, 16>>(salt_view, true);
+
+  auto key        = crypto::gen_aes_key(*salt, pin);
   sess.cipher_key = std::make_unique<crypto::aes_t>(key);
 
   tree.put("root.paired", 1);
@@ -189,7 +210,7 @@ void serverchallengeresp(pair_session_t &sess, pt::ptree &tree, const args_t &ar
   sess.clienthash = std::move(decrypted);
 
   auto serversecret = sess.serversecret;
-  auto sign = crypto::sign256(crypto::pkey(conf_intern.pkey), serversecret);
+  auto sign         = crypto::sign256(crypto::pkey(conf_intern.pkey), serversecret);
 
   serversecret.insert(std::end(serversecret), std::begin(sign), std::end(sign));
 
@@ -207,14 +228,14 @@ void clientchallenge(pair_session_t &sess, pt::ptree &tree, const args_t &args)
   std::vector<uint8_t> decrypted;
   cipher.decrypt(challenge, decrypted);
 
-  auto x509 = crypto::x509(conf_intern.servercert);
-  auto sign = crypto::signature(x509);
+  auto x509         = crypto::x509(conf_intern.servercert);
+  auto sign         = crypto::signature(x509);
   auto serversecret = crypto::rand(16);
 
   decrypted.insert(std::end(decrypted), std::begin(sign), std::end(sign));
   decrypted.insert(std::end(decrypted), std::begin(serversecret), std::end(serversecret));
 
-  auto hash = crypto::hash({ (char*)decrypted.data(), decrypted.size() });
+  auto hash            = crypto::hash({ (char *)decrypted.data(), decrypted.size() });
   auto serverchallenge = crypto::rand(16);
 
   std::string plaintext;
@@ -244,7 +265,7 @@ void clientpairingsecret(std::shared_ptr<safe::queue_t<crypto::x509_t>> &add_cer
 
   assert((secret.size() + sign.size()) == pairingsecret.size());
 
-  auto x509 = crypto::x509(client.cert);
+  auto x509      = crypto::x509(client.cert);
   auto x509_sign = crypto::signature(x509);
 
   std::string data;
@@ -298,8 +319,8 @@ template<class T>
 void print_req(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Request> request) {
   BOOST_LOG(debug) << "TUNNEL :: "sv << tunnel<T>::to_string;
 
-  BOOST_LOG(debug)  << "METHOD :: "sv << request->method;
-  BOOST_LOG(debug)  << "DESTINATION :: "sv << request->path;
+  BOOST_LOG(debug) << "METHOD :: "sv << request->method;
+  BOOST_LOG(debug) << "DESTINATION :: "sv << request->path;
 
   for(auto &[name, val] : request->header) {
     BOOST_LOG(debug) << name << " -- " << val;
@@ -326,33 +347,44 @@ void not_found(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> resp
   pt::write_xml(data, tree);
   response->write(data.str());
 
-  *response << "HTTP/1.1 404 NOT FOUND\r\n" << data.str();
+  *response << "HTTP/1.1 404 NOT FOUND\r\n"
+            << data.str();
 }
 
 template<class T>
 void pair(std::shared_ptr<safe::queue_t<crypto::x509_t>> &add_cert, std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> response, std::shared_ptr<typename SimpleWeb::ServerBase<T>::Request> request) {
   print_req<T>(request);
 
+  pt::ptree tree;
+
   auto args = request->parse_query_string();
+  if(args.find("uniqueid"s) == std::end(args)) {
+    tree.put("root.<xmlattr>.status_code", 400);
+
+    return;
+  }
+
   auto uniqID { std::move(args.at("uniqueid"s)) };
   auto sess_it = map_id_sess.find(uniqID);
 
-  pt::ptree tree;
-
   args_t::const_iterator it;
   if(it = args.find("phrase"); it != std::end(args)) {
     if(it->second == "getservercert"sv) {
       pair_session_t sess;
-      
+
       sess.client.uniqueID = std::move(uniqID);
-      sess.client.cert = util::from_hex_vec(args.at("clientcert"s), true);
+      sess.client.cert     = util::from_hex_vec(args.at("clientcert"s), true);
 
       BOOST_LOG(debug) << sess.client.cert;
       auto ptr = map_id_sess.emplace(sess.client.uniqueID, std::move(sess)).first;
 
       ptr->second.async_insert_pin.salt = std::move(args.at("salt"s));
 
-      if(config::sunshine.flags[config::flag::PIN_STDIN]) {
+      if(config::sunshine.flags[config::flag::CONST_PIN]) {
+        std::string pin("6174");
+        getservercert(ptr->second, tree, pin);
+      }
+      else if(config::sunshine.flags[config::flag::PIN_STDIN]) {
         std::string pin;
 
         std::cout << "Please insert pin: "sv;
@@ -423,7 +455,7 @@ void pin(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> response,
   if(async_response.has_left() && async_response.left()) {
     async_response.left()->write(data.str());
   }
-  else if(async_response.has_right() && async_response.right()){
+  else if(async_response.has_right() && async_response.right()) {
     async_response.right()->write(data.str());
   }
   else {
@@ -443,13 +475,13 @@ void serverinfo(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> res
   print_req<T>(request);
 
   int pair_status = 0;
-  if constexpr (std::is_same_v<SimpleWeb::HTTPS, T>) {
-    auto args = request->parse_query_string();
+  if constexpr(std::is_same_v<SimpleWeb::HTTPS, T>) {
+    auto args     = request->parse_query_string();
     auto clientID = args.find("uniqueid"s);
 
 
     if(clientID != std::end(args)) {
-      if (auto it = map_id_client.find(clientID->second); it != std::end(map_id_client)) {
+      if(auto it = map_id_client.find(clientID->second); it != std::end(map_id_client)) {
         pair_status = 1;
       }
     }
@@ -464,13 +496,13 @@ void serverinfo(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> res
   tree.put("root.GfeVersion", GFE_VERSION);
   tree.put("root.uniqueid", unique_id);
   tree.put("root.mac", platf::get_mac_address(request->local_endpoint_address()));
-  tree.put("root.MaxLumaPixelsHEVC", config::video.hevc_mode > 0 ? "1869449984" : "0");
+  tree.put("root.MaxLumaPixelsHEVC", config::video.hevc_mode > 1 ? "1869449984" : "0");
   tree.put("root.LocalIP", request->local_endpoint_address());
 
-  if(config::video.hevc_mode == 2) {
+  if(config::video.hevc_mode == 3) {
     tree.put("root.ServerCodecModeSupport", "3843");
   }
-  else if(config::video.hevc_mode == 1) {
+  else if(config::video.hevc_mode == 2) {
     tree.put("root.ServerCodecModeSupport", "259");
   }
   else {
@@ -481,10 +513,35 @@ void serverinfo(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> res
     tree.put("root.ExternalIP", config::nvhttp.external_ip);
   }
 
+  pt::ptree display_nodes;
+  for(auto &resolution : config::nvhttp.resolutions) {
+    auto pred = [](auto ch) { return ch == ' ' || ch == '\t' || ch == 'x'; };
+
+    auto middle = std::find_if(std::begin(resolution), std::end(resolution), pred);
+    if(middle == std::end(resolution)) {
+      BOOST_LOG(warning) << resolution << " is not in the proper format for a resolution: WIDTHxHEIGHT"sv;
+      continue;
+    }
+
+    auto width  = util::from_chars(&*std::begin(resolution), &*middle);
+    auto height = util::from_chars(&*(middle + 1), &*std::end(resolution));
+    for(auto fps : config::nvhttp.fps) {
+      pt::ptree display_node;
+      display_node.put("Width", width);
+      display_node.put("Height", height);
+      display_node.put("RefreshRate", fps);
+
+      display_nodes.add_child("DisplayMode", display_node);
+    }
+  }
+
+  if(!config::nvhttp.resolutions.empty()) {
+    tree.add_child("root.SupportedDisplayMode", display_nodes);
+  }
   auto current_appid = proc::proc.running();
   tree.put("root.PairStatus", pair_status);
   tree.put("root.currentgame", current_appid >= 0 ? current_appid + 1 : 0);
-  tree.put("root.state", "_SERVER_BUSY"); 
+  tree.put("root.state", current_appid >= 0 ? "SUNSHINE_SERVER_BUSY" : "SUNSHINE_SERVER_FREE");
 
   std::ostringstream data;
 
@@ -495,9 +552,6 @@ void serverinfo(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> res
 void applist(resp_https_t response, req_https_t request) {
   print_req<SimpleWeb::HTTPS>(request);
 
-  auto args = request->parse_query_string();
-  auto clientID = args.at("uniqueid"s);
-
   pt::ptree tree;
 
   auto g = util::fail_guard([&]() {
@@ -507,6 +561,15 @@ void applist(resp_https_t response, req_https_t request) {
     response->write(data.str());
   });
 
+  auto args = request->parse_query_string();
+  if(args.find("uniqueid"s) == std::end(args)) {
+    tree.put("root.<xmlattr>.status_code", 400);
+
+    return;
+  }
+
+  auto clientID = args.at("uniqueid"s);
+
   auto client = map_id_client.find(clientID);
   if(client == std::end(map_id_client)) {
     tree.put("root.<xmlattr>.status_code", 501);
@@ -522,7 +585,7 @@ void applist(resp_https_t response, req_https_t request) {
   for(auto &proc : proc::proc.get_apps()) {
     pt::ptree app;
 
-    app.put("IsHdrSupported"s, config::video.hevc_mode == 2 ? 1 : 0);
+    app.put("IsHdrSupported"s, config::video.hevc_mode == 3 ? 1 : 0);
     app.put("AppTitle"s, proc.name);
     app.put("ID"s, ++x);
 
@@ -530,7 +593,7 @@ void applist(resp_https_t response, req_https_t request) {
   }
 }
 
-void launch(resp_https_t response, req_https_t request) {
+void launch(bool &host_audio, resp_https_t response, req_https_t request) {
   print_req<SimpleWeb::HTTPS>(request);
 
   pt::ptree tree;
@@ -541,8 +604,6 @@ void launch(resp_https_t response, req_https_t request) {
     response->write(data.str());
   });
 
-  BOOST_LOG(fatal) << stream::session_count();
-
   if(stream::session_count() == config::stream.channels) {
     tree.put("root.resume", 0);
     tree.put("root.<xmlattr>.status_code", 503);
@@ -551,7 +612,19 @@ void launch(resp_https_t response, req_https_t request) {
   }
 
   auto args = request->parse_query_string();
-  auto appid = util::from_view(args.at("appid")) -1;
+  if(
+    args.find("rikey"s) == std::end(args) ||
+    args.find("rikeyid"s) == std::end(args) ||
+    args.find("localAudioPlayMode"s) == std::end(args) ||
+    args.find("appid"s) == std::end(args)) {
+
+    tree.put("root.resume", 0);
+    tree.put("root.<xmlattr>.status_code", 400);
+
+    return;
+  }
+
+  auto appid = util::from_view(args.at("appid")) - 1;
 
   auto current_appid = proc::proc.running();
   if(current_appid != -1) {
@@ -571,23 +644,14 @@ void launch(resp_https_t response, req_https_t request) {
     }
   }
 
-  stream::launch_session_t launch_session;
-
-  auto clientID = args.at("uniqueid"s);
-  launch_session.gcm_key = *util::from_hex<crypto::aes_t>(args.at("rikey"s), true);
-  uint32_t prepend_iv = util::endian::big<uint32_t>(util::from_view(args.at("rikeyid"s)));
-  auto prepend_iv_p = (uint8_t*)&prepend_iv;
-
-  auto next = std::copy(prepend_iv_p, prepend_iv_p + sizeof(prepend_iv), std::begin(launch_session.iv));
-  std::fill(next, std::end(launch_session.iv), 0);
-
-  stream::launch_session_raise(launch_session);
+  host_audio = util::from_view(args.at("localAudioPlayMode"));
+  stream::launch_session_raise(make_launch_session(host_audio, args));
 
   tree.put("root.<xmlattr>.status_code", 200);
   tree.put("root.gamesession", 1);
 }
 
-void resume(resp_https_t response, req_https_t request) {
+void resume(bool &host_audio, resp_https_t response, req_https_t request) {
   print_req<SimpleWeb::HTTPS>(request);
 
   pt::ptree tree;
@@ -601,7 +665,6 @@ void resume(resp_https_t response, req_https_t request) {
   // It is possible that due a race condition that this if-statement gives a false negative,
   // that is automatically resolved in rtsp_server_t
   if(stream::session_count() == config::stream.channels) {
-    BOOST_LOG(fatal) << stream::session_count();
     tree.put("root.resume", 0);
     tree.put("root.<xmlattr>.status_code", 503);
 
@@ -616,18 +679,18 @@ void resume(resp_https_t response, req_https_t request) {
     return;
   }
 
-  stream::launch_session_t launch_session;
-
   auto args = request->parse_query_string();
-  auto clientID = args.at("uniqueid"s);
-  launch_session.gcm_key = *util::from_hex<crypto::aes_t>(args.at("rikey"s), true);
-  uint32_t prepend_iv = util::endian::big<uint32_t>(util::from_view(args.at("rikeyid"s)));
-  auto prepend_iv_p = (uint8_t*)&prepend_iv;
+  if(
+    args.find("rikey"s) == std::end(args) ||
+    args.find("rikeyid"s) == std::end(args)) {
 
-  auto next = std::copy(prepend_iv_p, prepend_iv_p + sizeof(prepend_iv), std::begin(launch_session.iv));
-  std::fill(next, std::end(launch_session.iv), 0);
+    tree.put("root.resume", 0);
+    tree.put("root.<xmlattr>.status_code", 400);
 
-  stream::launch_session_raise(launch_session);
+    return;
+  }
+
+  stream::launch_session_raise(make_launch_session(host_audio, args));
 
   tree.put("root.<xmlattr>.status_code", 200);
   tree.put("root.resume", 1);
@@ -679,25 +742,25 @@ int create_creds(const std::string &pkey, const std::string &cert) {
   pkey_dir.remove_filename();
   cert_dir.remove_filename();
 
-  std::error_code err_code{};
+  std::error_code err_code {};
   fs::create_directories(pkey_dir, err_code);
-  if (err_code) {
+  if(err_code) {
     BOOST_LOG(fatal) << "Couldn't create directory ["sv << pkey_dir << "] :"sv << err_code.message();
     return -1;
   }
 
   fs::create_directories(cert_dir, err_code);
-  if (err_code) {
+  if(err_code) {
     BOOST_LOG(fatal) << "Couldn't create directory ["sv << cert_dir << "] :"sv << err_code.message();
     return -1;
   }
 
-  if (write_file(pkey.c_str(), creds.pkey)) {
+  if(write_file(pkey.c_str(), creds.pkey)) {
     BOOST_LOG(fatal) << "Couldn't open ["sv << config::nvhttp.pkey << ']';
     return -1;
   }
 
-  if (write_file(cert.c_str(), creds.x509)) {
+  if(write_file(cert.c_str(), creds.x509)) {
     BOOST_LOG(fatal) << "Couldn't open ["sv << config::nvhttp.cert << ']';
     return -1;
   }
@@ -706,7 +769,7 @@ int create_creds(const std::string &pkey, const std::string &cert) {
     fs::perms::owner_read | fs::perms::owner_write,
     fs::perm_options::replace, err_code);
 
-  if (err_code) {
+  if(err_code) {
     BOOST_LOG(fatal) << "Couldn't change permissions of ["sv << config::nvhttp.pkey << "] :"sv << err_code.message();
     return -1;
   }
@@ -715,7 +778,7 @@ int create_creds(const std::string &pkey, const std::string &cert) {
     fs::perms::owner_read | fs::perms::group_read | fs::perms::others_read | fs::perms::owner_write,
     fs::perm_options::replace, err_code);
 
-  if (err_code) {
+  if(err_code) {
     BOOST_LOG(fatal) << "Couldn't change permissions of ["sv << config::nvhttp.cert << "] :"sv << err_code.message();
     return -1;
   }
@@ -748,7 +811,7 @@ void start(std::shared_ptr<safe::signal_t> shutdown_event) {
     load_state();
   }
 
-  conf_intern.pkey = read_file(config::nvhttp.pkey.c_str());
+  conf_intern.pkey       = read_file(config::nvhttp.pkey.c_str());
   conf_intern.servercert = read_file(config::nvhttp.cert.c_str());
 
   auto ctx = std::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tls);
@@ -756,13 +819,13 @@ void start(std::shared_ptr<safe::signal_t> shutdown_event) {
   ctx->use_private_key_file(config::nvhttp.pkey, boost::asio::ssl::context::pem);
 
   crypto::cert_chain_t cert_chain;
-  for(auto &[_,client] : map_id_client) {
+  for(auto &[_, client] : map_id_client) {
     for(auto &cert : client.certs) {
       cert_chain.add(crypto::x509(cert));
     }
   }
 
-  auto add_cert = std::make_shared<safe::queue_t<crypto::x509_t>>();
+  auto add_cert = std::make_shared<safe::queue_t<crypto::x509_t>>(30);
 
   // Ugly hack for verifying certificates, see crypto::cert_chain_t::verify() for details
   ctx->set_verify_callback([&cert_chain, add_cert](int verified, boost::asio::ssl::verify_context &ctx) {
@@ -800,35 +863,64 @@ void start(std::shared_ptr<safe::signal_t> shutdown_event) {
     return 1;
   });
 
+  // /resume doesn't get the parameter "localAudioPlayMode"
+  // /launch will store it in host_audio
+  bool host_audio {};
 
   https_server_t https_server { ctx, boost::asio::ssl::verify_peer | boost::asio::ssl::verify_fail_if_no_peer_cert | boost::asio::ssl::verify_client_once };
   http_server_t http_server;
 
-  https_server.default_resource = not_found<SimpleWeb::HTTPS>;
-  https_server.resource["^/serverinfo$"]["GET"] = serverinfo<SimpleWeb::HTTPS>;
-  https_server.resource["^/pair$"]["GET"] = [&add_cert](auto resp, auto req) { pair<SimpleWeb::HTTPS>(add_cert, resp, req); };
-  https_server.resource["^/applist$"]["GET"] = applist;
-  https_server.resource["^/appasset$"]["GET"] = appasset;
-  https_server.resource["^/launch$"]["GET"] = launch;
+  https_server.default_resource                   = not_found<SimpleWeb::HTTPS>;
+  https_server.resource["^/serverinfo$"]["GET"]   = serverinfo<SimpleWeb::HTTPS>;
+  https_server.resource["^/pair$"]["GET"]         = [&add_cert](auto resp, auto req) { pair<SimpleWeb::HTTPS>(add_cert, resp, req); };
+  https_server.resource["^/applist$"]["GET"]      = applist;
+  https_server.resource["^/appasset$"]["GET"]     = appasset;
+  https_server.resource["^/launch$"]["GET"]       = [&host_audio](auto resp, auto req) { launch(host_audio, resp, req); };
   https_server.resource["^/pin/([0-9]+)$"]["GET"] = pin<SimpleWeb::HTTPS>;
-  https_server.resource["^/resume$"]["GET"] = resume;
-  https_server.resource["^/cancel$"]["GET"] = cancel;
+  https_server.resource["^/resume$"]["GET"]       = [&host_audio](auto resp, auto req) { resume(host_audio, resp, req); };
+  https_server.resource["^/cancel$"]["GET"]       = cancel;
 
   https_server.config.reuse_address = true;
-  https_server.config.address = "0.0.0.0"s;
-  https_server.config.port = PORT_HTTPS;
+  https_server.config.address       = "0.0.0.0"s;
+  https_server.config.port          = PORT_HTTPS;
 
-  http_server.default_resource = not_found<SimpleWeb::HTTP>;
-  http_server.resource["^/serverinfo$"]["GET"] = serverinfo<SimpleWeb::HTTP>;
-  http_server.resource["^/pair$"]["GET"] = [&add_cert](auto resp, auto req) { pair<SimpleWeb::HTTP>(add_cert, resp, req); };
+  http_server.default_resource                   = not_found<SimpleWeb::HTTP>;
+  http_server.resource["^/serverinfo$"]["GET"]   = serverinfo<SimpleWeb::HTTP>;
+  http_server.resource["^/pair$"]["GET"]         = [&add_cert](auto resp, auto req) { pair<SimpleWeb::HTTP>(add_cert, resp, req); };
   http_server.resource["^/pin/([0-9]+)$"]["GET"] = pin<SimpleWeb::HTTP>;
 
   http_server.config.reuse_address = true;
-  http_server.config.address = "0.0.0.0"s;
-  http_server.config.port = PORT_HTTP;
+  http_server.config.address       = "0.0.0.0"s;
+  http_server.config.port          = PORT_HTTP;
 
-  std::thread ssl { &https_server_t::start, &https_server };
-  std::thread tcp { &http_server_t::start, &http_server };
+  try {
+    https_server.bind();
+    http_server.bind();
+  }
+  catch(boost::system::system_error &err) {
+    BOOST_LOG(fatal) << "Couldn't bind http server to ports ["sv << PORT_HTTPS << ", "sv << PORT_HTTP << "]: "sv << err.what();
+
+    shutdown_event->raise(true);
+    return;
+  }
+
+  auto accept_and_run = [&](auto *http_server) {
+    try {
+      http_server->accept_and_run();
+    }
+    catch(boost::system::system_error &err) {
+      // It's possible the exception gets thrown after calling http_server->stop() from a different thread
+      if(shutdown_event->peek()) {
+        return;
+      }
+
+      BOOST_LOG(fatal) << "Couldn't start http server to ports ["sv << PORT_HTTPS << ", "sv << PORT_HTTP << "]: "sv << err.what();
+      shutdown_event->raise(true);
+      return;
+    }
+  };
+  std::thread ssl { accept_and_run, &https_server };
+  std::thread tcp { accept_and_run, &http_server };
 
   // Wait for any event
   shutdown_event->view();
@@ -866,4 +958,4 @@ std::string read_file(const char *path) {
 
   return base64_cert;
 }
-}
+} // namespace nvhttp

sunshine/nvhttp.h

@@ -11,8 +11,8 @@
 #include "thread_safe.h"
 
 #define CA_DIR SUNSHINE_ASSETS_DIR "/demoCA"
-#define PRIVATE_KEY_FILE CA_DIR    "/cakey.pem"
-#define CERTIFICATE_FILE CA_DIR    "/cacert.pem"
+#define PRIVATE_KEY_FILE CA_DIR "/cakey.pem"
+#define CERTIFICATE_FILE CA_DIR "/cacert.pem"
 
 namespace nvhttp {
 void start(std::shared_ptr<safe::signal_t> shutdown_event);

sunshine/platform/common.h

@@ -5,8 +5,10 @@
 #ifndef SUNSHINE_COMMON_H
 #define SUNSHINE_COMMON_H
 
-#include <string>
 #include "sunshine/utility.h"
+#include <bitset>
+#include <mutex>
+#include <string>
 
 struct sockaddr;
 namespace platf {
@@ -28,6 +30,85 @@ constexpr std::uint16_t B            = 0x2000;
 constexpr std::uint16_t X            = 0x4000;
 constexpr std::uint16_t Y            = 0x8000;
 
+namespace speaker {
+enum speaker_e {
+  FRONT_LEFT,
+  FRONT_RIGHT,
+  FRONT_CENTER,
+  LOW_FREQUENCY,
+  BACK_LEFT,
+  BACK_RIGHT,
+  SIDE_LEFT,
+  SIDE_RIGHT,
+  MAX_SPEAKERS,
+};
+
+constexpr std::uint8_t map_stereo[] {
+  FRONT_LEFT, FRONT_RIGHT
+};
+constexpr std::uint8_t map_surround51[] {
+  FRONT_LEFT,
+  FRONT_RIGHT,
+  FRONT_CENTER,
+  LOW_FREQUENCY,
+  BACK_LEFT,
+  BACK_RIGHT,
+};
+constexpr std::uint8_t map_surround71[] {
+  FRONT_LEFT,
+  FRONT_RIGHT,
+  FRONT_CENTER,
+  LOW_FREQUENCY,
+  LOW_FREQUENCY,
+  BACK_LEFT,
+  BACK_RIGHT,
+  SIDE_LEFT,
+  SIDE_RIGHT,
+};
+} // namespace speaker
+
+enum class dev_type_e {
+  none,
+  dxgi,
+  unknown
+};
+
+enum class pix_fmt_e {
+  yuv420p,
+  yuv420p10,
+  nv12,
+  p010,
+  unknown
+};
+
+inline std::string_view from_pix_fmt(pix_fmt_e pix_fmt) {
+  using namespace std::literals;
+#define _CONVERT(x)  \
+  case pix_fmt_e::x: \
+    return #x##sv
+  switch(pix_fmt) {
+    _CONVERT(yuv420p);
+    _CONVERT(yuv420p10);
+    _CONVERT(nv12);
+    _CONVERT(p010);
+    _CONVERT(unknown);
+  }
+#undef _CONVERT
+
+  return "unknown"sv;
+}
+
+// Dimensions for touchscreen input
+struct touch_port_t {
+  std::uint32_t offset_x, offset_y;
+  std::uint32_t width, height;
+
+  constexpr touch_port_t(
+    std::uint32_t offset_x, std::uint32_t offset_y,
+    std::uint32_t width, std::uint32_t height) noexcept : offset_x { offset_x }, offset_y { offset_y },
+                                                          width { width }, height { height } {};
+};
+
 struct gamepad_state_t {
   std::uint16_t buttonFlags;
   std::uint8_t lt;
@@ -45,19 +126,46 @@ public:
 
 struct img_t {
 public:
-  std::uint8_t *data  {};
-  std::int32_t width  {};
+  std::uint8_t *data {};
+  std::int32_t width {};
   std::int32_t height {};
   std::int32_t pixel_pitch {};
   std::int32_t row_pitch {};
 
-  img_t() = default;
-  img_t(const img_t&) = delete;
-  img_t(img_t&&) = delete;
+  img_t()              = default;
+  img_t(const img_t &) = delete;
+  img_t(img_t &&)      = delete;
 
   virtual ~img_t() = default;
 };
 
+struct sink_t {
+  // Play on host PC
+  std::string host;
+
+  // On Windows, it is not possible to create a virtual sink
+  // Therefore, it is optional
+  struct null_t {
+    std::string stereo;
+    std::string surround51;
+    std::string surround71;
+  };
+  std::optional<null_t> null;
+};
+
+struct hwdevice_t {
+  void *data {};
+  platf::img_t *img {};
+
+  virtual int convert(platf::img_t &img) {
+    return -1;
+  }
+
+  virtual void set_colorspace(std::uint32_t colorspace, std::uint32_t color_range) {};
+
+  virtual ~hwdevice_t() = default;
+};
+
 enum class capture_e : int {
   ok,
   reinit,
@@ -67,10 +175,22 @@ enum class capture_e : int {
 
 class display_t {
 public:
-  virtual capture_e snapshot(img_t *img, bool cursor) = 0;
-  virtual std::unique_ptr<img_t> alloc_img() = 0;
+  display_t() noexcept : offset_x { 0 }, offset_y { 0 } {}
+  virtual capture_e snapshot(img_t *img, std::chrono::milliseconds timeout, bool cursor) = 0;
+  virtual std::shared_ptr<img_t> alloc_img()                                             = 0;
+
+  virtual int dummy_img(img_t *img) = 0;
+
+  virtual std::shared_ptr<hwdevice_t> make_hwdevice(int width, int height, pix_fmt_e pix_fmt) {
+    return std::make_shared<hwdevice_t>();
+  }
 
   virtual ~display_t() = default;
+
+  // Offsets for when streaming a specific monitor. By default, they are 0.
+  int offset_x, offset_y;
+
+  int width, height;
 };
 
 class mic_t {
@@ -80,8 +200,18 @@ public:
   virtual ~mic_t() = default;
 };
 
+class audio_control_t {
+public:
+  virtual int set_sink(const std::string &sink) = 0;
 
-void freeInput(void*);
+  virtual std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std::uint32_t sample_rate, std::uint32_t frame_size) = 0;
+
+  virtual std::optional<sink_t> sink_info() = 0;
+
+  virtual ~audio_control_t() = default;
+};
+
+void freeInput(void *);
 
 using input_t = util::safe_ptr<void, freeInput>;
 
@@ -90,11 +220,12 @@ std::string get_mac_address(const std::string_view &address);
 std::string from_sockaddr(const sockaddr *const);
 std::pair<std::uint16_t, std::string> from_sockaddr_ex(const sockaddr *const);
 
-std::unique_ptr<mic_t> microphone(std::uint32_t sample_rate);
-std::unique_ptr<display_t> display();
+std::unique_ptr<audio_control_t> audio_control();
+std::shared_ptr<display_t> display(dev_type_e hwdevice_type);
 
 input_t input();
 void move_mouse(input_t &input, int deltaX, int deltaY);
+void abs_mouse(input_t &input, const touch_port_t &touch_port, float x, float y);
 void button_mouse(input_t &input, int button, bool release);
 void scroll(input_t &input, int distance);
 void keyboard(input_t &input, uint16_t modcode, bool release);
@@ -104,6 +235,6 @@ int alloc_gamepad(input_t &input, int nr);
 void free_gamepad(input_t &input, int nr);
 
 [[nodiscard]] std::unique_ptr<deinit_t> init();
-}
+} // namespace platf
 
 #endif //SUNSHINE_COMMON_H

sunshine/platform/linux.cpp

@@ -1,429 +0,0 @@
-//
-// Created by loki on 6/21/19.
-//
-
-#include "common.h"
-
-#include <fstream>
-#include <bitset>
-
-#include <arpa/inet.h>
-#include <ifaddrs.h>
-
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xfixes.h>
-#include <xcb/shm.h>
-#include <xcb/xfixes.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-#include <pulse/simple.h>
-#include <pulse/error.h>
-
-#include "sunshine/task_pool.h"
-#include "sunshine/config.h"
-#include "sunshine/main.h"
-
-namespace platf {
-using namespace std::literals;
-
-void freeImage(XImage *);
-void freeX(XFixesCursorImage *);
-
-using ifaddr_t = util::safe_ptr<ifaddrs, freeifaddrs>;
-using xcb_connect_t = util::safe_ptr<xcb_connection_t, xcb_disconnect>;
-using xcb_img_t = util::c_ptr<xcb_shm_get_image_reply_t>;
-using xcb_cursor_img = util::c_ptr<xcb_xfixes_get_cursor_image_reply_t>;
-
-using xdisplay_t = util::safe_ptr_v2<Display, int, XCloseDisplay>;
-using ximg_t = util::safe_ptr<XImage, freeImage>;
-using xcursor_t = util::safe_ptr<XFixesCursorImage, freeX>;
-
-class shm_id_t {
-public:
-  shm_id_t() : id { -1 } {}
-  shm_id_t(int id) : id {id } {}
-  shm_id_t(shm_id_t &&other) noexcept : id(other.id) {
-    other.id = -1;
-  }
-
-  ~shm_id_t() {
-    if(id != -1) {
-      shmctl(id, IPC_RMID, nullptr);
-      id = -1;
-    }
-  }
-  int id;
-};
-
-class shm_data_t {
-public:
-  shm_data_t() : data {(void*)-1 } {}
-  shm_data_t(void *data) : data {data } {}
-
-  shm_data_t(shm_data_t &&other) noexcept : data(other.data) {
-    other.data = (void*)-1;
-  }
-
-  ~shm_data_t() {
-    if((std::uintptr_t)data != -1) {
-      shmdt(data);
-      data = (void*)-1;
-    }
-  }
-
-  void *data;
-};
-
-struct x11_img_t : public img_t {
-  ximg_t img;
-};
-
-struct shm_img_t : public img_t {
-  ~shm_img_t() override {
-    delete[] data;
-    data = nullptr;
-  }
-};
-
-void blend_cursor(Display *display, img_t &img) {
-  xcursor_t overlay { XFixesGetCursorImage(display) };
-
-  if(!overlay) {
-    BOOST_LOG(error) << "Couldn't get cursor from XFixesGetCursorImage"sv;
-    return;
-  }
-
-  overlay->x -= overlay->xhot;
-  overlay->y -= overlay->yhot;
-
-  overlay->x = std::max((short)0, overlay->x);
-  overlay->y = std::max((short)0, overlay->y);
-
-  auto pixels = (int*)img.data;
-
-  auto screen_height = img.height;
-  auto screen_width  = img.width;
-
-  auto delta_height = std::min<uint16_t>(overlay->height, std::max(0, screen_height - overlay->y));
-  auto delta_width = std::min<uint16_t>(overlay->width, std::max(0, screen_width - overlay->x));
-  for(auto y = 0; y < delta_height; ++y) {
-
-    auto overlay_begin = &overlay->pixels[y * overlay->width];
-    auto overlay_end   = &overlay->pixels[y * overlay->width + delta_width];
-
-    auto pixels_begin = &pixels[(y + overlay->y) * (img.row_pitch / img.pixel_pitch) + overlay->x];
-    std::for_each(overlay_begin, overlay_end, [&](long pixel) {
-      int *pixel_p = (int*)&pixel;
-
-      auto colors_in = (uint8_t*)pixels_begin;
-
-      auto alpha = (*(uint*)pixel_p) >> 24u;
-      if(alpha == 255) {
-        *pixels_begin = *pixel_p;
-      }
-      else {
-        auto colors_out = (uint8_t*)pixel_p;
-        colors_in[0] = colors_out[0] + (colors_in[0] * (255 - alpha) + 255/2) / 255;
-        colors_in[1] = colors_out[1] + (colors_in[1] * (255 - alpha) + 255/2) / 255;
-        colors_in[2] = colors_out[2] + (colors_in[2] * (255 - alpha) + 255/2) / 255;
-      }
-      ++pixels_begin;
-    });
-  }
-}
-struct x11_attr_t : public display_t {
-  x11_attr_t() : xdisplay {XOpenDisplay(nullptr) }, xwindow { }, xattr {} {
-    if(!xdisplay) {
-      BOOST_LOG(fatal) << "Could not open x11 display"sv;
-      log_flush();
-      std::abort();
-    }
-
-    xwindow = DefaultRootWindow(xdisplay.get());
-
-    refresh();
-  }
-
-  void refresh() {
-    XGetWindowAttributes(xdisplay.get(), xwindow, &xattr);
-  }
-
-  capture_e snapshot(img_t *img_out_base, bool cursor) override {
-    refresh();
-    XImage *img { XGetImage(
-      xdisplay.get(),
-      xwindow,
-      0, 0,
-      xattr.width, xattr.height,
-      AllPlanes, ZPixmap)
-    };
-
-    auto img_out = (x11_img_t*)img_out_base;
-    img_out->width = img->width;
-    img_out->height = img->height;
-    img_out->data = (uint8_t*)img->data;
-    img_out->row_pitch = img->bytes_per_line;
-    img_out->pixel_pitch = img->bits_per_pixel / 8;
-    img_out->img.reset(img);
-
-    if(cursor) {
-      blend_cursor(xdisplay.get(), *img_out_base);
-    }
-
-    return capture_e::ok;
-  }
-
-  std::unique_ptr<img_t> alloc_img() override {
-    return std::make_unique<x11_img_t>();
-  }
-
-  xdisplay_t xdisplay;
-  Window xwindow;
-  XWindowAttributes xattr;
-};
-
-struct shm_attr_t : public x11_attr_t {
-  xdisplay_t shm_xdisplay; // Prevent race condition with x11_attr_t::xdisplay
-  xcb_connect_t xcb;
-  xcb_screen_t *display;
-  std::uint32_t seg;
-
-  shm_id_t shm_id;
-
-  shm_data_t data;
-
-  util::TaskPool::task_id_t refresh_task_id;
-  void delayed_refresh() {
-    refresh();
-
-    refresh_task_id = task_pool.pushDelayed(&shm_attr_t::delayed_refresh, 2s, this).task_id;
-  }
-
-  shm_attr_t() : x11_attr_t(), shm_xdisplay {XOpenDisplay(nullptr) } {
-    refresh_task_id = task_pool.pushDelayed(&shm_attr_t::delayed_refresh, 2s, this).task_id;
-  }
-
-  ~shm_attr_t() override {
-    while(!task_pool.cancel(refresh_task_id));
-  }
-
-  capture_e snapshot(img_t *img, bool cursor) override {
-    if(display->width_in_pixels != xattr.width || display->height_in_pixels != xattr.height) {
-      return capture_e::reinit;
-    }
-
-    auto img_cookie = xcb_shm_get_image_unchecked(
-      xcb.get(),
-      display->root,
-      0, 0,
-      display->width_in_pixels, display->height_in_pixels,
-      ~0,
-      XCB_IMAGE_FORMAT_Z_PIXMAP,
-      seg,
-      0
-    );
-
-    xcb_img_t img_reply { xcb_shm_get_image_reply(xcb.get(), img_cookie, nullptr) };
-    if(!img_reply) {
-      BOOST_LOG(error) << "Could not get image reply"sv;
-      return capture_e::reinit;
-    }
-
-    if(img->width != display->width_in_pixels || img->height != display->height_in_pixels) {
-      delete[] img->data;
-
-      img->data = new std::uint8_t[frame_size()];
-      img->width = display->width_in_pixels;
-      img->height = display->height_in_pixels;
-      img->pixel_pitch = 4;
-      img->row_pitch = img->width * img->pixel_pitch;
-    }
-
-    std::copy_n((std::uint8_t*)data.data, frame_size(), img->data);
-
-    if(cursor) {
-      blend_cursor(shm_xdisplay.get(), *img);
-    }
-
-    return capture_e::ok;
-  }
-
-  std::unique_ptr<img_t> alloc_img() override {
-    return std::make_unique<shm_img_t>();
-  }
-
-  int init() {
-    shm_xdisplay.reset(XOpenDisplay(nullptr));
-    xcb.reset(xcb_connect(nullptr, nullptr));
-    if(xcb_connection_has_error(xcb.get())) {
-      return -1;
-    }
-
-    if(!xcb_get_extension_data(xcb.get(), &xcb_shm_id)->present) {
-      BOOST_LOG(error) << "Missing SHM extension"sv;
-
-      return -1;
-    }
-
-    auto iter = xcb_setup_roots_iterator(xcb_get_setup(xcb.get()));
-    display = iter.data;
-    seg = xcb_generate_id(xcb.get());
-
-    shm_id.id = shmget(IPC_PRIVATE, frame_size(), IPC_CREAT | 0777);
-    if(shm_id.id == -1) {
-      BOOST_LOG(error) << "shmget failed"sv;
-      return -1;
-    }
-
-    xcb_shm_attach(xcb.get(), seg, shm_id.id, false);
-    data.data = shmat(shm_id.id, nullptr, 0);
-
-    if ((uintptr_t)data.data == -1) {
-      BOOST_LOG(error) << "shmat failed"sv;
-
-      return -1;
-    }
-
-    return 0;
-  }
-
-  std::uint32_t frame_size() {
-    return display->height_in_pixels * display->width_in_pixels * 4;
-  }
-};
-
-struct mic_attr_t : public mic_t {
-  pa_sample_spec ss;
-  util::safe_ptr<pa_simple, pa_simple_free> mic;
-
-  explicit mic_attr_t(pa_sample_format format, std::uint32_t sample_rate, std::uint8_t channels) : ss { format, sample_rate, channels }, mic {} {}
-  capture_e sample(std::vector<std::int16_t> &sample_buf) override {
-    auto sample_size = sample_buf.size();
-
-    auto buf = sample_buf.data();
-    int status;
-    if(pa_simple_read(mic.get(), buf, sample_size * 2, &status)) {
-      BOOST_LOG(error) << "pa_simple_read() failed: "sv << pa_strerror(status);
-
-      return capture_e::error;
-    }
-
-    return capture_e::ok;
-  }
-};
-
-std::unique_ptr<display_t> shm_display() {
-  auto shm = std::make_unique<shm_attr_t>();
-
-  if(shm->init()) {
-    return nullptr;
-  }
-
-  return shm;
-}
-
-std::unique_ptr<display_t> display() {
-  auto shm_disp = shm_display();
-
-  if(!shm_disp) {
-    return std::unique_ptr<display_t> { new x11_attr_t {} };
-  }
-
-  return shm_disp;
-}
-
-std::unique_ptr<mic_t> microphone(std::uint32_t sample_rate) {
-  auto mic = std::make_unique<mic_attr_t>(PA_SAMPLE_S16LE, sample_rate, 2);
-
-  int status;
-
-  const char *audio_sink = nullptr;
-  if(!config::audio.sink.empty()) {
-    audio_sink = config::audio.sink.c_str();
-  }
-  else {
-    audio_sink = "@DEFAULT_MONITOR@";
-  }
-
-  mic->mic.reset(
-    pa_simple_new(nullptr, "sunshine", pa_stream_direction_t::PA_STREAM_RECORD, audio_sink, "sunshine-record", &mic->ss, nullptr, nullptr, &status)
-  );
-
-  if(!mic->mic) {
-    auto err_str = pa_strerror(status);
-    BOOST_LOG(error) << "pa_simple_new() failed: "sv << err_str;
-
-    log_flush();
-    std::abort();
-  }
-
-  return mic;
-}
-
-ifaddr_t get_ifaddrs() {
-  ifaddrs *p { nullptr };
-
-  getifaddrs(&p);
-
-  return ifaddr_t { p };
-}
-
-std::string from_sockaddr(const sockaddr *const ip_addr) {
-  char data[INET6_ADDRSTRLEN];
-
-  auto family = ip_addr->sa_family;
-  if(family == AF_INET6) {
-    inet_ntop(AF_INET6, &((sockaddr_in6*)ip_addr)->sin6_addr, data, INET6_ADDRSTRLEN);
-  }
-
-  if(family == AF_INET) {
-    inet_ntop(AF_INET, &((sockaddr_in*)ip_addr)->sin_addr, data, INET_ADDRSTRLEN);
-  }
-
-  return std::string { data };
-}
-
-std::pair<std::uint16_t, std::string> from_sockaddr_ex(const sockaddr *const ip_addr) {
-  char data[INET6_ADDRSTRLEN];
-
-  auto family = ip_addr->sa_family;
-  std::uint16_t port;
-  if(family == AF_INET6) {
-    inet_ntop(AF_INET6, &((sockaddr_in6*)ip_addr)->sin6_addr, data, INET6_ADDRSTRLEN);
-    port = ((sockaddr_in6*)ip_addr)->sin6_port;
-  }
-
-  if(family == AF_INET) {
-    inet_ntop(AF_INET, &((sockaddr_in*)ip_addr)->sin_addr, data, INET_ADDRSTRLEN);
-    port = ((sockaddr_in*)ip_addr)->sin_port;
-  }
-
-  return { port, std::string { data } };
-}
-
-std::string get_mac_address(const std::string_view &address) {
-  auto ifaddrs = get_ifaddrs();
-  for(auto pos = ifaddrs.get(); pos != nullptr; pos = pos->ifa_next) {
-    if(pos->ifa_addr && address == from_sockaddr(pos->ifa_addr)) {
-      std::ifstream mac_file("/sys/class/net/"s + pos->ifa_name + "/address");
-      if(mac_file.good()) {
-        std::string mac_address;
-        std::getline(mac_file, mac_address);
-        return mac_address;
-      }
-    }
-  }
-  BOOST_LOG(warning) << "Unable to find MAC address for "sv << address;
-  return "00:00:00:00:00:00"s;
-}
-
-void freeImage(XImage *p) {
-  XDestroyImage(p);
-}
-void freeX(XFixesCursorImage *p) {
-  XFree(p);
-}
-}

sunshine/platform/linux/audio.cpp

@@ -0,0 +1,441 @@
+//
+// Created by loki on 5/16/21.
+//
+#include <bitset>
+#include <boost/regex.hpp>
+
+#include <pulse/error.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/simple.h>
+
+#include "sunshine/platform/common.h"
+
+#include "sunshine/config.h"
+#include "sunshine/main.h"
+#include "sunshine/thread_safe.h"
+
+namespace platf {
+using namespace std::literals;
+
+constexpr pa_channel_position_t position_mapping[] {
+  PA_CHANNEL_POSITION_FRONT_LEFT,
+  PA_CHANNEL_POSITION_FRONT_RIGHT,
+  PA_CHANNEL_POSITION_FRONT_CENTER,
+  PA_CHANNEL_POSITION_LFE,
+  PA_CHANNEL_POSITION_REAR_LEFT,
+  PA_CHANNEL_POSITION_REAR_RIGHT,
+  PA_CHANNEL_POSITION_SIDE_LEFT,
+  PA_CHANNEL_POSITION_SIDE_RIGHT,
+};
+
+std::string to_string(const char *name, const std::uint8_t *mapping, int channels) {
+  std::stringstream ss;
+
+  ss << "rate=48000 sink_name="sv << name << " format=s16le channels="sv << channels << " channel_map="sv;
+  std::for_each_n(mapping, channels - 1, [&ss](std::uint8_t pos) {
+    ss << pa_channel_position_to_string(position_mapping[pos]) << ',';
+  });
+
+  ss << pa_channel_position_to_string(position_mapping[mapping[channels - 1]]);
+
+  ss << " sink_properties=device.description="sv << name;
+  auto result = ss.str();
+
+  BOOST_LOG(debug) << "null-sink args: "sv << result;
+  return result;
+}
+
+struct mic_attr_t : public mic_t {
+  util::safe_ptr<pa_simple, pa_simple_free> mic;
+
+  capture_e sample(std::vector<std::int16_t> &sample_buf) override {
+    auto sample_size = sample_buf.size();
+
+    auto buf = sample_buf.data();
+    int status;
+    if(pa_simple_read(mic.get(), buf, sample_size * 2, &status)) {
+      BOOST_LOG(error) << "pa_simple_read() failed: "sv << pa_strerror(status);
+
+      return capture_e::error;
+    }
+
+    return capture_e::ok;
+  }
+};
+
+std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std::uint32_t sample_rate) {
+  auto mic = std::make_unique<mic_attr_t>();
+
+  pa_sample_spec ss { PA_SAMPLE_S16LE, sample_rate, (std::uint8_t)channels };
+  pa_channel_map pa_map;
+
+  pa_map.channels = channels;
+  std::for_each_n(pa_map.map, pa_map.channels, [mapping](auto &channel) mutable {
+    channel = position_mapping[*mapping++];
+  });
+
+  int status;
+
+  const char *audio_sink = "@DEFAULT_MONITOR@";
+  if(!config::audio.sink.empty()) {
+    audio_sink = config::audio.sink.c_str();
+  }
+
+  mic->mic.reset(
+    pa_simple_new(nullptr, "sunshine",
+      pa_stream_direction_t::PA_STREAM_RECORD, audio_sink,
+      "sunshine-record", &ss, &pa_map, nullptr, &status));
+
+  if(!mic->mic) {
+    auto err_str = pa_strerror(status);
+    BOOST_LOG(error) << "pa_simple_new() failed: "sv << err_str;
+
+    log_flush();
+    std::abort();
+  }
+
+  return mic;
+}
+
+namespace pa {
+template<bool B, class T>
+struct add_const_helper;
+
+template<class T>
+struct add_const_helper<true, T> {
+  using type = const std::remove_pointer_t<T> *;
+};
+
+template<class T>
+struct add_const_helper<false, T> {
+  using type = const T *;
+};
+
+template<class T>
+using add_const_t = typename add_const_helper<std::is_pointer_v<T>, T>::type;
+
+template<class T>
+void pa_free(T *p) {
+  pa_xfree(p);
+}
+using ctx_t    = util::safe_ptr<pa_context, pa_context_unref>;
+using loop_t   = util::safe_ptr<pa_mainloop, pa_mainloop_free>;
+using op_t     = util::safe_ptr<pa_operation, pa_operation_unref>;
+using string_t = util::safe_ptr<char, pa_free<char>>;
+
+template<class T>
+using cb_t = std::function<void(ctx_t::pointer, add_const_t<T> i, int eol)>;
+
+template<class T>
+void cb(ctx_t::pointer ctx, add_const_t<T> i, int eol, void *userdata) {
+  auto &f = *(cb_t<T> *)userdata;
+
+  // For some reason, pulseaudio calls this callback after disconnecting
+  if(i && eol) {
+    return;
+  }
+
+  f(ctx, i, eol);
+}
+
+void cb_i(ctx_t::pointer ctx, std::uint32_t i, void *userdata) {
+  auto alarm = (safe::alarm_raw_t<int> *)userdata;
+
+  alarm->ring(i);
+}
+
+void ctx_state_cb(ctx_t::pointer ctx, void *userdata) {
+  auto &f = *(std::function<void(ctx_t::pointer)> *)userdata;
+
+  f(ctx);
+}
+
+void success_cb(ctx_t::pointer ctx, int status, void *userdata) {
+  assert(userdata != nullptr);
+
+  auto alarm = (safe::alarm_raw_t<int> *)userdata;
+  alarm->ring(status ? 0 : 1);
+}
+
+class server_t : public audio_control_t {
+  enum ctx_event_e : int {
+    ready,
+    terminated,
+    failed
+  };
+
+public:
+  loop_t loop;
+  ctx_t ctx;
+
+  struct {
+    std::uint32_t stereo     = PA_INVALID_INDEX;
+    std::uint32_t surround51 = PA_INVALID_INDEX;
+    std::uint32_t surround71 = PA_INVALID_INDEX;
+  } index;
+
+  std::unique_ptr<safe::event_t<ctx_event_e>> events;
+  std::unique_ptr<std::function<void(ctx_t::pointer)>> events_cb;
+
+  std::thread worker;
+  int init() {
+    events = std::make_unique<safe::event_t<ctx_event_e>>();
+    loop.reset(pa_mainloop_new());
+    ctx.reset(pa_context_new(pa_mainloop_get_api(loop.get()), "sunshine"));
+
+    events_cb = std::make_unique<std::function<void(ctx_t::pointer)>>([this](ctx_t::pointer ctx) {
+      switch(pa_context_get_state(ctx)) {
+      case PA_CONTEXT_READY:
+        events->raise(ready);
+        break;
+      case PA_CONTEXT_TERMINATED:
+        BOOST_LOG(debug) << "Pulseadio context terminated"sv;
+        events->raise(terminated);
+        break;
+      case PA_CONTEXT_FAILED:
+        BOOST_LOG(debug) << "Pulseadio context failed"sv;
+        events->raise(failed);
+        break;
+      case PA_CONTEXT_CONNECTING:
+        BOOST_LOG(debug) << "Connecting to pulseaudio"sv;
+      case PA_CONTEXT_UNCONNECTED:
+      case PA_CONTEXT_AUTHORIZING:
+      case PA_CONTEXT_SETTING_NAME:
+        break;
+      }
+    });
+
+    pa_context_set_state_callback(ctx.get(), ctx_state_cb, events_cb.get());
+
+    auto status = pa_context_connect(ctx.get(), nullptr, PA_CONTEXT_NOFLAGS, nullptr);
+    if(status) {
+      BOOST_LOG(error) << "Couldn't connect to pulseaudio: "sv << pa_strerror(status);
+      return -1;
+    }
+
+    worker = std::thread {
+      [](loop_t::pointer loop) {
+        int retval;
+        auto status = pa_mainloop_run(loop, &retval);
+
+        if(status < 0) {
+          BOOST_LOG(fatal) << "Couldn't run pulseaudio main loop"sv;
+
+          log_flush();
+          std::abort();
+        }
+      },
+      loop.get()
+    };
+
+    auto event = events->pop();
+    if(event == failed) {
+      return -1;
+    }
+
+    return 0;
+  }
+
+  int load_null(const char *name, const std::uint8_t *channel_mapping, int channels) {
+    auto alarm = safe::make_alarm<int>();
+
+    op_t op {
+      pa_context_load_module(
+        ctx.get(),
+        "module-null-sink",
+        to_string(name, channel_mapping, channels).c_str(),
+        cb_i,
+        alarm.get()),
+    };
+
+    alarm->wait();
+    return *alarm->status();
+  }
+
+  int unload_null(std::uint32_t i) {
+    if(i == PA_INVALID_INDEX) {
+      return 0;
+    }
+
+    auto alarm = safe::make_alarm<int>();
+
+    op_t op {
+      pa_context_unload_module(ctx.get(), i, success_cb, alarm.get())
+    };
+
+    alarm->wait();
+
+    if(*alarm->status()) {
+      BOOST_LOG(error) << "Couldn't unload null-sink with index ["sv << i << "]: "sv << pa_strerror(pa_context_errno(ctx.get()));
+      return -1;
+    }
+
+    return 0;
+  }
+
+  std::optional<sink_t> sink_info() override {
+    constexpr auto stereo     = "sink-sunshine-stereo";
+    constexpr auto surround51 = "sink-sunshine-surround51";
+    constexpr auto surround71 = "sink-sunshine-surround71";
+
+    auto alarm = safe::make_alarm<int>();
+
+    sink_t sink;
+
+    // If hardware sink with more channels found, set that as host
+    int channels  = 0;
+    // Count of all virtual sinks that are created by us
+    int nullcount = 0;
+
+    cb_t<pa_sink_info *> f = [&](ctx_t::pointer ctx, const pa_sink_info *sink_info, int eol) {
+      if(!sink_info) {
+        if(!eol) {
+          BOOST_LOG(error) << "Couldn't get pulseaudio sink info: "sv << pa_strerror(pa_context_errno(ctx));
+
+          alarm->ring(-1);
+        }
+
+        alarm->ring(0);
+        return;
+      }
+
+      if(sink_info->flags & PA_SINK_HARDWARE &&
+         sink_info->channel_map.channels > channels) {
+
+        sink.host = sink_info->name;
+        channels  = sink_info->channel_map.channels;
+      }
+
+      // Ensure Sunshine won't create a sink that already exists.
+      if(!std::strcmp(sink_info->name, stereo)) {
+        index.stereo = sink_info->owner_module;
+
+        ++nullcount;
+      }
+      else if(!std::strcmp(sink_info->name, surround51)) {
+        index.surround51 = sink_info->owner_module;
+
+        ++nullcount;
+      }
+      else if(!std::strcmp(sink_info->name, surround71)) {
+        index.surround71 = sink_info->owner_module;
+
+        ++nullcount;
+      }
+    };
+
+    op_t op { pa_context_get_sink_info_list(ctx.get(), cb<pa_sink_info *>, &f) };
+
+    if(!op) {
+      BOOST_LOG(error) << "Couldn't create card info operation: "sv << pa_strerror(pa_context_errno(ctx.get()));
+
+      return std::nullopt;
+    }
+
+    alarm->wait();
+
+    if(*alarm->status()) {
+      return std::nullopt;
+    }
+
+    if(!channels) {
+      BOOST_LOG(warning) << "Couldn't find hardware sink"sv;
+    }
+
+    if(index.stereo == PA_INVALID_INDEX) {
+      index.stereo = load_null(stereo, speaker::map_stereo, sizeof(speaker::map_stereo));
+      if(index.stereo == PA_INVALID_INDEX) {
+        BOOST_LOG(warning) << "Couldn't create virtual sink for stereo: "sv << pa_strerror(pa_context_errno(ctx.get()));
+      }
+      else {
+        ++nullcount;
+      }
+    }
+
+    if(index.surround51 == PA_INVALID_INDEX) {
+      index.surround51 = load_null(surround51, speaker::map_surround51, sizeof(speaker::map_surround51));
+      if(index.surround51 == PA_INVALID_INDEX) {
+        BOOST_LOG(warning) << "Couldn't create virtual sink for surround-51: "sv << pa_strerror(pa_context_errno(ctx.get()));
+      }
+      else {
+        ++nullcount;
+      }
+    }
+
+    if(index.surround71 == PA_INVALID_INDEX) {
+      index.surround71 = load_null(surround71, speaker::map_surround71, sizeof(speaker::map_surround71));
+      if(index.surround71 == PA_INVALID_INDEX) {
+        BOOST_LOG(warning) << "Couldn't create virtual sink for surround-71: "sv << pa_strerror(pa_context_errno(ctx.get()));
+      }
+      else {
+        ++nullcount;
+      }
+    }
+
+    if(nullcount == 3) {
+      sink.null = std::make_optional(sink_t::null_t { stereo, surround51, surround71 });
+    }
+
+    return std::make_optional(std::move(sink));
+  }
+
+  std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std::uint32_t sample_rate, std::uint32_t frame_size) override {
+    return ::platf::microphone(mapping, channels, sample_rate);
+  }
+
+  int set_sink(const std::string &sink) override {
+    auto alarm = safe::make_alarm<int>();
+
+    op_t op {
+      pa_context_set_default_sink(
+        ctx.get(), sink.c_str(), success_cb, alarm.get()),
+    };
+
+    if(!op) {
+      BOOST_LOG(error) << "Couldn't create set default-sink operation: "sv << pa_strerror(pa_context_errno(ctx.get()));
+      return -1;
+    }
+
+    alarm->wait();
+    if(*alarm->status()) {
+      BOOST_LOG(error) << "Couldn't set default-sink ["sv << sink << "]: "sv << pa_strerror(pa_context_errno(ctx.get()));
+
+      return -1;
+    }
+
+    return 0;
+  }
+
+  ~server_t() override {
+    unload_null(index.stereo);
+    unload_null(index.surround51);
+    unload_null(index.surround71);
+
+    if(worker.joinable()) {
+      pa_context_disconnect(ctx.get());
+
+      KITTY_WHILE_LOOP(auto event = events->pop(), event != terminated && event != failed, {
+        event = events->pop();
+      })
+
+      pa_mainloop_quit(loop.get(), 0);
+      worker.join();
+    }
+  }
+};
+} // namespace pa
+
+std::unique_ptr<audio_control_t> audio_control() {
+  auto audio = std::make_unique<pa::server_t>();
+
+  if(audio->init()) {
+    return nullptr;
+  }
+
+  return audio;
+}
+
+std::unique_ptr<deinit_t> init() {
+  return std::make_unique<deinit_t>();
+}
+} // namespace platf

sunshine/platform/linux/display.cpp

@@ -0,0 +1,454 @@
+//
+// Created by loki on 6/21/19.
+//
+
+#include "sunshine/platform/common.h"
+
+#include <fstream>
+
+#include <arpa/inet.h>
+#include <ifaddrs.h>
+
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/Xrandr.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <xcb/shm.h>
+#include <xcb/xfixes.h>
+
+#include "sunshine/config.h"
+#include "sunshine/main.h"
+#include "sunshine/task_pool.h"
+
+namespace platf {
+using namespace std::literals;
+
+void freeImage(XImage *);
+void freeX(XFixesCursorImage *);
+
+using ifaddr_t      = util::safe_ptr<ifaddrs, freeifaddrs>;
+using xcb_connect_t = util::safe_ptr<xcb_connection_t, xcb_disconnect>;
+using xcb_img_t     = util::c_ptr<xcb_shm_get_image_reply_t>;
+
+using xdisplay_t = util::safe_ptr_v2<Display, int, XCloseDisplay>;
+using ximg_t     = util::safe_ptr<XImage, freeImage>;
+using xcursor_t  = util::safe_ptr<XFixesCursorImage, freeX>;
+
+using crtc_info_t   = util::safe_ptr<_XRRCrtcInfo, XRRFreeCrtcInfo>;
+using output_info_t = util::safe_ptr<_XRROutputInfo, XRRFreeOutputInfo>;
+using screen_res_t  = util::safe_ptr<_XRRScreenResources, XRRFreeScreenResources>;
+
+class shm_id_t {
+public:
+  shm_id_t() : id { -1 } {}
+  shm_id_t(int id) : id { id } {}
+  shm_id_t(shm_id_t &&other) noexcept : id(other.id) {
+    other.id = -1;
+  }
+
+  ~shm_id_t() {
+    if(id != -1) {
+      shmctl(id, IPC_RMID, nullptr);
+      id = -1;
+    }
+  }
+  int id;
+};
+
+class shm_data_t {
+public:
+  shm_data_t() : data { (void *)-1 } {}
+  shm_data_t(void *data) : data { data } {}
+
+  shm_data_t(shm_data_t &&other) noexcept : data(other.data) {
+    other.data = (void *)-1;
+  }
+
+  ~shm_data_t() {
+    if((std::uintptr_t)data != -1) {
+      shmdt(data);
+    }
+  }
+
+  void *data;
+};
+
+struct x11_img_t : public img_t {
+  ximg_t img;
+};
+
+struct shm_img_t : public img_t {
+  ~shm_img_t() override {
+    delete[] data;
+    data = nullptr;
+  }
+};
+
+void blend_cursor(Display *display, img_t &img, int offsetX, int offsetY) {
+  xcursor_t overlay { XFixesGetCursorImage(display) };
+
+  if(!overlay) {
+    BOOST_LOG(error) << "Couldn't get cursor from XFixesGetCursorImage"sv;
+    return;
+  }
+
+  overlay->x -= overlay->xhot;
+  overlay->y -= overlay->yhot;
+
+  overlay->x -= offsetX;
+  overlay->y -= offsetY;
+
+  overlay->x = std::max((short)0, overlay->x);
+  overlay->y = std::max((short)0, overlay->y);
+
+  auto pixels = (int *)img.data;
+
+  auto screen_height = img.height;
+  auto screen_width  = img.width;
+
+  auto delta_height = std::min<uint16_t>(overlay->height, std::max(0, screen_height - overlay->y));
+  auto delta_width  = std::min<uint16_t>(overlay->width, std::max(0, screen_width - overlay->x));
+  for(auto y = 0; y < delta_height; ++y) {
+    auto overlay_begin = &overlay->pixels[y * overlay->width];
+    auto overlay_end   = &overlay->pixels[y * overlay->width + delta_width];
+
+    auto pixels_begin = &pixels[(y + overlay->y) * (img.row_pitch / img.pixel_pitch) + overlay->x];
+
+    std::for_each(overlay_begin, overlay_end, [&](long pixel) {
+      int *pixel_p = (int *)&pixel;
+
+      auto colors_in = (uint8_t *)pixels_begin;
+
+      auto alpha = (*(uint *)pixel_p) >> 24u;
+      if(alpha == 255) {
+        *pixels_begin = *pixel_p;
+      }
+      else {
+        auto colors_out = (uint8_t *)pixel_p;
+        colors_in[0]    = colors_out[0] + (colors_in[0] * (255 - alpha) + 255 / 2) / 255;
+        colors_in[1]    = colors_out[1] + (colors_in[1] * (255 - alpha) + 255 / 2) / 255;
+        colors_in[2]    = colors_out[2] + (colors_in[2] * (255 - alpha) + 255 / 2) / 255;
+      }
+      ++pixels_begin;
+    });
+  }
+}
+struct x11_attr_t : public display_t {
+  xdisplay_t xdisplay;
+  Window xwindow;
+  XWindowAttributes xattr;
+
+  /*
+   * Last X (NOT the streamed monitor!) size.
+   * This way we can trigger reinitialization if the dimensions changed while streaming
+   */
+  int lastWidth, lastHeight;
+
+  x11_attr_t() : xdisplay { XOpenDisplay(nullptr) }, xwindow {}, xattr {} {
+    XInitThreads();
+  }
+
+  int init() {
+    if(!xdisplay) {
+      BOOST_LOG(error) << "Could not open X11 display"sv;
+      return -1;
+    }
+
+    xwindow = DefaultRootWindow(xdisplay.get());
+
+    refresh();
+
+    int streamedMonitor = -1;
+    if(!config::video.output_name.empty()) {
+      streamedMonitor = (int)util::from_view(config::video.output_name);
+    }
+
+    if(streamedMonitor != -1) {
+      BOOST_LOG(info) << "Configuring selected monitor ("sv << streamedMonitor << ") to stream"sv;
+      screen_res_t screenr { XRRGetScreenResources(xdisplay.get(), xwindow) };
+      int output = screenr->noutput;
+
+      if(streamedMonitor >= output) {
+        BOOST_LOG(error) << "Could not stream display number ["sv << streamedMonitor << "], there are only ["sv << output << "] displays."sv;
+        return -1;
+      }
+
+      output_info_t out_info { XRRGetOutputInfo(xdisplay.get(), screenr.get(), screenr->outputs[streamedMonitor]) };
+      if(!out_info || out_info->connection != RR_Connected) {
+        BOOST_LOG(error) << "Could not stream selected display because it doesn't seem to be connected"sv;
+        return -1;
+      }
+
+      crtc_info_t crt_info { XRRGetCrtcInfo(xdisplay.get(), screenr.get(), out_info->crtc) };
+      BOOST_LOG(info)
+        << "Streaming display: "sv << out_info->name << " with res "sv << crt_info->width << 'x' << crt_info->height << " offset by "sv << crt_info->x << 'x' << crt_info->y;
+
+      width    = crt_info->width;
+      height   = crt_info->height;
+      offset_x = crt_info->x;
+      offset_y = crt_info->y;
+    }
+    else {
+      width  = xattr.width;
+      height = xattr.height;
+    }
+
+    lastWidth  = xattr.width;
+    lastHeight = xattr.height;
+
+    return 0;
+  }
+
+  /**
+   * Called when the display attributes should change.
+   */
+  void refresh() {
+    XGetWindowAttributes(xdisplay.get(), xwindow, &xattr); //Update xattr's
+  }
+
+  capture_e snapshot(img_t *img_out_base, std::chrono::milliseconds timeout, bool cursor) override {
+    refresh();
+
+    //The whole X server changed, so we gotta reinit everything
+    if(xattr.width != lastWidth || xattr.height != lastHeight) {
+      BOOST_LOG(warning) << "X dimensions changed in non-SHM mode, request reinit"sv;
+      return capture_e::reinit;
+    }
+    XImage *img { XGetImage(xdisplay.get(), xwindow, offset_x, offset_y, width, height, AllPlanes, ZPixmap) };
+
+    auto img_out         = (x11_img_t *)img_out_base;
+    img_out->width       = img->width;
+    img_out->height      = img->height;
+    img_out->data        = (uint8_t *)img->data;
+    img_out->row_pitch   = img->bytes_per_line;
+    img_out->pixel_pitch = img->bits_per_pixel / 8;
+    img_out->img.reset(img);
+
+    if(cursor) {
+      blend_cursor(xdisplay.get(), *img_out_base, offset_x, offset_y);
+    }
+
+    return capture_e::ok;
+  }
+
+  std::shared_ptr<img_t> alloc_img() override {
+    return std::make_shared<x11_img_t>();
+  }
+
+  int dummy_img(img_t *img) override {
+    snapshot(img, 0s, true);
+    return 0;
+  }
+};
+
+struct shm_attr_t : public x11_attr_t {
+  xdisplay_t shm_xdisplay; // Prevent race condition with x11_attr_t::xdisplay
+  xcb_connect_t xcb;
+  xcb_screen_t *display;
+  std::uint32_t seg;
+
+  shm_id_t shm_id;
+
+  shm_data_t data;
+
+  util::TaskPool::task_id_t refresh_task_id;
+
+  void delayed_refresh() {
+    refresh();
+
+    refresh_task_id = task_pool.pushDelayed(&shm_attr_t::delayed_refresh, 2s, this).task_id;
+  }
+
+  shm_attr_t() : x11_attr_t(), shm_xdisplay { XOpenDisplay(nullptr) } {
+    refresh_task_id = task_pool.pushDelayed(&shm_attr_t::delayed_refresh, 2s, this).task_id;
+  }
+
+  ~shm_attr_t() override {
+    while(!task_pool.cancel(refresh_task_id))
+      ;
+  }
+
+  capture_e snapshot(img_t *img, std::chrono::milliseconds timeout, bool cursor) override {
+    //The whole X server changed, so we gotta reinit everything
+    if(xattr.width != lastWidth || xattr.height != lastHeight) {
+      BOOST_LOG(warning) << "X dimensions changed in SHM mode, request reinit"sv;
+      return capture_e::reinit;
+    }
+    else {
+      auto img_cookie = xcb_shm_get_image_unchecked(xcb.get(), display->root, offset_x, offset_y, width, height, ~0, XCB_IMAGE_FORMAT_Z_PIXMAP, seg, 0);
+
+      xcb_img_t img_reply { xcb_shm_get_image_reply(xcb.get(), img_cookie, nullptr) };
+      if(!img_reply) {
+        BOOST_LOG(error) << "Could not get image reply"sv;
+        return capture_e::reinit;
+      }
+
+      std::copy_n((std::uint8_t *)data.data, frame_size(), img->data);
+
+      if(cursor) {
+        blend_cursor(shm_xdisplay.get(), *img, offset_x, offset_y);
+      }
+
+      return capture_e::ok;
+    }
+  }
+
+  std::shared_ptr<img_t> alloc_img() override {
+    auto img         = std::make_shared<shm_img_t>();
+    img->width       = width;
+    img->height      = height;
+    img->pixel_pitch = 4;
+    img->row_pitch   = img->pixel_pitch * width;
+    img->data        = new std::uint8_t[height * img->row_pitch];
+
+    return img;
+  }
+
+  int dummy_img(platf::img_t *img) override {
+    return 0;
+  }
+
+  int init() {
+    if(x11_attr_t::init()) {
+      return 1;
+    }
+
+    shm_xdisplay.reset(XOpenDisplay(nullptr));
+    xcb.reset(xcb_connect(nullptr, nullptr));
+    if(xcb_connection_has_error(xcb.get())) {
+      return -1;
+    }
+
+    if(!xcb_get_extension_data(xcb.get(), &xcb_shm_id)->present) {
+      BOOST_LOG(error) << "Missing SHM extension"sv;
+
+      return -1;
+    }
+
+    auto iter = xcb_setup_roots_iterator(xcb_get_setup(xcb.get()));
+    display   = iter.data;
+    seg       = xcb_generate_id(xcb.get());
+
+    shm_id.id = shmget(IPC_PRIVATE, frame_size(), IPC_CREAT | 0777);
+    if(shm_id.id == -1) {
+      BOOST_LOG(error) << "shmget failed"sv;
+      return -1;
+    }
+
+    xcb_shm_attach(xcb.get(), seg, shm_id.id, false);
+    data.data = shmat(shm_id.id, nullptr, 0);
+
+    if((uintptr_t)data.data == -1) {
+      BOOST_LOG(error) << "shmat failed"sv;
+
+      return -1;
+    }
+
+    return 0;
+  }
+
+  std::uint32_t frame_size() {
+    return width * height * 4;
+  }
+};
+
+std::shared_ptr<display_t> display(platf::dev_type_e hwdevice_type) {
+  if(hwdevice_type != platf::dev_type_e::none) {
+    BOOST_LOG(error) << "Could not initialize display with the given hw device type."sv;
+    return nullptr;
+  }
+
+  // Attempt to use shared memory X11 to avoid copying the frame
+  auto shm_disp = std::make_shared<shm_attr_t>();
+
+  auto status = shm_disp->init();
+  if(status > 0) {
+    // x11_attr_t::init() failed, don't bother trying again.
+    return nullptr;
+  }
+
+  if(status == 0) {
+    return shm_disp;
+  }
+
+  // Fallback
+  auto x11_disp = std::make_shared<x11_attr_t>();
+  if(x11_disp->init()) {
+    return nullptr;
+  }
+
+  return x11_disp;
+}
+
+ifaddr_t get_ifaddrs() {
+  ifaddrs *p { nullptr };
+
+  getifaddrs(&p);
+
+  return ifaddr_t { p };
+}
+
+std::string from_sockaddr(const sockaddr *const ip_addr) {
+  char data[INET6_ADDRSTRLEN];
+
+  auto family = ip_addr->sa_family;
+  if(family == AF_INET6) {
+    inet_ntop(AF_INET6, &((sockaddr_in6 *)ip_addr)->sin6_addr, data,
+      INET6_ADDRSTRLEN);
+  }
+
+  if(family == AF_INET) {
+    inet_ntop(AF_INET, &((sockaddr_in *)ip_addr)->sin_addr, data,
+      INET_ADDRSTRLEN);
+  }
+
+  return std::string { data };
+}
+
+std::pair<std::uint16_t, std::string> from_sockaddr_ex(const sockaddr *const ip_addr) {
+  char data[INET6_ADDRSTRLEN];
+
+  auto family = ip_addr->sa_family;
+  std::uint16_t port;
+  if(family == AF_INET6) {
+    inet_ntop(AF_INET6, &((sockaddr_in6 *)ip_addr)->sin6_addr, data,
+      INET6_ADDRSTRLEN);
+    port = ((sockaddr_in6 *)ip_addr)->sin6_port;
+  }
+
+  if(family == AF_INET) {
+    inet_ntop(AF_INET, &((sockaddr_in *)ip_addr)->sin_addr, data,
+      INET_ADDRSTRLEN);
+    port = ((sockaddr_in *)ip_addr)->sin_port;
+  }
+
+  return { port, std::string { data } };
+}
+
+std::string get_mac_address(const std::string_view &address) {
+  auto ifaddrs = get_ifaddrs();
+  for(auto pos = ifaddrs.get(); pos != nullptr; pos = pos->ifa_next) {
+    if(pos->ifa_addr && address == from_sockaddr(pos->ifa_addr)) {
+      std::ifstream mac_file("/sys/class/net/"s + pos->ifa_name + "/address");
+      if(mac_file.good()) {
+        std::string mac_address;
+        std::getline(mac_file, mac_address);
+        return mac_address;
+      }
+    }
+  }
+
+  BOOST_LOG(warning) << "Unable to find MAC address for "sv << address;
+  return "00:00:00:00:00:00"s;
+}
+
+void freeImage(XImage *p) {
+  XDestroyImage(p);
+}
+void freeX(XFixesCursorImage *p) {
+  XFree(p);
+}
+} // namespace platf

sunshine/platform/linux/input.cpp

@@ -1,16 +1,17 @@
-#include <libevdev/libevdev.h>
 #include <libevdev/libevdev-uinput.h>
+#include <libevdev/libevdev.h>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XTest.h>
 
+#include <cmath>
 #include <cstring>
 #include <filesystem>
 
-#include "common.h"
 #include "sunshine/main.h"
+#include "sunshine/platform/common.h"
 #include "sunshine/utility.h"
 
 // Support older versions
@@ -24,13 +25,27 @@
 
 namespace platf {
 using namespace std::literals;
-using evdev_t = util::safe_ptr<libevdev, libevdev_free>;
+using evdev_t  = util::safe_ptr<libevdev, libevdev_free>;
 using uinput_t = util::safe_ptr<libevdev_uinput, libevdev_uinput_destroy>;
 
 using keyboard_t = util::safe_ptr_v2<Display, int, XCloseDisplay>;
 
+constexpr touch_port_t target_touch_port {
+  0, 0,
+  19200, 12000
+};
+
 struct input_raw_t {
 public:
+  void clear_touchscreen() {
+    std::filesystem::path touch_path { "sunshine_touchscreen"sv };
+
+    if(std::filesystem::is_symlink(touch_path)) {
+      std::filesystem::remove(touch_path);
+    }
+
+    touch_input.reset();
+  }
   void clear_mouse() {
     std::filesystem::path mouse_path { "sunshine_mouse"sv };
 
@@ -51,13 +66,11 @@ public:
       std::filesystem::remove(gamepad_path);
     }
 
-    gamepads[nr] = std::make_pair(uinput_t{}, gamepad_state_t {});
+    gamepads[nr] = std::make_pair(uinput_t {}, gamepad_state_t {});
   }
 
   int create_mouse() {
-    libevdev_uinput *buf;
-    int err = libevdev_uinput_create_from_device(mouse_dev.get(), LIBEVDEV_UINPUT_OPEN_MANAGED, &buf);
-    mouse_input.reset(buf);
+    int err = libevdev_uinput_create_from_device(mouse_dev.get(), LIBEVDEV_UINPUT_OPEN_MANAGED, &mouse_input);
 
     if(err) {
       BOOST_LOG(error) << "Could not create Sunshine Mouse: "sv << strerror(-err);
@@ -69,13 +82,24 @@ public:
     return 0;
   }
 
+  int create_touchscreen() {
+    int err = libevdev_uinput_create_from_device(touch_dev.get(), LIBEVDEV_UINPUT_OPEN_MANAGED, &touch_input);
+
+    if(err) {
+      BOOST_LOG(error) << "Could not create Sunshine Touchscreen: "sv << strerror(-err);
+      return -1;
+    }
+
+    std::filesystem::create_symlink(libevdev_uinput_get_devnode(touch_input.get()), "sunshine_touchscreen"sv);
+
+    return 0;
+  }
+
   int alloc_gamepad(int nr) {
     TUPLE_2D_REF(input, gamepad_state, gamepads[nr]);
 
-    libevdev_uinput *buf;
-    int err = libevdev_uinput_create_from_device(gamepad_dev.get(), LIBEVDEV_UINPUT_OPEN_MANAGED, &buf);
+    int err = libevdev_uinput_create_from_device(gamepad_dev.get(), LIBEVDEV_UINPUT_OPEN_MANAGED, &input);
 
-    input.reset(buf);
     gamepad_state = gamepad_state_t {};
 
     if(err) {
@@ -96,6 +120,7 @@ public:
   }
 
   void clear() {
+    clear_touchscreen();
     clear_mouse();
     for(int x = 0; x < gamepads.size(); ++x) {
       clear_gamepad(x);
@@ -106,18 +131,33 @@ public:
     clear();
   }
 
-  evdev_t gamepad_dev;
-
   std::vector<std::pair<uinput_t, gamepad_state_t>> gamepads;
-
-  evdev_t mouse_dev;
   uinput_t mouse_input;
+  uinput_t touch_input;
+
+  evdev_t gamepad_dev;
+  evdev_t touch_dev;
+  evdev_t mouse_dev;
 
   keyboard_t keyboard;
 };
 
+void abs_mouse(input_t &input, const touch_port_t &touch_port, float x, float y) {
+  auto touchscreen = ((input_raw_t *)input.get())->touch_input.get();
+
+  auto scaled_x = (int)std::lround((x + touch_port.offset_x) * ((float)target_touch_port.width / (float)touch_port.width));
+  auto scaled_y = (int)std::lround((y + touch_port.offset_y) * ((float)target_touch_port.height / (float)touch_port.height));
+
+  libevdev_uinput_write_event(touchscreen, EV_ABS, ABS_X, scaled_x);
+  libevdev_uinput_write_event(touchscreen, EV_ABS, ABS_Y, scaled_y);
+  libevdev_uinput_write_event(touchscreen, EV_KEY, BTN_TOOL_FINGER, 1);
+  libevdev_uinput_write_event(touchscreen, EV_KEY, BTN_TOOL_FINGER, 0);
+
+  libevdev_uinput_write_event(touchscreen, EV_SYN, SYN_REPORT, 0);
+}
+
 void move_mouse(input_t &input, int deltaX, int deltaY) {
-  auto mouse = ((input_raw_t*)input.get())->mouse_input.get();
+  auto mouse = ((input_raw_t *)input.get())->mouse_input.get();
 
   if(deltaX) {
     libevdev_uinput_write_event(mouse, EV_REL, REL_X, deltaX);
@@ -136,26 +176,26 @@ void button_mouse(input_t &input, int button, bool release) {
 
   if(button == 1) {
     btn_type = BTN_LEFT;
-    scan = 90001;
+    scan     = 90001;
   }
   else if(button == 2) {
     btn_type = BTN_MIDDLE;
-    scan = 90003;
+    scan     = 90003;
   }
   else if(button == 3) {
     btn_type = BTN_RIGHT;
-    scan = 90002;
+    scan     = 90002;
   }
   else if(button == 4) {
     btn_type = BTN_SIDE;
-    scan = 90004;
+    scan     = 90004;
   }
   else {
     btn_type = BTN_EXTRA;
-    scan = 90005;
+    scan     = 90005;
   }
 
-  auto mouse = ((input_raw_t*)input.get())->mouse_input.get();
+  auto mouse = ((input_raw_t *)input.get())->mouse_input.get();
   libevdev_uinput_write_event(mouse, EV_MSC, MSC_SCAN, scan);
   libevdev_uinput_write_event(mouse, EV_KEY, btn_type, release ? 0 : 1);
   libevdev_uinput_write_event(mouse, EV_SYN, SYN_REPORT, 0);
@@ -164,7 +204,7 @@ void button_mouse(input_t &input, int button, bool release) {
 void scroll(input_t &input, int high_res_distance) {
   int distance = high_res_distance / 120;
 
-  auto mouse = ((input_raw_t*)input.get())->mouse_input.get();
+  auto mouse = ((input_raw_t *)input.get())->mouse_input.get();
   libevdev_uinput_write_event(mouse, EV_REL, REL_WHEEL, distance);
   libevdev_uinput_write_event(mouse, EV_REL, REL_WHEEL_HI_RES, high_res_distance);
   libevdev_uinput_write_event(mouse, EV_SYN, SYN_REPORT, 0);
@@ -172,7 +212,7 @@ void scroll(input_t &input, int high_res_distance) {
 
 uint16_t keysym(uint16_t modcode) {
   constexpr auto VK_NUMPAD = 0x60;
-  constexpr auto VK_F1 = 0x70;
+  constexpr auto VK_F1     = 0x70;
 
   if(modcode >= VK_NUMPAD && modcode < VK_NUMPAD + 10) {
     return XK_KP_0 + (modcode - VK_NUMPAD);
@@ -184,108 +224,108 @@ uint16_t keysym(uint16_t modcode) {
 
 
   switch(modcode) {
-    case 0x08:
-      return XK_BackSpace;
-    case 0x09:
-      return XK_Tab;
-    case 0x0D:
-      return XK_Return;
-    case 0x13:
-      return XK_Pause;
-    case 0x14:
-      return XK_Caps_Lock;
-    case 0x1B:
-      return XK_Escape;
-    case 0x21:
-      return XK_Page_Up;
-    case 0x22:
-      return XK_Page_Down;
-    case 0x23:
-      return XK_End;
-    case 0x24:
-      return XK_Home;
-    case 0x25:
-      return XK_Left;
-    case 0x26:
-      return XK_Up;
-    case 0x27:
-      return XK_Right;
-    case 0x28:
-      return XK_Down;
-    case 0x29:
-      return XK_Select;
-    case 0x2B:
-      return XK_Execute;
-    case 0x2C:
-      return XK_Print;
-    case 0x2D:
-      return XK_Insert;
-    case 0x2E:
-      return XK_Delete;
-    case 0x2F:
-      return XK_Help;
-    case 0x6A:
-      return XK_KP_Multiply;
-    case 0x6B:
-      return XK_KP_Add;
-    case 0x6C:
-      return XK_KP_Separator;
-    case 0x6D:
-      return XK_KP_Subtract;
-    case 0x6E:
-      return XK_KP_Decimal;
-    case 0x6F:
-      return XK_KP_Divide;
-    case 0x90:
-      return XK_Num_Lock;
-    case 0x91:
-      return XK_Scroll_Lock;
-    case 0xA0:
-      return XK_Shift_L;
-    case 0xA1:
-      return XK_Shift_R;
-    case 0xA2:
-      return XK_Control_L;
-    case 0xA3:
-      return XK_Control_R;
-    case 0xA4:
-      return XK_Alt_L;
-    case 0xA5: /* return XK_Alt_R; */
-      return XK_Super_L;
-    case 0x5B:
-      return XK_Super_L;
-    case 0x5C:
-      return XK_Super_R;
-    case 0xBA:
-      return XK_semicolon;
-    case 0xBB:
-      return XK_equal;
-    case 0xBC:
-      return XK_comma;
-    case 0xBD:
-      return XK_minus;
-    case 0xBE:
-      return XK_period;
-    case 0xBF:
-      return XK_slash;
-    case 0xC0:
-      return XK_grave;
-    case 0xDB:
-      return XK_bracketleft;
-    case 0xDC:
-      return XK_backslash;
-    case 0xDD:
-      return XK_bracketright;
-    case 0xDE:
-      return XK_apostrophe;
+  case 0x08:
+    return XK_BackSpace;
+  case 0x09:
+    return XK_Tab;
+  case 0x0D:
+    return XK_Return;
+  case 0x13:
+    return XK_Pause;
+  case 0x14:
+    return XK_Caps_Lock;
+  case 0x1B:
+    return XK_Escape;
+  case 0x21:
+    return XK_Page_Up;
+  case 0x22:
+    return XK_Page_Down;
+  case 0x23:
+    return XK_End;
+  case 0x24:
+    return XK_Home;
+  case 0x25:
+    return XK_Left;
+  case 0x26:
+    return XK_Up;
+  case 0x27:
+    return XK_Right;
+  case 0x28:
+    return XK_Down;
+  case 0x29:
+    return XK_Select;
+  case 0x2B:
+    return XK_Execute;
+  case 0x2C:
+    return XK_Print;
+  case 0x2D:
+    return XK_Insert;
+  case 0x2E:
+    return XK_Delete;
+  case 0x2F:
+    return XK_Help;
+  case 0x6A:
+    return XK_KP_Multiply;
+  case 0x6B:
+    return XK_KP_Add;
+  case 0x6C:
+    return XK_KP_Separator;
+  case 0x6D:
+    return XK_KP_Subtract;
+  case 0x6E:
+    return XK_KP_Decimal;
+  case 0x6F:
+    return XK_KP_Divide;
+  case 0x90:
+    return XK_Num_Lock;
+  case 0x91:
+    return XK_Scroll_Lock;
+  case 0xA0:
+    return XK_Shift_L;
+  case 0xA1:
+    return XK_Shift_R;
+  case 0xA2:
+    return XK_Control_L;
+  case 0xA3:
+    return XK_Control_R;
+  case 0xA4:
+    return XK_Alt_L;
+  case 0xA5: /* return XK_Alt_R; */
+    return XK_Super_L;
+  case 0x5B:
+    return XK_Super_L;
+  case 0x5C:
+    return XK_Super_R;
+  case 0xBA:
+    return XK_semicolon;
+  case 0xBB:
+    return XK_equal;
+  case 0xBC:
+    return XK_comma;
+  case 0xBD:
+    return XK_minus;
+  case 0xBE:
+    return XK_period;
+  case 0xBF:
+    return XK_slash;
+  case 0xC0:
+    return XK_grave;
+  case 0xDB:
+    return XK_bracketleft;
+  case 0xDC:
+    return XK_backslash;
+  case 0xDD:
+    return XK_bracketright;
+  case 0xDE:
+    return XK_apostrophe;
   }
 
   return modcode;
 }
 
 void keyboard(input_t &input, uint16_t modcode, bool release) {
-  auto &keyboard = ((input_raw_t*)input.get())->keyboard;
-  KeyCode kc = XKeysymToKeycode(keyboard.get(), keysym(modcode));
+  auto &keyboard = ((input_raw_t *)input.get())->keyboard;
+  KeyCode kc     = XKeysymToKeycode(keyboard.get(), keysym(modcode));
 
   if(!kc) {
     return;
@@ -298,18 +338,18 @@ void keyboard(input_t &input, uint16_t modcode, bool release) {
 }
 
 int alloc_gamepad(input_t &input, int nr) {
-  return ((input_raw_t*)input.get())->alloc_gamepad(nr);
+  return ((input_raw_t *)input.get())->alloc_gamepad(nr);
 }
 
 void free_gamepad(input_t &input, int nr) {
-  ((input_raw_t*)input.get())->clear_gamepad(nr);
+  ((input_raw_t *)input.get())->clear_gamepad(nr);
 }
 
 void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
-  TUPLE_2D_REF(uinput, gamepad_state_old, ((input_raw_t*)input.get())->gamepads[nr]);
+  TUPLE_2D_REF(uinput, gamepad_state_old, ((input_raw_t *)input.get())->gamepads[nr]);
 
 
-  auto bf = gamepad_state.buttonFlags ^ gamepad_state_old.buttonFlags;
+  auto bf     = gamepad_state.buttonFlags ^ gamepad_state_old.buttonFlags;
   auto bf_new = gamepad_state.buttonFlags;
 
   if(bf) {
@@ -326,17 +366,17 @@ void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
       libevdev_uinput_write_event(uinput.get(), EV_ABS, ABS_HAT0X, button_state);
     }
 
-    if(START & bf)        libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_START,  bf_new & START        ? 1 : 0);
-    if(BACK & bf)         libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_SELECT, bf_new & BACK         ? 1 : 0);
-    if(LEFT_STICK & bf)   libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_THUMBL, bf_new & LEFT_STICK   ? 1 : 0);
-    if(RIGHT_STICK & bf)  libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_THUMBR, bf_new & RIGHT_STICK  ? 1 : 0);
-    if(LEFT_BUTTON & bf)  libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_TL,     bf_new & LEFT_BUTTON  ? 1 : 0);
-    if(RIGHT_BUTTON & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_TR,     bf_new & RIGHT_BUTTON ? 1 : 0);
-    if(HOME & bf)         libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_MODE,   bf_new & HOME         ? 1 : 0);
-    if(A & bf)            libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_SOUTH,  bf_new & A            ? 1 : 0);
-    if(B & bf)            libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_EAST,   bf_new & B            ? 1 : 0);
-    if(X & bf)            libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_NORTH,  bf_new & X            ? 1 : 0);
-    if(Y & bf)            libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_WEST,   bf_new & Y            ? 1 : 0);
+    if(START & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_START, bf_new & START ? 1 : 0);
+    if(BACK & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_SELECT, bf_new & BACK ? 1 : 0);
+    if(LEFT_STICK & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_THUMBL, bf_new & LEFT_STICK ? 1 : 0);
+    if(RIGHT_STICK & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_THUMBR, bf_new & RIGHT_STICK ? 1 : 0);
+    if(LEFT_BUTTON & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_TL, bf_new & LEFT_BUTTON ? 1 : 0);
+    if(RIGHT_BUTTON & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_TR, bf_new & RIGHT_BUTTON ? 1 : 0);
+    if(HOME & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_MODE, bf_new & HOME ? 1 : 0);
+    if(A & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_SOUTH, bf_new & A ? 1 : 0);
+    if(B & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_EAST, bf_new & B ? 1 : 0);
+    if(X & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_NORTH, bf_new & X ? 1 : 0);
+    if(Y & bf) libevdev_uinput_write_event(uinput.get(), EV_KEY, BTN_WEST, bf_new & Y ? 1 : 0);
   }
 
   if(gamepad_state_old.lt != gamepad_state.lt) {
@@ -368,7 +408,7 @@ void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
 }
 
 evdev_t mouse() {
-  evdev_t dev  { libevdev_new() };
+  evdev_t dev { libevdev_new() };
 
   libevdev_set_uniq(dev.get(), "Sunshine Mouse");
   libevdev_set_id_product(dev.get(), 0x4038);
@@ -409,6 +449,48 @@ evdev_t mouse() {
   return dev;
 }
 
+evdev_t touchscreen() {
+  evdev_t dev { libevdev_new() };
+
+  libevdev_set_uniq(dev.get(), "Sunshine Touch");
+  libevdev_set_id_product(dev.get(), 0xDEAD);
+  libevdev_set_id_vendor(dev.get(), 0xBEEF);
+  libevdev_set_id_bustype(dev.get(), 0x3);
+  libevdev_set_id_version(dev.get(), 0x111);
+  libevdev_set_name(dev.get(), "Touchscreen passthrough");
+
+  libevdev_enable_property(dev.get(), INPUT_PROP_DIRECT);
+
+
+  libevdev_enable_event_type(dev.get(), EV_KEY);
+  libevdev_enable_event_code(dev.get(), EV_KEY, BTN_TOUCH, nullptr);
+  libevdev_enable_event_code(dev.get(), EV_KEY, BTN_TOOL_PEN, nullptr); // Needed to be enabled for BTN_TOOL_FINGER to work.
+  libevdev_enable_event_code(dev.get(), EV_KEY, BTN_TOOL_FINGER, nullptr);
+
+  input_absinfo absx {
+    0,
+    0,
+    target_touch_port.width,
+    1,
+    0,
+    28
+  };
+
+  input_absinfo absy {
+    0,
+    0,
+    target_touch_port.height,
+    1,
+    0,
+    28
+  };
+  libevdev_enable_event_type(dev.get(), EV_ABS);
+  libevdev_enable_event_code(dev.get(), EV_ABS, ABS_X, &absx);
+  libevdev_enable_event_code(dev.get(), EV_ABS, ABS_Y, &absy);
+
+  return dev;
+}
+
 evdev_t x360() {
   evdev_t dev { libevdev_new() };
 
@@ -471,7 +553,7 @@ evdev_t x360() {
 
 input_t input() {
   input_t result { new input_raw_t() };
-  auto &gp = *(input_raw_t*)result.get();
+  auto &gp = *(input_raw_t *)result.get();
 
   gp.keyboard.reset(XOpenDisplay(nullptr));
 
@@ -486,10 +568,11 @@ input_t input() {
 
   // Ensure starting from clean slate
   gp.clear();
-  gp.mouse_dev = mouse();
+  gp.touch_dev   = touchscreen();
+  gp.mouse_dev   = mouse();
   gp.gamepad_dev = x360();
 
-  if(gp.create_mouse()) {
+  if(gp.create_mouse() || gp.create_touchscreen()) {
     log_flush();
     std::abort();
   }
@@ -498,9 +581,7 @@ input_t input() {
 }
 
 void freeInput(void *p) {
-  auto *input = (input_raw_t*)p;
+  auto *input = (input_raw_t *)p;
   delete input;
 }
-
-std::unique_ptr<deinit_t> init() { return nullptr; }
-}
+} // namespace platf

sunshine/platform/windows/PolicyConfig.h

@@ -0,0 +1,164 @@
+// ----------------------------------------------------------------------------
+// PolicyConfig.h
+// Undocumented COM-interface IPolicyConfig.
+// Use for set default audio render endpoint
+// @author EreTIk
+// http://eretik.omegahg.com/
+// ----------------------------------------------------------------------------
+
+
+#pragma once
+
+#ifdef __MINGW32__
+#undef DEFINE_GUID
+#ifdef __cplusplus
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) EXTERN_C const GUID DECLSPEC_SELECTANY name = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
+#else
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) const GUID DECLSPEC_SELECTANY name = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
+#endif
+
+DEFINE_GUID(IID_IPolicyConfig, 0xf8679f50, 0x850a, 0x41cf, 0x9c, 0x72, 0x43, 0x0f, 0x29, 0x02, 0x90, 0xc8);
+DEFINE_GUID(CLSID_CPolicyConfigClient, 0x870af99c, 0x171d, 0x4f9e, 0xaf, 0x0d, 0xe6, 0x3d, 0xf4, 0x0c, 0x2b, 0xc9);
+
+#endif
+
+interface DECLSPEC_UUID("f8679f50-850a-41cf-9c72-430f290290c8") IPolicyConfig;
+class DECLSPEC_UUID("870af99c-171d-4f9e-af0d-e63df40c2bc9") CPolicyConfigClient;
+// ----------------------------------------------------------------------------
+// class CPolicyConfigClient
+// {870af99c-171d-4f9e-af0d-e63df40c2bc9}
+//
+// interface IPolicyConfig
+// {f8679f50-850a-41cf-9c72-430f290290c8}
+//
+// Query interface:
+// CComPtr<IPolicyConfig> PolicyConfig;
+// PolicyConfig.CoCreateInstance(__uuidof(CPolicyConfigClient));
+//
+// @compatible: Windows 7 and Later
+// ----------------------------------------------------------------------------
+interface IPolicyConfig : public IUnknown {
+public:
+  virtual HRESULT GetMixFormat(
+    PCWSTR,
+    WAVEFORMATEX **);
+
+  virtual HRESULT STDMETHODCALLTYPE GetDeviceFormat(
+    PCWSTR,
+    INT,
+    WAVEFORMATEX **);
+
+  virtual HRESULT STDMETHODCALLTYPE ResetDeviceFormat(
+    PCWSTR);
+
+  virtual HRESULT STDMETHODCALLTYPE SetDeviceFormat(
+    PCWSTR,
+    WAVEFORMATEX *,
+    WAVEFORMATEX *);
+
+  virtual HRESULT STDMETHODCALLTYPE GetProcessingPeriod(
+    PCWSTR,
+    INT,
+    PINT64,
+    PINT64);
+
+  virtual HRESULT STDMETHODCALLTYPE SetProcessingPeriod(
+    PCWSTR,
+    PINT64);
+
+  virtual HRESULT STDMETHODCALLTYPE GetShareMode(
+    PCWSTR,
+    struct DeviceShareMode *);
+
+  virtual HRESULT STDMETHODCALLTYPE SetShareMode(
+    PCWSTR,
+    struct DeviceShareMode *);
+
+  virtual HRESULT STDMETHODCALLTYPE GetPropertyValue(
+    PCWSTR,
+    const PROPERTYKEY &,
+    PROPVARIANT *);
+
+  virtual HRESULT STDMETHODCALLTYPE SetPropertyValue(
+    PCWSTR,
+    const PROPERTYKEY &,
+    PROPVARIANT *);
+
+  virtual HRESULT STDMETHODCALLTYPE SetDefaultEndpoint(
+    PCWSTR wszDeviceId,
+    ERole eRole);
+
+  virtual HRESULT STDMETHODCALLTYPE SetEndpointVisibility(
+    PCWSTR,
+    INT);
+};
+
+interface DECLSPEC_UUID("568b9108-44bf-40b4-9006-86afe5b5a620") IPolicyConfigVista;
+class DECLSPEC_UUID("294935CE-F637-4E7C-A41B-AB255460B862") CPolicyConfigVistaClient;
+// ----------------------------------------------------------------------------
+// class CPolicyConfigVistaClient
+// {294935CE-F637-4E7C-A41B-AB255460B862}
+//
+// interface IPolicyConfigVista
+// {568b9108-44bf-40b4-9006-86afe5b5a620}
+//
+// Query interface:
+// CComPtr<IPolicyConfigVista> PolicyConfig;
+// PolicyConfig.CoCreateInstance(__uuidof(CPolicyConfigVistaClient));
+//
+// @compatible: Windows Vista and Later
+// ----------------------------------------------------------------------------
+interface IPolicyConfigVista : public IUnknown {
+public:
+  virtual HRESULT GetMixFormat(
+    PCWSTR,
+    WAVEFORMATEX **); // not available on Windows 7, use method from IPolicyConfig
+
+  virtual HRESULT STDMETHODCALLTYPE GetDeviceFormat(
+    PCWSTR,
+    INT,
+    WAVEFORMATEX **);
+
+  virtual HRESULT STDMETHODCALLTYPE SetDeviceFormat(
+    PCWSTR,
+    WAVEFORMATEX *,
+    WAVEFORMATEX *);
+
+  virtual HRESULT STDMETHODCALLTYPE GetProcessingPeriod(
+    PCWSTR,
+    INT,
+    PINT64,
+    PINT64); // not available on Windows 7, use method from IPolicyConfig
+
+  virtual HRESULT STDMETHODCALLTYPE SetProcessingPeriod(
+    PCWSTR,
+    PINT64); // not available on Windows 7, use method from IPolicyConfig
+
+  virtual HRESULT STDMETHODCALLTYPE GetShareMode(
+    PCWSTR,
+    struct DeviceShareMode *); // not available on Windows 7, use method from IPolicyConfig
+
+  virtual HRESULT STDMETHODCALLTYPE SetShareMode(
+    PCWSTR,
+    struct DeviceShareMode *); // not available on Windows 7, use method from IPolicyConfig
+
+  virtual HRESULT STDMETHODCALLTYPE GetPropertyValue(
+    PCWSTR,
+    const PROPERTYKEY &,
+    PROPVARIANT *);
+
+  virtual HRESULT STDMETHODCALLTYPE SetPropertyValue(
+    PCWSTR,
+    const PROPERTYKEY &,
+    PROPVARIANT *);
+
+  virtual HRESULT STDMETHODCALLTYPE SetDefaultEndpoint(
+    PCWSTR wszDeviceId,
+    ERole eRole);
+
+  virtual HRESULT STDMETHODCALLTYPE SetEndpointVisibility(
+    PCWSTR,
+    INT); // not available on Windows 7, use method from IPolicyConfig
+};
+
+// ----------------------------------------------------------------------------

sunshine/platform/windows/audio.cpp

@@ -0,0 +1,988 @@
+//
+// Created by loki on 1/12/20.
+//
+
+#include <audioclient.h>
+#include <mmdeviceapi.h>
+#include <roapi.h>
+
+#include <codecvt>
+
+#include <synchapi.h>
+
+#define INITGUID
+#include <propkeydef.h>
+#undef INITGUID
+
+#include "sunshine/config.h"
+#include "sunshine/main.h"
+#include "sunshine/platform/common.h"
+
+// Must be the last included file
+// clang-format off
+#include "PolicyConfig.h"
+// clang-format on
+
+DEFINE_PROPERTYKEY(PKEY_Device_DeviceDesc, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 2);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_DeviceInterface_FriendlyName, 0x026e516e, 0xb814, 0x414b, 0x83, 0xcd, 0x85, 0x6d, 0x6f, 0xef, 0x48, 0x22, 2);
+
+const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
+const IID IID_IMMDeviceEnumerator    = __uuidof(IMMDeviceEnumerator);
+const IID IID_IAudioClient           = __uuidof(IAudioClient);
+const IID IID_IAudioCaptureClient    = __uuidof(IAudioCaptureClient);
+
+using namespace std::literals;
+namespace platf::audio {
+constexpr auto SAMPLE_RATE = 48000;
+
+template<class T>
+void Release(T *p) {
+  p->Release();
+}
+
+template<class T>
+void co_task_free(T *p) {
+  CoTaskMemFree((LPVOID)p);
+}
+
+using device_enum_t   = util::safe_ptr<IMMDeviceEnumerator, Release<IMMDeviceEnumerator>>;
+using device_t        = util::safe_ptr<IMMDevice, Release<IMMDevice>>;
+using collection_t    = util::safe_ptr<IMMDeviceCollection, Release<IMMDeviceCollection>>;
+using audio_client_t  = util::safe_ptr<IAudioClient, Release<IAudioClient>>;
+using audio_capture_t = util::safe_ptr<IAudioCaptureClient, Release<IAudioCaptureClient>>;
+using wave_format_t   = util::safe_ptr<WAVEFORMATEX, co_task_free<WAVEFORMATEX>>;
+using wstring_t       = util::safe_ptr<WCHAR, co_task_free<WCHAR>>;
+using handle_t        = util::safe_ptr_v2<void, BOOL, CloseHandle>;
+using policy_t        = util::safe_ptr<IPolicyConfig, Release<IPolicyConfig>>;
+using prop_t          = util::safe_ptr<IPropertyStore, Release<IPropertyStore>>;
+
+class co_init_t : public deinit_t {
+public:
+  co_init_t() {
+    CoInitializeEx(nullptr, COINIT_MULTITHREADED | COINIT_SPEED_OVER_MEMORY);
+  }
+
+  ~co_init_t() override {
+    CoUninitialize();
+  }
+};
+
+class prop_var_t {
+public:
+  prop_var_t() {
+    PropVariantInit(&prop);
+  }
+
+  ~prop_var_t() {
+    PropVariantClear(&prop);
+  }
+
+  PROPVARIANT prop;
+};
+
+class audio_pipe_t {
+public:
+  static constexpr auto stereo     = 2;
+  static constexpr auto channels51 = 6;
+  static constexpr auto channels71 = 8;
+
+  using samples_t = std::vector<std::int16_t>;
+  using buf_t     = util::buffer_t<std::int16_t>;
+
+  virtual void to_stereo(samples_t &out, const buf_t &in) = 0;
+  virtual void to_51(samples_t &out, const buf_t &in)     = 0;
+  virtual void to_71(samples_t &out, const buf_t &in)     = 0;
+};
+
+class mono_t : public audio_pipe_t {
+public:
+  void to_stereo(samples_t &out, const buf_t &in) override {
+    auto sample_in_pos = std::begin(in);
+    auto sample_end    = std::begin(out) + out.size();
+
+    for(auto sample_out_p = std::begin(out); sample_out_p != sample_end;) {
+      *sample_out_p++ = *sample_in_pos * 7 / 10;
+      *sample_out_p++ = *sample_in_pos++ * 7 / 10;
+    }
+  }
+
+  void to_51(samples_t &out, const buf_t &in) override {
+    using namespace speaker;
+
+    auto sample_in_pos = std::begin(in);
+    auto sample_end    = std::begin(out) + out.size();
+
+    for(auto sample_out_p = std::begin(out); sample_out_p != sample_end; sample_out_p += channels51) {
+      int left = *sample_in_pos++;
+
+      auto fl = (left * 7 / 10);
+
+      sample_out_p[FRONT_LEFT]    = fl;
+      sample_out_p[FRONT_RIGHT]   = fl;
+      sample_out_p[FRONT_CENTER]  = fl * 6;
+      sample_out_p[LOW_FREQUENCY] = fl / 10;
+      sample_out_p[BACK_LEFT]     = left * 4 / 10;
+      sample_out_p[BACK_RIGHT]    = left * 4 / 10;
+    }
+  }
+
+  void to_71(samples_t &out, const buf_t &in) override {
+    using namespace speaker;
+
+    auto sample_in_pos = std::begin(in);
+    auto sample_end    = std::begin(out) + out.size();
+
+    for(auto sample_out_p = std::begin(out); sample_out_p != sample_end; sample_out_p += channels71) {
+      int left = *sample_in_pos++;
+
+      auto fl = (left * 7 / 10);
+
+      sample_out_p[FRONT_LEFT]    = fl;
+      sample_out_p[FRONT_RIGHT]   = fl;
+      sample_out_p[FRONT_CENTER]  = fl * 6;
+      sample_out_p[LOW_FREQUENCY] = fl / 10;
+      sample_out_p[BACK_LEFT]     = left * 4 / 10;
+      sample_out_p[BACK_RIGHT]    = left * 4 / 10;
+      sample_out_p[SIDE_LEFT]     = left * 5 / 10;
+      sample_out_p[SIDE_RIGHT]    = left * 5 / 10;
+    }
+  }
+};
+
+class stereo_t : public audio_pipe_t {
+public:
+  void to_stereo(samples_t &out, const buf_t &in) override {
+    std::copy_n(std::begin(in), out.size(), std::begin(out));
+  }
+
+  void to_51(samples_t &out, const buf_t &in) override {
+    using namespace speaker;
+
+    auto sample_in_pos = std::begin(in);
+    auto sample_end    = std::begin(out) + out.size();
+
+    for(auto sample_out_p = std::begin(out); sample_out_p != sample_end; sample_out_p += channels51) {
+      int left  = sample_in_pos[speaker::FRONT_LEFT];
+      int right = sample_in_pos[speaker::FRONT_RIGHT];
+
+      sample_in_pos += 2;
+
+      auto fl = (left * 7 / 10);
+      auto fr = (right * 7 / 10);
+
+      auto mix = (fl + fr) / 2;
+
+      sample_out_p[FRONT_LEFT]    = fl;
+      sample_out_p[FRONT_RIGHT]   = fr;
+      sample_out_p[FRONT_CENTER]  = mix;
+      sample_out_p[LOW_FREQUENCY] = mix / 2;
+      sample_out_p[BACK_LEFT]     = left * 4 / 10;
+      sample_out_p[BACK_RIGHT]    = right * 4 / 10;
+    }
+  }
+
+  void to_71(samples_t &out, const buf_t &in) override {
+    using namespace speaker;
+
+    auto sample_in_pos = std::begin(in);
+    auto sample_end    = std::begin(out) + out.size();
+
+    for(auto sample_out_p = std::begin(out); sample_out_p != sample_end; sample_out_p += channels71) {
+      int left  = sample_in_pos[speaker::FRONT_LEFT];
+      int right = sample_in_pos[speaker::FRONT_RIGHT];
+
+      sample_in_pos += 2;
+
+      auto fl = (left * 7 / 10);
+      auto fr = (right * 7 / 10);
+
+      auto mix = (fl + fr) / 2;
+
+      sample_out_p[FRONT_LEFT]    = fl;
+      sample_out_p[FRONT_RIGHT]   = fr;
+      sample_out_p[FRONT_CENTER]  = mix;
+      sample_out_p[LOW_FREQUENCY] = mix / 2;
+      sample_out_p[BACK_LEFT]     = left * 4 / 10;
+      sample_out_p[BACK_RIGHT]    = right * 4 / 10;
+      sample_out_p[SIDE_LEFT]     = left * 5 / 10;
+      sample_out_p[SIDE_RIGHT]    = right * 5 / 10;
+    }
+  }
+};
+
+class surr51_t : public audio_pipe_t {
+public:
+  void to_stereo(samples_t &out, const buf_t &in) {
+    using namespace speaker;
+
+    auto sample_in_pos = std::begin(in);
+    auto sample_end    = std::begin(out) + out.size();
+
+    for(auto sample_out_p = std::begin(out); sample_out_p != sample_end; sample_out_p += stereo) {
+      int left {}, right {};
+
+      left += sample_in_pos[FRONT_LEFT];
+      left += sample_in_pos[FRONT_CENTER] * 9 / 10;
+      left += sample_in_pos[LOW_FREQUENCY] * 3 / 10;
+      left += sample_in_pos[BACK_LEFT] * 7 / 10;
+      left += sample_in_pos[BACK_RIGHT] * 3 / 10;
+
+      right += sample_in_pos[FRONT_RIGHT];
+      right += sample_in_pos[FRONT_CENTER] * 9 / 10;
+      right += sample_in_pos[LOW_FREQUENCY] * 3 / 10;
+      right += sample_in_pos[BACK_LEFT] * 3 / 10;
+      right += sample_in_pos[BACK_RIGHT] * 7 / 10;
+
+      sample_out_p[0] = left;
+      sample_out_p[1] = right;
+
+      sample_in_pos += channels51;
+    }
+  }
+
+  void to_51(samples_t &out, const buf_t &in) override {
+    std::copy_n(std::begin(in), out.size(), std::begin(out));
+  }
+
+  void to_71(samples_t &out, const buf_t &in) override {
+    using namespace speaker;
+
+    auto sample_in_pos = std::begin(in);
+    auto sample_end    = std::begin(out) + out.size();
+
+    for(auto sample_out_p = std::begin(out); sample_out_p != sample_end; sample_out_p += channels71) {
+      int fl = sample_in_pos[FRONT_LEFT];
+      int fr = sample_in_pos[FRONT_RIGHT];
+      int bl = sample_in_pos[BACK_LEFT];
+      int br = sample_in_pos[BACK_RIGHT];
+
+      auto mix_l = (fl + bl) / 2;
+      auto mix_r = (bl + br) / 2;
+
+      sample_out_p[FRONT_LEFT]    = fl;
+      sample_out_p[FRONT_RIGHT]   = fr;
+      sample_out_p[FRONT_CENTER]  = sample_in_pos[FRONT_CENTER];
+      sample_out_p[LOW_FREQUENCY] = sample_in_pos[LOW_FREQUENCY];
+      sample_out_p[BACK_LEFT]     = bl;
+      sample_out_p[BACK_RIGHT]    = br;
+      sample_out_p[SIDE_LEFT]     = mix_l;
+      sample_out_p[SIDE_RIGHT]    = mix_r;
+
+      sample_in_pos += channels51;
+    }
+  }
+};
+
+class surr71_t : public audio_pipe_t {
+public:
+  void to_stereo(samples_t &out, const buf_t &in) {
+    using namespace speaker;
+
+    auto sample_in_pos = std::begin(in);
+    auto sample_end    = std::begin(out) + out.size();
+
+    for(auto sample_out_p = std::begin(out); sample_out_p != sample_end; sample_out_p += stereo) {
+      int left {}, right {};
+
+      left += sample_in_pos[FRONT_LEFT];
+      left += sample_in_pos[FRONT_CENTER] * 9 / 10;
+      left += sample_in_pos[LOW_FREQUENCY] * 3 / 10;
+      left += sample_in_pos[BACK_LEFT] * 7 / 10;
+      left += sample_in_pos[BACK_RIGHT] * 3 / 10;
+      left += sample_in_pos[SIDE_LEFT];
+
+      right += sample_in_pos[FRONT_RIGHT];
+      right += sample_in_pos[FRONT_CENTER] * 9 / 10;
+      right += sample_in_pos[LOW_FREQUENCY] * 3 / 10;
+      right += sample_in_pos[BACK_LEFT] * 3 / 10;
+      right += sample_in_pos[BACK_RIGHT] * 7 / 10;
+      right += sample_in_pos[SIDE_RIGHT];
+
+      sample_out_p[0] = left;
+      sample_out_p[1] = right;
+
+      sample_in_pos += channels71;
+    }
+  }
+
+  void to_51(samples_t &out, const buf_t &in) override {
+    using namespace speaker;
+
+    auto sample_in_pos = std::begin(in);
+    auto sample_end    = std::begin(out) + out.size();
+
+    for(auto sample_out_p = std::begin(out); sample_out_p != sample_end; sample_out_p += channels51) {
+      auto sl = (int)sample_out_p[SIDE_LEFT] * 3 / 10;
+      auto sr = (int)sample_out_p[SIDE_RIGHT] * 3 / 10;
+
+      sample_out_p[FRONT_LEFT]    = sample_in_pos[FRONT_LEFT] + sl;
+      sample_out_p[FRONT_RIGHT]   = sample_in_pos[FRONT_RIGHT] + sr;
+      sample_out_p[FRONT_CENTER]  = sample_in_pos[FRONT_CENTER];
+      sample_out_p[LOW_FREQUENCY] = sample_in_pos[LOW_FREQUENCY];
+      sample_out_p[BACK_LEFT]     = sample_in_pos[BACK_LEFT] + sl;
+      sample_out_p[BACK_RIGHT]    = sample_in_pos[BACK_RIGHT] + sr;
+
+      sample_in_pos += channels71;
+    }
+  }
+
+  void to_71(samples_t &out, const buf_t &in) override {
+    std::copy_n(std::begin(in), out.size(), std::begin(out));
+  }
+};
+
+static std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
+struct format_t {
+  enum type_e : int {
+    none,
+    mono,
+    stereo,
+    surr51,
+    surr71,
+  } type;
+
+  std::string_view name;
+  int channels;
+  int channel_mask;
+} formats[] {
+  {
+    format_t::mono,
+    "Mono"sv,
+    1,
+    SPEAKER_FRONT_CENTER,
+  },
+  {
+    format_t::stereo,
+    "Stereo"sv,
+    2,
+    SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT,
+  },
+  {
+    format_t::surr51,
+    "Surround 5.1"sv,
+    6,
+    SPEAKER_FRONT_LEFT |
+      SPEAKER_FRONT_RIGHT |
+      SPEAKER_FRONT_CENTER |
+      SPEAKER_LOW_FREQUENCY |
+      SPEAKER_BACK_LEFT |
+      SPEAKER_BACK_RIGHT,
+  },
+  {
+    format_t::surr71,
+    "Surround 7.1"sv,
+    8,
+    SPEAKER_FRONT_LEFT |
+      SPEAKER_FRONT_RIGHT |
+      SPEAKER_FRONT_CENTER |
+      SPEAKER_LOW_FREQUENCY |
+      SPEAKER_BACK_LEFT |
+      SPEAKER_BACK_RIGHT |
+      SPEAKER_SIDE_LEFT |
+      SPEAKER_SIDE_RIGHT,
+  },
+};
+
+static format_t surround_51_side_speakers {
+  format_t::surr51,
+  "Surround 5.1"sv,
+  6,
+  SPEAKER_FRONT_LEFT |
+    SPEAKER_FRONT_RIGHT |
+    SPEAKER_FRONT_CENTER |
+    SPEAKER_LOW_FREQUENCY |
+    SPEAKER_SIDE_LEFT |
+    SPEAKER_SIDE_RIGHT,
+};
+
+void set_wave_format(audio::wave_format_t &wave_format, const format_t &format) {
+  wave_format->nChannels       = format.channels;
+  wave_format->nBlockAlign     = wave_format->nChannels * wave_format->wBitsPerSample / 8;
+  wave_format->nAvgBytesPerSec = wave_format->nSamplesPerSec * wave_format->nBlockAlign;
+
+  if(wave_format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
+    ((PWAVEFORMATEXTENSIBLE)wave_format.get())->dwChannelMask = format.channel_mask;
+  }
+}
+
+int init_wave_format(audio::wave_format_t &wave_format, DWORD sample_rate) {
+  wave_format->wBitsPerSample = 16;
+  wave_format->nSamplesPerSec = sample_rate;
+  switch(wave_format->wFormatTag) {
+  case WAVE_FORMAT_PCM:
+    break;
+  case WAVE_FORMAT_IEEE_FLOAT:
+    break;
+  case WAVE_FORMAT_EXTENSIBLE: {
+    auto wave_ex = (PWAVEFORMATEXTENSIBLE)wave_format.get();
+    if(IsEqualGUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, wave_ex->SubFormat)) {
+      wave_ex->Samples.wValidBitsPerSample = 16;
+      wave_ex->SubFormat                   = KSDATAFORMAT_SUBTYPE_PCM;
+      break;
+    }
+
+    BOOST_LOG(error) << "Unsupported Sub Format for WAVE_FORMAT_EXTENSIBLE: [0x"sv << util::hex(wave_ex->SubFormat).to_string_view() << ']';
+  }
+  default:
+    BOOST_LOG(error) << "Unsupported Wave Format: [0x"sv << util::hex(wave_format->wFormatTag).to_string_view() << ']';
+    return -1;
+  };
+
+  return 0;
+}
+
+audio_client_t make_audio_client(device_t &device, const format_t &format, int sample_rate) {
+  audio_client_t audio_client;
+  auto status = device->Activate(
+    IID_IAudioClient,
+    CLSCTX_ALL,
+    nullptr,
+    (void **)&audio_client);
+
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Couldn't activate Device: [0x"sv << util::hex(status).to_string_view() << ']';
+
+    return nullptr;
+  }
+
+  wave_format_t wave_format;
+  status = audio_client->GetMixFormat(&wave_format);
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Couldn't acquire Wave Format [0x"sv << util::hex(status).to_string_view() << ']';
+
+    return nullptr;
+  }
+
+  if(init_wave_format(wave_format, sample_rate)) {
+    return nullptr;
+  }
+  set_wave_format(wave_format, format);
+
+  status = audio_client->Initialize(
+    AUDCLNT_SHAREMODE_SHARED,
+    AUDCLNT_STREAMFLAGS_LOOPBACK | AUDCLNT_STREAMFLAGS_EVENTCALLBACK,
+    0, 0,
+    wave_format.get(),
+    nullptr);
+
+  if(status) {
+    BOOST_LOG(debug) << "Couldn't initialize audio client for ["sv << format.name << "]: [0x"sv << util::hex(status).to_string_view() << ']';
+    return nullptr;
+  }
+
+  return audio_client;
+}
+
+const wchar_t *no_null(const wchar_t *str) {
+  return str ? str : L"Unknown";
+}
+
+format_t::type_e validate_device(device_t &device, int sample_rate) {
+  for(const auto &format : formats) {
+    // Ensure WaveFromat is compatible
+    auto audio_client = make_audio_client(device, format, sample_rate);
+
+    BOOST_LOG(debug) << format.name << ": "sv << (!audio_client ? "unsupported"sv : "supported"sv);
+
+    if(audio_client) {
+      return format.type;
+    }
+  }
+
+  return format_t::none;
+}
+
+device_t default_device(device_enum_t &device_enum) {
+  device_t device;
+  HRESULT status;
+  status = device_enum->GetDefaultAudioEndpoint(
+    eRender,
+    eConsole,
+    &device);
+
+
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Couldn't create audio Device [0x"sv << util::hex(status).to_string_view() << ']';
+
+    return nullptr;
+  }
+
+  return device;
+}
+
+class mic_wasapi_t : public mic_t {
+public:
+  capture_e sample(std::vector<std::int16_t> &sample_out) override {
+    auto sample_size = sample_out.size() / channels_out * channels_in;
+    while(sample_buf_pos - std::begin(sample_buf) < sample_size) {
+      //FIXME: Use IAudioClient3 instead of IAudioClient, that would allows for adjusting the latency of the audio samples
+      auto capture_result = _fill_buffer();
+
+      if(capture_result != capture_e::ok) {
+        return capture_result;
+      }
+    }
+
+    switch(channels_out) {
+    case 2:
+      pipe->to_stereo(sample_out, sample_buf);
+      break;
+    case 6:
+      pipe->to_51(sample_out, sample_buf);
+      break;
+    case 8:
+      pipe->to_71(sample_out, sample_buf);
+      break;
+    default:
+      BOOST_LOG(error) << "converting to ["sv << channels_out << "] channels is not supported"sv;
+      return capture_e::error;
+    }
+
+    // The excess samples should be in front of the queue
+    std::move(&sample_buf[sample_size], sample_buf_pos, std::begin(sample_buf));
+    sample_buf_pos -= sample_size;
+
+    return capture_e::ok;
+  }
+
+
+  int init(std::uint32_t sample_rate, std::uint32_t frame_size, std::uint32_t channels_out) {
+    audio_event.reset(CreateEventA(nullptr, FALSE, FALSE, nullptr));
+    if(!audio_event) {
+      BOOST_LOG(error) << "Couldn't create Event handle"sv;
+
+      return -1;
+    }
+
+    HRESULT status;
+
+    status = CoCreateInstance(
+      CLSID_MMDeviceEnumerator,
+      nullptr,
+      CLSCTX_ALL,
+      IID_IMMDeviceEnumerator,
+      (void **)&device_enum);
+
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't create Device Enumerator [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return -1;
+    }
+
+    auto device = default_device(device_enum);
+    if(!device) {
+      return -1;
+    }
+
+    for(auto &format : formats) {
+      BOOST_LOG(debug) << "Trying audio format ["sv << format.name << ']';
+      audio_client = make_audio_client(device, format, sample_rate);
+
+      if(audio_client) {
+        BOOST_LOG(debug) << "Found audio format ["sv << format.name << ']';
+        channels_in        = format.channels;
+        this->channels_out = channels_out;
+
+        switch(channels_in) {
+        case 1:
+          pipe = std::make_unique<mono_t>();
+          break;
+        case 2:
+          pipe = std::make_unique<stereo_t>();
+          break;
+        case 6:
+          pipe = std::make_unique<surr51_t>();
+          break;
+        case 8:
+          pipe = std::make_unique<surr71_t>();
+          break;
+        default:
+          BOOST_LOG(error) << "converting from ["sv << channels_in << "] channels is not supported"sv;
+          return -1;
+        }
+        break;
+      }
+    }
+
+    if(!audio_client) {
+      BOOST_LOG(error) << "Couldn't find supported format for audio"sv;
+      return -1;
+    }
+
+    REFERENCE_TIME default_latency;
+    audio_client->GetDevicePeriod(&default_latency, nullptr);
+    default_latency_ms = default_latency / 1000;
+
+    std::uint32_t frames;
+    status = audio_client->GetBufferSize(&frames);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't acquire the number of audio frames [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return -1;
+    }
+
+    // *2 --> needs to fit double
+    sample_buf     = util::buffer_t<std::int16_t> { std::max(frames, frame_size) * 2 * channels_in };
+    sample_buf_pos = std::begin(sample_buf);
+
+    status = audio_client->GetService(IID_IAudioCaptureClient, (void **)&audio_capture);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't initialize audio capture client [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return -1;
+    }
+
+    status = audio_client->SetEventHandle(audio_event.get());
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't set event handle [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return -1;
+    }
+
+    status = audio_client->Start();
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't start recording [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return -1;
+    }
+
+    return 0;
+  }
+
+  ~mic_wasapi_t() override {
+    if(audio_client) {
+      audio_client->Stop();
+    }
+  }
+
+private:
+  capture_e _fill_buffer() {
+    HRESULT status;
+
+    // Total number of samples
+    struct sample_aligned_t {
+      std::uint32_t uninitialized;
+      std::int16_t *samples;
+    } sample_aligned;
+
+    // number of samples / number of channels
+    struct block_aligned_t {
+      std::uint32_t audio_sample_size;
+    } block_aligned;
+
+    status = WaitForSingleObjectEx(audio_event.get(), default_latency_ms, FALSE);
+    switch(status) {
+    case WAIT_OBJECT_0:
+      break;
+    case WAIT_TIMEOUT:
+      return capture_e::timeout;
+    default:
+      BOOST_LOG(error) << "Couldn't wait for audio event: [0x"sv << util::hex(status).to_string_view() << ']';
+      return capture_e::error;
+    }
+
+    std::uint32_t packet_size {};
+    for(
+      status = audio_capture->GetNextPacketSize(&packet_size);
+      SUCCEEDED(status) && packet_size > 0;
+      status = audio_capture->GetNextPacketSize(&packet_size)) {
+      DWORD buffer_flags;
+      status = audio_capture->GetBuffer(
+        (BYTE **)&sample_aligned.samples,
+        &block_aligned.audio_sample_size,
+        &buffer_flags,
+        nullptr, nullptr);
+
+      switch(status) {
+      case S_OK:
+        break;
+      case AUDCLNT_E_DEVICE_INVALIDATED:
+        return capture_e::reinit;
+      default:
+        BOOST_LOG(error) << "Couldn't capture audio [0x"sv << util::hex(status).to_string_view() << ']';
+        return capture_e::error;
+      }
+
+      sample_aligned.uninitialized = std::end(sample_buf) - sample_buf_pos;
+      auto n                       = std::min(sample_aligned.uninitialized, block_aligned.audio_sample_size * channels_in);
+
+      if(buffer_flags & AUDCLNT_BUFFERFLAGS_SILENT) {
+        std::fill_n(sample_buf_pos, n, 0);
+      }
+      else {
+        std::copy_n(sample_aligned.samples, n, sample_buf_pos);
+      }
+
+      sample_buf_pos += n;
+
+      audio_capture->ReleaseBuffer(block_aligned.audio_sample_size);
+    }
+
+    if(status == AUDCLNT_E_DEVICE_INVALIDATED) {
+      return capture_e::reinit;
+    }
+
+    if(FAILED(status)) {
+      return capture_e::error;
+    }
+
+    return capture_e::ok;
+  }
+
+public:
+  handle_t audio_event;
+
+  device_enum_t device_enum;
+  device_t device;
+  audio_client_t audio_client;
+  audio_capture_t audio_capture;
+
+  REFERENCE_TIME default_latency_ms;
+
+  util::buffer_t<std::int16_t> sample_buf;
+  std::int16_t *sample_buf_pos;
+
+  // out --> our audio output
+  int channels_out;
+  // in --> our wasapi input
+  int channels_in;
+
+  std::unique_ptr<audio_pipe_t> pipe;
+};
+
+class audio_control_t : public ::platf::audio_control_t {
+public:
+  std::optional<sink_t> sink_info() override {
+    auto virtual_adapter_name = L"Steam Streaming Speakers"sv;
+
+    sink_t sink;
+
+    audio::device_enum_t device_enum;
+    auto status = CoCreateInstance(
+      CLSID_MMDeviceEnumerator,
+      nullptr,
+      CLSCTX_ALL,
+      IID_IMMDeviceEnumerator,
+      (void **)&device_enum);
+
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't create Device Enumerator: [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return std::nullopt;
+    }
+
+    auto device = default_device(device_enum);
+    if(!device) {
+      return std::nullopt;
+    }
+
+    audio::wstring_t wstring;
+    device->GetId(&wstring);
+
+    sink.host = converter.to_bytes(wstring.get());
+
+    collection_t collection;
+    status = device_enum->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &collection);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't enumerate: [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return std::nullopt;
+    }
+
+    UINT count;
+    collection->GetCount(&count);
+
+    std::string virtual_device_id = config::audio.virtual_sink;
+    for(auto x = 0; x < count; ++x) {
+      audio::device_t device;
+      collection->Item(x, &device);
+
+      auto type = validate_device(device, SAMPLE_RATE);
+      if(type == format_t::none) {
+        continue;
+      }
+
+      audio::wstring_t wstring;
+      device->GetId(&wstring);
+
+      audio::prop_t prop;
+      device->OpenPropertyStore(STGM_READ, &prop);
+
+      prop_var_t adapter_friendly_name;
+      prop_var_t device_friendly_name;
+      prop_var_t device_desc;
+
+      prop->GetValue(PKEY_Device_FriendlyName, &device_friendly_name.prop);
+      prop->GetValue(PKEY_DeviceInterface_FriendlyName, &adapter_friendly_name.prop);
+      prop->GetValue(PKEY_Device_DeviceDesc, &device_desc.prop);
+
+      auto adapter_name = no_null((LPWSTR)adapter_friendly_name.prop.pszVal);
+      BOOST_LOG(verbose)
+        << L"===== Device ====="sv << std::endl
+        << L"Device ID          : "sv << wstring.get() << std::endl
+        << L"Device name        : "sv << no_null((LPWSTR)device_friendly_name.prop.pszVal) << std::endl
+        << L"Adapter name       : "sv << adapter_name << std::endl
+        << L"Device description : "sv << no_null((LPWSTR)device_desc.prop.pszVal) << std::endl
+        << std::endl;
+
+      if(virtual_device_id.empty() && adapter_name == virtual_adapter_name) {
+        virtual_device_id = converter.to_bytes(wstring.get());
+      }
+    }
+
+    if(!virtual_device_id.empty()) {
+      sink.null = std::make_optional(sink_t::null_t {
+        "virtual-"s.append(formats[format_t::stereo - 1].name) + virtual_device_id,
+        "virtual-"s.append(formats[format_t::surr51 - 1].name) + virtual_device_id,
+        "virtual-"s.append(formats[format_t::surr71 - 1].name) + virtual_device_id,
+      });
+    }
+
+    return sink;
+  }
+
+  std::unique_ptr<mic_t> microphone(const std::uint8_t *mapping, int channels, std::uint32_t sample_rate, std::uint32_t frame_size) override {
+    auto mic = std::make_unique<mic_wasapi_t>();
+
+    if(mic->init(sample_rate, frame_size, channels)) {
+      return nullptr;
+    }
+
+    return mic;
+  }
+
+  /**
+   * If the requested sink is a virtual sink, meaning no speakers attached to
+   * the host, then we can seamlessly set the format to stereo and surround sound.
+   * 
+   * Any virtual sink detected will be prefixed by:
+   *    virtual-(format name)
+   * If it doesn't contain that prefix, then the format will not be changed
+   */
+  std::optional<std::wstring> set_format(const std::string &sink) {
+    std::string_view sv { sink.c_str(), sink.size() };
+
+    format_t::type_e type = format_t::none;
+    // sink format:
+    // [virtual-(format name)]device_id
+    auto prefix = "virtual-"sv;
+    if(sv.find(prefix) == 0) {
+      sv = sv.substr(prefix.size(), sv.size() - prefix.size());
+
+      for(auto &format : formats) {
+        auto &name = format.name;
+        if(sv.find(name) == 0) {
+          type = format.type;
+          sv   = sv.substr(name.size(), sv.size() - name.size());
+
+          break;
+        }
+      }
+    }
+
+    auto wstring_device_id = converter.from_bytes(sv.data());
+
+    if(type == format_t::none) {
+      // wstring_device_id does not contain virtual-(format name)
+      // It's a simple deviceId, just pass it back
+      return std::make_optional(std::move(wstring_device_id));
+    }
+
+    wave_format_t wave_format;
+    auto status = policy->GetMixFormat(wstring_device_id.c_str(), &wave_format);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't acquire Wave Format [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return std::nullopt;
+    }
+
+    if(init_wave_format(wave_format, SAMPLE_RATE)) {
+      return std::nullopt;
+    }
+    set_wave_format(wave_format, formats[(int)type - 1]);
+
+    WAVEFORMATEXTENSIBLE p {};
+    status = policy->SetDeviceFormat(wstring_device_id.c_str(), wave_format.get(), (WAVEFORMATEX *)&p);
+
+    // Surround 5.1 might contain side-{left, right} instead of speaker in the back
+    // Try again with different speaker mask.
+    if(status == 0x88890008 && type == format_t::surr51) {
+      set_wave_format(wave_format, surround_51_side_speakers);
+      status = policy->SetDeviceFormat(wstring_device_id.c_str(), wave_format.get(), (WAVEFORMATEX *)&p);
+    }
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't set Wave Format [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return std::nullopt;
+    }
+
+    return std::make_optional(std::move(wstring_device_id));
+  }
+
+  int set_sink(const std::string &sink) override {
+    auto wstring_device_id = set_format(sink);
+    if(!wstring_device_id) {
+      return -1;
+    }
+
+    int failure {};
+    for(int x = 0; x < (int)ERole_enum_count; ++x) {
+      auto status = policy->SetDefaultEndpoint(wstring_device_id->c_str(), (ERole)x);
+      if(status) {
+        BOOST_LOG(warning) << "Couldn't set ["sv << sink << "] to role ["sv << x << ']';
+
+        ++failure;
+      }
+    }
+
+    return failure;
+  }
+
+  int init() {
+    auto status = CoCreateInstance(
+      CLSID_CPolicyConfigClient,
+      nullptr,
+      CLSCTX_ALL,
+      IID_IPolicyConfig,
+      (void **)&policy);
+
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't create audio policy config: [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return -1;
+    }
+
+    return 0;
+  }
+
+  ~audio_control_t() override {}
+
+  policy_t policy;
+};
+} // namespace platf::audio
+
+namespace platf {
+
+// It's not big enough to justify it's own source file :/
+namespace dxgi {
+int init();
+}
+
+std::unique_ptr<audio_control_t> audio_control() {
+  auto control = std::make_unique<audio::audio_control_t>();
+
+  if(control->init()) {
+    return nullptr;
+  }
+
+  return control;
+}
+
+std::unique_ptr<deinit_t> init() {
+  if(dxgi::init()) {
+    return nullptr;
+  }
+  return std::make_unique<platf::audio::co_init_t>();
+}
+} // namespace platf

sunshine/platform/windows/display.h

@@ -0,0 +1,128 @@
+//
+// Created by loki on 4/23/20.
+//
+
+#ifndef SUNSHINE_DISPLAY_H
+#define SUNSHINE_DISPLAY_H
+
+#include <d3d11.h>
+#include <d3d11_4.h>
+#include <d3dcommon.h>
+#include <dxgi.h>
+#include <dxgi1_2.h>
+
+#include "sunshine/platform/common.h"
+#include "sunshine/utility.h"
+
+namespace platf::dxgi {
+extern const char *format_str[];
+
+template<class T>
+void Release(T *dxgi) {
+  dxgi->Release();
+}
+
+using factory1_t    = util::safe_ptr<IDXGIFactory1, Release<IDXGIFactory1>>;
+using dxgi_t        = util::safe_ptr<IDXGIDevice, Release<IDXGIDevice>>;
+using dxgi1_t       = util::safe_ptr<IDXGIDevice1, Release<IDXGIDevice1>>;
+using device_t      = util::safe_ptr<ID3D11Device, Release<ID3D11Device>>;
+using device_ctx_t  = util::safe_ptr<ID3D11DeviceContext, Release<ID3D11DeviceContext>>;
+using adapter_t     = util::safe_ptr<IDXGIAdapter1, Release<IDXGIAdapter1>>;
+using output_t      = util::safe_ptr<IDXGIOutput, Release<IDXGIOutput>>;
+using output1_t     = util::safe_ptr<IDXGIOutput1, Release<IDXGIOutput1>>;
+using dup_t         = util::safe_ptr<IDXGIOutputDuplication, Release<IDXGIOutputDuplication>>;
+using texture2d_t   = util::safe_ptr<ID3D11Texture2D, Release<ID3D11Texture2D>>;
+using texture1d_t   = util::safe_ptr<ID3D11Texture1D, Release<ID3D11Texture1D>>;
+using resource_t    = util::safe_ptr<IDXGIResource, Release<IDXGIResource>>;
+using multithread_t = util::safe_ptr<ID3D11Multithread, Release<ID3D11Multithread>>;
+
+namespace video {
+using device_t         = util::safe_ptr<ID3D11VideoDevice, Release<ID3D11VideoDevice>>;
+using ctx_t            = util::safe_ptr<ID3D11VideoContext, Release<ID3D11VideoContext>>;
+using processor_t      = util::safe_ptr<ID3D11VideoProcessor, Release<ID3D11VideoProcessor>>;
+using processor_out_t  = util::safe_ptr<ID3D11VideoProcessorOutputView, Release<ID3D11VideoProcessorOutputView>>;
+using processor_in_t   = util::safe_ptr<ID3D11VideoProcessorInputView, Release<ID3D11VideoProcessorInputView>>;
+using processor_enum_t = util::safe_ptr<ID3D11VideoProcessorEnumerator, Release<ID3D11VideoProcessorEnumerator>>;
+} // namespace video
+
+class hwdevice_t;
+struct cursor_t {
+  std::vector<std::uint8_t> img_data;
+
+  DXGI_OUTDUPL_POINTER_SHAPE_INFO shape_info;
+  int x, y;
+  bool visible;
+};
+
+struct gpu_cursor_t {
+  texture2d_t texture;
+
+  LONG width, height;
+};
+
+class duplication_t {
+public:
+  dup_t dup;
+  bool has_frame {};
+
+  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 init();
+
+  factory1_t factory;
+  adapter_t adapter;
+  output_t output;
+  device_t device;
+  device_ctx_t device_ctx;
+  duplication_t dup;
+
+  DXGI_FORMAT format;
+  D3D_FEATURE_LEVEL feature_level;
+
+  typedef enum _D3DKMT_SCHEDULINGPRIORITYCLASS {
+    D3DKMT_SCHEDULINGPRIORITYCLASS_IDLE,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_BELOW_NORMAL,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_NORMAL,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_ABOVE_NORMAL,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_HIGH,
+    D3DKMT_SCHEDULINGPRIORITYCLASS_REALTIME
+  } D3DKMT_SCHEDULINGPRIORITYCLASS;
+
+  typedef NTSTATUS WINAPI (*PD3DKMTSetProcessSchedulingPriorityClass)(HANDLE, D3DKMT_SCHEDULINGPRIORITYCLASS);
+};
+
+class display_ram_t : public display_base_t {
+public:
+  capture_e snapshot(img_t *img, std::chrono::milliseconds timeout, bool cursor_visible) override;
+  std::shared_ptr<img_t> alloc_img() override;
+  int dummy_img(img_t *img) override;
+
+  int init();
+
+  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:
+  capture_e snapshot(img_t *img, std::chrono::milliseconds timeout, bool cursor_visible) override;
+
+  std::shared_ptr<img_t> alloc_img() override;
+  int dummy_img(img_t *img_base) override;
+
+  std::shared_ptr<platf::hwdevice_t> make_hwdevice(int width, int height, pix_fmt_e pix_fmt) override;
+
+  gpu_cursor_t cursor;
+  std::vector<hwdevice_t *> hwdevices;
+};
+} // namespace platf::dxgi
+
+#endif

sunshine/platform/windows/display_base.cpp

@@ -0,0 +1,438 @@
+//
+// Created by loki on 1/12/20.
+//
+
+#include <codecvt>
+
+#include "sunshine/config.h"
+#include "sunshine/main.h"
+#include "sunshine/platform/common.h"
+
+#include "display.h"
+
+namespace platf {
+using namespace std::literals;
+}
+namespace platf::dxgi {
+capture_e duplication_t::next_frame(DXGI_OUTDUPL_FRAME_INFO &frame_info, std::chrono::milliseconds timeout, resource_t::pointer *res_p) {
+  auto capture_status = release_frame();
+  if(capture_status != capture_e::ok) {
+    return capture_status;
+  }
+
+  auto status = dup->AcquireNextFrame(timeout.count(), &frame_info, res_p);
+
+  switch(status) {
+  case S_OK:
+    has_frame = true;
+    return capture_e::ok;
+  case DXGI_ERROR_WAIT_TIMEOUT:
+    return capture_e::timeout;
+  case WAIT_ABANDONED:
+  case DXGI_ERROR_ACCESS_LOST:
+  case DXGI_ERROR_ACCESS_DENIED:
+    return capture_e::reinit;
+  default:
+    BOOST_LOG(error) << "Couldn't acquire next frame [0x"sv << util::hex(status).to_string_view();
+    return capture_e::error;
+  }
+}
+
+capture_e duplication_t::reset(dup_t::pointer dup_p) {
+  auto capture_status = release_frame();
+
+  dup.reset(dup_p);
+
+  return capture_status;
+}
+
+capture_e duplication_t::release_frame() {
+  if(!has_frame) {
+    return capture_e::ok;
+  }
+
+  auto status = dup->ReleaseFrame();
+  switch(status) {
+  case S_OK:
+    has_frame = false;
+    return capture_e::ok;
+  case DXGI_ERROR_WAIT_TIMEOUT:
+    return capture_e::timeout;
+  case WAIT_ABANDONED:
+  case DXGI_ERROR_ACCESS_LOST:
+  case DXGI_ERROR_ACCESS_DENIED:
+    has_frame = false;
+    return capture_e::reinit;
+  default:
+    BOOST_LOG(error) << "Couldn't release frame [0x"sv << util::hex(status).to_string_view();
+    return capture_e::error;
+  }
+}
+
+duplication_t::~duplication_t() {
+  release_frame();
+}
+
+int display_base_t::init() {
+  /* Uncomment when use of IDXGIOutput5 is implemented
+  std::call_once(windows_cpp_once_flag, []() {
+    DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
+    const auto DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 = ((DPI_AWARENESS_CONTEXT)-4);
+
+    typedef BOOL (*User32_SetProcessDpiAwarenessContext)(DPI_AWARENESS_CONTEXT value);
+
+    auto user32 = LoadLibraryA("user32.dll");
+    auto f = (User32_SetProcessDpiAwarenessContext)GetProcAddress(user32, "SetProcessDpiAwarenessContext");
+    if(f) {
+      f(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+    }
+
+    FreeLibrary(user32);
+  });
+*/
+
+  HRESULT status;
+
+  status = CreateDXGIFactory1(IID_IDXGIFactory1, (void **)&factory);
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Failed to create DXGIFactory1 [0x"sv << util::hex(status).to_string_view() << ']';
+    return -1;
+  }
+
+  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
+
+  auto adapter_name = converter.from_bytes(config::video.adapter_name);
+  auto output_name  = converter.from_bytes(config::video.output_name);
+
+  adapter_t::pointer adapter_p;
+  for(int x = 0; factory->EnumAdapters1(x, &adapter_p) != DXGI_ERROR_NOT_FOUND; ++x) {
+    dxgi::adapter_t adapter_tmp { adapter_p };
+
+    DXGI_ADAPTER_DESC1 adapter_desc;
+    adapter_tmp->GetDesc1(&adapter_desc);
+
+    if(!adapter_name.empty() && adapter_desc.Description != adapter_name) {
+      continue;
+    }
+
+    dxgi::output_t::pointer output_p;
+    for(int y = 0; adapter_tmp->EnumOutputs(y, &output_p) != DXGI_ERROR_NOT_FOUND; ++y) {
+      dxgi::output_t output_tmp { output_p };
+
+      DXGI_OUTPUT_DESC desc;
+      output_tmp->GetDesc(&desc);
+
+      if(!output_name.empty() && desc.DeviceName != output_name) {
+        continue;
+      }
+
+      if(desc.AttachedToDesktop) {
+        output = std::move(output_tmp);
+
+        offset_x = desc.DesktopCoordinates.left;
+        offset_y = desc.DesktopCoordinates.top;
+        width    = desc.DesktopCoordinates.right - offset_x;
+        height   = desc.DesktopCoordinates.bottom - offset_y;
+      }
+    }
+
+    if(output) {
+      adapter = std::move(adapter_tmp);
+      break;
+    }
+  }
+
+  if(!output) {
+    BOOST_LOG(error) << "Failed to locate an output device"sv;
+    return -1;
+  }
+
+  D3D_FEATURE_LEVEL featureLevels[] {
+    D3D_FEATURE_LEVEL_11_1,
+    D3D_FEATURE_LEVEL_11_0,
+    D3D_FEATURE_LEVEL_10_1,
+    D3D_FEATURE_LEVEL_10_0,
+    D3D_FEATURE_LEVEL_9_3,
+    D3D_FEATURE_LEVEL_9_2,
+    D3D_FEATURE_LEVEL_9_1
+  };
+
+  status = adapter->QueryInterface(IID_IDXGIAdapter, (void **)&adapter_p);
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Failed to query IDXGIAdapter interface"sv;
+    return -1;
+  }
+
+  status = D3D11CreateDevice(
+    adapter_p,
+    D3D_DRIVER_TYPE_UNKNOWN,
+    nullptr,
+    D3D11_CREATE_DEVICE_VIDEO_SUPPORT,
+    featureLevels, sizeof(featureLevels) / sizeof(D3D_FEATURE_LEVEL),
+    D3D11_SDK_VERSION,
+    &device,
+    &feature_level,
+    &device_ctx);
+
+  adapter_p->Release();
+
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Failed to create D3D11 device [0x"sv << util::hex(status).to_string_view() << ']';
+
+    return -1;
+  }
+
+  DXGI_ADAPTER_DESC adapter_desc;
+  adapter->GetDesc(&adapter_desc);
+
+  auto description = converter.to_bytes(adapter_desc.Description);
+  BOOST_LOG(info)
+    << std::endl
+    << "Device Description : " << description << std::endl
+    << "Device Vendor ID   : 0x"sv << util::hex(adapter_desc.VendorId).to_string_view() << std::endl
+    << "Device Device ID   : 0x"sv << util::hex(adapter_desc.DeviceId).to_string_view() << std::endl
+    << "Device Video Mem   : "sv << adapter_desc.DedicatedVideoMemory / 1048576 << " MiB"sv << std::endl
+    << "Device Sys Mem     : "sv << adapter_desc.DedicatedSystemMemory / 1048576 << " MiB"sv << std::endl
+    << "Share Sys Mem      : "sv << adapter_desc.SharedSystemMemory / 1048576 << " MiB"sv << std::endl
+    << "Feature Level      : 0x"sv << util::hex(feature_level).to_string_view() << std::endl
+    << "Capture size       : "sv << width << 'x' << height;
+
+  // Bump up thread priority
+  {
+    const DWORD flags = TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY;
+    TOKEN_PRIVILEGES tp;
+    HANDLE token;
+    LUID val;
+
+    if(OpenProcessToken(GetCurrentProcess(), flags, &token) &&
+       !!LookupPrivilegeValue(NULL, SE_INC_BASE_PRIORITY_NAME, &val)) {
+      tp.PrivilegeCount           = 1;
+      tp.Privileges[0].Luid       = val;
+      tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+
+      if(!AdjustTokenPrivileges(token, false, &tp, sizeof(tp), NULL, NULL)) {
+        BOOST_LOG(warning) << "Could not set privilege to increase GPU priority";
+      }
+    }
+
+    CloseHandle(token);
+
+    HMODULE gdi32 = GetModuleHandleA("GDI32");
+    if(gdi32) {
+      PD3DKMTSetProcessSchedulingPriorityClass fn =
+        (PD3DKMTSetProcessSchedulingPriorityClass)GetProcAddress(gdi32, "D3DKMTSetProcessSchedulingPriorityClass");
+      if(fn) {
+        status = fn(GetCurrentProcess(), D3DKMT_SCHEDULINGPRIORITYCLASS_REALTIME);
+        if(FAILED(status)) {
+          BOOST_LOG(warning) << "Failed to set realtime GPU priority. Please run application as administrator for optimal performance.";
+        }
+      }
+    }
+
+    dxgi::dxgi_t dxgi;
+    status = device->QueryInterface(IID_IDXGIDevice, (void **)&dxgi);
+    if(FAILED(status)) {
+      BOOST_LOG(warning) << "Failed to query DXGI interface from device [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    dxgi->SetGPUThreadPriority(7);
+  }
+
+  // Try to reduce latency
+  {
+    dxgi::dxgi1_t dxgi {};
+    status = device->QueryInterface(IID_IDXGIDevice, (void **)&dxgi);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to query DXGI interface from device [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    status = dxgi->SetMaximumFrameLatency(1);
+    if(FAILED(status)) {
+      BOOST_LOG(warning) << "Failed to set maximum frame latency [0x"sv << util::hex(status).to_string_view() << ']';
+    }
+  }
+
+  //FIXME: Duplicate output on RX580 in combination with DOOM (2016) --> BSOD
+  //TODO: Use IDXGIOutput5 for improved performance
+  {
+    dxgi::output1_t output1 {};
+    status = output->QueryInterface(IID_IDXGIOutput1, (void **)&output1);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to query IDXGIOutput1 from the output"sv;
+      return -1;
+    }
+
+    // We try this twice, in case we still get an error on reinitialization
+    for(int x = 0; x < 2; ++x) {
+      status = output1->DuplicateOutput((IUnknown *)device.get(), &dup.dup);
+      if(SUCCEEDED(status)) {
+        break;
+      }
+      std::this_thread::sleep_for(200ms);
+    }
+
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "DuplicateOutput Failed [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+  }
+
+  DXGI_OUTDUPL_DESC dup_desc;
+  dup.dup->GetDesc(&dup_desc);
+
+  format = dup_desc.ModeDesc.Format;
+
+  BOOST_LOG(debug) << "Source format ["sv << format_str[dup_desc.ModeDesc.Format] << ']';
+
+  return 0;
+}
+
+const char *format_str[] = {
+  "DXGI_FORMAT_UNKNOWN",
+  "DXGI_FORMAT_R32G32B32A32_TYPELESS",
+  "DXGI_FORMAT_R32G32B32A32_FLOAT",
+  "DXGI_FORMAT_R32G32B32A32_UINT",
+  "DXGI_FORMAT_R32G32B32A32_SINT",
+  "DXGI_FORMAT_R32G32B32_TYPELESS",
+  "DXGI_FORMAT_R32G32B32_FLOAT",
+  "DXGI_FORMAT_R32G32B32_UINT",
+  "DXGI_FORMAT_R32G32B32_SINT",
+  "DXGI_FORMAT_R16G16B16A16_TYPELESS",
+  "DXGI_FORMAT_R16G16B16A16_FLOAT",
+  "DXGI_FORMAT_R16G16B16A16_UNORM",
+  "DXGI_FORMAT_R16G16B16A16_UINT",
+  "DXGI_FORMAT_R16G16B16A16_SNORM",
+  "DXGI_FORMAT_R16G16B16A16_SINT",
+  "DXGI_FORMAT_R32G32_TYPELESS",
+  "DXGI_FORMAT_R32G32_FLOAT",
+  "DXGI_FORMAT_R32G32_UINT",
+  "DXGI_FORMAT_R32G32_SINT",
+  "DXGI_FORMAT_R32G8X24_TYPELESS",
+  "DXGI_FORMAT_D32_FLOAT_S8X24_UINT",
+  "DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS",
+  "DXGI_FORMAT_X32_TYPELESS_G8X24_UINT",
+  "DXGI_FORMAT_R10G10B10A2_TYPELESS",
+  "DXGI_FORMAT_R10G10B10A2_UNORM",
+  "DXGI_FORMAT_R10G10B10A2_UINT",
+  "DXGI_FORMAT_R11G11B10_FLOAT",
+  "DXGI_FORMAT_R8G8B8A8_TYPELESS",
+  "DXGI_FORMAT_R8G8B8A8_UNORM",
+  "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
+  "DXGI_FORMAT_R8G8B8A8_UINT",
+  "DXGI_FORMAT_R8G8B8A8_SNORM",
+  "DXGI_FORMAT_R8G8B8A8_SINT",
+  "DXGI_FORMAT_R16G16_TYPELESS",
+  "DXGI_FORMAT_R16G16_FLOAT",
+  "DXGI_FORMAT_R16G16_UNORM",
+  "DXGI_FORMAT_R16G16_UINT",
+  "DXGI_FORMAT_R16G16_SNORM",
+  "DXGI_FORMAT_R16G16_SINT",
+  "DXGI_FORMAT_R32_TYPELESS",
+  "DXGI_FORMAT_D32_FLOAT",
+  "DXGI_FORMAT_R32_FLOAT",
+  "DXGI_FORMAT_R32_UINT",
+  "DXGI_FORMAT_R32_SINT",
+  "DXGI_FORMAT_R24G8_TYPELESS",
+  "DXGI_FORMAT_D24_UNORM_S8_UINT",
+  "DXGI_FORMAT_R24_UNORM_X8_TYPELESS",
+  "DXGI_FORMAT_X24_TYPELESS_G8_UINT",
+  "DXGI_FORMAT_R8G8_TYPELESS",
+  "DXGI_FORMAT_R8G8_UNORM",
+  "DXGI_FORMAT_R8G8_UINT",
+  "DXGI_FORMAT_R8G8_SNORM",
+  "DXGI_FORMAT_R8G8_SINT",
+  "DXGI_FORMAT_R16_TYPELESS",
+  "DXGI_FORMAT_R16_FLOAT",
+  "DXGI_FORMAT_D16_UNORM",
+  "DXGI_FORMAT_R16_UNORM",
+  "DXGI_FORMAT_R16_UINT",
+  "DXGI_FORMAT_R16_SNORM",
+  "DXGI_FORMAT_R16_SINT",
+  "DXGI_FORMAT_R8_TYPELESS",
+  "DXGI_FORMAT_R8_UNORM",
+  "DXGI_FORMAT_R8_UINT",
+  "DXGI_FORMAT_R8_SNORM",
+  "DXGI_FORMAT_R8_SINT",
+  "DXGI_FORMAT_A8_UNORM",
+  "DXGI_FORMAT_R1_UNORM",
+  "DXGI_FORMAT_R9G9B9E5_SHAREDEXP",
+  "DXGI_FORMAT_R8G8_B8G8_UNORM",
+  "DXGI_FORMAT_G8R8_G8B8_UNORM",
+  "DXGI_FORMAT_BC1_TYPELESS",
+  "DXGI_FORMAT_BC1_UNORM",
+  "DXGI_FORMAT_BC1_UNORM_SRGB",
+  "DXGI_FORMAT_BC2_TYPELESS",
+  "DXGI_FORMAT_BC2_UNORM",
+  "DXGI_FORMAT_BC2_UNORM_SRGB",
+  "DXGI_FORMAT_BC3_TYPELESS",
+  "DXGI_FORMAT_BC3_UNORM",
+  "DXGI_FORMAT_BC3_UNORM_SRGB",
+  "DXGI_FORMAT_BC4_TYPELESS",
+  "DXGI_FORMAT_BC4_UNORM",
+  "DXGI_FORMAT_BC4_SNORM",
+  "DXGI_FORMAT_BC5_TYPELESS",
+  "DXGI_FORMAT_BC5_UNORM",
+  "DXGI_FORMAT_BC5_SNORM",
+  "DXGI_FORMAT_B5G6R5_UNORM",
+  "DXGI_FORMAT_B5G5R5A1_UNORM",
+  "DXGI_FORMAT_B8G8R8A8_UNORM",
+  "DXGI_FORMAT_B8G8R8X8_UNORM",
+  "DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM",
+  "DXGI_FORMAT_B8G8R8A8_TYPELESS",
+  "DXGI_FORMAT_B8G8R8A8_UNORM_SRGB",
+  "DXGI_FORMAT_B8G8R8X8_TYPELESS",
+  "DXGI_FORMAT_B8G8R8X8_UNORM_SRGB",
+  "DXGI_FORMAT_BC6H_TYPELESS",
+  "DXGI_FORMAT_BC6H_UF16",
+  "DXGI_FORMAT_BC6H_SF16",
+  "DXGI_FORMAT_BC7_TYPELESS",
+  "DXGI_FORMAT_BC7_UNORM",
+  "DXGI_FORMAT_BC7_UNORM_SRGB",
+  "DXGI_FORMAT_AYUV",
+  "DXGI_FORMAT_Y410",
+  "DXGI_FORMAT_Y416",
+  "DXGI_FORMAT_NV12",
+  "DXGI_FORMAT_P010",
+  "DXGI_FORMAT_P016",
+  "DXGI_FORMAT_420_OPAQUE",
+  "DXGI_FORMAT_YUY2",
+  "DXGI_FORMAT_Y210",
+  "DXGI_FORMAT_Y216",
+  "DXGI_FORMAT_NV11",
+  "DXGI_FORMAT_AI44",
+  "DXGI_FORMAT_IA44",
+  "DXGI_FORMAT_P8",
+  "DXGI_FORMAT_A8P8",
+  "DXGI_FORMAT_B4G4R4A4_UNORM",
+
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+
+  "DXGI_FORMAT_P208",
+  "DXGI_FORMAT_V208",
+  "DXGI_FORMAT_V408"
+};
+
+} // namespace platf::dxgi
+
+namespace platf {
+std::shared_ptr<display_t> display(dev_type_e hwdevice_type) {
+  if(hwdevice_type == dev_type_e::dxgi) {
+    auto disp = std::make_shared<dxgi::display_vram_t>();
+
+    if(!disp->init()) {
+      return disp;
+    }
+  }
+  else if(hwdevice_type == dev_type_e::none) {
+    auto disp = std::make_shared<dxgi::display_ram_t>();
+
+    if(!disp->init()) {
+      return disp;
+    }
+  }
+
+  return nullptr;
+}
+} // namespace platf

sunshine/platform/windows/display_ram.cpp

@@ -0,0 +1,297 @@
+#include "display.h"
+#include "sunshine/main.h"
+
+namespace platf {
+using namespace std::literals;
+}
+
+namespace platf::dxgi {
+struct img_t : public ::platf::img_t {
+  ~img_t() override {
+    delete[] data;
+    data = nullptr;
+  }
+};
+
+void blend_cursor_monochrome(const cursor_t &cursor, img_t &img) {
+  int height = cursor.shape_info.Height / 2;
+  int width  = cursor.shape_info.Width;
+  int pitch  = cursor.shape_info.Pitch;
+
+  // img cursor.{x,y} < 0, skip parts of the cursor.img_data
+  auto cursor_skip_y = -std::min(0, cursor.y);
+  auto cursor_skip_x = -std::min(0, cursor.x);
+
+  // img cursor.{x,y} > img.{x,y}, truncate parts of the cursor.img_data
+  auto cursor_truncate_y = std::max(0, cursor.y - img.height);
+  auto cursor_truncate_x = std::max(0, cursor.x - img.width);
+
+  auto cursor_width  = width - cursor_skip_x - cursor_truncate_x;
+  auto cursor_height = height - cursor_skip_y - cursor_truncate_y;
+
+  if(cursor_height > height || cursor_width > width) {
+    return;
+  }
+
+  auto img_skip_y = std::max(0, cursor.y);
+  auto img_skip_x = std::max(0, cursor.x);
+
+  auto cursor_img_data = cursor.img_data.data() + cursor_skip_y * pitch;
+
+  int delta_height = std::min(cursor_height - cursor_truncate_y, std::max(0, img.height - img_skip_y));
+  int delta_width  = std::min(cursor_width - cursor_truncate_x, std::max(0, img.width - img_skip_x));
+
+  auto pixels_per_byte = width / pitch;
+  auto bytes_per_row   = delta_width / pixels_per_byte;
+
+  auto img_data = (int *)img.data;
+  for(int i = 0; i < delta_height; ++i) {
+    auto and_mask = &cursor_img_data[i * pitch];
+    auto xor_mask = &cursor_img_data[(i + height) * pitch];
+
+    auto img_pixel_p = &img_data[(i + img_skip_y) * (img.row_pitch / img.pixel_pitch) + img_skip_x];
+
+    auto skip_x = cursor_skip_x;
+    for(int x = 0; x < bytes_per_row; ++x) {
+      for(auto bit = 0u; bit < 8; ++bit) {
+        if(skip_x > 0) {
+          --skip_x;
+
+          continue;
+        }
+
+        int and_ = *and_mask & (1 << (7 - bit)) ? -1 : 0;
+        int xor_ = *xor_mask & (1 << (7 - bit)) ? -1 : 0;
+
+        *img_pixel_p &= and_;
+        *img_pixel_p ^= xor_;
+
+        ++img_pixel_p;
+      }
+
+      ++and_mask;
+      ++xor_mask;
+    }
+  }
+}
+
+void apply_color_alpha(int *img_pixel_p, int cursor_pixel) {
+  auto colors_out = (std::uint8_t *)&cursor_pixel;
+  auto colors_in  = (std::uint8_t *)img_pixel_p;
+
+  //TODO: When use of IDXGIOutput5 is implemented, support different color formats
+  auto alpha = colors_out[3];
+  if(alpha == 255) {
+    *img_pixel_p = cursor_pixel;
+  }
+  else {
+    colors_in[0] = colors_out[0] + (colors_in[0] * (255 - alpha) + 255 / 2) / 255;
+    colors_in[1] = colors_out[1] + (colors_in[1] * (255 - alpha) + 255 / 2) / 255;
+    colors_in[2] = colors_out[2] + (colors_in[2] * (255 - alpha) + 255 / 2) / 255;
+  }
+}
+
+void apply_color_masked(int *img_pixel_p, int cursor_pixel) {
+  //TODO: When use of IDXGIOutput5 is implemented, support different color formats
+  auto alpha = ((std::uint8_t *)&cursor_pixel)[3];
+  if(alpha == 0xFF) {
+    *img_pixel_p ^= cursor_pixel;
+  }
+  else {
+    *img_pixel_p = cursor_pixel;
+  }
+}
+
+void blend_cursor_color(const cursor_t &cursor, img_t &img, const bool masked) {
+  int height = cursor.shape_info.Height;
+  int width  = cursor.shape_info.Width;
+  int pitch  = cursor.shape_info.Pitch;
+
+  // img cursor.y < 0, skip parts of the cursor.img_data
+  auto cursor_skip_y = -std::min(0, cursor.y);
+  auto cursor_skip_x = -std::min(0, cursor.x);
+
+  // img cursor.{x,y} > img.{x,y}, truncate parts of the cursor.img_data
+  auto cursor_truncate_y = std::max(0, cursor.y - img.height);
+  auto cursor_truncate_x = std::max(0, cursor.x - img.width);
+
+  auto img_skip_y = std::max(0, cursor.y);
+  auto img_skip_x = std::max(0, cursor.x);
+
+  auto cursor_width  = width - cursor_skip_x - cursor_truncate_x;
+  auto cursor_height = height - cursor_skip_y - cursor_truncate_y;
+
+  if(cursor_height > height || cursor_width > width) {
+    return;
+  }
+
+  auto cursor_img_data = (int *)&cursor.img_data[cursor_skip_y * pitch];
+
+  int delta_height = std::min(cursor_height - cursor_truncate_y, std::max(0, img.height - img_skip_y));
+  int delta_width  = std::min(cursor_width - cursor_truncate_x, std::max(0, img.width - img_skip_x));
+
+  auto img_data = (int *)img.data;
+
+  for(int i = 0; i < delta_height; ++i) {
+    auto cursor_begin = &cursor_img_data[i * cursor.shape_info.Width + cursor_skip_x];
+    auto cursor_end   = &cursor_begin[delta_width];
+
+    auto img_pixel_p = &img_data[(i + img_skip_y) * (img.row_pitch / img.pixel_pitch) + img_skip_x];
+    std::for_each(cursor_begin, cursor_end, [&](int cursor_pixel) {
+      if(masked) {
+        apply_color_masked(img_pixel_p, cursor_pixel);
+      }
+      else {
+        apply_color_alpha(img_pixel_p, cursor_pixel);
+      }
+      ++img_pixel_p;
+    });
+  }
+}
+
+void blend_cursor(const cursor_t &cursor, img_t &img) {
+  switch(cursor.shape_info.Type) {
+  case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_COLOR:
+    blend_cursor_color(cursor, img, false);
+    break;
+  case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MONOCHROME:
+    blend_cursor_monochrome(cursor, img);
+    break;
+  case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MASKED_COLOR:
+    blend_cursor_color(cursor, img, true);
+    break;
+  default:
+    BOOST_LOG(warning) << "Unsupported cursor format ["sv << cursor.shape_info.Type << ']';
+  }
+}
+
+capture_e display_ram_t::snapshot(::platf::img_t *img_base, std::chrono::milliseconds timeout, bool cursor_visible) {
+  auto img = (img_t *)img_base;
+
+  HRESULT status;
+
+  DXGI_OUTDUPL_FRAME_INFO frame_info;
+
+  resource_t::pointer res_p {};
+  auto capture_status = dup.next_frame(frame_info, timeout, &res_p);
+  resource_t res { res_p };
+
+  if(capture_status != capture_e::ok) {
+    return capture_status;
+  }
+
+  if(frame_info.PointerShapeBufferSize > 0) {
+    auto &img_data = cursor.img_data;
+
+    img_data.resize(frame_info.PointerShapeBufferSize);
+
+    UINT dummy;
+    status = dup.dup->GetFramePointerShape(img_data.size(), img_data.data(), &dummy, &cursor.shape_info);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to get new pointer shape [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return capture_e::error;
+    }
+  }
+
+  if(frame_info.LastMouseUpdateTime.QuadPart) {
+    cursor.x       = frame_info.PointerPosition.Position.x;
+    cursor.y       = frame_info.PointerPosition.Position.y;
+    cursor.visible = frame_info.PointerPosition.Visible;
+  }
+
+  // If frame has been updated
+  if(frame_info.LastPresentTime.QuadPart != 0) {
+    {
+      texture2d_t src {};
+      status = res->QueryInterface(IID_ID3D11Texture2D, (void **)&src);
+
+      if(FAILED(status)) {
+        BOOST_LOG(error) << "Couldn't query interface [0x"sv << util::hex(status).to_string_view() << ']';
+        return capture_e::error;
+      }
+
+      //Copy from GPU to CPU
+      device_ctx->CopyResource(texture.get(), src.get());
+    }
+
+    if(img_info.pData) {
+      device_ctx->Unmap(texture.get(), 0);
+      img_info.pData = nullptr;
+    }
+
+    status = device_ctx->Map(texture.get(), 0, D3D11_MAP_READ, 0, &img_info);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to map texture [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return capture_e::error;
+    }
+  }
+
+  const bool mouse_update =
+    (frame_info.LastMouseUpdateTime.QuadPart || frame_info.PointerShapeBufferSize > 0) &&
+    (cursor_visible && cursor.visible);
+
+  const bool update_flag = frame_info.LastPresentTime.QuadPart != 0 || mouse_update;
+
+  if(!update_flag) {
+    return capture_e::timeout;
+  }
+
+  std::copy_n((std::uint8_t *)img_info.pData, height * img_info.RowPitch, (std::uint8_t *)img->data);
+
+  if(cursor_visible && cursor.visible) {
+    blend_cursor(cursor, *img);
+  }
+
+  return capture_e::ok;
+}
+
+std::shared_ptr<platf::img_t> display_ram_t::alloc_img() {
+  auto img = std::make_shared<img_t>();
+
+  img->pixel_pitch = 4;
+  img->row_pitch   = img_info.RowPitch;
+  img->width       = width;
+  img->height      = height;
+  img->data        = new std::uint8_t[img->row_pitch * height];
+
+  return img;
+}
+
+int display_ram_t::dummy_img(platf::img_t *img) {
+  return 0;
+}
+
+int display_ram_t::init() {
+  if(display_base_t::init()) {
+    return -1;
+  }
+
+  D3D11_TEXTURE2D_DESC t {};
+  t.Width            = width;
+  t.Height           = height;
+  t.MipLevels        = 1;
+  t.ArraySize        = 1;
+  t.SampleDesc.Count = 1;
+  t.Usage            = D3D11_USAGE_STAGING;
+  t.Format           = format;
+  t.CPUAccessFlags   = D3D11_CPU_ACCESS_READ;
+
+  auto status = device->CreateTexture2D(&t, nullptr, &texture);
+
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Failed to create texture [0x"sv << util::hex(status).to_string_view() << ']';
+    return -1;
+  }
+
+  // map the texture simply to get the pitch and stride
+  status = device_ctx->Map(texture.get(), 0, D3D11_MAP_READ, 0, &img_info);
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Failed to map the texture [0x"sv << util::hex(status).to_string_view() << ']';
+    return -1;
+  }
+
+  return 0;
+}
+} // namespace platf::dxgi

sunshine/platform/windows/display_vram.cpp

@@ -0,0 +1,915 @@
+#include <cmath>
+
+#include <codecvt>
+
+#include <d3dcompiler.h>
+#include <directxmath.h>
+
+#include "display.h"
+#include "sunshine/main.h"
+
+#define SUNSHINE_SHADERS_DIR SUNSHINE_ASSETS_DIR "/shaders"
+namespace platf {
+using namespace std::literals;
+}
+
+namespace platf::dxgi {
+using input_layout_t        = util::safe_ptr<ID3D11InputLayout, Release<ID3D11InputLayout>>;
+using render_target_t       = util::safe_ptr<ID3D11RenderTargetView, Release<ID3D11RenderTargetView>>;
+using shader_res_t          = util::safe_ptr<ID3D11ShaderResourceView, Release<ID3D11ShaderResourceView>>;
+using buf_t                 = util::safe_ptr<ID3D11Buffer, Release<ID3D11Buffer>>;
+using blend_t               = util::safe_ptr<ID3D11BlendState, Release<ID3D11BlendState>>;
+using raster_state_t        = util::safe_ptr<ID3D11RasterizerState, Release<ID3D11RasterizerState>>;
+using sampler_state_t       = util::safe_ptr<ID3D11SamplerState, Release<ID3D11SamplerState>>;
+using vs_t                  = util::safe_ptr<ID3D11VertexShader, Release<ID3D11VertexShader>>;
+using ps_t                  = util::safe_ptr<ID3D11PixelShader, Release<ID3D11PixelShader>>;
+using blob_t                = util::safe_ptr<ID3DBlob, Release<ID3DBlob>>;
+using depth_stencil_state_t = util::safe_ptr<ID3D11DepthStencilState, Release<ID3D11DepthStencilState>>;
+using depth_stencil_view_t  = util::safe_ptr<ID3D11DepthStencilView, Release<ID3D11DepthStencilView>>;
+
+using float4 = DirectX::XMFLOAT4;
+using float3 = DirectX::XMFLOAT3;
+using float2 = DirectX::XMFLOAT2;
+struct __attribute__((__aligned__(16))) color_t {
+  float4 color_vec_y;
+  float4 color_vec_u;
+  float4 color_vec_v;
+  float2 range_y;
+  float2 range_uv;
+};
+
+color_t make_color_matrix(float Cr, float Cb, float U_max, float V_max, float add_Y, float add_UV, float2 range_Y, float2 range_UV) {
+  float Cg = 1.0f - Cr - Cb;
+
+  float Cr_i = 1.0f - Cr;
+  float Cb_i = 1.0f - Cb;
+
+  float shift_y  = range_Y.x / 256.0f;
+  float shift_uv = range_UV.x / 256.0f;
+
+  float scale_y  = (range_Y.y - range_Y.x) / 256.0f;
+  float scale_uv = (range_UV.y - range_UV.x) / 256.0f;
+  return {
+    { Cr, Cg, Cb, add_Y },
+    { -(Cr * U_max / Cb_i), -(Cg * U_max / Cb_i), U_max, add_UV },
+    { V_max, -(Cg * V_max / Cr_i), -(Cb * V_max / Cr_i), add_UV },
+    { scale_y, shift_y },
+    { scale_uv, shift_uv },
+  };
+}
+
+color_t colors[] {
+  make_color_matrix(0.299f, 0.114f, 0.436f, 0.615f, 0.0625, 0.5f, { 16.0f, 235.0f }, { 16.0f, 240.0f }),   // BT601 MPEG
+  make_color_matrix(0.299f, 0.114f, 0.5f, 0.5f, 0.0f, 0.5f, { 0.0f, 255.0f }, { 0.0f, 255.0f }),           // BT601 JPEG
+  make_color_matrix(0.2126f, 0.0722f, 0.436f, 0.615f, 0.0625, 0.5f, { 16.0f, 235.0f }, { 16.0f, 240.0f }), //BT701 MPEG
+  make_color_matrix(0.2126f, 0.0722f, 0.5f, 0.5f, 0.0f, 0.5f, { 0.0f, 255.0f }, { 0.0f, 255.0f }),         //BT701 JPEG
+};
+
+template<class T>
+buf_t make_buffer(device_t::pointer device, const T &t) {
+  static_assert(sizeof(T) % 16 == 0, "Buffer needs to be aligned on a 16-byte alignment");
+
+  D3D11_BUFFER_DESC buffer_desc {
+    sizeof(T),
+    D3D11_USAGE_IMMUTABLE,
+    D3D11_BIND_CONSTANT_BUFFER
+  };
+
+  D3D11_SUBRESOURCE_DATA init_data {
+    &t
+  };
+
+  buf_t::pointer buf_p;
+  auto status = device->CreateBuffer(&buffer_desc, &init_data, &buf_p);
+  if(status) {
+    BOOST_LOG(error) << "Failed to create buffer: [0x"sv << util::hex(status).to_string_view() << ']';
+    return nullptr;
+  }
+
+  return buf_t { buf_p };
+}
+
+blend_t make_blend(device_t::pointer device, bool enable) {
+  D3D11_BLEND_DESC bdesc {};
+  auto &rt                 = bdesc.RenderTarget[0];
+  rt.BlendEnable           = enable;
+  rt.RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
+
+  if(enable) {
+    rt.BlendOp      = D3D11_BLEND_OP_ADD;
+    rt.BlendOpAlpha = D3D11_BLEND_OP_ADD;
+
+    rt.SrcBlend  = D3D11_BLEND_SRC_ALPHA;
+    rt.DestBlend = D3D11_BLEND_INV_SRC_ALPHA;
+
+    rt.SrcBlendAlpha  = D3D11_BLEND_ZERO;
+    rt.DestBlendAlpha = D3D11_BLEND_ZERO;
+  }
+
+  blend_t blend;
+  auto status = device->CreateBlendState(&bdesc, &blend);
+  if(status) {
+    BOOST_LOG(error) << "Failed to create blend state: [0x"sv << util::hex(status).to_string_view() << ']';
+    return nullptr;
+  }
+
+  return blend;
+}
+
+blob_t convert_UV_vs_hlsl;
+blob_t convert_UV_ps_hlsl;
+blob_t scene_vs_hlsl;
+blob_t convert_Y_ps_hlsl;
+blob_t scene_ps_hlsl;
+
+struct img_d3d_t : public platf::img_t {
+  shader_res_t input_res;
+  texture2d_t texture;
+  std::shared_ptr<platf::display_t> display;
+
+  ~img_d3d_t() override = default;
+};
+
+util::buffer_t<std::uint8_t> make_cursor_image(util::buffer_t<std::uint8_t> &&img_data, DXGI_OUTDUPL_POINTER_SHAPE_INFO shape_info) {
+  constexpr std::uint32_t black       = 0xFF000000;
+  constexpr std::uint32_t white       = 0xFFFFFFFF;
+  constexpr std::uint32_t transparent = 0;
+
+  switch(shape_info.Type) {
+  case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MASKED_COLOR:
+    std::for_each((std::uint32_t *)std::begin(img_data), (std::uint32_t *)std::end(img_data), [](auto &pixel) {
+      if(pixel & 0xFF000000) {
+        pixel = transparent;
+      }
+    });
+  case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_COLOR:
+    return std::move(img_data);
+  default:
+    break;
+  }
+
+  shape_info.Height /= 2;
+
+  util::buffer_t<std::uint8_t> cursor_img { shape_info.Width * shape_info.Height * 4 };
+
+  auto bytes       = shape_info.Pitch * shape_info.Height;
+  auto pixel_begin = (std::uint32_t *)std::begin(cursor_img);
+  auto pixel_data  = pixel_begin;
+  auto and_mask    = std::begin(img_data);
+  auto xor_mask    = std::begin(img_data) + bytes;
+
+  for(auto x = 0; x < bytes; ++x) {
+    for(auto c = 7; c >= 0; --c) {
+      auto bit        = 1 << c;
+      auto color_type = ((*and_mask & bit) ? 1 : 0) + ((*xor_mask & bit) ? 2 : 0);
+
+      switch(color_type) {
+      case 0: //black
+        *pixel_data = black;
+        break;
+      case 2: //white
+        *pixel_data = white;
+        break;
+      case 1: //transparent
+      {
+        *pixel_data = transparent;
+
+        break;
+      }
+      case 3: //inverse
+      {
+        auto top_p    = pixel_data - shape_info.Width;
+        auto left_p   = pixel_data - 1;
+        auto right_p  = pixel_data + 1;
+        auto bottom_p = pixel_data + shape_info.Width;
+
+        // Get the x coordinate of the pixel
+        auto column = (pixel_data - pixel_begin) % shape_info.Width != 0;
+
+        if(top_p >= pixel_begin && *top_p == transparent) {
+          *top_p = black;
+        }
+
+        if(column != 0 && left_p >= pixel_begin && *left_p == transparent) {
+          *left_p = black;
+        }
+
+        if(bottom_p < (std::uint32_t *)std::end(cursor_img)) {
+          *bottom_p = black;
+        }
+
+        if(column != shape_info.Width - 1) {
+          *right_p = black;
+        }
+        *pixel_data = white;
+      }
+      }
+
+      ++pixel_data;
+    }
+    ++and_mask;
+    ++xor_mask;
+  }
+
+  return cursor_img;
+}
+
+blob_t compile_shader(LPCSTR file, LPCSTR entrypoint, LPCSTR shader_model) {
+  blob_t::pointer msg_p = nullptr;
+  blob_t::pointer compiled_p;
+
+  DWORD flags = D3DCOMPILE_ENABLE_STRICTNESS;
+
+#ifndef NDEBUG
+  flags |= D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
+#endif
+  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
+
+  auto wFile  = converter.from_bytes(file);
+  auto status = D3DCompileFromFile(wFile.c_str(), nullptr, nullptr, entrypoint, shader_model, flags, 0, &compiled_p, &msg_p);
+
+  if(msg_p) {
+    BOOST_LOG(warning) << std::string_view { (const char *)msg_p->GetBufferPointer(), msg_p->GetBufferSize() - 1 };
+    msg_p->Release();
+  }
+
+  if(status) {
+    BOOST_LOG(error) << "Couldn't compile ["sv << file << "] [0x"sv << util::hex(status).to_string_view() << ']';
+    return nullptr;
+  }
+
+  return blob_t { compiled_p };
+}
+
+blob_t compile_pixel_shader(LPCSTR file) {
+  return compile_shader(file, "main_ps", "ps_5_0");
+}
+
+blob_t compile_vertex_shader(LPCSTR file) {
+  return compile_shader(file, "main_vs", "vs_5_0");
+}
+
+class hwdevice_t : public platf::hwdevice_t {
+public:
+  hwdevice_t(std::vector<hwdevice_t *> *hwdevices_p) : hwdevices_p { hwdevices_p } {}
+  hwdevice_t() = delete;
+
+  void set_cursor_pos(LONG rel_x, LONG rel_y, bool visible) {
+    cursor_visible = visible;
+
+    if(!visible) {
+      return;
+    }
+
+    auto x = ((float)rel_x);
+    auto y = ((float)rel_y);
+
+    cursor_view.TopLeftX = x;
+    cursor_view.TopLeftY = y;
+  }
+
+  int set_cursor_texture(texture2d_t::pointer texture, LONG width, LONG height) {
+    auto device = (device_t::pointer)data;
+
+    cursor_view.Width  = width;
+    cursor_view.Height = height;
+
+    D3D11_SHADER_RESOURCE_VIEW_DESC desc {
+      DXGI_FORMAT_B8G8R8A8_UNORM,
+      D3D11_SRV_DIMENSION_TEXTURE2D
+    };
+    desc.Texture2D.MipLevels = 1;
+
+    auto status = device->CreateShaderResourceView(texture, &desc, &img.input_res);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to create cursor shader resource view [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    return 0;
+  }
+
+  int convert(platf::img_t &img_base) override {
+    auto &img = (img_d3d_t &)img_base;
+
+    if(!img.input_res) {
+      auto device = (device_t::pointer)data;
+
+      D3D11_SHADER_RESOURCE_VIEW_DESC desc {
+        DXGI_FORMAT_B8G8R8A8_UNORM,
+        D3D11_SRV_DIMENSION_TEXTURE2D
+      };
+      desc.Texture2D.MipLevels = 1;
+
+      auto status = device->CreateShaderResourceView(img.texture.get(), &desc, &img.input_res);
+      if(FAILED(status)) {
+        BOOST_LOG(error) << "Failed to create input shader resource view [0x"sv << util::hex(status).to_string_view() << ']';
+        return -1;
+      }
+    }
+
+    auto input_res_p = img.input_res.get();
+
+    if(cursor_visible) {
+      _init_view_port(img.width, img.height);
+
+      device_ctx_p->OMSetRenderTargets(1, &scene_rt, nullptr);
+      device_ctx_p->VSSetShader(scene_vs.get(), nullptr, 0);
+      device_ctx_p->PSSetShader(scene_ps.get(), nullptr, 0);
+      device_ctx_p->PSSetShaderResources(0, 1, &input_res_p);
+
+      device_ctx_p->Draw(3, 0);
+
+      device_ctx_p->OMSetBlendState(blend_enable.get(), nullptr, 0xFFFFFFFFu);
+      device_ctx_p->RSSetViewports(1, &cursor_view);
+      device_ctx_p->PSSetShaderResources(0, 1, &this->img.input_res);
+      device_ctx_p->Draw(3, 0);
+      device_ctx_p->OMSetBlendState(blend_disable.get(), nullptr, 0xFFFFFFFFu);
+
+      input_res_p = scene_sr.get();
+    }
+
+    _init_view_port(this->img.width, this->img.height);
+    device_ctx_p->OMSetRenderTargets(1, &nv12_Y_rt, nullptr);
+    device_ctx_p->VSSetShader(scene_vs.get(), nullptr, 0);
+    device_ctx_p->PSSetShader(convert_Y_ps.get(), nullptr, 0);
+    device_ctx_p->PSSetShaderResources(0, 1, &back_img.input_res);
+    device_ctx_p->Draw(3, 0);
+
+    device_ctx_p->RSSetViewports(1, &outY_view);
+    device_ctx_p->PSSetShaderResources(0, 1, &input_res_p);
+    device_ctx_p->Draw(3, 0);
+
+    // Artifacts start appearing on the rendered image if Sunshine doesn't flush
+    // before rendering on the UV part of the image.
+    device_ctx_p->Flush();
+
+    _init_view_port(this->img.width / 2, this->img.height / 2);
+    device_ctx_p->OMSetRenderTargets(1, &nv12_UV_rt, nullptr);
+    device_ctx_p->VSSetShader(convert_UV_vs.get(), nullptr, 0);
+    device_ctx_p->PSSetShader(convert_UV_ps.get(), nullptr, 0);
+    device_ctx_p->PSSetShaderResources(0, 1, &back_img.input_res);
+    device_ctx_p->Draw(3, 0);
+
+    device_ctx_p->RSSetViewports(1, &outUV_view);
+    device_ctx_p->PSSetShaderResources(0, 1, &input_res_p);
+    device_ctx_p->Draw(3, 0);
+    device_ctx_p->Flush();
+
+    return 0;
+  }
+
+  void set_colorspace(std::uint32_t colorspace, std::uint32_t color_range) override {
+    switch(colorspace) {
+    case 5: // SWS_CS_SMPTE170M
+      color_p = &colors[0];
+      break;
+    case 1: // SWS_CS_ITU709
+      color_p = &colors[2];
+      break;
+    case 9: // SWS_CS_BT2020
+    default:
+      BOOST_LOG(warning) << "Colorspace: ["sv << colorspace << "] not yet supported: switching to default"sv;
+      color_p = &colors[0];
+    };
+
+    if(color_range > 1) {
+      // Full range
+      ++color_p;
+    }
+
+    auto color_matrix = make_buffer((device_t::pointer)data, *color_p);
+    if(!color_matrix) {
+      BOOST_LOG(warning) << "Failed to create color matrix"sv;
+      return;
+    }
+
+    device_ctx_p->PSSetConstantBuffers(0, 1, &color_matrix);
+    this->color_matrix = std::move(color_matrix);
+  }
+
+  int init(
+    std::shared_ptr<platf::display_t> display, device_t::pointer device_p, device_ctx_t::pointer device_ctx_p,
+    int out_width, int out_height,
+    pix_fmt_e pix_fmt) {
+    HRESULT status;
+
+    device_p->AddRef();
+    data = device_p;
+
+    this->device_ctx_p = device_ctx_p;
+
+    cursor_visible       = false;
+    cursor_view.MinDepth = 0.0f;
+    cursor_view.MaxDepth = 1.0f;
+
+    platf::hwdevice_t::img = &img;
+
+    float in_width  = display->width;
+    float in_height = display->height;
+
+    // // Ensure aspect ratio is maintained
+    auto scalar       = std::fminf(out_width / in_width, out_height / in_height);
+    auto out_width_f  = in_width * scalar;
+    auto out_height_f = in_height * scalar;
+
+    // result is always positive
+    auto offsetX = (out_width - out_width_f) / 2;
+    auto offsetY = (out_height - out_height_f) / 2;
+
+    outY_view  = D3D11_VIEWPORT { offsetX, offsetY, out_width_f, out_height_f, 0.0f, 1.0f };
+    outUV_view = D3D11_VIEWPORT { offsetX / 2, offsetY / 2, out_width_f / 2, out_height_f / 2, 0.0f, 1.0f };
+
+    status = device_p->CreateVertexShader(scene_vs_hlsl->GetBufferPointer(), scene_vs_hlsl->GetBufferSize(), nullptr, &scene_vs);
+    if(status) {
+      BOOST_LOG(error) << "Failed to create scene vertex shader [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    status = device_p->CreatePixelShader(convert_Y_ps_hlsl->GetBufferPointer(), convert_Y_ps_hlsl->GetBufferSize(), nullptr, &convert_Y_ps);
+    if(status) {
+      BOOST_LOG(error) << "Failed to create convertY pixel shader [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    status = device_p->CreatePixelShader(convert_UV_ps_hlsl->GetBufferPointer(), convert_UV_ps_hlsl->GetBufferSize(), nullptr, &convert_UV_ps);
+    if(status) {
+      BOOST_LOG(error) << "Failed to create convertUV pixel shader [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    status = device_p->CreateVertexShader(convert_UV_vs_hlsl->GetBufferPointer(), convert_UV_vs_hlsl->GetBufferSize(), nullptr, &convert_UV_vs);
+    if(status) {
+      BOOST_LOG(error) << "Failed to create convertUV vertex shader [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    status = device_p->CreatePixelShader(scene_ps_hlsl->GetBufferPointer(), scene_ps_hlsl->GetBufferSize(), nullptr, &scene_ps);
+    if(status) {
+      BOOST_LOG(error) << "Failed to create scene pixel shader [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    blend_disable = make_blend(device_p, false);
+    blend_enable  = make_blend(device_p, true);
+
+    if(!blend_disable || !blend_enable) {
+      return -1;
+    }
+
+    if(_init_rt(scene_sr, scene_rt, in_width, in_height, DXGI_FORMAT_B8G8R8A8_UNORM)) {
+      return -1;
+    }
+
+    color_matrix = make_buffer(device_p, colors[0]);
+    if(!color_matrix) {
+      BOOST_LOG(error) << "Failed to create color matrix buffer"sv;
+      return -1;
+    }
+
+    float info_in[16 / sizeof(float)] { 1.0f / (float)out_width }; //aligned to 16-byte
+    info_scene = make_buffer(device_p, info_in);
+    if(!info_in) {
+      BOOST_LOG(error) << "Failed to create info scene buffer"sv;
+      return -1;
+    }
+
+    D3D11_INPUT_ELEMENT_DESC layout_desc {
+      "SV_Position", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0
+    };
+
+    status = device_p->CreateInputLayout(
+      &layout_desc, 1,
+      convert_UV_vs_hlsl->GetBufferPointer(), convert_UV_vs_hlsl->GetBufferSize(),
+      &input_layout);
+
+    D3D11_TEXTURE2D_DESC t {};
+    t.Width            = out_width;
+    t.Height           = out_height;
+    t.MipLevels        = 1;
+    t.ArraySize        = 1;
+    t.SampleDesc.Count = 1;
+    t.Usage            = D3D11_USAGE_DEFAULT;
+    t.Format           = pix_fmt == pix_fmt_e::nv12 ? DXGI_FORMAT_NV12 : DXGI_FORMAT_P010;
+    t.BindFlags        = D3D11_BIND_RENDER_TARGET;
+
+    status = device_p->CreateTexture2D(&t, nullptr, &img.texture);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to create render target texture [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    img.display     = std::move(display);
+    img.width       = out_width;
+    img.height      = out_height;
+    img.data        = (std::uint8_t *)img.texture.get();
+    img.row_pitch   = out_width;
+    img.pixel_pitch = 1;
+
+    D3D11_RENDER_TARGET_VIEW_DESC nv12_rt_desc {
+      DXGI_FORMAT_R8_UNORM,
+      D3D11_RTV_DIMENSION_TEXTURE2D
+    };
+
+    status = device_p->CreateRenderTargetView(img.texture.get(), &nv12_rt_desc, &nv12_Y_rt);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to create render target view [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    nv12_rt_desc.Format = DXGI_FORMAT_R8G8_UNORM;
+    status              = device_p->CreateRenderTargetView(img.texture.get(), &nv12_rt_desc, &nv12_UV_rt);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to create render target view [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    D3D11_SAMPLER_DESC sampler_desc {};
+    sampler_desc.Filter         = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+    sampler_desc.AddressU       = D3D11_TEXTURE_ADDRESS_CLAMP;
+    sampler_desc.AddressV       = D3D11_TEXTURE_ADDRESS_CLAMP;
+    sampler_desc.AddressW       = D3D11_TEXTURE_ADDRESS_WRAP;
+    sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER;
+    sampler_desc.MinLOD         = 0;
+    sampler_desc.MaxLOD         = D3D11_FLOAT32_MAX;
+
+    status = device_p->CreateSamplerState(&sampler_desc, &sampler_linear);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to create point sampler state [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    // Color the background black, so that the padding for keeping the aspect ratio
+    // is black
+    if(img.display->dummy_img(&back_img)) {
+      BOOST_LOG(warning) << "Couldn't create an image to set background color to black"sv;
+      return -1;
+    }
+
+    D3D11_SHADER_RESOURCE_VIEW_DESC desc {
+      DXGI_FORMAT_B8G8R8A8_UNORM,
+      D3D11_SRV_DIMENSION_TEXTURE2D
+    };
+    desc.Texture2D.MipLevels = 1;
+
+    status = device_p->CreateShaderResourceView(back_img.texture.get(), &desc, &back_img.input_res);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to create input shader resource view [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    device_ctx_p->OMSetBlendState(blend_disable.get(), nullptr, 0xFFFFFFFFu);
+    device_ctx_p->PSSetSamplers(0, 1, &sampler_linear);
+    device_ctx_p->PSSetConstantBuffers(0, 1, &color_matrix);
+    device_ctx_p->VSSetConstantBuffers(0, 1, &info_scene);
+    device_ctx_p->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+    device_ctx_p->IASetInputLayout(input_layout.get());
+
+    return 0;
+  }
+
+  ~hwdevice_t() override {
+    if(data) {
+      ((ID3D11Device *)data)->Release();
+    }
+
+    auto it = std::find(std::begin(*hwdevices_p), std::end(*hwdevices_p), this);
+    if(it != std::end(*hwdevices_p)) {
+      hwdevices_p->erase(it);
+    }
+  }
+
+private:
+  void _init_view_port(float x, float y, float width, float height) {
+    D3D11_VIEWPORT view {
+      x, y,
+      width, height,
+      0.0f, 1.0f
+    };
+
+    device_ctx_p->RSSetViewports(1, &view);
+  }
+
+  void _init_view_port(float width, float height) {
+    _init_view_port(0.0f, 0.0f, width, height);
+  }
+
+  int _init_rt(shader_res_t &shader_res, render_target_t &render_target, int width, int height, DXGI_FORMAT format) {
+    D3D11_TEXTURE2D_DESC desc {};
+
+    desc.Width            = width;
+    desc.Height           = height;
+    desc.Format           = format;
+    desc.Usage            = D3D11_USAGE_DEFAULT;
+    desc.BindFlags        = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
+    desc.MipLevels        = 1;
+    desc.ArraySize        = 1;
+    desc.SampleDesc.Count = 1;
+
+    auto device = (device_t::pointer)data;
+
+    texture2d_t tex;
+    auto status = device->CreateTexture2D(&desc, nullptr, &tex);
+    if(status) {
+      BOOST_LOG(error) << "Failed to create render target texture for luma [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+
+    D3D11_SHADER_RESOURCE_VIEW_DESC shader_resource_desc {
+      format,
+      D3D11_SRV_DIMENSION_TEXTURE2D
+    };
+    shader_resource_desc.Texture2D.MipLevels = 1;
+
+    device->CreateShaderResourceView(tex.get(), &shader_resource_desc, &shader_res);
+    if(status) {
+      BOOST_LOG(error) << "Failed to create render target texture for luma [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    D3D11_RENDER_TARGET_VIEW_DESC render_target_desc {
+      format,
+      D3D11_RTV_DIMENSION_TEXTURE2D
+    };
+
+    device->CreateRenderTargetView(tex.get(), &render_target_desc, &render_target);
+    if(status) {
+      BOOST_LOG(error) << "Failed to create render target view [0x"sv << util::hex(status).to_string_view() << ']';
+      return -1;
+    }
+
+    return 0;
+  }
+
+public:
+  color_t *color_p;
+
+  blend_t blend_enable;
+  blend_t blend_disable;
+
+  buf_t info_scene;
+  buf_t color_matrix;
+
+  sampler_state_t sampler_linear;
+
+  input_layout_t input_layout;
+
+  render_target_t nv12_Y_rt;
+  render_target_t nv12_UV_rt;
+
+  render_target_t scene_rt;
+  shader_res_t scene_sr;
+
+  img_d3d_t img;
+
+  // Clear nv12 render target to black
+  img_d3d_t back_img;
+
+  vs_t convert_UV_vs;
+  ps_t convert_UV_ps;
+  ps_t convert_Y_ps;
+  ps_t scene_ps;
+  vs_t scene_vs;
+
+  D3D11_VIEWPORT outY_view;
+  D3D11_VIEWPORT outUV_view;
+
+  D3D11_VIEWPORT cursor_view;
+  bool cursor_visible;
+
+  device_ctx_t::pointer device_ctx_p;
+
+  // The destructor will remove itself from the list of hardware devices, this is done synchronously
+  std::vector<hwdevice_t *> *hwdevices_p;
+};
+
+capture_e display_vram_t::snapshot(platf::img_t *img_base, std::chrono::milliseconds timeout, bool cursor_visible) {
+  auto img = (img_d3d_t *)img_base;
+
+  HRESULT status;
+
+  DXGI_OUTDUPL_FRAME_INFO frame_info;
+
+  resource_t::pointer res_p {};
+  auto capture_status = dup.next_frame(frame_info, timeout, &res_p);
+  resource_t res { res_p };
+
+  if(capture_status != capture_e::ok) {
+    return capture_status;
+  }
+
+  const bool mouse_update_flag = frame_info.LastMouseUpdateTime.QuadPart != 0 || frame_info.PointerShapeBufferSize > 0;
+  const bool frame_update_flag = frame_info.AccumulatedFrames != 0 || frame_info.LastPresentTime.QuadPart != 0;
+  const bool update_flag       = mouse_update_flag || frame_update_flag;
+
+  if(!update_flag) {
+    return capture_e::timeout;
+  }
+
+  if(frame_info.PointerShapeBufferSize > 0) {
+    DXGI_OUTDUPL_POINTER_SHAPE_INFO shape_info {};
+
+    util::buffer_t<std::uint8_t> img_data { frame_info.PointerShapeBufferSize };
+
+    UINT dummy;
+    status = dup.dup->GetFramePointerShape(img_data.size(), std::begin(img_data), &dummy, &shape_info);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to get new pointer shape [0x"sv << util::hex(status).to_string_view() << ']';
+
+      return capture_e::error;
+    }
+
+    auto cursor_img = make_cursor_image(std::move(img_data), shape_info);
+
+    D3D11_SUBRESOURCE_DATA data {
+      std::begin(cursor_img),
+      4 * shape_info.Width,
+      0
+    };
+
+    // Create texture for cursor
+    D3D11_TEXTURE2D_DESC t {};
+    t.Width            = shape_info.Width;
+    t.Height           = cursor_img.size() / data.SysMemPitch;
+    t.MipLevels        = 1;
+    t.ArraySize        = 1;
+    t.SampleDesc.Count = 1;
+    t.Usage            = D3D11_USAGE_DEFAULT;
+    t.Format           = DXGI_FORMAT_B8G8R8A8_UNORM;
+    t.BindFlags        = D3D11_BIND_SHADER_RESOURCE;
+
+    texture2d_t texture;
+    auto status = device->CreateTexture2D(&t, &data, &texture);
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Failed to create mouse texture [0x"sv << util::hex(status).to_string_view() << ']';
+      return capture_e::error;
+    }
+
+    for(auto *hwdevice : hwdevices) {
+      if(hwdevice->set_cursor_texture(texture.get(), t.Width, t.Height)) {
+        return capture_e::error;
+      }
+    }
+
+    cursor.texture = std::move(texture);
+    cursor.width   = t.Width;
+    cursor.height  = t.Height;
+  }
+
+  if(frame_info.LastMouseUpdateTime.QuadPart) {
+    for(auto *hwdevice : hwdevices) {
+      hwdevice->set_cursor_pos(frame_info.PointerPosition.Position.x, frame_info.PointerPosition.Position.y, frame_info.PointerPosition.Visible && cursor_visible);
+    }
+  }
+
+  if(frame_update_flag) {
+    texture2d_t src;
+    status = res->QueryInterface(IID_ID3D11Texture2D, (void **)&src);
+
+    if(FAILED(status)) {
+      BOOST_LOG(error) << "Couldn't query interface [0x"sv << util::hex(status).to_string_view() << ']';
+      return capture_e::error;
+    }
+
+    device_ctx->CopyResource(img->texture.get(), src.get());
+  }
+
+  return capture_e::ok;
+}
+
+std::shared_ptr<platf::img_t> display_vram_t::alloc_img() {
+  auto img = std::make_shared<img_d3d_t>();
+
+  D3D11_TEXTURE2D_DESC t {};
+  t.Width            = width;
+  t.Height           = height;
+  t.MipLevels        = 1;
+  t.ArraySize        = 1;
+  t.SampleDesc.Count = 1;
+  t.Usage            = D3D11_USAGE_DEFAULT;
+  t.Format           = format;
+  t.BindFlags        = D3D11_BIND_SHADER_RESOURCE;
+
+  auto status = device->CreateTexture2D(&t, nullptr, &img->texture);
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Failed to create img buf texture [0x"sv << util::hex(status).to_string_view() << ']';
+    return nullptr;
+  }
+
+  img->data        = (std::uint8_t *)img->texture.get();
+  img->row_pitch   = 0;
+  img->pixel_pitch = 4;
+  img->width       = 0;
+  img->height      = 0;
+  img->display     = shared_from_this();
+
+  return img;
+}
+
+int display_vram_t::dummy_img(platf::img_t *img_base) {
+  auto img = (img_d3d_t *)img_base;
+
+  img->row_pitch  = width * 4;
+  auto dummy_data = std::make_unique<int[]>(width * height);
+  D3D11_SUBRESOURCE_DATA data {
+    dummy_data.get(),
+    (UINT)img->row_pitch
+  };
+  std::fill_n(dummy_data.get(), width * height, 0);
+
+  D3D11_TEXTURE2D_DESC t {};
+  t.Width            = width;
+  t.Height           = height;
+  t.MipLevels        = 1;
+  t.ArraySize        = 1;
+  t.SampleDesc.Count = 1;
+  t.Usage            = D3D11_USAGE_DEFAULT;
+  t.Format           = format;
+  t.BindFlags        = D3D11_BIND_SHADER_RESOURCE;
+
+  dxgi::texture2d_t tex;
+  auto status = device->CreateTexture2D(&t, &data, &tex);
+  if(FAILED(status)) {
+    BOOST_LOG(error) << "Failed to create dummy texture [0x"sv << util::hex(status).to_string_view() << ']';
+    return -1;
+  }
+
+  img->texture     = std::move(tex);
+  img->data        = (std::uint8_t *)img->texture.get();
+  img->height      = height;
+  img->width       = width;
+  img->pixel_pitch = 4;
+
+  return 0;
+}
+
+std::shared_ptr<platf::hwdevice_t> display_vram_t::make_hwdevice(int width, int height, pix_fmt_e pix_fmt) {
+  if(pix_fmt != platf::pix_fmt_e::nv12) {
+    BOOST_LOG(error) << "display_vram_t doesn't support pixel format ["sv << from_pix_fmt(pix_fmt) << ']';
+
+    return nullptr;
+  }
+
+  auto hwdevice = std::make_shared<hwdevice_t>(&hwdevices);
+
+  auto ret = hwdevice->init(
+    shared_from_this(),
+    device.get(),
+    device_ctx.get(),
+    width, height,
+    pix_fmt);
+
+  if(ret) {
+    return nullptr;
+  }
+
+  if(cursor.texture && hwdevice->set_cursor_texture(cursor.texture.get(), cursor.width, cursor.height)) {
+    return nullptr;
+  }
+
+  hwdevices.emplace_back(hwdevice.get());
+
+  return hwdevice;
+}
+
+int init() {
+  for(auto &color : colors) {
+    BOOST_LOG(debug) << "Color Matrix"sv;
+    BOOST_LOG(debug) << "Y ["sv << color.color_vec_y.x << ", "sv << color.color_vec_y.y << ", "sv << color.color_vec_y.z << ", "sv << color.color_vec_y.w << ']';
+    BOOST_LOG(debug) << "U ["sv << color.color_vec_u.x << ", "sv << color.color_vec_u.y << ", "sv << color.color_vec_u.z << ", "sv << color.color_vec_u.w << ']';
+    BOOST_LOG(debug) << "V ["sv << color.color_vec_v.x << ", "sv << color.color_vec_v.y << ", "sv << color.color_vec_v.z << ", "sv << color.color_vec_v.w << ']';
+    BOOST_LOG(debug) << "range Y  ["sv << color.range_y.x << ", "sv << color.range_y.y << ']';
+    BOOST_LOG(debug) << "range UV ["sv << color.range_uv.x << ", "sv << color.range_uv.y << ']';
+  }
+
+  BOOST_LOG(info) << "Compiling shaders..."sv;
+  scene_vs_hlsl = compile_vertex_shader(SUNSHINE_SHADERS_DIR "/SceneVS.hlsl");
+  if(!scene_vs_hlsl) {
+    return -1;
+  }
+
+  convert_Y_ps_hlsl = compile_pixel_shader(SUNSHINE_SHADERS_DIR "/ConvertYPS.hlsl");
+  if(!convert_Y_ps_hlsl) {
+    return -1;
+  }
+
+  convert_UV_ps_hlsl = compile_pixel_shader(SUNSHINE_SHADERS_DIR "/ConvertUVPS.hlsl");
+  if(!convert_UV_ps_hlsl) {
+    return -1;
+  }
+
+  convert_UV_vs_hlsl = compile_vertex_shader(SUNSHINE_SHADERS_DIR "/ConvertUVVS.hlsl");
+  if(!convert_UV_vs_hlsl) {
+    return -1;
+  }
+
+  scene_ps_hlsl = compile_pixel_shader(SUNSHINE_SHADERS_DIR "/ScenePS.hlsl");
+  if(!scene_ps_hlsl) {
+    return -1;
+  }
+  BOOST_LOG(info) << "Compiled shaders"sv;
+
+  return 0;
+}
+} // namespace platf::dxgi

sunshine/platform/windows/input.cpp

@@ -1,22 +1,34 @@
-#include <sstream>
+#include <cmath>
 #include <iomanip>
+#include <sstream>
 
-#include <ws2tcpip.h>
+// prevent clang format from "optimizing" the header include order
+// clang-format off
 #include <winsock2.h>
+#include <iphlpapi.h>
 #include <windows.h>
 #include <winuser.h>
-#include <iphlpapi.h>
+#include <ws2tcpip.h>
+// clang-format on
 
 #include <ViGEm/Client.h>
 
 #include "sunshine/main.h"
-#include "common.h"
+#include "sunshine/platform/common.h"
 
 namespace platf {
 using namespace std::literals;
 
 using adapteraddrs_t = util::c_ptr<IP_ADAPTER_ADDRESSES>;
 
+volatile HDESK _lastKnownInputDesktop = NULL;
+constexpr touch_port_t target_touch_port {
+  0, 0,
+  65535, 65535
+};
+
+HDESK pairInputDesktop();
+
 class vigem_t {
 public:
   using client_t = util::safe_ptr<_VIGEM_CLIENT_T, vigem_free>;
@@ -91,11 +103,11 @@ std::string from_sockaddr(const sockaddr *const socket_address) {
 
   auto family = socket_address->sa_family;
   if(family == AF_INET6) {
-    inet_ntop(AF_INET6, &((sockaddr_in6*)socket_address)->sin6_addr, data, INET6_ADDRSTRLEN);
+    inet_ntop(AF_INET6, &((sockaddr_in6 *)socket_address)->sin6_addr, data, INET6_ADDRSTRLEN);
   }
 
   if(family == AF_INET) {
-    inet_ntop(AF_INET, &((sockaddr_in*)socket_address)->sin_addr, data, INET_ADDRSTRLEN);
+    inet_ntop(AF_INET, &((sockaddr_in *)socket_address)->sin_addr, data, INET_ADDRSTRLEN);
   }
 
   return std::string { data };
@@ -107,13 +119,13 @@ std::pair<std::uint16_t, std::string> from_sockaddr_ex(const sockaddr *const ip_
   auto family = ip_addr->sa_family;
   std::uint16_t port;
   if(family == AF_INET6) {
-    inet_ntop(AF_INET6, &((sockaddr_in6*)ip_addr)->sin6_addr, data, INET6_ADDRSTRLEN);
-    port = ((sockaddr_in6*)ip_addr)->sin6_port;
+    inet_ntop(AF_INET6, &((sockaddr_in6 *)ip_addr)->sin6_addr, data, INET6_ADDRSTRLEN);
+    port = ((sockaddr_in6 *)ip_addr)->sin6_port;
   }
 
   if(family == AF_INET) {
-    inet_ntop(AF_INET, &((sockaddr_in*)ip_addr)->sin_addr, data, INET_ADDRSTRLEN);
-    port = ((sockaddr_in*)ip_addr)->sin_port;
+    inet_ntop(AF_INET, &((sockaddr_in *)ip_addr)->sin_addr, data, INET_ADDRSTRLEN);
+    port = ((sockaddr_in *)ip_addr)->sin_port;
   }
 
   return { port, std::string { data } };
@@ -154,7 +166,7 @@ std::string get_mac_address(const std::string_view &address) {
 input_t input() {
   input_t result { new vigem_t {} };
 
-  auto vigem = (vigem_t*)result.get();
+  auto vigem = (vigem_t *)result.get();
   if(vigem->init()) {
     return nullptr;
   }
@@ -162,55 +174,86 @@ input_t input() {
   return result;
 }
 
+void send_input(INPUT &i) {
+retry:
+  auto send = SendInput(1, &i, sizeof(INPUT));
+  if(send != 1) {
+    auto hDesk = pairInputDesktop();
+    if(_lastKnownInputDesktop != hDesk) {
+      _lastKnownInputDesktop = hDesk;
+      goto retry;
+    }
+    BOOST_LOG(warning) << "Couldn't send input"sv;
+  }
+}
+void abs_mouse(input_t &input, const touch_port_t &touch_port, float x, float y) {
+  INPUT i {};
+
+  i.type   = INPUT_MOUSE;
+  auto &mi = i.mi;
+
+  mi.dwFlags =
+    MOUSEEVENTF_MOVE |
+    MOUSEEVENTF_ABSOLUTE |
+
+    // MOUSEEVENTF_VIRTUALDESK maps to the entirety of the desktop rather than the primary desktop
+    MOUSEEVENTF_VIRTUALDESK;
+
+  auto scaled_x = std::lround((x + touch_port.offset_x) * ((float)target_touch_port.width / (float)touch_port.width));
+  auto scaled_y = std::lround((y + touch_port.offset_y) * ((float)target_touch_port.height / (float)touch_port.height));
+
+  mi.dx = scaled_x;
+  mi.dy = scaled_y;
+
+  send_input(i);
+}
+
 void move_mouse(input_t &input, int deltaX, int deltaY) {
   INPUT i {};
 
-  i.type = INPUT_MOUSE;
+  i.type   = INPUT_MOUSE;
   auto &mi = i.mi;
 
   mi.dwFlags = MOUSEEVENTF_MOVE;
-  mi.dx = deltaX;
-  mi.dy = deltaY;
+  mi.dx      = deltaX;
+  mi.dy      = deltaY;
 
-  auto send = SendInput(1, &i, sizeof(INPUT));
-  if(send != 1) {
-    BOOST_LOG(warning) << "Couldn't send mouse movement input"sv;
-  }
+  send_input(i);
 }
 
 void button_mouse(input_t &input, int button, bool release) {
-  constexpr SHORT KEY_STATE_DOWN = 0x8000;
+  constexpr auto KEY_STATE_DOWN = (SHORT)0x8000;
 
   INPUT i {};
 
-  i.type = INPUT_MOUSE;
+  i.type   = INPUT_MOUSE;
   auto &mi = i.mi;
 
   int mouse_button;
   if(button == 1) {
-    mi.dwFlags = release ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_LEFTDOWN;
+    mi.dwFlags   = release ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_LEFTDOWN;
     mouse_button = VK_LBUTTON;
   }
   else if(button == 2) {
-    mi.dwFlags = release ? MOUSEEVENTF_MIDDLEUP : MOUSEEVENTF_MIDDLEDOWN;
+    mi.dwFlags   = release ? MOUSEEVENTF_MIDDLEUP : MOUSEEVENTF_MIDDLEDOWN;
     mouse_button = VK_MBUTTON;
   }
   else if(button == 3) {
-    mi.dwFlags = release ? MOUSEEVENTF_RIGHTUP : MOUSEEVENTF_RIGHTDOWN;
+    mi.dwFlags   = release ? MOUSEEVENTF_RIGHTUP : MOUSEEVENTF_RIGHTDOWN;
     mouse_button = VK_RBUTTON;
   }
   else if(button == 4) {
-    mi.dwFlags = release ? MOUSEEVENTF_XUP : MOUSEEVENTF_XDOWN;
+    mi.dwFlags   = release ? MOUSEEVENTF_XUP : MOUSEEVENTF_XDOWN;
     mi.mouseData = XBUTTON1;
     mouse_button = VK_XBUTTON1;
   }
   else {
-    mi.dwFlags = release ? MOUSEEVENTF_XUP : MOUSEEVENTF_XDOWN;
+    mi.dwFlags   = release ? MOUSEEVENTF_XUP : MOUSEEVENTF_XDOWN;
     mi.mouseData = XBUTTON2;
     mouse_button = VK_XBUTTON2;
   }
 
-  auto key_state = GetAsyncKeyState(mouse_button);
+  auto key_state      = GetAsyncKeyState(mouse_button);
   bool key_state_down = (key_state & KEY_STATE_DOWN) != 0;
   if(key_state_down != release) {
     BOOST_LOG(warning) << "Button state of mouse_button ["sv << button << "] does not match the desired state"sv;
@@ -218,49 +261,33 @@ void button_mouse(input_t &input, int button, bool release) {
     return;
   }
 
-  auto send = SendInput(1, &i, sizeof(INPUT));
-  if(send != 1) {
-    BOOST_LOG(warning) << "Couldn't send mouse button input"sv;
-  }
+  send_input(i);
 }
 
 void scroll(input_t &input, int distance) {
   INPUT i {};
 
-  i.type = INPUT_MOUSE;
+  i.type   = INPUT_MOUSE;
   auto &mi = i.mi;
 
-  mi.dwFlags = MOUSEEVENTF_WHEEL;
+  mi.dwFlags   = MOUSEEVENTF_WHEEL;
   mi.mouseData = distance;
 
-  auto send = SendInput(1, &i, sizeof(INPUT));
-  if(send != 1) {
-    BOOST_LOG(warning) << "Couldn't send moue movement input"sv;
-  }
+  send_input(i);
 }
 
 void keyboard(input_t &input, uint16_t modcode, bool release) {
-  constexpr SHORT KEY_STATE_DOWN = 0x8000;
-
   if(modcode == VK_RMENU) {
     modcode = VK_LWIN;
   }
 
-  auto key_state = GetAsyncKeyState(modcode);
-  bool key_state_down = (key_state & KEY_STATE_DOWN) != 0;
-  if(key_state_down != release) {
-    BOOST_LOG(warning) << "Key state of vkey ["sv << util::hex(modcode).to_string_view() << "] does not match the desired state ["sv << (release ? "on]"sv : "off]"sv);
-
-    return;
-  }
-
   INPUT i {};
-  i.type = INPUT_KEYBOARD;
+  i.type   = INPUT_KEYBOARD;
   auto &ki = i.ki;
 
   // For some reason, MapVirtualKey(VK_LWIN, MAPVK_VK_TO_VSC) doesn't seem to work :/
   if(modcode != VK_LWIN && modcode != VK_RWIN && modcode != VK_PAUSE) {
-    ki.wScan = MapVirtualKey(modcode, MAPVK_VK_TO_VSC);
+    ki.wScan   = MapVirtualKey(modcode, MAPVK_VK_TO_VSC);
     ki.dwFlags = KEYEVENTF_SCANCODE;
   }
   else {
@@ -269,33 +296,30 @@ void keyboard(input_t &input, uint16_t modcode, bool release) {
 
   // https://docs.microsoft.com/en-us/windows/win32/inputdev/about-keyboard-input#keystroke-message-flags
   switch(modcode) {
-    case VK_RMENU:
-    case VK_RCONTROL:
-    case VK_INSERT:
-    case VK_DELETE:
-    case VK_HOME:
-    case VK_END:
-    case VK_PRIOR:
-    case VK_NEXT:
-    case VK_UP:
-    case VK_DOWN:
-    case VK_LEFT:
-    case VK_RIGHT:
-    case VK_DIVIDE:
-      ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
-      break;
-    default:
-      break;
+  case VK_RMENU:
+  case VK_RCONTROL:
+  case VK_INSERT:
+  case VK_DELETE:
+  case VK_HOME:
+  case VK_END:
+  case VK_PRIOR:
+  case VK_NEXT:
+  case VK_UP:
+  case VK_DOWN:
+  case VK_LEFT:
+  case VK_RIGHT:
+  case VK_DIVIDE:
+    ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
+    break;
+  default:
+    break;
   }
 
   if(release) {
     ki.dwFlags |= KEYEVENTF_KEYUP;
   }
 
-  auto send = SendInput(1, &i, sizeof(INPUT));
-  if(send != 1) {
-    BOOST_LOG(warning) << "Couldn't send moue movement input"sv;
-  }
+  send_input(i);
 }
 
 int alloc_gamepad(input_t &input, int nr) {
@@ -303,7 +327,7 @@ int alloc_gamepad(input_t &input, int nr) {
     return 0;
   }
 
-  return ((vigem_t*)input.get())->alloc_x360(nr);
+  return ((vigem_t *)input.get())->alloc_x360(nr);
 }
 
 void free_gamepad(input_t &input, int nr) {
@@ -311,7 +335,7 @@ void free_gamepad(input_t &input, int nr) {
     return;
   }
 
-  ((vigem_t*)input.get())->free_target(nr);
+  ((vigem_t *)input.get())->free_target(nr);
 }
 void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
   // If there is no gamepad support
@@ -319,7 +343,7 @@ void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
     return;
   }
 
-  auto vigem = (vigem_t*)input.get();
+  auto vigem = (vigem_t *)input.get();
 
   auto &xusb = *(PXUSB_REPORT)&gamepad_state;
   auto &x360 = vigem->x360s[nr];
@@ -333,9 +357,32 @@ void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state) {
   }
 }
 
+int thread_priority() {
+  return SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST) ? 0 : 1;
+}
+
+HDESK pairInputDesktop() {
+  auto hDesk = OpenInputDesktop(DF_ALLOWOTHERACCOUNTHOOK, FALSE, GENERIC_ALL);
+  if(NULL == hDesk) {
+    auto err = GetLastError();
+    BOOST_LOG(error) << "Failed to OpenInputDesktop [0x"sv << util::hex(err).to_string_view() << ']';
+  }
+  else {
+    BOOST_LOG(info) << std::endl
+                    << "Opened desktop [0x"sv << util::hex(hDesk).to_string_view() << ']';
+    if(!SetThreadDesktop(hDesk)) {
+      auto err = GetLastError();
+      BOOST_LOG(error) << "Failed to SetThreadDesktop [0x"sv << util::hex(err).to_string_view() << ']';
+    }
+    CloseDesktop(hDesk);
+  }
+
+  return hDesk;
+}
+
 void freeInput(void *p) {
-  auto vigem = (vigem_t*)p;
+  auto vigem = (vigem_t *)p;
 
   delete vigem;
 }
-}
+} // namespace platf

sunshine/platform/windows_dxgi.cpp

@@ -1,741 +0,0 @@
-//
-// Created by loki on 1/12/20.
-//
-
-#include <dxgi.h>
-#include <d3d11.h>
-#include <d3dcommon.h>
-#include <dxgi1_2.h>
-
-#include <codecvt>
-#include <sunshine/config.h>
-
-#include "sunshine/main.h"
-#include "common.h"
-
-namespace platf {
-using namespace std::literals;
-}
-namespace platf::dxgi {
-template<class T>
-void Release(T *dxgi) {
-  dxgi->Release();
-}
-
-using factory1_t   = util::safe_ptr<IDXGIFactory1, Release<IDXGIFactory1>>;
-using dxgi_t       = util::safe_ptr<IDXGIDevice, Release<IDXGIDevice>>;
-using dxgi1_t      = util::safe_ptr<IDXGIDevice1, Release<IDXGIDevice1>>;
-using device_t     = util::safe_ptr<ID3D11Device, Release<ID3D11Device>>;
-using device_ctx_t = util::safe_ptr<ID3D11DeviceContext, Release<ID3D11DeviceContext>>;
-using adapter_t    = util::safe_ptr<IDXGIAdapter1, Release<IDXGIAdapter1>>;
-using output_t     = util::safe_ptr<IDXGIOutput, Release<IDXGIOutput>>;
-using output1_t    = util::safe_ptr<IDXGIOutput1, Release<IDXGIOutput1>>;
-using dup_t        = util::safe_ptr<IDXGIOutputDuplication, Release<IDXGIOutputDuplication>>;
-using texture2d_t  = util::safe_ptr<ID3D11Texture2D, Release<ID3D11Texture2D>>;
-using resource_t   = util::safe_ptr<IDXGIResource, Release<IDXGIResource>>;
-
-extern const char *format_str[];
-
-class duplication_t {
-public:
-  dup_t dup;
-  bool has_frame {};
-
-  capture_e next_frame(DXGI_OUTDUPL_FRAME_INFO &frame_info, resource_t::pointer *res_p) {
-    auto capture_status = release_frame();
-    if(capture_status != capture_e::ok) {
-      return capture_status;
-    }
-
-    auto status = dup->AcquireNextFrame(1000, &frame_info, res_p);
-
-    switch(status) {
-      case S_OK:
-        has_frame = true;
-        return capture_e::ok;
-      case DXGI_ERROR_WAIT_TIMEOUT:
-        return capture_e::timeout;
-      case WAIT_ABANDONED:
-      case DXGI_ERROR_ACCESS_LOST:
-      case DXGI_ERROR_ACCESS_DENIED:
-        return capture_e::reinit;
-      default:
-        BOOST_LOG(error) << "Couldn't acquire next frame [0x"sv << util::hex(status).to_string_view();
-        return capture_e::error;
-    }
-  }
-
-  capture_e reset(dup_t::pointer dup_p = dup_t::pointer()) {
-    auto capture_status = release_frame();
-
-    dup.reset(dup_p);
-
-    return capture_status;
-  }
-
-  capture_e release_frame() {
-    if(!has_frame) {
-      return capture_e::ok;
-    }
-
-    auto status = dup->ReleaseFrame();
-    switch (status) {
-      case S_OK:
-        has_frame = false;
-        return capture_e::ok;
-      case DXGI_ERROR_WAIT_TIMEOUT:
-        return capture_e::timeout;
-      case WAIT_ABANDONED:
-      case DXGI_ERROR_ACCESS_LOST:
-      case DXGI_ERROR_ACCESS_DENIED:
-        has_frame = false;
-        return capture_e::reinit;
-      default:
-        BOOST_LOG(error) << "Couldn't release frame [0x"sv << util::hex(status).to_string_view();
-        return capture_e::error;
-    }
-  }
-
-  ~duplication_t() {
-    release_frame();
-  }
-};
-
-class display_t;
-struct img_t : public ::platf::img_t  {
-  ~img_t() override {
-    delete[] data;
-    data = nullptr;
-  }
-};
-
-struct cursor_t {
-  std::vector<std::uint8_t> img_data;
-
-  DXGI_OUTDUPL_POINTER_SHAPE_INFO shape_info;
-  int x, y;
-  bool visible;
-};
-
-void blend_cursor_monochrome(const cursor_t &cursor, img_t &img) {
-  int height = cursor.shape_info.Height / 2;
-  int width  = cursor.shape_info.Width;
-  int pitch  = cursor.shape_info.Pitch;
-
-  // img cursor.{x,y} < 0, skip parts of the cursor.img_data
-  auto cursor_skip_y = -std::min(0, cursor.y);
-  auto cursor_skip_x = -std::min(0, cursor.x);
-
-  // img cursor.{x,y} > img.{x,y}, truncate parts of the cursor.img_data 
-  auto cursor_truncate_y = std::max(0, cursor.y - img.height);
-  auto cursor_truncate_x = std::max(0, cursor.x - img.width);
-
-  auto cursor_width = width - cursor_skip_x - cursor_truncate_x;
-  auto cursor_height = height - cursor_skip_y - cursor_truncate_y;
-
-  if(cursor_height > height || cursor_width > width) {
-    return;
-  }
-
-  auto img_skip_y    = std::max(0, cursor.y);
-  auto img_skip_x    = std::max(0, cursor.x);
-
-  auto cursor_img_data = cursor.img_data.data() + cursor_skip_y * pitch;
-
-  int delta_height = std::min(cursor_height - cursor_truncate_y, std::max(0, img.height - img_skip_y));
-  int delta_width = std::min(cursor_width - cursor_truncate_x, std::max(0, img.width - img_skip_x));
-
-  auto pixels_per_byte = width / pitch;
-  auto bytes_per_row = delta_width / pixels_per_byte;
-
-  auto img_data = (int*)img.data;
-  for(int i = 0; i < delta_height; ++i) {
-    auto and_mask = &cursor_img_data[i * pitch];
-    auto xor_mask = &cursor_img_data[(i + height) * pitch];
-
-    auto img_pixel_p = &img_data[(i + img_skip_y) * (img.row_pitch / img.pixel_pitch) + img_skip_x];
-
-    auto skip_x = cursor_skip_x;
-    for(int x = 0; x < bytes_per_row; ++x) {
-      for(auto bit = 0u; bit < 8; ++bit) {
-        if(skip_x > 0) {
-          --skip_x;
-
-          continue;
-        }
-
-        int and_ = *and_mask & (1 << (7 - bit)) ? -1 : 0;
-        int xor_ = *xor_mask & (1 << (7 - bit)) ? -1 : 0;
-
-        *img_pixel_p &= and_;
-        *img_pixel_p ^= xor_;
-
-        ++img_pixel_p;
-      }
-
-      ++and_mask;
-      ++xor_mask;
-    }
-  }
-}
-
-void blend_cursor_color(const cursor_t &cursor, img_t &img) {
-  int height = cursor.shape_info.Height;
-  int width  = cursor.shape_info.Width;
-  int pitch  = cursor.shape_info.Pitch;
-
-  // img cursor.y < 0, skip parts of the cursor.img_data
-  auto cursor_skip_y = -std::min(0, cursor.y);
-  auto cursor_skip_x = -std::min(0, cursor.x);
-
-  // img cursor.{x,y} > img.{x,y}, truncate parts of the cursor.img_data 
-  auto cursor_truncate_y = std::max(0, cursor.y - img.height);
-  auto cursor_truncate_x = std::max(0, cursor.x - img.width);
-
-  auto img_skip_y    = std::max(0, cursor.y);
-  auto img_skip_x    = std::max(0, cursor.x);
-
-  auto cursor_width = width - cursor_skip_x - cursor_truncate_x;
-  auto cursor_height = height - cursor_skip_y - cursor_truncate_y;
-
-  if(cursor_height > height || cursor_width > width) {
-    return;
-  }
-
-  auto cursor_img_data = (int*)&cursor.img_data[cursor_skip_y * pitch];
-
-  int delta_height = std::min(cursor_height - cursor_truncate_y, std::max(0, img.height - img_skip_y));
-  int delta_width = std::min(cursor_width - cursor_truncate_x, std::max(0, img.width - img_skip_x));
-
-  auto img_data = (int*)img.data;
-
-  for(int i = 0; i < delta_height; ++i) {
-    auto cursor_begin = &cursor_img_data[i * cursor.shape_info.Width + cursor_skip_x];
-    auto cursor_end = &cursor_begin[delta_width];
-
-    auto img_pixel_p = &img_data[(i + img_skip_y) * (img.row_pitch / img.pixel_pitch) + img_skip_x];
-    std::for_each(cursor_begin, cursor_end, [&](int cursor_pixel) {
-      auto colors_out = (std::uint8_t*)&cursor_pixel;
-      auto colors_in  = (std::uint8_t*)img_pixel_p;
-
-      //TODO: When use of IDXGIOutput5 is implemented, support different color formats
-      auto alpha = colors_out[3];
-      if(alpha == 255) {
-        *img_pixel_p = cursor_pixel;
-      }
-      else {
-        colors_in[0] = colors_out[0] + (colors_in[0] * (255 - alpha) + 255/2) / 255;
-        colors_in[1] = colors_out[1] + (colors_in[1] * (255 - alpha) + 255/2) / 255;
-        colors_in[2] = colors_out[2] + (colors_in[2] * (255 - alpha) + 255/2) / 255;
-      }
-      ++img_pixel_p;
-    });
-  }
-}
-
-void blend_cursor(const cursor_t &cursor, img_t &img) {
-  switch(cursor.shape_info.Type) {
-    case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_COLOR:
-      blend_cursor_color(cursor, img);
-      break;
-    case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MONOCHROME:
-      blend_cursor_monochrome(cursor, img);
-      break;
-    case DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MASKED_COLOR:
-    default:
-      BOOST_LOG(warning) << "Unsupported cursor format ["sv << cursor.shape_info.Type << ']';
-  }
-}
-
-class display_t : public ::platf::display_t {
-public:
-  capture_e snapshot(::platf::img_t *img_base, bool cursor_visible) override {
-    auto img = (img_t *) img_base;
-    HRESULT status;
-
-    DXGI_OUTDUPL_FRAME_INFO frame_info;
-
-    resource_t::pointer res_p {};
-    auto capture_status = dup.next_frame(frame_info, &res_p);
-    resource_t res{res_p};
-
-    if (capture_status != capture_e::ok) {
-      return capture_status;
-    }
-
-    if (frame_info.PointerShapeBufferSize > 0) {
-      auto &img_data = cursor.img_data;
-
-      img_data.resize(frame_info.PointerShapeBufferSize);
-
-      UINT dummy;
-      status = dup.dup->GetFramePointerShape(img_data.size(), img_data.data(), &dummy, &cursor.shape_info);
-      if (FAILED(status)) {
-        BOOST_LOG(error) << "Failed to get new pointer shape [0x"sv << util::hex(status).to_string_view() << ']';
-
-        return capture_e::error;
-      }
-    }
-
-    if(frame_info.LastMouseUpdateTime.QuadPart) {
-      cursor.x = frame_info.PointerPosition.Position.x;
-      cursor.y = frame_info.PointerPosition.Position.y;
-      cursor.visible = frame_info.PointerPosition.Visible;
-    }
-
-    // If frame has been updated
-    if (frame_info.LastPresentTime.QuadPart != 0) {
-      {
-        texture2d_t::pointer src_p {};
-        status = res->QueryInterface(IID_ID3D11Texture2D, (void **)&src_p);
-        texture2d_t src{src_p};
-
-        if (FAILED(status)) {
-          BOOST_LOG(error) << "Couldn't query interface [0x"sv << util::hex(status).to_string_view() << ']';
-          return capture_e::error;
-        }
-
-        //Copy from GPU to CPU
-        device_ctx->CopyResource(texture.get(), src.get());
-      }
-
-      if(current_img.pData) {
-        device_ctx->Unmap(texture.get(), 0);
-        current_img.pData = nullptr;
-      }
-
-      status = device_ctx->Map(texture.get(), 0, D3D11_MAP_READ, 0, &current_img);
-      if (FAILED(status)) {
-        BOOST_LOG(error) << "Failed to map texture [0x"sv << util::hex(status).to_string_view() << ']';
-
-        return capture_e::error;
-      }
-    }
-
-    const bool update_flag =
-      frame_info.LastMouseUpdateTime.QuadPart  ||
-      frame_info.LastPresentTime.QuadPart != 0 ||
-      frame_info.PointerShapeBufferSize > 0;
-
-
-    if(!update_flag) {
-      return capture_e::timeout;
-    }
-
-    if(img->width != width || img->height != height) {
-      delete[] img->data;
-      img->data = new std::uint8_t[height * current_img.RowPitch];
-
-      img->width = width;
-      img->height = height;
-      img->row_pitch = current_img.RowPitch;
-    }
-
-    std::copy_n((std::uint8_t*)current_img.pData, height * current_img.RowPitch, (std::uint8_t*)img->data);
-    if(cursor_visible && cursor.visible) {
-      blend_cursor(cursor, *img);
-    }
-
-    return capture_e::ok;
-  }
-
-  std::unique_ptr<::platf::img_t> alloc_img() override {
-    auto img = std::make_unique<img_t>();
-
-    img->data   = nullptr;
-    img->height = 0;
-    img->width  = 0;
-    img->row_pitch = 0;
-    img->pixel_pitch = 4;
-
-    return img;
-  }
-
-  int init() {
-/* Uncomment when use of IDXGIOutput5 is implemented
-  std::call_once(windows_cpp_once_flag, []() {
-    DECLARE_HANDLE(DPI_AWARENESS_CONTEXT);
-    const auto DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 = ((DPI_AWARENESS_CONTEXT)-4);
-
-    typedef BOOL (*User32_SetProcessDpiAwarenessContext)(DPI_AWARENESS_CONTEXT value);
-
-    auto user32 = LoadLibraryA("user32.dll");
-    auto f = (User32_SetProcessDpiAwarenessContext)GetProcAddress(user32, "SetProcessDpiAwarenessContext");
-    if(f) {
-      f(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
-    }
-
-    FreeLibrary(user32);
-  });
-*/
-    current_img.pData = nullptr; // current_img is not yet mapped
-
-    dxgi::factory1_t::pointer   factory_p {};
-    dxgi::adapter_t::pointer    adapter_p {};
-    dxgi::output_t::pointer     output_p {};
-    dxgi::device_t::pointer     device_p {};
-    dxgi::device_ctx_t::pointer device_ctx_p {};
-
-    HRESULT status;
-
-    status = CreateDXGIFactory1(IID_IDXGIFactory1, (void**)&factory_p);
-    factory.reset(factory_p);
-    if(FAILED(status)) {
-      BOOST_LOG(error) << "Failed to create DXGIFactory1 [0x"sv << util::hex(status).to_string_view() << ']';
-      return -1;
-    }
-
-    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
-
-    auto adapter_name = converter.from_bytes(config::video.adapter_name);
-    auto output_name = converter.from_bytes(config::video.output_name);
-
-    for(int x = 0; factory_p->EnumAdapters1(x, &adapter_p) != DXGI_ERROR_NOT_FOUND; ++x) {
-      dxgi::adapter_t adapter_tmp { adapter_p };
-
-      DXGI_ADAPTER_DESC1 adapter_desc;
-      adapter_tmp->GetDesc1(&adapter_desc);
-
-      if(!adapter_name.empty() && adapter_desc.Description != adapter_name) {
-        continue;
-      }
-
-      for(int y = 0; adapter_tmp->EnumOutputs(y, &output_p) != DXGI_ERROR_NOT_FOUND; ++y) {
-        dxgi::output_t output_tmp {output_p };
-
-        DXGI_OUTPUT_DESC desc;
-        output_tmp->GetDesc(&desc);
-
-        if(!output_name.empty() && desc.DeviceName != output_name) {
-          continue;
-        }
-
-        if(desc.AttachedToDesktop) {
-          output = std::move(output_tmp);
-
-          width  = desc.DesktopCoordinates.right - desc.DesktopCoordinates.left;
-          height = desc.DesktopCoordinates.bottom - desc.DesktopCoordinates.top;
-        }
-      }
-
-      if(output) {
-        adapter = std::move(adapter_tmp);
-        break;
-      }
-    }
-
-    if(!output) {
-      BOOST_LOG(error) << "Failed to locate an output device"sv;
-      return -1;
-    }
-
-    D3D_FEATURE_LEVEL featureLevels[] {
-      D3D_FEATURE_LEVEL_12_1,
-      D3D_FEATURE_LEVEL_12_0,
-      D3D_FEATURE_LEVEL_11_1,
-      D3D_FEATURE_LEVEL_11_0,
-      D3D_FEATURE_LEVEL_10_1,
-      D3D_FEATURE_LEVEL_10_0,
-      D3D_FEATURE_LEVEL_9_3,
-      D3D_FEATURE_LEVEL_9_2,
-      D3D_FEATURE_LEVEL_9_1
-    };
-
-    status = adapter->QueryInterface(IID_IDXGIAdapter, (void**)&adapter_p);
-    if(FAILED(status)) {
-      BOOST_LOG(error) << "Failed to query IDXGIAdapter interface"sv;
-
-      return -1;
-    }
-
-    status = D3D11CreateDevice(
-      adapter_p,
-      D3D_DRIVER_TYPE_UNKNOWN,
-      nullptr,
-      D3D11_CREATE_DEVICE_VIDEO_SUPPORT,
-      featureLevels, sizeof(featureLevels) / sizeof(D3D_FEATURE_LEVEL),
-      D3D11_SDK_VERSION,
-      &device_p,
-      &feature_level,
-      &device_ctx_p);
-
-    adapter_p->Release();
-
-    device.reset(device_p);
-    device_ctx.reset(device_ctx_p);
-    if(FAILED(status)) {
-      BOOST_LOG(error) << "Failed to create D3D11 device [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-
-    DXGI_ADAPTER_DESC adapter_desc;
-    adapter->GetDesc(&adapter_desc);
-
-    auto description = converter.to_bytes(adapter_desc.Description);
-    BOOST_LOG(info) << std::endl
-      << "Device Description : " << description << std::endl
-      << "Device Vendor ID   : 0x"sv << util::hex(adapter_desc.VendorId).to_string_view() << std::endl
-      << "Device Device ID   : 0x"sv << util::hex(adapter_desc.DeviceId).to_string_view() << std::endl
-      << "Device Video Mem   : "sv << adapter_desc.DedicatedVideoMemory / 1048576 << " MiB"sv << std::endl
-      << "Device Sys Mem     : "sv << adapter_desc.DedicatedSystemMemory / 1048576 << " MiB"sv << std::endl
-      << "Share Sys Mem      : "sv << adapter_desc.SharedSystemMemory / 1048576 << " MiB"sv << std::endl
-      << "Feature Level      : 0x"sv << util::hex(feature_level).to_string_view() << std::endl
-      << "Capture size       : "sv << width << 'x'  << height;
-
-    // Bump up thread priority
-    {
-      dxgi::dxgi_t::pointer dxgi_p {};
-      status = device->QueryInterface(IID_IDXGIDevice, (void**)&dxgi_p);
-      dxgi::dxgi_t dxgi { dxgi_p };
-
-      if(FAILED(status)) {
-        BOOST_LOG(error) << "Failed to query DXGI interface from device [0x"sv << util::hex(status).to_string_view() << ']';
-        return -1;
-      }
-
-      dxgi->SetGPUThreadPriority(7);
-    }
-
-    // Try to reduce latency
-    {
-      dxgi::dxgi1_t::pointer dxgi_p {};
-      status = device->QueryInterface(IID_IDXGIDevice, (void**)&dxgi_p);
-      dxgi::dxgi1_t dxgi { dxgi_p };
-
-      if(FAILED(status)) {
-        BOOST_LOG(error) << "Failed to query DXGI interface from device [0x"sv << util::hex(status).to_string_view() << ']';
-        return -1;
-      }
-
-      dxgi->SetMaximumFrameLatency(1);
-    }
-
-    //FIXME: Duplicate output on RX580 in combination with DOOM (2016) --> BSOD
-    //TODO: Use IDXGIOutput5 for improved performance
-    {
-      dxgi::output1_t::pointer output1_p {};
-      status = output->QueryInterface(IID_IDXGIOutput1, (void**)&output1_p);
-      dxgi::output1_t output1 {output1_p };
-
-      if(FAILED(status)) {
-        BOOST_LOG(error) << "Failed to query IDXGIOutput1 from the output"sv;
-        return -1;
-      }
-
-      // We try this twice, in case we still get an error on reinitialization
-      for(int x = 0; x < 2; ++x) {
-        dxgi::dup_t::pointer dup_p {};
-        status = output1->DuplicateOutput((IUnknown*)device.get(), &dup_p);
-        if(SUCCEEDED(status)) {
-          dup.reset(dup_p);
-          break;
-        }
-        std::this_thread::sleep_for(200ms);
-      }
-
-      if(FAILED(status)) {
-        BOOST_LOG(error) << "DuplicateOutput Failed [0x"sv << util::hex(status).to_string_view() << ']';
-        return -1;
-      }
-    }
-
-    DXGI_OUTDUPL_DESC dup_desc;
-    dup.dup->GetDesc(&dup_desc);
-
-    format = dup_desc.ModeDesc.Format;
-
-    BOOST_LOG(debug) << "Source format ["sv << format_str[dup_desc.ModeDesc.Format] << ']';
-
-    D3D11_TEXTURE2D_DESC t {};
-    t.Width  = width;
-    t.Height = height;
-    t.MipLevels = 1;
-    t.ArraySize = 1;
-    t.SampleDesc.Count = 1;
-    t.Usage = D3D11_USAGE_STAGING;
-    t.Format = format;
-    t.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-
-    dxgi::texture2d_t::pointer tex_p {};
-    status = device->CreateTexture2D(&t, nullptr, &tex_p);
-
-    texture.reset(tex_p);
-
-    if(FAILED(status)) {
-      BOOST_LOG(error) << "Failed to create texture [0x"sv << util::hex(status).to_string_view() << ']';
-      return -1;
-    }
-
-    // map the texture simply to get the pitch and stride
-    status = device_ctx->Map(texture.get(), 0, D3D11_MAP_READ, 0, &current_img);
-    if(FAILED(status)) {
-      BOOST_LOG(error) << "Error: Failed to map the texture [0x"sv << util::hex(status).to_string_view() << ']';
-      return -1;
-    }
-
-    return 0;
-  }
-
-  ~display_t() override {
-    if(current_img.pData) {
-      device_ctx->Unmap(texture.get(), 0);
-      current_img.pData = nullptr;
-    }
-  }
-
-  factory1_t factory;
-  adapter_t adapter;
-  output_t output;
-  device_t device;
-  device_ctx_t device_ctx;
-  duplication_t dup;
-  cursor_t cursor;
-  texture2d_t texture;
-
-  int width, height;
-
-  DXGI_FORMAT format;
-  D3D_FEATURE_LEVEL feature_level;
-  D3D11_MAPPED_SUBRESOURCE current_img;
-};
-
-const char *format_str[] = {
-  "DXGI_FORMAT_UNKNOWN",
-  "DXGI_FORMAT_R32G32B32A32_TYPELESS",
-  "DXGI_FORMAT_R32G32B32A32_FLOAT",
-  "DXGI_FORMAT_R32G32B32A32_UINT",
-  "DXGI_FORMAT_R32G32B32A32_SINT",
-  "DXGI_FORMAT_R32G32B32_TYPELESS",
-  "DXGI_FORMAT_R32G32B32_FLOAT",
-  "DXGI_FORMAT_R32G32B32_UINT",
-  "DXGI_FORMAT_R32G32B32_SINT",
-  "DXGI_FORMAT_R16G16B16A16_TYPELESS",
-  "DXGI_FORMAT_R16G16B16A16_FLOAT",
-  "DXGI_FORMAT_R16G16B16A16_UNORM",
-  "DXGI_FORMAT_R16G16B16A16_UINT",
-  "DXGI_FORMAT_R16G16B16A16_SNORM",
-  "DXGI_FORMAT_R16G16B16A16_SINT",
-  "DXGI_FORMAT_R32G32_TYPELESS",
-  "DXGI_FORMAT_R32G32_FLOAT",
-  "DXGI_FORMAT_R32G32_UINT",
-  "DXGI_FORMAT_R32G32_SINT",
-  "DXGI_FORMAT_R32G8X24_TYPELESS",
-  "DXGI_FORMAT_D32_FLOAT_S8X24_UINT",
-  "DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS",
-  "DXGI_FORMAT_X32_TYPELESS_G8X24_UINT",
-  "DXGI_FORMAT_R10G10B10A2_TYPELESS",
-  "DXGI_FORMAT_R10G10B10A2_UNORM",
-  "DXGI_FORMAT_R10G10B10A2_UINT",
-  "DXGI_FORMAT_R11G11B10_FLOAT",
-  "DXGI_FORMAT_R8G8B8A8_TYPELESS",
-  "DXGI_FORMAT_R8G8B8A8_UNORM",
-  "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
-  "DXGI_FORMAT_R8G8B8A8_UINT",
-  "DXGI_FORMAT_R8G8B8A8_SNORM",
-  "DXGI_FORMAT_R8G8B8A8_SINT",
-  "DXGI_FORMAT_R16G16_TYPELESS",
-  "DXGI_FORMAT_R16G16_FLOAT",
-  "DXGI_FORMAT_R16G16_UNORM",
-  "DXGI_FORMAT_R16G16_UINT",
-  "DXGI_FORMAT_R16G16_SNORM",
-  "DXGI_FORMAT_R16G16_SINT",
-  "DXGI_FORMAT_R32_TYPELESS",
-  "DXGI_FORMAT_D32_FLOAT",
-  "DXGI_FORMAT_R32_FLOAT",
-  "DXGI_FORMAT_R32_UINT",
-  "DXGI_FORMAT_R32_SINT",
-  "DXGI_FORMAT_R24G8_TYPELESS",
-  "DXGI_FORMAT_D24_UNORM_S8_UINT",
-  "DXGI_FORMAT_R24_UNORM_X8_TYPELESS",
-  "DXGI_FORMAT_X24_TYPELESS_G8_UINT",
-  "DXGI_FORMAT_R8G8_TYPELESS",
-  "DXGI_FORMAT_R8G8_UNORM",
-  "DXGI_FORMAT_R8G8_UINT",
-  "DXGI_FORMAT_R8G8_SNORM",
-  "DXGI_FORMAT_R8G8_SINT",
-  "DXGI_FORMAT_R16_TYPELESS",
-  "DXGI_FORMAT_R16_FLOAT",
-  "DXGI_FORMAT_D16_UNORM",
-  "DXGI_FORMAT_R16_UNORM",
-  "DXGI_FORMAT_R16_UINT",
-  "DXGI_FORMAT_R16_SNORM",
-  "DXGI_FORMAT_R16_SINT",
-  "DXGI_FORMAT_R8_TYPELESS",
-  "DXGI_FORMAT_R8_UNORM",
-  "DXGI_FORMAT_R8_UINT",
-  "DXGI_FORMAT_R8_SNORM",
-  "DXGI_FORMAT_R8_SINT",
-  "DXGI_FORMAT_A8_UNORM",
-  "DXGI_FORMAT_R1_UNORM",
-  "DXGI_FORMAT_R9G9B9E5_SHAREDEXP",
-  "DXGI_FORMAT_R8G8_B8G8_UNORM",
-  "DXGI_FORMAT_G8R8_G8B8_UNORM",
-  "DXGI_FORMAT_BC1_TYPELESS",
-  "DXGI_FORMAT_BC1_UNORM",
-  "DXGI_FORMAT_BC1_UNORM_SRGB",
-  "DXGI_FORMAT_BC2_TYPELESS",
-  "DXGI_FORMAT_BC2_UNORM",
-  "DXGI_FORMAT_BC2_UNORM_SRGB",
-  "DXGI_FORMAT_BC3_TYPELESS",
-  "DXGI_FORMAT_BC3_UNORM",
-  "DXGI_FORMAT_BC3_UNORM_SRGB",
-  "DXGI_FORMAT_BC4_TYPELESS",
-  "DXGI_FORMAT_BC4_UNORM",
-  "DXGI_FORMAT_BC4_SNORM",
-  "DXGI_FORMAT_BC5_TYPELESS",
-  "DXGI_FORMAT_BC5_UNORM",
-  "DXGI_FORMAT_BC5_SNORM",
-  "DXGI_FORMAT_B5G6R5_UNORM",
-  "DXGI_FORMAT_B5G5R5A1_UNORM",
-  "DXGI_FORMAT_B8G8R8A8_UNORM",
-  "DXGI_FORMAT_B8G8R8X8_UNORM",
-  "DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM",
-  "DXGI_FORMAT_B8G8R8A8_TYPELESS",
-  "DXGI_FORMAT_B8G8R8A8_UNORM_SRGB",
-  "DXGI_FORMAT_B8G8R8X8_TYPELESS",
-  "DXGI_FORMAT_B8G8R8X8_UNORM_SRGB",
-  "DXGI_FORMAT_BC6H_TYPELESS",
-  "DXGI_FORMAT_BC6H_UF16",
-  "DXGI_FORMAT_BC6H_SF16",
-  "DXGI_FORMAT_BC7_TYPELESS",
-  "DXGI_FORMAT_BC7_UNORM",
-  "DXGI_FORMAT_BC7_UNORM_SRGB",
-  "DXGI_FORMAT_AYUV",
-  "DXGI_FORMAT_Y410",
-  "DXGI_FORMAT_Y416",
-  "DXGI_FORMAT_NV12",
-  "DXGI_FORMAT_P010",
-  "DXGI_FORMAT_P016",
-  "DXGI_FORMAT_420_OPAQUE",
-  "DXGI_FORMAT_YUY2",
-  "DXGI_FORMAT_Y210",
-  "DXGI_FORMAT_Y216",
-  "DXGI_FORMAT_NV11",
-  "DXGI_FORMAT_AI44",
-  "DXGI_FORMAT_IA44",
-  "DXGI_FORMAT_P8",
-  "DXGI_FORMAT_A8P8",
-  "DXGI_FORMAT_B4G4R4A4_UNORM",
-
-  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
-  "DXGI_FORMAT_P208",
-  "DXGI_FORMAT_V208",
-  "DXGI_FORMAT_V408"
-};
-
-}
-
-namespace platf {
-std::unique_ptr<display_t> display() {
-  auto disp = std::make_unique<dxgi::display_t>();
-
-  if (disp->init()) {
-    return nullptr;
-  }
-
-  return disp;
-}
-}

sunshine/platform/windows_wasapi.cpp

@@ -1,342 +0,0 @@
-//
-// Created by loki on 1/12/20.
-//
-
-#include <roapi.h>
-#include <mmdeviceapi.h>
-#include <audioclient.h>
-
-#include <codecvt>
-
-#include <synchapi.h>
-
-#include "sunshine/config.h"
-#include "sunshine/main.h"
-#include "common.h"
-
-const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
-const IID IID_IMMDeviceEnumerator    = __uuidof(IMMDeviceEnumerator);
-const IID IID_IAudioClient           = __uuidof(IAudioClient);
-const IID IID_IAudioCaptureClient    = __uuidof(IAudioCaptureClient);
-
-using namespace std::literals;
-namespace platf::audio {
-template<class T>
-void Release(T *p) {
-  p->Release();
-}
-
-template<class T>
-void co_task_free(T *p) {
-  CoTaskMemFree((LPVOID)p);
-}
-
-using device_enum_t   = util::safe_ptr<IMMDeviceEnumerator, Release<IMMDeviceEnumerator>>;
-using device_t        = util::safe_ptr<IMMDevice, Release<IMMDevice>>;
-using audio_client_t  = util::safe_ptr<IAudioClient, Release<IAudioClient>>;
-using audio_capture_t = util::safe_ptr<IAudioCaptureClient, Release<IAudioCaptureClient>>;
-using wave_format_t   = util::safe_ptr<WAVEFORMATEX, co_task_free<WAVEFORMATEX>>;
-using handle_t = util::safe_ptr_v2<void, BOOL, CloseHandle>;
-
-class co_init_t : public deinit_t {
-public:
-  co_init_t() {
-    CoInitializeEx(nullptr, COINIT_MULTITHREADED | COINIT_SPEED_OVER_MEMORY);
-  }
-
-  ~co_init_t() override {
-    CoUninitialize();
-  }
-};
-
-class mic_wasapi_t : public mic_t {
-public:
-  capture_e sample(std::vector<std::int16_t> &sample_in) override {
-    while(sample_buf_pos - std::begin(sample_buf) < sample_in.size()) {
-      //FIXME: Use IAudioClient3 instead of IAudioClient, that would allows for adjusting the latency of the audio samples
-      auto capture_result = _fill_buffer();
-
-      if(capture_result != capture_e::ok) {
-        return capture_result;
-      }
-    }
-
-    std::copy_n(std::begin(sample_buf), sample_in.size(), std::begin(sample_in));
-
-    // The excess samples should be in front of the queue
-    std::move(&sample_buf[sample_in.size()], sample_buf_pos, std::begin(sample_buf));
-    sample_buf_pos -= sample_in.size();
-
-    return capture_e::ok;
-  }
-
-
-  int init(std::uint32_t sample_rate) {
-    audio_event.reset(CreateEventA(nullptr, FALSE, FALSE, nullptr));
-    if(!audio_event) {
-      BOOST_LOG(error) << "Couldn't create Event handle"sv;
-
-      return -1;
-    }
-
-    HRESULT status;
-
-    device_enum_t::pointer device_enum_p{};
-    status = CoCreateInstance(
-      CLSID_MMDeviceEnumerator,
-      nullptr,
-      CLSCTX_ALL,
-      IID_IMMDeviceEnumerator,
-      (void **) &device_enum_p);
-    device_enum.reset(device_enum_p);
-
-    if (FAILED(status)) {
-      BOOST_LOG(error) << "Couldn't create Device Enumerator [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-    device_t::pointer device_p{};
-
-    if(config::audio.sink.empty()) {
-      status = device_enum->GetDefaultAudioEndpoint(
-        eRender,
-        eConsole,
-        &device_p);
-    }
-    else {
-      std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
-      auto wstring_device_id = converter.from_bytes(config::audio.sink);
-
-      status = device_enum->GetDevice(wstring_device_id.c_str(), &device_p);
-    }
-    device.reset(device_p);
-
-    if (FAILED(status)) {
-      BOOST_LOG(error) << "Couldn't create audio Device [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-    audio_client_t::pointer audio_client_p{};
-    status = device->Activate(
-      IID_IAudioClient,
-      CLSCTX_ALL,
-      nullptr,
-      (void **) &audio_client_p);
-    audio_client.reset(audio_client_p);
-
-    if (FAILED(status)) {
-      BOOST_LOG(error) << "Couldn't activate audio Device [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-    wave_format_t::pointer wave_format_p{};
-    status = audio_client->GetMixFormat(&wave_format_p);
-    wave_format.reset(wave_format_p);
-
-    if (FAILED(status)) {
-      BOOST_LOG(error) << "Couldn't acquire Wave Format [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-    wave_format->nChannels = 2;
-    wave_format->wBitsPerSample = 16;
-    wave_format->nSamplesPerSec = sample_rate;
-    wave_format->nBlockAlign = wave_format->nChannels * wave_format->wBitsPerSample / 8;
-    wave_format->nAvgBytesPerSec = wave_format->nSamplesPerSec * wave_format->nBlockAlign;
-
-    switch(wave_format->wFormatTag) {
-      case WAVE_FORMAT_PCM:
-        break;
-      case WAVE_FORMAT_IEEE_FLOAT:
-        wave_format->wFormatTag = WAVE_FORMAT_PCM;
-        break;
-      case WAVE_FORMAT_EXTENSIBLE: {
-        auto wave_ex = (PWAVEFORMATEXTENSIBLE) wave_format.get();
-        if (IsEqualGUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, wave_ex->SubFormat)) {
-          wave_ex->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
-          wave_ex->Samples.wValidBitsPerSample = 16;
-          break;
-        }
-
-        BOOST_LOG(error) << "Unsupported Sub Format for WAVE_FORMAT_EXTENSIBLE: [0x"sv << util::hex(wave_ex->SubFormat).to_string_view() << ']';
-        return -1;
-      }
-      default:
-        BOOST_LOG(error) << "Unsupported Wave Format: [0x"sv << util::hex(wave_format->wFormatTag).to_string_view() << ']';
-        return -1;
-    };
-
-    REFERENCE_TIME default_latency;
-    audio_client->GetDevicePeriod(&default_latency, nullptr);
-    default_latency_ms = default_latency / 1000;
-
-    status = audio_client->Initialize(
-      AUDCLNT_SHAREMODE_SHARED,
-      AUDCLNT_STREAMFLAGS_LOOPBACK | AUDCLNT_STREAMFLAGS_EVENTCALLBACK,
-      0, 0,
-      wave_format.get(),
-      nullptr);
-
-    if (FAILED(status)) {
-      BOOST_LOG(error) << "Couldn't initialize audio client [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-    std::uint32_t frames;
-    status = audio_client->GetBufferSize(&frames);
-    if (FAILED(status)) {
-      BOOST_LOG(error) << "Couldn't acquire the number of audio frames [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-    sample_buf = util::buffer_t<std::int16_t> { frames };
-    sample_buf_pos = std::begin(sample_buf);
-
-    audio_capture_t::pointer audio_capture_p {};
-    status = audio_client->GetService(IID_IAudioCaptureClient, (void**)&audio_capture_p);
-    audio_capture.reset(audio_capture_p);
-    if (FAILED(status)) {
-      BOOST_LOG(error) << "Couldn't initialize audio capture client [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-    status = audio_client->SetEventHandle(audio_event.get());
-    if (FAILED(status)) {
-      BOOST_LOG(error) << "Couldn't set event handle [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-    status = audio_client->Start();
-    if (FAILED(status)) {
-      BOOST_LOG(error) << "Couldn't start recording [0x"sv << util::hex(status).to_string_view() << ']';
-
-      return -1;
-    }
-
-    return 0;
-  }
-
-  ~mic_wasapi_t() override {
-    if(audio_client) {
-      audio_client->Stop();
-    }
-  }
-private:
-  capture_e _fill_buffer() {
-    HRESULT status;
-
-    // Total number of samples
-    struct sample_aligned_t {
-      std::uint32_t uninitialized;
-      std::int16_t *samples;
-    } sample_aligned;
-
-    // number of samples / number of channels
-    struct block_aligned_t {
-      std::uint32_t audio_sample_size;
-    } block_aligned;
-
-    status = WaitForSingleObjectEx(audio_event.get(), default_latency_ms, FALSE);
-    switch (status) {
-      case WAIT_OBJECT_0:
-        break;
-      case WAIT_TIMEOUT:
-        return capture_e::timeout;
-      default:
-        BOOST_LOG(error) << "Couldn't wait for audio event: [0x"sv << util::hex(status).to_string_view() << ']';
-        return capture_e::error;
-    }
-
-    std::uint32_t packet_size{};
-    for (
-      status = audio_capture->GetNextPacketSize(&packet_size);
-      SUCCEEDED(status) && packet_size > 0;
-      status = audio_capture->GetNextPacketSize(&packet_size)
-      ) {
-      DWORD buffer_flags;
-      status = audio_capture->GetBuffer(
-        (BYTE **) &sample_aligned.samples,
-        &block_aligned.audio_sample_size,
-        &buffer_flags,
-        nullptr, nullptr);
-
-      switch (status) {
-        case S_OK:
-          break;
-        case AUDCLNT_E_DEVICE_INVALIDATED:
-          return capture_e::reinit;
-        default:
-          BOOST_LOG(error) << "Couldn't capture audio [0x"sv << util::hex(status).to_string_view() << ']';
-          return capture_e::error;
-      }
-
-      sample_aligned.uninitialized = std::end(sample_buf) - sample_buf_pos;
-      auto n = std::min(sample_aligned.uninitialized, block_aligned.audio_sample_size * wave_format->nChannels);
-
-      if (buffer_flags & AUDCLNT_BUFFERFLAGS_SILENT) {
-        std::fill_n(sample_buf_pos, n, 0);
-      } else {
-        std::copy_n(sample_aligned.samples, n, sample_buf_pos);
-      }
-
-      sample_buf_pos += n;
-
-      audio_capture->ReleaseBuffer(block_aligned.audio_sample_size);
-    }
-
-    if (status == AUDCLNT_E_DEVICE_INVALIDATED) {
-      return capture_e::reinit;
-    }
-
-    if (FAILED(status)) {
-      return capture_e::error;
-    }
-
-    return capture_e::ok;
-  }
-public:
-  handle_t audio_event;
-
-  device_enum_t device_enum;
-  device_t device;
-  audio_client_t audio_client;
-  wave_format_t wave_format;
-  audio_capture_t audio_capture;
-
-  REFERENCE_TIME default_latency_ms;
-
-  util::buffer_t<std::int16_t> sample_buf;
-  std::int16_t *sample_buf_pos;
-};
-}
-
-namespace platf {
-class dummy_mic_t : public mic_t {
-public:
-  capture_e sample(std::vector<std::int16_t> &sample_buf) override {
-    return capture_e::ok;
-  }
-};
-
-std::unique_ptr<mic_t> microphone(std::uint32_t sample_rate) {
-  auto mic = std::make_unique<audio::mic_wasapi_t>();
-
-  if(mic->init(sample_rate)) {
-    return std::make_unique<dummy_mic_t>();
-  }
-
-  return mic;
-}
-
-std::unique_ptr<deinit_t> init() {
-  return std::make_unique<platf::audio::co_init_t>();
-}
-}

sunshine/process.cpp

@@ -2,16 +2,18 @@
 // Created by loki on 12/14/19.
 //
 
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+
 #include "process.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
-#include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
 
-#include "utility.h"
 #include "main.h"
+#include "utility.h"
 
 namespace proc {
 using namespace std::literals;
@@ -57,11 +59,11 @@ int proc_t::execute(int app_id) {
   // Ensure starting from a clean slate
   terminate();
 
-  _app_id = app_id;
+  _app_id    = app_id;
   auto &proc = _apps[app_id];
 
   _undo_begin = std::begin(proc.prep_cmds);
-  _undo_it = _undo_begin;
+  _undo_it    = _undo_begin;
 
   if(!proc.output.empty() && proc.output != "null"sv) {
     _pipe.reset(fopen(proc.output.c_str(), "a"));
@@ -80,17 +82,31 @@ int proc_t::execute(int app_id) {
     auto ret = exe(cmd, _env, _pipe, ec);
 
     if(ec) {
-      BOOST_LOG(error) << "System: "sv << ec.message();
+      BOOST_LOG(error) << "Couldn't run ["sv << cmd << "]: System: "sv << ec.message();
       return -1;
     }
 
     if(ret != 0) {
-      BOOST_LOG(error) << "Return code ["sv << ret << ']';
+      BOOST_LOG(error) << '[' << cmd << "] failed with code ["sv << ret << ']';
       return -1;
     }
   }
 
-  BOOST_LOG(debug) << "Starting ["sv << proc.cmd << ']';
+  for(auto &cmd : proc.detached) {
+    BOOST_LOG(info) << "Spawning ["sv << cmd << ']';
+    if(proc.output.empty()) {
+      bp::spawn(cmd, _env, bp::std_out > bp::null, bp::std_err > bp::null, ec);
+    }
+    else {
+      bp::spawn(cmd, _env, bp::std_out > _pipe.get(), bp::std_err > _pipe.get(), ec);
+    }
+
+    if(ec) {
+      BOOST_LOG(warning) << "Couldn't spawn ["sv << cmd << "]: System: "sv << ec.message();
+    }
+  }
+
+  BOOST_LOG(info) << "Executing: ["sv << proc.cmd << ']';
   if(proc.cmd.empty()) {
     placebo = true;
   }
@@ -102,7 +118,7 @@ int proc_t::execute(int app_id) {
   }
 
   if(ec) {
-    BOOST_LOG(info) << "System: "sv << ec.message();
+    BOOST_LOG(warning) << "Couldn't run ["sv << proc.cmd << "]: System: "sv << ec.message();
     return -1;
   }
 
@@ -133,7 +149,7 @@ void proc_t::terminate() {
     std::abort();
   }
 
-  for(;_undo_it != _undo_begin; --_undo_it) {
+  for(; _undo_it != _undo_begin; --_undo_it) {
     auto &cmd = (_undo_it - 1)->undo_cmd;
 
     if(cmd.empty()) {
@@ -178,9 +194,11 @@ std::string_view::iterator find_match(std::string_view::iterator begin, std::str
   do {
     ++begin;
     switch(*begin) {
-      case '(': ++stack;
+    case '(':
+      ++stack;
       break;
-      case ')': --stack;
+    case ')':
+      --stack;
     }
   } while(begin != end && stack != 0);
 
@@ -191,7 +209,7 @@ std::string_view::iterator find_match(std::string_view::iterator begin, std::str
 }
 
 std::string parse_env_val(bp::native_environment &env, const std::string_view &val_raw) {
-  auto pos = std::begin(val_raw);
+  auto pos    = std::begin(val_raw);
   auto dollar = std::find(pos, std::end(val_raw), '$');
 
   std::stringstream ss;
@@ -200,23 +218,23 @@ std::string parse_env_val(bp::native_environment &env, const std::string_view &v
     auto next = dollar + 1;
     if(next != std::end(val_raw)) {
       switch(*next) {
-        case '(': {
-          ss.write(pos, (dollar - pos));
-          auto var_begin = next + 1;
-          auto var_end   = find_match(next, std::end(val_raw));
+      case '(': {
+        ss.write(pos, (dollar - pos));
+        auto var_begin = next + 1;
+        auto var_end   = find_match(next, std::end(val_raw));
 
-          ss << env[std::string { var_begin, var_end }].to_string();
+        ss << env[std::string { var_begin, var_end }].to_string();
 
-          pos = var_end + 1;
-          next = var_end;
+        pos  = var_end + 1;
+        next = var_end;
 
-          break;
-        }
-        case '$':
-          ss.write(pos, (next - pos));
-          pos = next + 1;
-          ++next;
-          break;
+        break;
+      }
+      case '$':
+        ss.write(pos, (next - pos));
+        pos = next + 1;
+        ++next;
+        break;
       }
 
       dollar = std::find(next, std::end(val_raw), '$');
@@ -231,7 +249,7 @@ std::string parse_env_val(bp::native_environment &env, const std::string_view &v
   return ss.str();
 }
 
-std::optional<proc::proc_t> parse(const std::string& file_name) {
+std::optional<proc::proc_t> parse(const std::string &file_name) {
   pt::ptree tree;
 
   try {
@@ -242,26 +260,45 @@ std::optional<proc::proc_t> parse(const std::string& file_name) {
 
     auto this_env = boost::this_process::environment();
 
+    for(auto &[name, val] : env_vars) {
+      this_env[name] = parse_env_val(this_env, val.get_value<std::string>());
+    }
+
     std::vector<proc::ctx_t> apps;
-    for(auto &[_,app_node] : apps_node) {
+    for(auto &[_, app_node] : apps_node) {
       proc::ctx_t ctx;
 
-      auto &prep_nodes = app_node.get_child("prep-cmd"s);
-      auto output = app_node.get_optional<std::string>("output"s);
-      auto name = parse_env_val(this_env, app_node.get<std::string>("name"s));
-      auto cmd = app_node.get_optional<std::string>("cmd"s);
+      auto prep_nodes_opt     = app_node.get_child_optional("prep-cmd"s);
+      auto detached_nodes_opt = app_node.get_child_optional("detached"s);
+      auto output             = app_node.get_optional<std::string>("output"s);
+      auto name               = parse_env_val(this_env, app_node.get<std::string>("name"s));
+      auto cmd                = app_node.get_optional<std::string>("cmd"s);
 
       std::vector<proc::cmd_t> prep_cmds;
-      prep_cmds.reserve(prep_nodes.size());
-      for(auto &[_, prep_node] : prep_nodes) {
-        auto do_cmd = parse_env_val(this_env, prep_node.get<std::string>("do"s));
-        auto undo_cmd = prep_node.get_optional<std::string>("undo"s);
+      if(prep_nodes_opt) {
+        auto &prep_nodes = *prep_nodes_opt;
 
-        if(undo_cmd) {
-          prep_cmds.emplace_back(std::move(do_cmd), parse_env_val(this_env, *undo_cmd));
+        prep_cmds.reserve(prep_nodes.size());
+        for(auto &[_, prep_node] : prep_nodes) {
+          auto do_cmd   = parse_env_val(this_env, prep_node.get<std::string>("do"s));
+          auto undo_cmd = prep_node.get_optional<std::string>("undo"s);
+
+          if(undo_cmd) {
+            prep_cmds.emplace_back(std::move(do_cmd), parse_env_val(this_env, *undo_cmd));
+          }
+          else {
+            prep_cmds.emplace_back(std::move(do_cmd));
+          }
         }
-        else {
-          prep_cmds.emplace_back(std::move(do_cmd));
+      }
+
+      std::vector<std::string> detached;
+      if(detached_nodes_opt) {
+        auto &detached_nodes = *detached_nodes_opt;
+
+        detached.reserve(detached_nodes.size());
+        for(auto &[_, detached_val] : detached_nodes) {
+          detached.emplace_back(parse_env_val(this_env, detached_val.get_value<std::string>()));
         }
       }
 
@@ -273,21 +310,18 @@ std::optional<proc::proc_t> parse(const std::string& file_name) {
         ctx.cmd = parse_env_val(this_env, *cmd);
       }
 
-      ctx.name = std::move(name);
+      ctx.name      = std::move(name);
       ctx.prep_cmds = std::move(prep_cmds);
+      ctx.detached  = std::move(detached);
 
       apps.emplace_back(std::move(ctx));
     }
 
-    bp::environment env = boost::this_process::environment();
-    for(auto &[name,val] : env_vars) {
-      this_env[name] = parse_env_val(this_env, val.get_value<std::string>());
-    }
-
     return proc::proc_t {
       std::move(this_env), std::move(apps)
     };
-  } catch (std::exception &e) {
+  }
+  catch(std::exception &e) {
     BOOST_LOG(error) << e.what();
   }
 
@@ -301,4 +335,4 @@ void refresh(const std::string &file_name) {
     proc = std::move(*proc_opt);
   }
 }
-}
+} // namespace proc

sunshine/process.h

@@ -9,8 +9,8 @@
 #define __kernel_entry
 #endif
 
-#include <unordered_map>
 #include <optional>
+#include <unordered_map>
 
 #include <boost/process.hpp>
 
@@ -30,6 +30,7 @@ struct cmd_t {
 };
 /*
  * pre_cmds -- guaranteed to be executed unless any of the commands fail.
+ * detached -- commands detached from Sunshine
  * cmd -- Runs indefinitely until:
  *    No session is running and a different set of commands it to be executed
  *    Command exits
@@ -41,6 +42,14 @@ struct cmd_t {
 struct ctx_t {
   std::vector<cmd_t> prep_cmds;
 
+  /**
+   * Some applications, such as Steam,
+   * either exit quickly, or keep running indefinitely.
+   * Steam.exe is one such application.
+   * That is why some applications need be run and forgotten about
+   */
+  std::vector<std::string> detached;
+
   std::string name;
   std::string cmd;
   std::string output;
@@ -52,10 +61,9 @@ public:
 
   proc_t(
     boost::process::environment &&env,
-    std::vector<ctx_t> &&apps) :
-    _app_id(-1),
-    _env(std::move(env)),
-    _apps(std::move(apps)) {}
+    std::vector<ctx_t> &&apps) : _app_id(-1),
+                                 _env(std::move(env)),
+                                 _apps(std::move(apps)) {}
 
   int execute(int app_id);
 
@@ -68,7 +76,7 @@ public:
 
   const std::vector<ctx_t> &get_apps() const;
   std::vector<ctx_t> &get_apps();
-  
+
   void terminate();
 
 private:
@@ -89,8 +97,8 @@ private:
 };
 
 void refresh(const std::string &file_name);
-std::optional<proc::proc_t> parse(const std::string& file_name);
+std::optional<proc::proc_t> parse(const std::string &file_name);
 
 extern proc_t proc;
-}
+} // namespace proc
 #endif //SUNSHINE_PROCESS_H

sunshine/round_robin.h

@@ -0,0 +1,156 @@
+#ifndef KITTY_UTIL_ITERATOR_H
+#define KITTY_UTIL_ITERATOR_H
+
+#include <iterator>
+
+namespace util {
+template<class V, class T>
+class it_wrap_t : public std::iterator<std::random_access_iterator_tag, V> {
+public:
+  typedef T iterator;
+  typedef typename std::iterator<std::random_access_iterator_tag, V>::value_type class_t;
+
+  typedef class_t &reference;
+  typedef class_t *pointer;
+
+  typedef std::ptrdiff_t diff_t;
+
+  iterator operator+=(diff_t step) {
+    while(step-- > 0) {
+      ++_this();
+    }
+
+    return _this();
+  }
+
+  iterator operator-=(diff_t step) {
+    while(step-- > 0) {
+      --_this();
+    }
+
+    return _this();
+  }
+
+  iterator operator+(diff_t step) {
+    iterator new_ = _this();
+
+    return new_ += step;
+  }
+
+  iterator operator-(diff_t step) {
+    iterator new_ = _this();
+
+    return new_ -= step;
+  }
+
+  diff_t operator-(iterator first) {
+    diff_t step = 0;
+    while(first != _this()) {
+      ++step;
+      ++first;
+    }
+
+    return step;
+  }
+
+  iterator operator++() {
+    _this().inc();
+    return _this();
+  }
+  iterator operator--() {
+    _this().dec();
+    return _this();
+  }
+
+  iterator operator++(int) {
+    iterator new_ = _this();
+
+    ++_this();
+
+    return new_;
+  }
+
+  iterator operator--(int) {
+    iterator new_ = _this();
+
+    --_this();
+
+    return new_;
+  }
+
+  reference operator*() { return *_this().get(); }
+  const reference operator*() const { return *_this().get(); }
+
+  pointer operator->() { return &*_this(); }
+  const pointer operator->() const { return &*_this(); }
+
+  bool operator!=(const iterator &other) const {
+    return !(_this() == other);
+  }
+
+  bool operator<(const iterator &other) const {
+    return !(_this() >= other);
+  }
+
+  bool operator>=(const iterator &other) const {
+    return _this() == other || _this() > other;
+  }
+
+  bool operator<=(const iterator &other) const {
+    return _this() == other || _this() < other;
+  }
+
+  bool operator==(const iterator &other) const { return _this().eq(other); };
+  bool operator>(const iterator &other) const { return _this().gt(other); }
+
+private:
+  iterator &_this() { return *static_cast<iterator *>(this); }
+  const iterator &_this() const { return *static_cast<const iterator *>(this); }
+};
+
+template<class V, class It>
+class round_robin_t : public it_wrap_t<V, round_robin_t<V, It>> {
+public:
+  using iterator = It;
+  using pointer  = V *;
+
+  round_robin_t(iterator begin, iterator end) : _begin(begin), _end(end), _pos(begin) {}
+
+  void inc() {
+    ++_pos;
+
+    if(_pos == _end) {
+      _pos = _begin;
+    }
+  }
+
+  void dec() {
+    if(_pos == _begin) {
+      _pos = _end;
+    }
+
+    --_pos;
+  }
+
+  bool eq(const round_robin_t &other) const {
+    return *_pos == *other._pos;
+  }
+
+  pointer get() const {
+    return &*_pos;
+  }
+
+private:
+  It _begin;
+  It _end;
+
+  It _pos;
+};
+
+template<class V, class It>
+round_robin_t<V, It> make_round_robin(It begin, It end) {
+  return round_robin_t<V, It>(begin, end);
+}
+} // namespace util
+
+#endif

sunshine/rtsp.cpp

@@ -7,11 +7,12 @@ extern "C" {
 }
 
 #include "config.h"
+#include "input.h"
 #include "main.h"
 #include "network.h"
 #include "rtsp.h"
-#include "input.h"
 #include "stream.h"
+#include "sync.h"
 
 namespace asio = boost::asio;
 
@@ -24,7 +25,7 @@ namespace stream {
 
 //FIXME: Quick and dirty workaround for bug in MinGW 9.3 causing a linker error when using std::to_string
 template<class T>
-std::string to_string(T && t)	{
+std::string to_string(T &&t) {
   std::stringstream ss;
   ss << std::forward<T>(t);
   return ss.str();
@@ -40,11 +41,11 @@ void free_msg(PRTSP_MESSAGE msg) {
 
 class rtsp_server_t;
 
-using msg_t = util::safe_ptr<RTSP_MESSAGE, free_msg>;
-using cmd_func_t = std::function<void(rtsp_server_t*, net::peer_t, msg_t&&)>;
+using msg_t      = util::safe_ptr<RTSP_MESSAGE, free_msg>;
+using cmd_func_t = std::function<void(rtsp_server_t *, net::peer_t, msg_t &&)>;
 
 void print_msg(PRTSP_MESSAGE msg);
-void cmd_not_found(net::host_t::pointer host, net::peer_t peer, msg_t&& req);
+void cmd_not_found(net::host_t::pointer host, net::peer_t peer, msg_t &&req);
 
 class rtsp_server_t {
 public:
@@ -54,14 +55,21 @@ public:
     }
   }
 
-  void bind(std::uint16_t port) {
-    _session_slots.resize(config::stream.channels);
-    _slot_count = config::stream.channels;
+  int bind(std::uint16_t port) {
+    {
+      auto lg = _session_slots.lock();
+
+      _session_slots->resize(config::stream.channels);
+      _slot_count = config::stream.channels;
+    }
 
     _host = net::host_create(_addr, 1, port);
+
+    return !(bool)_host;
   }
 
   void session_raise(launch_session_t launch_session) {
+    //FIXME: If client abandons us at this stage, _slot_count won't be raised again.
     --_slot_count;
     launch_event.raise(launch_session);
   }
@@ -75,61 +83,61 @@ public:
     ENetEvent event;
     auto res = enet_host_service(_host.get(), &event, std::chrono::floor<std::chrono::milliseconds>(timeout).count());
 
-    if (res > 0) {
-      switch (event.type) {
-        case ENET_EVENT_TYPE_RECEIVE: {
-          net::packet_t packet{event.packet};
-          net::peer_t peer{event.peer};
+    if(res > 0) {
+      switch(event.type) {
+      case ENET_EVENT_TYPE_RECEIVE: {
+        net::packet_t packet { event.packet };
+        net::peer_t peer { event.peer };
 
-          msg_t req { new msg_t::element_type };
+        msg_t req { new msg_t::element_type };
 
-          //TODO: compare addresses of the peers
-          if (_queue_packet.second == nullptr) {
-            parseRtspMessage(req.get(), (char *) packet->data, packet->dataLength);
-            for (auto option = req->options; option != nullptr; option = option->next) {
-              if ("Content-length"sv == option->option) {
-                _queue_packet = std::make_pair(peer, std::move(packet));
-                return;
-              }
+        //TODO: compare addresses of the peers
+        if(_queue_packet.second == nullptr) {
+          parseRtspMessage(req.get(), (char *)packet->data, packet->dataLength);
+          for(auto option = req->options; option != nullptr; option = option->next) {
+            if("Content-length"sv == option->option) {
+              _queue_packet = std::make_pair(peer, std::move(packet));
+              return;
             }
           }
-          else {
-            std::vector<char> full_payload;
-
-            auto old_msg = std::move(_queue_packet);
-            TUPLE_2D_REF(_, old_packet, old_msg);
-
-            std::string_view new_payload{(char *) packet->data, packet->dataLength};
-            std::string_view old_payload{(char *) old_packet->data, old_packet->dataLength};
-            full_payload.resize(new_payload.size() + old_payload.size());
-
-            std::copy(std::begin(old_payload), std::end(old_payload), std::begin(full_payload));
-            std::copy(std::begin(new_payload), std::end(new_payload), std::begin(full_payload) + old_payload.size());
-
-            parseRtspMessage(req.get(), full_payload.data(), full_payload.size());
-          }
-
-          print_msg(req.get());
-
-          msg_t resp;
-          auto func = _map_cmd_cb.find(req->message.request.command);
-          if (func != std::end(_map_cmd_cb)) {
-            func->second(this, peer, std::move(req));
-          }
-          else {
-            cmd_not_found(host(), peer, std::move(req));
-          }
-
-          return;
         }
-        case ENET_EVENT_TYPE_CONNECT:
-          BOOST_LOG(info) << "CLIENT CONNECTED TO RTSP"sv;
-          break;
-        case ENET_EVENT_TYPE_DISCONNECT:
-          BOOST_LOG(info) << "CLIENT DISCONNECTED FROM RTSP"sv;
-          break;
-        case ENET_EVENT_TYPE_NONE:
-          break;
+        else {
+          std::vector<char> full_payload;
+
+          auto old_msg     = std::move(_queue_packet);
+          auto &old_packet = old_msg.second;
+
+          std::string_view new_payload { (char *)packet->data, packet->dataLength };
+          std::string_view old_payload { (char *)old_packet->data, old_packet->dataLength };
+          full_payload.resize(new_payload.size() + old_payload.size());
+
+          std::copy(std::begin(old_payload), std::end(old_payload), std::begin(full_payload));
+          std::copy(std::begin(new_payload), std::end(new_payload), std::begin(full_payload) + old_payload.size());
+
+          parseRtspMessage(req.get(), full_payload.data(), full_payload.size());
+        }
+
+        print_msg(req.get());
+
+        msg_t resp;
+        auto func = _map_cmd_cb.find(req->message.request.command);
+        if(func != std::end(_map_cmd_cb)) {
+          func->second(this, peer, std::move(req));
+        }
+        else {
+          cmd_not_found(host(), peer, std::move(req));
+        }
+
+        return;
+      }
+      case ENET_EVENT_TYPE_CONNECT:
+        BOOST_LOG(info) << "CLIENT CONNECTED TO RTSP"sv;
+        break;
+      case ENET_EVENT_TYPE_DISCONNECT:
+        BOOST_LOG(info) << "CLIENT DISCONNECTED FROM RTSP"sv;
+        break;
+      case ENET_EVENT_TYPE_NONE:
+        break;
       }
     }
   }
@@ -139,8 +147,10 @@ public:
   }
 
   void clear(bool all = true) {
-    for(auto &slot : _session_slots) {
-      if (slot && (all || session::state(*slot) == session::state_e::STOPPING)) {
+    auto lg = _session_slots.lock();
+
+    for(auto &slot : *_session_slots) {
+      if(slot && (all || session::state(*slot) == session::state_e::STOPPING)) {
         session::stop(*slot);
         session::join(*slot);
 
@@ -157,16 +167,25 @@ public:
     }
   }
 
-  bool accept(const std::shared_ptr<session_t> &session) {
-    for(auto &slot : _session_slots) {
+  void clear(std::shared_ptr<session_t> *session_p) {
+    auto lg = _session_slots.lock();
+
+    session_p->reset();
+
+    ++_slot_count;
+  }
+
+  std::shared_ptr<session_t> *accept(std::shared_ptr<session_t> &session) {
+    auto lg = _session_slots.lock();
+
+    for(auto &slot : *_session_slots) {
       if(!slot) {
         slot = session;
-
-        return true;
+        return &slot;
       }
     }
 
-    return false;
+    return nullptr;
   }
 
   net::host_t::pointer host() const {
@@ -176,14 +195,13 @@ public:
   safe::event_t<launch_session_t> launch_event;
 
 private:
-
   // named _queue_packet because I want to make it an actual queue
   // It's like this for convenience sake
   std::pair<net::peer_t, net::packet_t> _queue_packet;
 
   std::unordered_map<std::string_view, cmd_func_t> _map_cmd_cb;
 
-  std::vector<std::shared_ptr<session_t>> _session_slots;
+  util::sync_t<std::vector<std::shared_ptr<session_t>>> _session_slots;
 
   int _slot_count;
   ENetAddress _addr;
@@ -197,6 +215,9 @@ void launch_session_raise(launch_session_t launch_session) {
 }
 
 int session_count() {
+  // Ensure session_count is up to date
+  server.clear(false);
+
   return server.session_count();
 }
 
@@ -204,11 +225,11 @@ void respond(net::host_t::pointer host, net::peer_t peer, msg_t &resp) {
   auto payload = std::make_pair(resp->payload, resp->payloadLength);
 
   auto lg = util::fail_guard([&]() {
-    resp->payload = payload.first;
+    resp->payload       = payload.first;
     resp->payloadLength = payload.second;
   });
 
-  resp->payload = nullptr;
+  resp->payload       = nullptr;
   resp->payloadLength = 0;
 
   int serialized_len;
@@ -243,45 +264,69 @@ void respond(net::host_t::pointer host, net::peer_t peer, msg_t &resp) {
 
 void respond(net::host_t::pointer host, net::peer_t peer, POPTION_ITEM options, int statuscode, const char *status_msg, int seqn, const std::string_view &payload) {
   msg_t resp { new msg_t::element_type };
-  createRtspResponse(resp.get(), nullptr, 0, const_cast<char*>("RTSP/1.0"), statuscode, const_cast<char*>(status_msg), seqn, options, const_cast<char*>(payload.data()), (int)payload.size());
+  createRtspResponse(resp.get(), nullptr, 0, const_cast<char *>("RTSP/1.0"), statuscode, const_cast<char *>(status_msg), seqn, options, const_cast<char *>(payload.data()), (int)payload.size());
 
   respond(host, peer, resp);
 }
 
-void cmd_not_found(net::host_t::pointer host, net::peer_t peer, msg_t&& req) {
+void cmd_not_found(net::host_t::pointer host, net::peer_t peer, msg_t &&req) {
   respond(host, peer, nullptr, 404, "NOT FOUND", req->sequenceNumber, {});
 }
 
-void cmd_option(rtsp_server_t *server, net::peer_t peer, msg_t&& req) {
+void cmd_option(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
   OPTION_ITEM option {};
 
   // I know these string literals will not be modified
-  option.option = const_cast<char*>("CSeq");
+  option.option = const_cast<char *>("CSeq");
 
-  auto seqn_str = to_string(req->sequenceNumber);
-  option.content = const_cast<char*>(seqn_str.c_str());
+  auto seqn_str  = to_string(req->sequenceNumber);
+  option.content = const_cast<char *>(seqn_str.c_str());
 
   respond(server->host(), peer, &option, 200, "OK", req->sequenceNumber, {});
 }
 
-void cmd_describe(rtsp_server_t *server, net::peer_t peer, msg_t&& req) {
+void cmd_describe(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
   OPTION_ITEM option {};
 
   // I know these string literals will not be modified
-  option.option = const_cast<char*>("CSeq");
+  option.option = const_cast<char *>("CSeq");
 
-  auto seqn_str = to_string(req->sequenceNumber);
-  option.content = const_cast<char*>(seqn_str.c_str());
+  auto seqn_str  = to_string(req->sequenceNumber);
+  option.content = const_cast<char *>(seqn_str.c_str());
 
-  std::string_view payload;
-  if(config::video.hevc_mode == 0) {
-    payload = "surround-params=NONE"sv;
-  }
-  else {
-    payload = "sprop-parameter-sets=AAAAAU;surround-params=NONE"sv;
+  std::stringstream ss;
+  if(config::video.hevc_mode != 1) {
+    ss << "sprop-parameter-sets=AAAAAU"sv << std::endl;
   }
 
-  respond(server->host(), peer, &option, 200, "OK", req->sequenceNumber, payload);
+  for(int x = 0; x < audio::MAX_STREAM_CONFIG; ++x) {
+    auto &stream_config = audio::stream_configs[x];
+    std::uint8_t mapping[platf::speaker::MAX_SPEAKERS];
+
+    auto mapping_p = stream_config.mapping;
+
+    /**
+     * GFE advertises incorrect mapping for normal quality configurations,
+     * as a result, Moonlight rotates all channels from index '3' to the right
+     * To work around this, rotate channels to the left from index '3'
+     */
+    if(x == audio::SURROUND51 || x == audio::SURROUND71) {
+      std::copy_n(mapping_p, stream_config.channelCount, mapping);
+      std::rotate(mapping + 3, mapping + 4, mapping + audio::MAX_STREAM_CONFIG);
+
+      mapping_p = mapping;
+    }
+
+    ss << "a=fmtp:97 surround-params="sv << stream_config.channelCount << stream_config.streams << stream_config.coupledStreams;
+
+    std::for_each_n(mapping_p, stream_config.channelCount, [&ss](std::uint8_t digit) {
+      ss << (char)(digit + '0');
+    });
+
+    ss << std::endl;
+  }
+
+  respond(server->host(), peer, &option, 200, "OK", req->sequenceNumber, ss.str());
 }
 
 void cmd_setup(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
@@ -290,10 +335,10 @@ void cmd_setup(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
   auto &seqn           = options[0];
   auto &session_option = options[1];
 
-  seqn.option = const_cast<char*>("CSeq");
+  seqn.option = const_cast<char *>("CSeq");
 
   auto seqn_str = to_string(req->sequenceNumber);
-  seqn.content = const_cast<char*>(seqn_str.c_str());
+  seqn.content  = const_cast<char *>(seqn_str.c_str());
 
   std::string_view target { req->message.request.target };
   auto begin = std::find(std::begin(target), std::end(target), '=') + 1;
@@ -303,8 +348,8 @@ void cmd_setup(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
   if(type == "audio"sv) {
     seqn.next = &session_option;
 
-    session_option.option  = const_cast<char*>("Session");
-    session_option.content = const_cast<char*>("DEADBEEFCAFE;timeout = 90");
+    session_option.option  = const_cast<char *>("Session");
+    session_option.content = const_cast<char *>("DEADBEEFCAFE;timeout = 90");
   }
   else if(type != "video"sv && type != "control"sv) {
     cmd_not_found(server->host(), peer, std::move(req));
@@ -319,10 +364,10 @@ void cmd_announce(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
   OPTION_ITEM option {};
 
   // I know these string literals will not be modified
-  option.option = const_cast<char*>("CSeq");
+  option.option = const_cast<char *>("CSeq");
 
-  auto seqn_str = to_string(req->sequenceNumber);
-  option.content = const_cast<char*>(seqn_str.c_str());
+  auto seqn_str  = to_string(req->sequenceNumber);
+  option.content = const_cast<char *>(seqn_str.c_str());
 
   if(!server->launch_event.peek()) {
     // /launch has not been used
@@ -341,10 +386,10 @@ void cmd_announce(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
   };
 
   {
-    auto pos = std::begin(payload);
+    auto pos   = std::begin(payload);
     auto begin = pos;
-    while (pos != std::end(payload)) {
-      if (whitespace(*pos++)) {
+    while(pos != std::end(payload)) {
+      if(whitespace(*pos++)) {
         lines.emplace_back(begin, pos - begin - 1);
 
         while(pos != std::end(payload) && whitespace(*pos)) { ++pos; }
@@ -365,10 +410,10 @@ void cmd_announce(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
       auto pos = line.find(':');
 
       auto name = line.substr(2, pos - 2);
-      auto val = line.substr(pos + 1);
+      auto val  = line.substr(pos + 1);
 
-      if(val[val.size() -1] == ' ') {
-        val = val.substr(0, val.size() -1);
+      if(val[val.size() - 1] == ' ') {
+        val = val.substr(0, val.size() - 1);
       }
       args.emplace(name, val);
     }
@@ -381,11 +426,16 @@ void cmd_announce(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
   args.try_emplace("x-nv-aqos.packetDuration"sv, "5"sv);
 
   config_t config;
+
+  config.audio.flags[audio::config_t::HOST_AUDIO] = launch_session->host_audio;
   try {
     config.audio.channels       = util::from_view(args.at("x-nv-audio.surround.numChannels"sv));
     config.audio.mask           = util::from_view(args.at("x-nv-audio.surround.channelMask"sv));
     config.audio.packetDuration = util::from_view(args.at("x-nv-aqos.packetDuration"sv));
 
+    config.audio.flags[audio::config_t::HIGH_QUALITY] =
+      util::from_view(args.at("x-nv-audio.surround.AudioQuality"sv));
+
     config.packetsize = util::from_view(args.at("x-nv-video[0].packetSize"sv));
 
     config.monitor.height         = util::from_view(args.at("x-nv-video[0].clientViewportHt"sv));
@@ -397,14 +447,14 @@ void cmd_announce(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
     config.monitor.encoderCscMode = util::from_view(args.at("x-nv-video[0].encoderCscMode"sv));
     config.monitor.videoFormat    = util::from_view(args.at("x-nv-vqos[0].bitStreamFormat"sv));
     config.monitor.dynamicRange   = util::from_view(args.at("x-nv-video[0].dynamicRangeMode"sv));
-
-  } catch(std::out_of_range &) {
+  }
+  catch(std::out_of_range &) {
 
     respond(server->host(), peer, &option, 400, "BAD REQUEST", req->sequenceNumber, {});
     return;
   }
 
-  if(config.monitor.videoFormat != 0 && config::video.hevc_mode == 0) {
+  if(config.monitor.videoFormat != 0 && config::video.hevc_mode == 1) {
     BOOST_LOG(warning) << "HEVC is disabled, yet the client requested HEVC"sv;
 
     respond(server->host(), peer, &option, 400, "BAD REQUEST", req->sequenceNumber, {});
@@ -412,14 +462,22 @@ void cmd_announce(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
   }
 
   auto session = session::alloc(config, launch_session->gcm_key, launch_session->iv);
-  if(!server->accept(session)) {
+
+  auto slot = server->accept(session);
+  if(!slot) {
     BOOST_LOG(info) << "Ran out of slots for client from ["sv << ']';
 
     respond(server->host(), peer, &option, 503, "Service Unavailable", req->sequenceNumber, {});
     return;
   }
 
-  session::start(*session, platf::from_sockaddr((sockaddr*)&peer->address.address));
+  if(session::start(*session, platf::from_sockaddr((sockaddr *)&peer->address.address))) {
+    BOOST_LOG(error) << "Failed to start a streaming session"sv;
+
+    server->clear(slot);
+    respond(server->host(), peer, &option, 500, "Internal Server Error", req->sequenceNumber, {});
+    return;
+  }
 
   respond(server->host(), peer, &option, 200, "OK", req->sequenceNumber, {});
 }
@@ -428,10 +486,10 @@ void cmd_play(rtsp_server_t *server, net::peer_t peer, msg_t &&req) {
   OPTION_ITEM option {};
 
   // I know these string literals will not be modified
-  option.option = const_cast<char*>("CSeq");
+  option.option = const_cast<char *>("CSeq");
 
-  auto seqn_str = to_string(req->sequenceNumber);
-  option.content = const_cast<char*>(seqn_str.c_str());
+  auto seqn_str  = to_string(req->sequenceNumber);
+  option.content = const_cast<char *>(seqn_str.c_str());
 
   respond(server->host(), peer, &option, 200, "OK", req->sequenceNumber, {});
 }
@@ -444,7 +502,13 @@ void rtpThread(std::shared_ptr<safe::signal_t> shutdown_event) {
 
   server.map("PLAY"sv, &cmd_play);
 
-  server.bind(RTSP_SETUP_PORT);
+  if(server.bind(RTSP_SETUP_PORT)) {
+    BOOST_LOG(fatal) << "Couldn't bind RTSP server to port ["sv << RTSP_SETUP_PORT << "], likely another process already bound to the port"sv;
+    shutdown_event->raise(true);
+
+    return;
+  }
+
   while(!shutdown_event->peek()) {
     server.iterate(std::min(500ms, config::stream.ping_timeout));
 
@@ -483,7 +547,7 @@ void print_msg(PRTSP_MESSAGE msg) {
     BOOST_LOG(debug) << "status :: "sv << status;
   }
   else {
-    auto& req = msg->message.request;
+    auto &req = msg->message.request;
 
     std::string_view command { req.command };
     std::string_view target { req.target };
@@ -499,6 +563,8 @@ void print_msg(PRTSP_MESSAGE msg) {
     BOOST_LOG(debug) << name << " :: "sv << content;
   }
 
-  BOOST_LOG(debug) << "---Begin MessageBuffer---"sv << std::endl << messageBuffer << std::endl << "---End MessageBuffer---"sv << std::endl;
-}
+  BOOST_LOG(debug) << "---Begin MessageBuffer---"sv << std::endl
+                   << messageBuffer << std::endl
+                   << "---End MessageBuffer---"sv << std::endl;
 }
+} // namespace stream

sunshine/rtsp.h

@@ -14,6 +14,8 @@ namespace stream {
 struct launch_session_t {
   crypto::aes_t gcm_key;
   crypto::aes_t iv;
+
+  bool host_audio;
 };
 
 void launch_session_raise(launch_session_t launch_session);
@@ -21,6 +23,6 @@ int session_count();
 
 void rtpThread(std::shared_ptr<safe::signal_t> shutdown_event);
 
-}
+} // namespace stream
 
 #endif //SUNSHINE_RTSP_H

sunshine/stream.cpp

@@ -4,8 +4,8 @@
 
 #include "process.h"
 
-#include <queue>
 #include <future>
+#include <queue>
 
 #include <fstream>
 #include <openssl/err.h>
@@ -15,14 +15,14 @@ extern "C" {
 #include <rs.h>
 }
 
-#include "network.h"
 #include "config.h"
-#include "utility.h"
-#include "stream.h"
-#include "thread_safe.h"
-#include "sync.h"
 #include "input.h"
 #include "main.h"
+#include "network.h"
+#include "stream.h"
+#include "sync.h"
+#include "thread_safe.h"
+#include "utility.h"
 
 #define IDX_START_A 0
 #define IDX_REQUEST_IDR_FRAME 0
@@ -45,7 +45,7 @@ static const short packetTypes[] = {
 };
 
 constexpr auto VIDEO_STREAM_PORT = 47998;
-constexpr auto CONTROL_PORT = 47999;
+constexpr auto CONTROL_PORT      = 47999;
 constexpr auto AUDIO_STREAM_PORT = 48000;
 
 namespace asio = boost::asio;
@@ -71,6 +71,7 @@ struct video_packet_raw_t {
   }
 
   RTP_PACKET rtp;
+  char reserved[4];
   NV_VIDEO_PACKET packet;
 };
 
@@ -88,7 +89,7 @@ using rh_t           = util::safe_ptr<reed_solomon, reed_solomon_release>;
 using video_packet_t = util::c_ptr<video_packet_raw_t>;
 using audio_packet_t = util::c_ptr<audio_packet_raw_t>;
 
-using message_queue_t = std::shared_ptr<safe::queue_t<std::pair<std::uint16_t, std::string>>>;
+using message_queue_t       = std::shared_ptr<safe::queue_t<std::pair<std::uint16_t, std::string>>>;
 using message_queue_queue_t = std::shared_ptr<safe::queue_t<std::tuple<socket_e, asio::ip::address, message_queue_t>>>;
 
 static inline void while_starting_do_nothing(std::atomic<session::state_e> &state) {
@@ -99,10 +100,11 @@ static inline void while_starting_do_nothing(std::atomic<session::state_e> &stat
 
 class control_server_t {
 public:
-  control_server_t(control_server_t &&) noexcept = default;
-  control_server_t &operator=(control_server_t &&) noexcept = default;
+  int bind(std::uint16_t port) {
+    _host = net::host_create(_addr, config::stream.channels, port);
 
-  explicit control_server_t(std::uint16_t port) : _host { net::host_create(_addr, config::stream.channels, port) } {}
+    return !(bool)_host;
+  }
 
   void emplace_addr_to_session(const std::string &addr, session_t &session) {
     auto lg = _map_addr_session.lock();
@@ -122,7 +124,7 @@ public:
   // Therefore, iterate is implemented further down the source file
   void iterate(std::chrono::milliseconds timeout);
 
-  void map(uint16_t type, std::function<void(session_t *, const std::string_view&)> cb) {
+  void map(uint16_t type, std::function<void(session_t *, const std::string_view &)> cb) {
     _map_type_cb.emplace(type, std::move(cb));
   }
 
@@ -138,10 +140,10 @@ public:
   }
 
   // Callbacks
-  std::unordered_map<std::uint16_t, std::function<void(session_t *, const std::string_view&)>> _map_type_cb;
+  std::unordered_map<std::uint16_t, std::function<void(session_t *, const std::string_view &)>> _map_type_cb;
 
   // Mapping ip:port to session
-  util::sync_t<std::unordered_multimap<std::string, std::pair<std::uint16_t, session_t*>>> _map_addr_session;
+  util::sync_t<std::unordered_multimap<std::string, std::pair<std::uint16_t, session_t *>>> _map_addr_session;
 
   ENetAddress _addr;
   net::host_t _host;
@@ -160,9 +162,9 @@ struct broadcast_ctx_t {
 
   asio::io_service io;
 
-  udp::socket video_sock { io, udp::endpoint(udp::v4(), VIDEO_STREAM_PORT) };
-  udp::socket audio_sock { io, udp::endpoint(udp::v4(), AUDIO_STREAM_PORT) };
-  control_server_t control_server { CONTROL_PORT };
+  udp::socket video_sock { io };
+  udp::socket audio_sock { io };
+  control_server_t control_server;
 };
 
 struct session_t {
@@ -208,7 +210,7 @@ static auto broadcast = safe::make_shared<broadcast_ctx_t>(start_broadcast, end_
 safe::signal_t broadcast_shutdown_event;
 
 session_t *control_server_t::get_session(const net::peer_t peer) {
-  TUPLE_2D(port, addr_string, platf::from_sockaddr_ex((sockaddr*)&peer->address.address));
+  TUPLE_2D(port, addr_string, platf::from_sockaddr_ex((sockaddr *)&peer->address.address));
 
   auto lg = _map_addr_session.lock();
   TUPLE_2D(begin, end, _map_addr_session->equal_range(addr_string));
@@ -229,7 +231,7 @@ session_t *control_server_t::get_session(const net::peer_t peer) {
     TUPLE_2D_REF(session_port, session_p, it->second);
 
     session_p->control.peer = peer;
-    session_port = port;
+    session_port            = port;
 
     return session_p;
   }
@@ -244,7 +246,7 @@ void control_server_t::iterate(std::chrono::milliseconds timeout) {
   if(res > 0) {
     auto session = get_session(event.peer);
     if(!session) {
-      BOOST_LOG(warning) << "Rejected connection from ["sv << platf::from_sockaddr((sockaddr*)&event.peer->address.address) << "]: it's not properly set up"sv;
+      BOOST_LOG(warning) << "Rejected connection from ["sv << platf::from_sockaddr((sockaddr *)&event.peer->address.address) << "]: it's not properly set up"sv;
       enet_peer_disconnect_now(event.peer, 0);
 
       return;
@@ -253,37 +255,37 @@ void control_server_t::iterate(std::chrono::milliseconds timeout) {
     session->pingTimeout = std::chrono::steady_clock::now() + config::stream.ping_timeout;
 
     switch(event.type) {
-      case ENET_EVENT_TYPE_RECEIVE:
-      {
-        net::packet_t packet { event.packet };
+    case ENET_EVENT_TYPE_RECEIVE: {
+      net::packet_t packet { event.packet };
 
-        auto type = (std::uint16_t *)packet->data;
-        std::string_view payload { (char*)packet->data + sizeof(*type), packet->dataLength - sizeof(*type) };
+      auto type = (std::uint16_t *)packet->data;
+      std::string_view payload { (char *)packet->data + sizeof(*type), packet->dataLength - sizeof(*type) };
 
-        auto cb = _map_type_cb.find(*type);
-        if(cb == std::end(_map_type_cb)) {
-          BOOST_LOG(warning)
-            << "type [Unknown] { "sv << util::hex(*type).to_string_view() << " }"sv << std::endl
-            << "---data---"sv << std::endl << util::hex_vec(payload) << std::endl << "---end data---"sv;
-        }
-
-        else {
-          cb->second(session, payload);
-        }
+      auto cb = _map_type_cb.find(*type);
+      if(cb == std::end(_map_type_cb)) {
+        BOOST_LOG(warning)
+          << "type [Unknown] { "sv << util::hex(*type).to_string_view() << " }"sv << std::endl
+          << "---data---"sv << std::endl
+          << util::hex_vec(payload) << std::endl
+          << "---end data---"sv;
       }
-        break;
-      case ENET_EVENT_TYPE_CONNECT:
-        BOOST_LOG(info) << "CLIENT CONNECTED"sv;
-        break;
-      case ENET_EVENT_TYPE_DISCONNECT:
-        BOOST_LOG(info) << "CLIENT DISCONNECTED"sv;
-        // No more clients to send video data to ^_^
-        if(session->state == session::state_e::RUNNING) {
-          session::stop(*session);
-        }
-        break;
-      case ENET_EVENT_TYPE_NONE:
-        break;
+
+      else {
+        cb->second(session, payload);
+      }
+    } break;
+    case ENET_EVENT_TYPE_CONNECT:
+      BOOST_LOG(info) << "CLIENT CONNECTED"sv;
+      break;
+    case ENET_EVENT_TYPE_DISCONNECT:
+      BOOST_LOG(info) << "CLIENT DISCONNECTED"sv;
+      // No more clients to send video data to ^_^
+      if(session->state == session::state_e::RUNNING) {
+        session::stop(*session);
+      }
+      break;
+    case ENET_EVENT_TYPE_NONE:
+      break;
     }
   }
 }
@@ -299,8 +301,12 @@ struct fec_t {
   size_t blocksize;
   util::buffer_t<char> shards;
 
+  char *data(size_t el) {
+    return &shards[el * blocksize];
+  }
+
   std::string_view operator[](size_t el) const {
-    return { &shards[el*blocksize], blocksize };
+    return { &shards[el * blocksize], blocksize };
   }
 
   size_t size() const {
@@ -308,38 +314,42 @@ struct fec_t {
   }
 };
 
-fec_t encode(const std::string_view &payload, size_t blocksize, size_t fecpercentage) {
+static fec_t encode(const std::string_view &payload, size_t blocksize, size_t fecpercentage) {
   auto payload_size = payload.size();
 
   auto pad = payload_size % blocksize != 0;
 
   auto data_shards   = payload_size / blocksize + (pad ? 1 : 0);
   auto parity_shards = (data_shards * fecpercentage + 99) / 100;
-  auto nr_shards = data_shards + parity_shards;
+  auto nr_shards     = data_shards + parity_shards;
 
   if(nr_shards > DATA_SHARDS_MAX) {
-    BOOST_LOG(error)
+    BOOST_LOG(warning)
       << "Number of fragments for reed solomon exceeds DATA_SHARDS_MAX"sv << std::endl
-      << nr_shards << " > "sv << DATA_SHARDS_MAX;
+      << nr_shards << " > "sv << DATA_SHARDS_MAX
+      << ", skipping error correction"sv;
 
-    return { 0 };
+    nr_shards     = data_shards;
+    fecpercentage = 0;
   }
 
   util::buffer_t<char> shards { nr_shards * blocksize };
-  util::buffer_t<uint8_t*> shards_p { nr_shards };
+  util::buffer_t<uint8_t *> shards_p { nr_shards };
 
   // copy payload + padding
   auto next = std::copy(std::begin(payload), std::end(payload), std::begin(shards));
   std::fill(next, std::end(shards), 0); // padding with zero
 
   for(auto x = 0; x < nr_shards; ++x) {
-    shards_p[x] = (uint8_t*)&shards[x * blocksize];
+    shards_p[x] = (uint8_t *)&shards[x * blocksize];
   }
 
-  // packets = parity_shards + data_shards
-  rs_t rs { reed_solomon_new(data_shards, parity_shards) };
+  if(data_shards + parity_shards <= DATA_SHARDS_MAX) {
+    // packets = parity_shards + data_shards
+    rs_t rs { reed_solomon_new(data_shards, parity_shards) };
 
-  reed_solomon_encode(rs.get(), shards_p.begin(), nr_shards, blocksize);
+    reed_solomon_encode(rs.get(), shards_p.begin(), nr_shards, blocksize);
+  }
 
   return {
     data_shards,
@@ -349,11 +359,11 @@ fec_t encode(const std::string_view &payload, size_t blocksize, size_t fecpercen
     std::move(shards)
   };
 }
-}
+} // namespace fec
 
 template<class F>
 std::vector<uint8_t> insert(uint64_t insert_size, uint64_t slice_size, const std::string_view &data, F &&f) {
-  auto pad = data.size() % slice_size != 0;
+  auto pad      = data.size() % slice_size != 0;
   auto elements = data.size() / slice_size + (pad ? 1 : 0);
 
   std::vector<uint8_t> result;
@@ -361,20 +371,20 @@ std::vector<uint8_t> insert(uint64_t insert_size, uint64_t slice_size, const std
 
   auto next = std::begin(data);
   for(auto x = 0; x < elements - 1; ++x) {
-    void *p = &result[x*(insert_size + slice_size)];
+    void *p = &result[x * (insert_size + slice_size)];
 
     f(p, x, elements);
 
-    std::copy(next, next + slice_size, (char*)p + insert_size);
+    std::copy(next, next + slice_size, (char *)p + insert_size);
     next += slice_size;
   }
 
-  auto x = elements - 1;
-  void *p = &result[x*(insert_size + slice_size)];
+  auto x  = elements - 1;
+  void *p = &result[x * (insert_size + slice_size)];
 
   f(p, x, elements);
 
-  std::copy(next, std::end(data), (char*)p + insert_size);
+  std::copy(next, std::end(data), (char *)p + insert_size);
 
   return result;
 }
@@ -383,7 +393,7 @@ std::vector<uint8_t> replace(const std::string_view &original, const std::string
   std::vector<uint8_t> replaced;
 
   auto begin = std::begin(original);
-  auto next = std::search(begin, std::end(original), std::begin(old), std::end(old));
+  auto next  = std::search(begin, std::end(original), std::begin(old), std::end(old));
 
   std::copy(begin, next, std::back_inserter(replaced));
   std::copy(std::begin(_new), std::end(_new), std::back_inserter(replaced));
@@ -402,8 +412,8 @@ void controlBroadcastThread(safe::signal_t *shutdown_event, control_server_t *se
   });
 
   server->map(packetTypes[IDX_LOSS_STATS], [&](session_t *session, const std::string_view &payload) {
-    int32_t *stats = (int32_t*)payload.data();
-    auto count = stats[0];
+    int32_t *stats = (int32_t *)payload.data();
+    auto count     = stats[0];
     std::chrono::milliseconds t { stats[1] };
 
     auto lastGoodFrame = stats[3];
@@ -418,9 +428,9 @@ void controlBroadcastThread(safe::signal_t *shutdown_event, control_server_t *se
   });
 
   server->map(packetTypes[IDX_INVALIDATE_REF_FRAMES], [&](session_t *session, const std::string_view &payload) {
-    auto frames = (std::int64_t *)payload.data();
+    auto frames     = (std::int64_t *)payload.data();
     auto firstFrame = frames[0];
-    auto lastFrame = frames[1];
+    auto lastFrame  = frames[1];
 
     BOOST_LOG(debug)
       << "type [IDX_INVALIDATE_REF_FRAMES]"sv << std::endl
@@ -433,7 +443,7 @@ void controlBroadcastThread(safe::signal_t *shutdown_event, control_server_t *se
   server->map(packetTypes[IDX_INPUT_DATA], [&](session_t *session, const std::string_view &payload) {
     BOOST_LOG(debug) << "type [IDX_INPUT_DATA]"sv;
 
-    int32_t tagged_cipher_length = util::endian::big(*(int32_t*)payload.data());
+    int32_t tagged_cipher_length = util::endian::big(*(int32_t *)payload.data());
     std::string_view tagged_cipher { payload.data() + sizeof(tagged_cipher_length), (size_t)tagged_cipher_length };
 
     crypto::cipher_t cipher { session->gcm_key };
@@ -492,10 +502,13 @@ void controlBroadcastThread(safe::signal_t *shutdown_event, control_server_t *se
       payload[0] = packetTypes[IDX_TERMINATION];
       payload[1] = reason;
 
-      server->send(std::string_view {(char*)payload.data(), payload.size()});
+      server->send(std::string_view { (char *)payload.data(), payload.size() });
 
-      shutdown_event->raise(true);
-      continue;
+      auto lg = server->_map_addr_session.lock();
+      for(auto pos = std::begin(*server->_map_addr_session); pos != std::end(*server->_map_addr_session); ++pos) {
+        auto session = pos->second.second;
+        session->shutdown_event.raise(true);
+      }
     }
 
     server->iterate(500ms);
@@ -510,7 +523,7 @@ void recvThread(broadcast_ctx_t &ctx) {
   auto &audio_sock = ctx.audio_sock;
 
   auto &message_queue_queue = ctx.message_queue_queue;
-  auto &io = ctx.io;
+  auto &io                  = ctx.io;
 
   udp::endpoint peer;
 
@@ -523,28 +536,28 @@ void recvThread(broadcast_ctx_t &ctx) {
       TUPLE_3D_REF(socket_type, addr, message_queue, *message_queue_opt);
 
       switch(socket_type) {
-        case socket_e::video:
-          if(message_queue) {
-            peer_to_video_session.emplace(addr, message_queue);
-          }
-          else {
-            peer_to_video_session.erase(addr);
-          }
-          break;
-        case socket_e::audio:
-          if(message_queue) {
-            peer_to_audio_session.emplace(addr, message_queue);
-          }
-          else {
-            peer_to_audio_session.erase(addr);
-          }
-          break;
+      case socket_e::video:
+        if(message_queue) {
+          peer_to_video_session.emplace(addr, message_queue);
+        }
+        else {
+          peer_to_video_session.erase(addr);
+        }
+        break;
+      case socket_e::audio:
+        if(message_queue) {
+          peer_to_audio_session.emplace(addr, message_queue);
+        }
+        else {
+          peer_to_audio_session.erase(addr);
+        }
+        break;
       }
     }
   };
 
   auto recv_func_init = [&](udp::socket &sock, int buf_elem, std::map<asio::ip::address, message_queue_t> &peer_to_session) {
-    recv_func[buf_elem] = [&,buf_elem](const boost::system::error_code &ec, size_t bytes) {
+    recv_func[buf_elem] = [&, buf_elem](const boost::system::error_code &ec, size_t bytes) {
       auto fg = util::fail_guard([&]() {
         sock.async_receive_from(asio::buffer(buf[buf_elem]), peer, 0, recv_func[buf_elem]);
       });
@@ -592,20 +605,20 @@ void videoBroadcastThread(safe::signal_t *shutdown_event, udp::socket &sock, vid
       break;
     }
 
-    auto session = (session_t*)packet->channel_data;
-    auto lowseq = session->video.lowseq;
+    auto session = (session_t *)packet->channel_data;
+    auto lowseq  = session->video.lowseq;
 
-    std::string_view payload{(char *) packet->data, (size_t) packet->size};
+    std::string_view payload { (char *)packet->data, (size_t)packet->size };
     std::vector<uint8_t> payload_new;
 
     auto nv_packet_header = "\0017charss"sv;
     std::copy(std::begin(nv_packet_header), std::end(nv_packet_header), std::back_inserter(payload_new));
     std::copy(std::begin(payload), std::end(payload), std::back_inserter(payload_new));
 
-    payload = {(char *) payload_new.data(), payload_new.size()};
+    payload = { (char *)payload_new.data(), payload_new.size() };
 
     // make sure moonlight recognizes the nalu code for IDR frames
-    if (packet->flags & AV_PKT_FLAG_KEY) {
+    if(packet->flags & AV_PKT_FLAG_KEY) {
       // TODO: Not all encoders encode their IDR frames with the 4 byte NALU prefix
       std::string_view frame_old = "\000\000\001e"sv;
       std::string_view frame_new = "\000\000\000\001e"sv;
@@ -614,30 +627,26 @@ void videoBroadcastThread(safe::signal_t *shutdown_event, udp::socket &sock, vid
         frame_new = "\000\000\000\001("sv;
       }
 
-      assert(std::search(std::begin(payload), std::end(payload), std::begin(hevc_i_frame), std::end(hevc_i_frame)) ==
-             std::end(payload));
       payload_new = replace(payload, frame_old, frame_new);
-      payload = {(char *) payload_new.data(), payload_new.size()};
+      payload     = { (char *)payload_new.data(), payload_new.size() };
     }
 
     // insert packet headers
-    auto blocksize = session->config.packetsize + MAX_RTP_HEADER_SIZE;
+    auto blocksize         = session->config.packetsize + MAX_RTP_HEADER_SIZE;
     auto payload_blocksize = blocksize - sizeof(video_packet_raw_t);
 
     auto fecPercentage = config::stream.fec_percentage;
 
     payload_new = insert(sizeof(video_packet_raw_t), payload_blocksize,
-                         payload, [&](void *p, int fecIndex, int end) {
+      payload, [&](void *p, int fecIndex, int end) {
         video_packet_raw_t *video_packet = (video_packet_raw_t *)p;
 
-        video_packet->packet.flags = FLAG_CONTAINS_PIC_DATA;
-        video_packet->packet.frameIndex = packet->pts;
+        video_packet->packet.flags             = FLAG_CONTAINS_PIC_DATA;
+        video_packet->packet.frameIndex        = packet->pts;
         video_packet->packet.streamPacketIndex = ((uint32_t)lowseq + fecIndex) << 8;
-        video_packet->packet.fecInfo = (
-          fecIndex << 12 |
-          end << 22 |
-          fecPercentage << 4
-        );
+        video_packet->packet.fecInfo           = (fecIndex << 12 |
+                                        end << 22 |
+                                        fecPercentage << 4);
 
         if(fecIndex == 0) {
           video_packet->packet.flags |= FLAG_SOF;
@@ -647,10 +656,11 @@ void videoBroadcastThread(safe::signal_t *shutdown_event, udp::socket &sock, vid
           video_packet->packet.flags |= FLAG_EOF;
         }
 
+        video_packet->rtp.header         = FLAG_EXTENSION;
         video_packet->rtp.sequenceNumber = util::endian::big<uint16_t>(lowseq + fecIndex);
       });
 
-    payload = {(char *) payload_new.data(), payload_new.size()};
+    payload = { (char *)payload_new.data(), payload_new.size() };
 
     auto shards = fec::encode(payload, blocksize, fecPercentage);
     if(shards.data_shards == 0) {
@@ -658,20 +668,19 @@ void videoBroadcastThread(safe::signal_t *shutdown_event, udp::socket &sock, vid
       continue;
     }
 
-    for (auto x = shards.data_shards; x < shards.size(); ++x) {
-      video_packet_raw_t *inspect = (video_packet_raw_t *)shards[x].data();
+    for(auto x = shards.data_shards; x < shards.size(); ++x) {
+      auto *inspect = (video_packet_raw_t *)shards.data(x);
 
       inspect->packet.frameIndex = packet->pts;
-      inspect->packet.fecInfo = (
-        x << 12 |
-        shards.data_shards << 22 |
-        fecPercentage << 4
-      );
+      inspect->packet.fecInfo    = (x << 12 |
+                                 shards.data_shards << 22 |
+                                 shards.percentage << 4);
 
+      inspect->rtp.header         = FLAG_EXTENSION;
       inspect->rtp.sequenceNumber = util::endian::big<uint16_t>(lowseq + x);
     }
 
-    for (auto x = 0; x < shards.size(); ++x) {
+    for(auto x = 0; x < shards.size(); ++x) {
       sock.send_to(asio::buffer(shards[x]), session->video.peer);
     }
 
@@ -689,27 +698,27 @@ void videoBroadcastThread(safe::signal_t *shutdown_event, udp::socket &sock, vid
 }
 
 void audioBroadcastThread(safe::signal_t *shutdown_event, udp::socket &sock, audio::packet_queue_t packets) {
-  while (auto packet = packets->pop()) {
+  while(auto packet = packets->pop()) {
     if(shutdown_event->peek()) {
       break;
     }
 
     TUPLE_2D_REF(channel_data, packet_data, *packet);
-    auto session = (session_t*)channel_data;
+    auto session = (session_t *)channel_data;
 
     auto frame = session->audio.frame++;
 
-    audio_packet_t audio_packet { (audio_packet_raw_t*)malloc(sizeof(audio_packet_raw_t) + packet_data.size()) };
+    audio_packet_t audio_packet { (audio_packet_raw_t *)malloc(sizeof(audio_packet_raw_t) + packet_data.size()) };
 
-    audio_packet->rtp.header = 0;
-    audio_packet->rtp.packetType = 97;
+    audio_packet->rtp.header         = 0;
+    audio_packet->rtp.packetType     = 97;
     audio_packet->rtp.sequenceNumber = util::endian::big(frame);
-    audio_packet->rtp.timestamp = 0;
-    audio_packet->rtp.ssrc = 0;
+    audio_packet->rtp.timestamp      = 0;
+    audio_packet->rtp.ssrc           = 0;
 
     std::copy(std::begin(packet_data), std::end(packet_data), audio_packet->payload());
 
-    sock.send_to(asio::buffer((char*)audio_packet.get(), sizeof(audio_packet_raw_t) + packet_data.size()), session->audio.peer);
+    sock.send_to(asio::buffer((char *)audio_packet.get(), sizeof(audio_packet_raw_t) + packet_data.size()), session->audio.peer);
     BOOST_LOG(verbose) << "Audio ["sv << frame << "] ::  send..."sv;
   }
 
@@ -717,12 +726,47 @@ void audioBroadcastThread(safe::signal_t *shutdown_event, udp::socket &sock, aud
 }
 
 int start_broadcast(broadcast_ctx_t &ctx) {
-  ctx.video_packets = std::make_shared<video::packet_queue_t::element_type>();
-  ctx.audio_packets = std::make_shared<audio::packet_queue_t::element_type>();
-  ctx.message_queue_queue = std::make_shared<message_queue_queue_t::element_type>();
+  if(ctx.control_server.bind(CONTROL_PORT)) {
+    BOOST_LOG(error) << "Couldn't bind Control server to port ["sv << CONTROL_PORT << "], likely another process already bound to the port"sv;
 
-  ctx.video_thread = std::thread { videoBroadcastThread, &broadcast_shutdown_event, std::ref(ctx.video_sock), ctx.video_packets };
-  ctx.audio_thread = std::thread { audioBroadcastThread, &broadcast_shutdown_event, std::ref(ctx.audio_sock), ctx.audio_packets };
+    return -1;
+  }
+
+  boost::system::error_code ec;
+  ctx.video_sock.open(udp::v4(), ec);
+  if(ec) {
+    BOOST_LOG(fatal) << "Couldn't open socket for Video server: "sv << ec.message();
+
+    return -1;
+  }
+
+  ctx.video_sock.bind(udp::endpoint(udp::v4(), VIDEO_STREAM_PORT), ec);
+  if(ec) {
+    BOOST_LOG(fatal) << "Couldn't bind Video server to port ["sv << VIDEO_STREAM_PORT << "]: "sv << ec.message();
+
+    return -1;
+  }
+
+  ctx.audio_sock.open(udp::v4(), ec);
+  if(ec) {
+    BOOST_LOG(fatal) << "Couldn't open socket for Audio server: "sv << ec.message();
+
+    return -1;
+  }
+
+  ctx.audio_sock.bind(udp::endpoint(udp::v4(), AUDIO_STREAM_PORT), ec);
+  if(ec) {
+    BOOST_LOG(fatal) << "Couldn't bind Audio server to port ["sv << AUDIO_STREAM_PORT << "]: "sv << ec.message();
+
+    return -1;
+  }
+
+  ctx.video_packets       = std::make_shared<video::packet_queue_t::element_type>(30);
+  ctx.audio_packets       = std::make_shared<audio::packet_queue_t::element_type>(30);
+  ctx.message_queue_queue = std::make_shared<message_queue_queue_t::element_type>(30);
+
+  ctx.video_thread   = std::thread { videoBroadcastThread, &broadcast_shutdown_event, std::ref(ctx.video_sock), ctx.video_packets };
+  ctx.audio_thread   = std::thread { audioBroadcastThread, &broadcast_shutdown_event, std::ref(ctx.audio_sock), ctx.audio_packets };
   ctx.control_thread = std::thread { controlBroadcastThread, &broadcast_shutdown_event, &ctx.control_server };
 
   ctx.recv_thread = std::thread { recvThread, std::ref(ctx) };
@@ -762,7 +806,7 @@ void end_broadcast(broadcast_ctx_t &ctx) {
 int recv_ping(decltype(broadcast)::ptr_t ref, socket_e type, asio::ip::address &addr, std::chrono::milliseconds timeout) {
   auto constexpr ping = "PING"sv;
 
-  auto messages = std::make_shared<message_queue_t::element_type>();
+  auto messages = std::make_shared<message_queue_t::element_type>(30);
   ref->message_queue_queue->raise(type, addr, messages);
 
   auto fg = util::fail_guard([&]() {
@@ -798,7 +842,7 @@ void videoThread(session_t *session, std::string addr_str) {
   while_starting_do_nothing(session->state);
 
   auto addr = asio::ip::make_address(addr_str);
-  auto ref = broadcast.ref();
+  auto ref  = broadcast.ref();
   auto port = recv_ping(ref, socket_e::video, addr, config::stream.ping_timeout);
   if(port < 0) {
     return;
@@ -820,7 +864,7 @@ void audioThread(session_t *session, std::string addr_str) {
 
   auto addr = asio::ip::make_address(addr_str);
 
-  auto ref = broadcast.ref();
+  auto ref  = broadcast.ref();
   auto port = recv_ping(ref, socket_e::audio, addr, config::stream.ping_timeout);
   if(port < 0) {
     return;
@@ -840,8 +884,7 @@ state_e state(session_t &session) {
 
 void stop(session_t &session) {
   while_starting_do_nothing(session.state);
-
-  auto expected = state_e::RUNNING;
+  auto expected         = state_e::RUNNING;
   auto already_stopping = !session.state.compare_exchange_strong(expected, state_e::STOPPING);
   if(already_stopping) {
     return;
@@ -857,32 +900,41 @@ void join(session_t &session) {
   session.audioThread.join();
   BOOST_LOG(debug) << "Waiting for control to end..."sv;
   session.controlEnd.view();
+  //Reset input on session stop to avoid stuck repeated keys
+  BOOST_LOG(debug) << "Resetting Input..."sv;
+  input::reset(session.input);
   BOOST_LOG(debug) << "Session ended"sv;
 }
 
-void start(session_t &session, const std::string &addr_string) {
+int start(session_t &session, const std::string &addr_string) {
   session.input = input::alloc();
 
   session.broadcast_ref = broadcast.ref();
+  if(!session.broadcast_ref) {
+    return -1;
+  }
+
   session.broadcast_ref->control_server.emplace_addr_to_session(addr_string, session);
 
   session.pingTimeout = std::chrono::steady_clock::now() + config::stream.ping_timeout;
 
-  session.audioThread = std::thread {audioThread, &session, addr_string};
-  session.videoThread = std::thread {videoThread, &session, addr_string};
+  session.audioThread = std::thread { audioThread, &session, addr_string };
+  session.videoThread = std::thread { videoThread, &session, addr_string };
 
   session.state.store(state_e::RUNNING, std::memory_order_relaxed);
+
+  return 0;
 }
 
 std::shared_ptr<session_t> alloc(config_t &config, crypto::aes_t &gcm_key, crypto::aes_t &iv) {
   auto session = std::make_shared<session_t>();
 
-  session->config = config;
+  session->config  = config;
   session->gcm_key = gcm_key;
-  session->iv = iv;
+  session->iv      = iv;
 
   session->video.idr_events = std::make_shared<video::idr_event_t::element_type>();
-  session->video.lowseq = 0;
+  session->video.lowseq     = 0;
 
   session->audio.frame = 1;
 
@@ -891,5 +943,5 @@ std::shared_ptr<session_t> alloc(config_t &config, crypto::aes_t &gcm_key, crypt
 
   return session;
 }
-}
-}
+} // namespace session
+} // namespace stream

sunshine/stream.h

@@ -7,9 +7,9 @@
 
 #include <boost/asio.hpp>
 
-#include "video.h"
 #include "audio.h"
 #include "crypto.h"
+#include "video.h"
 
 namespace stream {
 struct session_t;
@@ -18,7 +18,6 @@ struct config_t {
   video::config_t monitor;
   int packetsize;
 
-  bool sops;
   std::optional<int> gcmap;
 };
 
@@ -31,13 +30,13 @@ enum class state_e : int {
 };
 
 std::shared_ptr<session_t> alloc(config_t &config, crypto::aes_t &gcm_key, crypto::aes_t &iv);
-void start(session_t &session, const std::string &addr_string);
+int start(session_t &session, const std::string &addr_string);
 void stop(session_t &session);
 void join(session_t &session);
 state_e state(session_t &session);
-}
+} // namespace session
 
 extern safe::signal_t broadcast_shutdown_event;
-}
+} // namespace stream
 
 #endif //SUNSHINE_STREAM_H

sunshine/sync.h

@@ -5,9 +5,9 @@
 #ifndef SUNSHINE_SYNC_H
 #define SUNSHINE_SYNC_H
 
-#include <utility>
-#include <mutex>
 #include <array>
+#include <mutex>
+#include <utility>
 
 namespace util {
 
@@ -21,8 +21,8 @@ public:
     return std::lock_guard { _lock };
   }
 
-  template<class ...Args>
-  sync_t(Args&&... args) : raw {std::forward<Args>(args)... } {}
+  template<class... Args>
+  sync_t(Args &&...args) : raw { std::forward<Args>(args)... } {}
 
   sync_t &operator=(sync_t &&other) noexcept {
     std::lock(_lock, other._lock);
@@ -46,6 +46,15 @@ public:
     return *this;
   }
 
+  template<class V>
+  sync_t &operator=(V &&val) {
+    auto lg = lock();
+
+    raw = val;
+
+    return *this;
+  }
+
   sync_t &operator=(const value_t &val) noexcept {
     auto lg = lock();
 
@@ -75,11 +84,12 @@ public:
   }
 
   value_t raw;
+
 private:
   mutex_t _lock;
 };
 
-}
+} // namespace util
 
 
 #endif //T_MAN_SYNC_H

sunshine/task_pool.h

@@ -1,18 +1,18 @@
 #ifndef KITTY_TASK_POOL_H
 #define KITTY_TASK_POOL_H
 
-#include <deque>
-#include <vector>
-#include <future>
 #include <chrono>
-#include <utility>
+#include <deque>
 #include <functional>
+#include <future>
 #include <mutex>
-#include <type_traits>
 #include <optional>
+#include <type_traits>
+#include <utility>
+#include <vector>
 
-#include "utility.h"
 #include "move_by_copy.h"
+#include "utility.h"
 namespace util {
 
 class _ImplBase {
@@ -29,8 +29,7 @@ class _Impl : public _ImplBase {
   Function _func;
 
 public:
-
-  _Impl(Function&& f) : _func(std::forward<Function>(f)) { }
+  _Impl(Function &&f) : _func(std::forward<Function>(f)) {}
 
   void run() override {
     _func();
@@ -40,7 +39,7 @@ public:
 class TaskPool {
 public:
   typedef std::unique_ptr<_ImplBase> __task;
-  typedef _ImplBase* task_id_t;
+  typedef _ImplBase *task_id_t;
 
 
   typedef std::chrono::steady_clock::time_point __time_point;
@@ -53,9 +52,10 @@ public:
 
     timer_task_t(task_id_t task_id, std::future<R> &future) : task_id { task_id }, future { std::move(future) } {}
   };
+
 protected:
   std::deque<__task> _tasks;
-  std::vector<std::pair<__time_point, __task>> _timer_tasks; 
+  std::vector<std::pair<__time_point, __task>> _timer_tasks;
   std::mutex _task_mutex;
 
 public:
@@ -70,8 +70,8 @@ public:
   }
 
   template<class Function, class... Args>
-  auto push(Function && newTask, Args &&... args) {
-    static_assert(std::is_invocable_v<Function, Args&&...>, "arguments don't match the function");
+  auto push(Function &&newTask, Args &&...args) {
+    static_assert(std::is_invocable_v<Function, Args &&...>, "arguments don't match the function");
 
     using __return = std::invoke_result_t<Function, Args &&...>;
     using task_t   = std::packaged_task<__return()>;
@@ -81,12 +81,12 @@ public:
     };
 
     task_t task(std::move(bind));
-    
+
     auto future = task.get_future();
-    
+
     std::lock_guard<std::mutex> lg(_task_mutex);
     _tasks.emplace_back(toRunnable(std::move(task)));
-    
+
     return future;
   }
 
@@ -107,13 +107,19 @@ public:
    * @return an id to potentially delay the task
    */
   template<class Function, class X, class Y, class... Args>
-  auto pushDelayed(Function &&newTask, std::chrono::duration<X, Y> duration, Args &&... args) {
-    static_assert(std::is_invocable_v<Function, Args&&...>, "arguments don't match the function");
+  auto pushDelayed(Function &&newTask, std::chrono::duration<X, Y> duration, Args &&...args) {
+    static_assert(std::is_invocable_v<Function, Args &&...>, "arguments don't match the function");
 
     using __return = std::invoke_result_t<Function, Args &&...>;
     using task_t   = std::packaged_task<__return()>;
-    
-    __time_point time_point = std::chrono::steady_clock::now() + duration;
+
+    __time_point time_point;
+    if constexpr(std::is_floating_point_v<X>) {
+      time_point = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::nanoseconds>(duration);
+    }
+    else {
+      time_point = std::chrono::steady_clock::now() + duration;
+    }
 
     auto bind = [task = std::forward<Function>(newTask), tuple_args = std::make_tuple(std::forward<Args>(args)...)]() mutable {
       return std::apply(task, std::move(tuple_args));
@@ -121,7 +127,7 @@ public:
 
     task_t task(std::move(bind));
 
-    auto future = task.get_future();
+    auto future   = task.get_future();
     auto runnable = toRunnable(std::move(task));
 
     task_id_t task_id = &*runnable;
@@ -154,13 +160,14 @@ public:
     }
 
     // smaller time goes to the back
-    auto prev = it -1;
+    auto prev = it - 1;
     while(it > _timer_tasks.cbegin()) {
       if(std::get<0>(*it) > std::get<0>(*prev)) {
         std::swap(*it, *prev);
       }
 
-      --prev; --it;
+      --prev;
+      --it;
     }
   }
 
@@ -195,20 +202,20 @@ public:
 
   std::optional<__task> pop() {
     std::lock_guard lg(_task_mutex);
-    
+
     if(!_tasks.empty()) {
       __task task = std::move(_tasks.front());
       _tasks.pop_front();
       return std::move(task);
     }
-    
+
     if(!_timer_tasks.empty() && std::get<0>(_timer_tasks.back()) <= std::chrono::steady_clock::now()) {
       __task task = std::move(std::get<1>(_timer_tasks.back()));
       _timer_tasks.pop_back();
-      
+
       return std::move(task);
     }
-    
+
     return std::nullopt;
   }
 
@@ -227,12 +234,12 @@ public:
 
     return std::get<0>(_timer_tasks.back());
   }
-private:
 
+private:
   template<class Function>
   std::unique_ptr<_ImplBase> toRunnable(Function &&f) {
-    return std::make_unique<_Impl<Function>>(std::forward<Function&&>(f));
+    return std::make_unique<_Impl<Function>>(std::forward<Function &&>(f));
   }
 };
-}
+} // namespace util
 #endif

sunshine/thread_pool.h

@@ -1,8 +1,8 @@
 #ifndef KITTY_THREAD_POOL_H
 #define KITTY_THREAD_POOL_H
 
-#include <thread>
 #include "task_pool.h"
+#include <thread>
 
 namespace util {
 /*
@@ -12,32 +12,33 @@ namespace util {
 class ThreadPool : public TaskPool {
 public:
   typedef TaskPool::__task __task;
-  
+
 private:
   std::vector<std::thread> _thread;
 
   std::condition_variable _cv;
   std::mutex _lock;
-  
+
   bool _continue;
+
 public:
   ThreadPool() : _continue { false } {}
 
   explicit ThreadPool(int threads) : _thread(threads), _continue { true } {
-    for (auto &t : _thread) {
+    for(auto &t : _thread) {
       t = std::thread(&ThreadPool::_main, this);
     }
   }
 
   ~ThreadPool() noexcept {
-    if (!_continue) return;
+    if(!_continue) return;
 
     stop();
     join();
   }
 
   template<class Function, class... Args>
-  auto push(Function && newTask, Args &&... args) {
+  auto push(Function &&newTask, Args &&...args) {
     std::lock_guard lg(_lock);
     auto future = TaskPool::push(std::forward<Function>(newTask), std::forward<Args>(args)...);
 
@@ -52,7 +53,7 @@ public:
   }
 
   template<class Function, class X, class Y, class... Args>
-  auto pushDelayed(Function &&newTask, std::chrono::duration<X, Y> duration, Args &&... args) {
+  auto pushDelayed(Function &&newTask, std::chrono::duration<X, Y> duration, Args &&...args) {
     std::lock_guard lg(_lock);
     auto future = TaskPool::pushDelayed(std::forward<Function>(newTask), duration, std::forward<Args>(args)...);
 
@@ -79,15 +80,14 @@ public:
   }
 
   void join() {
-    for (auto & t : _thread) {
+    for(auto &t : _thread) {
       t.join();
     }
   }
 
 public:
-
   void _main() {
-    while (_continue) {
+    while(_continue) {
       if(auto task = this->pop()) {
         (*task)->run();
       }
@@ -117,5 +117,5 @@ public:
     }
   }
 };
-}
+} // namespace util
 #endif

sunshine/thread_safe.h

@@ -5,85 +5,90 @@
 #ifndef SUNSHINE_THREAD_SAFE_H
 #define SUNSHINE_THREAD_SAFE_H
 
-#include <vector>
-#include <mutex>
-#include <condition_variable>
 #include <atomic>
+#include <condition_variable>
 #include <functional>
+#include <mutex>
+#include <vector>
 
 #include "utility.h"
 
 namespace safe {
 template<class T>
 class event_t {
+public:
   using status_t = util::optional_t<T>;
 
-public:
-  template<class...Args>
+  template<class... Args>
   void raise(Args &&...args) {
     std::lock_guard lg { _lock };
     if(!_continue) {
       return;
     }
 
-    _status = status_t { std::forward<Args>(args)... };
+    if constexpr(std::is_same_v<std::optional<T>, status_t>) {
+      _status = std::make_optional<T>(std::forward<Args>(args)...);
+    }
+    else {
+      _status = status_t { std::forward<Args>(args)... };
+    }
 
     _cv.notify_all();
   }
 
   // pop and view shoud not be used interchangebly
   status_t pop() {
-    std::unique_lock ul{_lock};
+    std::unique_lock ul { _lock };
 
-    if (!_continue) {
+    if(!_continue) {
       return util::false_v<status_t>;
     }
 
-    while (!_status) {
+    while(!_status) {
       _cv.wait(ul);
 
-      if (!_continue) {
+      if(!_continue) {
         return util::false_v<status_t>;
       }
     }
 
     auto val = std::move(_status);
-    _status = util::false_v<status_t>;
+    _status  = util::false_v<status_t>;
     return val;
   }
 
   // pop and view shoud not be used interchangebly
   template<class Rep, class Period>
   status_t pop(std::chrono::duration<Rep, Period> delay) {
-    std::unique_lock ul{_lock};
+    std::unique_lock ul { _lock };
 
-    if (!_continue) {
+    if(!_continue) {
       return util::false_v<status_t>;
     }
 
-    while (!_status) {
-      if (!_continue || _cv.wait_for(ul, delay) == std::cv_status::timeout) {
+    while(!_status) {
+      if(!_continue || _cv.wait_for(ul, delay) == std::cv_status::timeout) {
         return util::false_v<status_t>;
       }
     }
 
     auto val = std::move(_status);
-    _status = util::false_v<status_t>;
+    _status  = util::false_v<status_t>;
     return val;
   }
 
   // pop and view shoud not be used interchangebly
   const status_t &view() {
-    std::unique_lock ul{_lock};
+    std::unique_lock ul { _lock };
 
-    if (!_continue) {
+    if(!_continue) {
       return util::false_v<status_t>;
     }
 
-    while (!_status) {
+    while(!_status) {
       _cv.wait(ul);
 
-      if (!_continue) {
+      if(!_continue) {
         return util::false_v<status_t>;
       }
     }
@@ -98,7 +103,7 @@ public:
   }
 
   void stop() {
-    std::lock_guard lg{_lock};
+    std::lock_guard lg { _lock };
 
     _continue = false;
 
@@ -106,7 +111,7 @@ public:
   }
 
   void reset() {
-    std::lock_guard lg{_lock};
+    std::lock_guard lg { _lock };
 
     _continue = true;
 
@@ -116,28 +121,121 @@ public:
   [[nodiscard]] bool running() const {
     return _continue;
   }
-private:
 
-  bool _continue{true};
-  status_t _status;
+private:
+  bool _continue { true };
+  status_t _status { util::false_v<status_t> };
 
   std::condition_variable _cv;
   std::mutex _lock;
 };
 
 template<class T>
-class queue_t {
+class alarm_raw_t {
+public:
   using status_t = util::optional_t<T>;
 
+  alarm_raw_t() : _status { util::false_v<status_t> } {}
+
+  void ring(const status_t &status) {
+    std::lock_guard lg(_lock);
+
+    _status = status;
+    _cv.notify_one();
+  }
+
+  void ring(status_t &&status) {
+    std::lock_guard lg(_lock);
+
+    _status = std::move(status);
+    _cv.notify_one();
+  }
+
+  template<class Rep, class Period>
+  auto wait_for(const std::chrono::duration<Rep, Period> &rel_time) {
+    std::unique_lock ul(_lock);
+
+    return _cv.wait_for(ul, rel_time, [this]() { return (bool)status(); });
+  }
+
+  template<class Rep, class Period, class Pred>
+  auto wait_for(const std::chrono::duration<Rep, Period> &rel_time, Pred &&pred) {
+    std::unique_lock ul(_lock);
+
+    return _cv.wait_for(ul, rel_time, [this, &pred]() { return (bool)status() || pred(); });
+  }
+
+  template<class Rep, class Period>
+  auto wait_until(const std::chrono::duration<Rep, Period> &rel_time) {
+    std::unique_lock ul(_lock);
+
+    return _cv.wait_until(ul, rel_time, [this]() { return (bool)status(); });
+  }
+
+  template<class Rep, class Period, class Pred>
+  auto wait_until(const std::chrono::duration<Rep, Period> &rel_time, Pred &&pred) {
+    std::unique_lock ul(_lock);
+
+    return _cv.wait_until(ul, rel_time, [this, &pred]() { return (bool)status() || pred(); });
+  }
+
+  auto wait() {
+    std::unique_lock ul(_lock);
+    _cv.wait(ul, [this]() { return (bool)status(); });
+  }
+
+  template<class Pred>
+  auto wait(Pred &&pred) {
+    std::unique_lock ul(_lock);
+    _cv.wait(ul, [this, &pred]() { return (bool)status() || pred(); });
+  }
+
+  const status_t &status() const {
+    return _status;
+  }
+
+  status_t &status() {
+    return _status;
+  }
+
+  void reset() {
+    _status = status_t {};
+  }
+
+private:
+  std::mutex _lock;
+  std::condition_variable _cv;
+
+  status_t _status;
+};
+
+template<class T>
+using alarm_t = std::shared_ptr<alarm_raw_t<T>>;
+
+template<class T>
+alarm_t<T> make_alarm() {
+  return std::make_shared<alarm_raw_t<T>>();
+}
+
+template<class T>
+class queue_t {
 public:
-  template<class ...Args>
-  void raise(Args &&... args) {
-    std::lock_guard lg{_lock};
+  using status_t = util::optional_t<T>;
+
+  queue_t(std::uint32_t max_elements) : _max_elements { max_elements } {}
+
+  template<class... Args>
+  void raise(Args &&...args) {
+    std::lock_guard ul { _lock };
 
     if(!_continue) {
       return;
     }
 
+    if(_queue.size() == _max_elements) {
+      _queue.clear();
+    }
+
     _queue.emplace_back(std::forward<Args>(args)...);
 
     _cv.notify_all();
@@ -151,14 +249,14 @@ public:
 
   template<class Rep, class Period>
   status_t pop(std::chrono::duration<Rep, Period> delay) {
-    std::unique_lock ul{_lock};
+    std::unique_lock ul { _lock };
 
-    if (!_continue) {
+    if(!_continue) {
       return util::false_v<status_t>;
     }
 
-    while (_queue.empty()) {
-      if (!_continue || _cv.wait_for(ul, delay) == std::cv_status::timeout) {
+    while(_queue.empty()) {
+      if(!_continue || _cv.wait_for(ul, delay) == std::cv_status::timeout) {
         return util::false_v<status_t>;
       }
     }
@@ -170,16 +268,16 @@ public:
   }
 
   status_t pop() {
-    std::unique_lock ul{_lock};
+    std::unique_lock ul { _lock };
 
-    if (!_continue) {
+    if(!_continue) {
       return util::false_v<status_t>;
     }
 
-    while (_queue.empty()) {
+    while(_queue.empty()) {
       _cv.wait(ul);
 
-      if (!_continue) {
+      if(!_continue) {
         return util::false_v<status_t>;
       }
     }
@@ -195,7 +293,7 @@ public:
   }
 
   void stop() {
-    std::lock_guard lg{_lock};
+    std::lock_guard lg { _lock };
 
     _continue = false;
 
@@ -207,11 +305,12 @@ public:
   }
 
 private:
-
-  bool _continue{true};
+  bool _continue { true };
+  std::uint32_t _max_elements;
 
   std::mutex _lock;
   std::condition_variable _cv;
+
   std::vector<T> _queue;
 };
 
@@ -221,7 +320,7 @@ public:
   using element_type = T;
 
   using construct_f = std::function<int(element_type &)>;
-  using destruct_f = std::function<void(element_type &)>;
+  using destruct_f  = std::function<void(element_type &)>;
 
   struct ptr_t {
     shared_t *owner;
@@ -238,7 +337,7 @@ public:
         return;
       }
 
-      auto tmp = ptr.owner->ref();
+      auto tmp  = ptr.owner->ref();
       tmp.owner = nullptr;
     }
 
@@ -268,15 +367,14 @@ public:
       }
     }
 
-    operator bool () const {
+    operator bool() const {
       return owner != nullptr;
     }
 
     void release() {
       std::lock_guard lg { owner->_lock };
-      auto c = owner->_count.fetch_sub(1, std::memory_order_acquire);
 
-      if(c - 1 == 0) {
+      if(!--owner->_count) {
         owner->_destruct(*get());
         (*this)->~element_type();
       }
@@ -285,36 +383,38 @@ public:
     }
 
     element_type *get() const {
-      return reinterpret_cast<element_type*>(owner->_object_buf.data());
+      return reinterpret_cast<element_type *>(owner->_object_buf.data());
     }
 
     element_type *operator->() {
-      return reinterpret_cast<element_type*>(owner->_object_buf.data());
+      return reinterpret_cast<element_type *>(owner->_object_buf.data());
     }
   };
 
   template<class FC, class FD>
-  shared_t(FC && fc, FD &&fd) : _construct { std::forward<FC>(fc) }, _destruct { std::forward<FD>(fd) } {}
+  shared_t(FC &&fc, FD &&fd) : _construct { std::forward<FC>(fc) }, _destruct { std::forward<FD>(fd) } {}
   [[nodiscard]] ptr_t ref() {
-    auto c = _count.fetch_add(1, std::memory_order_acquire);
-    if(!c) {
-      std::lock_guard lg { _lock };
+    std::lock_guard lg { _lock };
 
+    if(!_count) {
       new(_object_buf.data()) element_type;
-      if(_construct(*reinterpret_cast<element_type*>(_object_buf.data()))) {
+      if(_construct(*reinterpret_cast<element_type *>(_object_buf.data()))) {
         return ptr_t { nullptr };
       }
     }
 
+    ++_count;
+
     return ptr_t { this };
   }
+
 private:
   construct_f _construct;
   destruct_f _destruct;
 
   std::array<std::uint8_t, sizeof(element_type)> _object_buf;
 
-  std::atomic<std::uint32_t> _count;
+  std::uint32_t _count;
   std::mutex _lock;
 };
 
@@ -326,6 +426,6 @@ auto make_shared(F_Construct &&fc, F_Destruct &&fd) {
 }
 
 using signal_t = event_t<bool>;
-}
+} // namespace safe
 
 #endif //SUNSHINE_THREAD_SAFE_H

sunshine/utility.h

@@ -1,63 +1,71 @@
 #ifndef UTILITY_H
 #define UTILITY_H
 
+#include <algorithm>
+#include <condition_variable>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <string_view>
+#include <type_traits>
 #include <variant>
 #include <vector>
-#include <memory>
-#include <type_traits>
-#include <algorithm>
-#include <optional>
-#include <mutex>
-#include <condition_variable>
-#include <string_view>
 
-#define KITTY_WHILE_LOOP(x, y, z) { x;while(y) z }
-#define KITTY_DECL_CONSTR(x)\
-  x(x&&) noexcept = default;\
-  x&operator=(x&&) noexcept = default;\
+#define KITTY_WHILE_LOOP(x, y, z) \
+  {                               \
+    x;                            \
+    while(y) z                    \
+  }
+#define KITTY_DECL_CONSTR(x)             \
+  x(x &&) noexcept = default;            \
+  x &operator=(x &&) noexcept = default; \
   x();
 
-#define KITTY_DEFAULT_CONSTR(x)\
-  x(x&&) noexcept = default;\
-  x&operator=(x&&) noexcept = default;\
-  x() = default;
+#define KITTY_DEFAULT_CONSTR(x)          \
+  x(x &&) noexcept = default;            \
+  x &operator=(x &&) noexcept = default; \
+  x()                         = default;
 
-#define KITTY_DEFAULT_CONSTR_THROW(x)\
-  x(x&&) = default;\
-  x&operator=(x&&) = default;\
-  x() = default;
+#define KITTY_DEFAULT_CONSTR_THROW(x) \
+  x(x &&)    = default;               \
+  x &operator=(x &&) = default;       \
+  x()                = default;
 
-#define TUPLE_2D(a,b, expr)\
-  decltype(expr) a##_##b = expr;\
-  auto &a = std::get<0>(a##_##b);\
-  auto &b = std::get<1>(a##_##b)
+#define TUPLE_2D(a, b, expr)                     \
+  decltype(expr) a##_##b = expr;                 \
+  auto &a                = std::get<0>(a##_##b); \
+  auto &b                = std::get<1>(a##_##b)
 
-#define TUPLE_2D_REF(a,b, expr)\
-  auto &a##_##b = expr;\
-  auto &a = std::get<0>(a##_##b);\
-  auto &b = std::get<1>(a##_##b)
+#define TUPLE_2D_REF(a, b, expr)        \
+  auto &a##_##b = expr;                 \
+  auto &a       = std::get<0>(a##_##b); \
+  auto &b       = std::get<1>(a##_##b)
 
-#define TUPLE_3D(a,b,c, expr)\
-  decltype(expr) a##_##b##_##c = expr;\
-  auto &a = std::get<0>(a##_##b##_##c);\
-  auto &b = std::get<1>(a##_##b##_##c);\
-  auto &c = std::get<2>(a##_##b##_##c)
+#define TUPLE_3D(a, b, c, expr)                              \
+  decltype(expr) a##_##b##_##c = expr;                       \
+  auto &a                      = std::get<0>(a##_##b##_##c); \
+  auto &b                      = std::get<1>(a##_##b##_##c); \
+  auto &c                      = std::get<2>(a##_##b##_##c)
 
-#define TUPLE_3D_REF(a,b,c, expr)\
-  auto &a##_##b##_##c = expr;\
-  auto &a = std::get<0>(a##_##b##_##c);\
-  auto &b = std::get<1>(a##_##b##_##c);\
-  auto &c = std::get<2>(a##_##b##_##c)
+#define TUPLE_3D_REF(a, b, c, expr)                 \
+  auto &a##_##b##_##c = expr;                       \
+  auto &a             = std::get<0>(a##_##b##_##c); \
+  auto &b             = std::get<1>(a##_##b##_##c); \
+  auto &c             = std::get<2>(a##_##b##_##c)
+
+#define TUPLE_EL(a, b, expr)  \
+  decltype(expr) a##_ = expr; \
+  auto &a             = std::get<b>(a##_)
 
 namespace util {
 
-template<template<typename...> class X, class...Y>
+template<template<typename...> class X, class... Y>
 struct __instantiation_of : public std::false_type {};
 
 template<template<typename...> class X, class... Y>
 struct __instantiation_of<X, X<Y...>> : public std::true_type {};
 
-template<template<typename...> class X, class T, class...Y>
+template<template<typename...> class X, class T, class... Y>
 static constexpr auto instantiation_of_v = __instantiation_of<X, T, Y...>::value;
 
 template<bool V, class X, class Y>
@@ -76,42 +84,16 @@ struct __either<false, X, Y> {
 template<bool V, class X, class Y>
 using either_t = typename __either<V, X, Y>::type;
 
-template<class T, class V = void>
-struct __false_v;
-
-template<class T>
-struct __false_v<T, std::enable_if_t<instantiation_of_v<std::optional, T>>> {
-  static constexpr std::nullopt_t value = std::nullopt;
-};
-
-template<class T>
-struct __false_v<T, std::enable_if_t<
-  (std::is_pointer_v<T> || instantiation_of_v<std::unique_ptr, T> || instantiation_of_v<std::shared_ptr, T>)
-  >> {
-  static constexpr std::nullptr_t value = nullptr;
-};
-
-template<class T>
-struct __false_v<T, std::enable_if_t<std::is_same_v<T, bool>>> {
-  static constexpr bool value = false;
-};
-
-template<class T>
-static constexpr auto false_v = __false_v<T>::value;
-
-template<class T>
-using optional_t = either_t<
-  (std::is_same_v<T, bool> ||
-   instantiation_of_v<std::unique_ptr, T> ||
-   instantiation_of_v<std::shared_ptr, T> ||
-   std::is_pointer_v<T>),
-  T, std::optional<T>>;
+template<class... Ts>
+struct overloaded : Ts... { using Ts::operator()...; };
+template<class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;
 
 template<class T>
 class FailGuard {
 public:
   FailGuard() = delete;
-  FailGuard(T && f) noexcept : _func { std::forward<T>(f) } {}
+  FailGuard(T &&f) noexcept : _func { std::forward<T>(f) } {}
   FailGuard(FailGuard &&other) noexcept : _func { std::move(other._func) } {
     this->failure = other.failure;
 
@@ -131,12 +113,13 @@ public:
 
   void disable() { failure = false; }
   bool failure { true };
+
 private:
   T _func;
 };
 
 template<class T>
-[[nodiscard]] auto fail_guard(T && f) {
+[[nodiscard]] auto fail_guard(T &&f) {
   return FailGuard<T> { std::forward<T>(f) };
 }
 
@@ -146,9 +129,9 @@ void append_struct(std::vector<uint8_t> &buf, const T &_struct) {
 
   buf.reserve(data_len);
 
-  auto *data = (uint8_t *) & _struct;
+  auto *data = (uint8_t *)&_struct;
 
-  for (size_t x = 0; x < data_len; ++x) {
+  for(size_t x = 0; x < data_len; ++x) {
     buf.push_back(data[x]);
   }
 }
@@ -157,24 +140,26 @@ template<class T>
 class Hex {
 public:
   typedef T elem_type;
+
 private:
   const char _bits[16] {
     '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
   };
 
   char _hex[sizeof(elem_type) * 2];
+
 public:
   Hex(const elem_type &elem, bool rev) {
     if(!rev) {
       const uint8_t *data = reinterpret_cast<const uint8_t *>(&elem) + sizeof(elem_type) - 1;
-      for (auto it = begin(); it < cend();) {
+      for(auto it = begin(); it < cend();) {
         *it++ = _bits[*data / 16];
         *it++ = _bits[*data-- % 16];
       }
     }
     else {
       const uint8_t *data = reinterpret_cast<const uint8_t *>(&elem);
-      for (auto it = begin(); it < cend();) {
+      for(auto it = begin(); it < cend();) {
         *it++ = _bits[*data / 16];
         *it++ = _bits[*data++ % 16];
       }
@@ -206,7 +191,7 @@ Hex<T> hex(const T &elem, bool rev = false) {
 
 template<class It>
 std::string hex_vec(It begin, It end, bool rev = false) {
-  auto str_size = 2*std::distance(begin, end);
+  auto str_size = 2 * std::distance(begin, end);
 
 
   std::string hex;
@@ -217,14 +202,14 @@ std::string hex_vec(It begin, It end, bool rev = false) {
   };
 
   if(rev) {
-    for (auto it = std::begin(hex); it < std::end(hex);) {
+    for(auto it = std::begin(hex); it < std::end(hex);) {
       *it++ = _bits[((uint8_t)*begin) / 16];
       *it++ = _bits[((uint8_t)*begin++) % 16];
     }
   }
   else {
     --end;
-    for (auto it = std::begin(hex); it < std::end(hex);) {
+    for(auto it = std::begin(hex); it < std::end(hex);) {
       *it++ = _bits[((uint8_t)*end) / 16];
       *it++ = _bits[((uint8_t)*end--) % 16];
     }
@@ -235,7 +220,7 @@ std::string hex_vec(It begin, It end, bool rev = false) {
 }
 
 template<class C>
-std::string hex_vec(C&& c, bool rev = false) {
+std::string hex_vec(C &&c, bool rev = false) {
   return hex_vec(std::begin(c), std::end(c), rev);
 }
 
@@ -244,7 +229,7 @@ std::optional<T> from_hex(const std::string_view &hex, bool rev = false) {
   std::uint8_t buf[sizeof(T)];
 
   static char constexpr shift_bit = 'a' - 'A';
-  auto is_convertable = [] (char ch) -> bool {
+  auto is_convertable             = [](char ch) -> bool {
     if(isdigit(ch)) {
       return true;
     }
@@ -263,9 +248,9 @@ std::optional<T> from_hex(const std::string_view &hex, bool rev = false) {
     return std::nullopt;
   }
 
-  const char *data = hex.data() + hex.size() -1;
+  const char *data = hex.data() + hex.size() - 1;
 
-  auto convert = [] (char ch) -> std::uint8_t {
+  auto convert = [](char ch) -> std::uint8_t {
     if(ch >= '0' && ch <= '9') {
       return (std::uint8_t)ch - '0';
     }
@@ -294,7 +279,7 @@ inline std::string from_hex_vec(const std::string &hex, bool rev = false) {
   std::string buf;
 
   static char constexpr shift_bit = 'a' - 'A';
-  auto is_convertable = [] (char ch) -> bool {
+  auto is_convertable             = [](char ch) -> bool {
     if(isdigit(ch)) {
       return true;
     }
@@ -311,9 +296,9 @@ inline std::string from_hex_vec(const std::string &hex, bool rev = false) {
   auto buf_size = std::count_if(std::begin(hex), std::end(hex), is_convertable) / 2;
   buf.resize(buf_size);
 
-  const char *data = hex.data() + hex.size() -1;
+  const char *data = hex.data() + hex.size() - 1;
 
-  auto convert = [] (char ch) -> std::uint8_t {
+  auto convert = [](char ch) -> std::uint8_t {
     if(ch >= '0' && ch <= '9') {
       return (std::uint8_t)ch - '0';
     }
@@ -345,112 +330,20 @@ public:
   std::size_t operator()(const value_type &value) const {
     const auto *p = reinterpret_cast<const char *>(&value);
 
-    return std::hash<std::string_view>{}(std::string_view { p, sizeof(value_type) });
+    return std::hash<std::string_view> {}(std::string_view { p, sizeof(value_type) });
   }
 };
 
 template<class T>
-auto enm(const T& val) -> const std::underlying_type_t<T>& {
-  return *reinterpret_cast<const std::underlying_type_t<T>*>(&val);
+auto enm(const T &val) -> const std::underlying_type_t<T> & {
+  return *reinterpret_cast<const std::underlying_type_t<T> *>(&val);
 }
 
 template<class T>
-auto enm(T& val) -> std::underlying_type_t<T>& {
-  return *reinterpret_cast<std::underlying_type_t<T>*>(&val);
+auto enm(T &val) -> std::underlying_type_t<T> & {
+  return *reinterpret_cast<std::underlying_type_t<T> *>(&val);
 }
 
-template<class ReturnType, class ...Args>
-struct Function {
-  typedef ReturnType (*type)(Args...);
-};
-
-template<class T, class ReturnType, typename Function<ReturnType, T>::type function>
-struct Destroy {
-  typedef T pointer;
-  
-  void operator()(pointer p) {
-    function(p);
-  }
-};
-
-template<class T, typename Function<void, T*>::type function>
-using safe_ptr = std::unique_ptr<T, Destroy<T*, void, function>>;
-
-// You cannot specialize an alias
-template<class T, class ReturnType, typename Function<ReturnType, T*>::type function>
-using safe_ptr_v2 = std::unique_ptr<T, Destroy<T*, ReturnType, function>>;
-
-template<class T>
-void c_free(T *p) {
-  free(p);
-}
-
-template<class T>
-using c_ptr = safe_ptr<T, c_free<T>>;
-
-template<class T>
-class FakeContainer {
-  typedef T pointer;
-
-  pointer _begin;
-  pointer _end;
-
-public:
-  FakeContainer(pointer begin, pointer end) : _begin(begin), _end(end) {}
-
-  pointer begin() { return _begin; }
-  pointer end() { return  _end; }
-
-  const pointer begin() const { return _begin; }
-  const pointer end() const { return _end; }
-
-  const pointer cbegin() const { return _begin; }
-  const pointer cend() const { return _end; }
-
-  pointer data() { return begin(); }
-  const pointer data() const { return cbegin(); }
-
-  std::size_t size() const { return std::distance(begin(), end()); }
-};
-
-template<class T>
-FakeContainer<T> toContainer(T begin, T end) {
-  return { begin, end };
-}
-
-template<class T>
-FakeContainer<T> toContainer(T begin, std::size_t end) {
-  return { begin, begin + end };
-}
-
-template<class T>
-FakeContainer<T*> toContainer(T * const begin) {
-  T *end = begin;
-
-  auto default_val = T();
-  while(*end != default_val) {
-    ++end;
-  }
-
-  return toContainer(begin, end);
-}
-
-template<class T, class H>
-struct _init_helper;
-
-template<template<class...> class T, class H, class... Args>
-struct _init_helper<T<Args...>, H> {
-  using type = T<Args...>;
-
-  static type move(Args&&... args, H&&) {
-    return std::make_tuple(std::move(args)...);
-  }
-
-  static type copy(const Args&... args, const H&) {
-    return std::make_tuple(args...);
-  }
-};
-
 inline std::int64_t from_chars(const char *begin, const char *end) {
   std::int64_t res {};
   std::int64_t mul = 1;
@@ -496,18 +389,279 @@ public:
   }
 };
 
+// Compared to std::unique_ptr, it adds the ability to get the address of the pointer itself
+template<typename T, typename D = std::default_delete<T>>
+class uniq_ptr {
+public:
+  using element_type = T;
+  using pointer      = element_type *;
+  using deleter_type = D;
+
+  constexpr uniq_ptr() noexcept : _p { nullptr } {}
+  constexpr uniq_ptr(std::nullptr_t) noexcept : _p { nullptr } {}
+
+  uniq_ptr(const uniq_ptr &other) noexcept = delete;
+  uniq_ptr &operator=(const uniq_ptr &other) noexcept = delete;
+
+  template<class V>
+  uniq_ptr(V *p) noexcept : _p { p } {
+    static_assert(std::is_same_v<element_type, void> || std::is_same_v<element_type, V> || std::is_base_of_v<element_type, V>, "element_type must be base class of V");
+  }
+
+  template<class V>
+  uniq_ptr(std::unique_ptr<V, deleter_type> &&uniq) noexcept : _p { uniq.release() } {
+    static_assert(std::is_same_v<element_type, void> || std::is_same_v<T, V> || std::is_base_of_v<element_type, V>, "element_type must be base class of V");
+  }
+
+  template<class V>
+  uniq_ptr(uniq_ptr<V, deleter_type> &&other) noexcept : _p { other.release() } {
+    static_assert(std::is_same_v<element_type, void> || std::is_same_v<T, V> || std::is_base_of_v<element_type, V>, "element_type must be base class of V");
+  }
+
+  template<class V>
+  uniq_ptr &operator=(uniq_ptr<V, deleter_type> &&other) noexcept {
+    static_assert(std::is_same_v<element_type, void> || std::is_same_v<T, V> || std::is_base_of_v<element_type, V>, "element_type must be base class of V");
+    reset(other.release());
+
+    return *this;
+  }
+
+  template<class V>
+  uniq_ptr &operator=(std::unique_ptr<V, deleter_type> &&uniq) noexcept {
+    static_assert(std::is_same_v<element_type, void> || std::is_same_v<T, V> || std::is_base_of_v<element_type, V>, "element_type must be base class of V");
+
+    reset(uniq.release());
+
+    return *this;
+  }
+
+  ~uniq_ptr() {
+    reset();
+  }
+
+  void reset(pointer p = pointer()) {
+    if(_p) {
+      _deleter(_p);
+    }
+
+    _p = p;
+  }
+
+  pointer release() {
+    auto tmp = _p;
+    _p       = nullptr;
+    return tmp;
+  }
+
+  pointer get() {
+    return _p;
+  }
+
+  const pointer get() const {
+    return _p;
+  }
+
+  const std::add_lvalue_reference_t<element_type> operator*() const {
+    return *_p;
+  }
+  std::add_lvalue_reference_t<element_type> operator*() {
+    return *_p;
+  }
+  const pointer operator->() const {
+    return _p;
+  }
+  pointer operator->() {
+    return _p;
+  }
+  pointer *operator&() const {
+    return &_p;
+  }
+
+  pointer *operator&() {
+    return &_p;
+  }
+
+  deleter_type &get_deleter() {
+    return _deleter;
+  }
+
+  const deleter_type &get_deleter() const {
+    return _deleter;
+  }
+
+  explicit operator bool() const {
+    return _p != nullptr;
+  }
+
+protected:
+  pointer _p;
+  deleter_type _deleter;
+};
+
+template<class T1, class D1, class T2, class D2>
+bool operator==(const uniq_ptr<T1, D1> &x, const uniq_ptr<T2, D2> &y) {
+  return x.get() == y.get();
+}
+
+template<class T1, class D1, class T2, class D2>
+bool operator!=(const uniq_ptr<T1, D1> &x, const uniq_ptr<T2, D2> &y) {
+  return x.get() != y.get();
+}
+
+template<class T1, class D1, class T2, class D2>
+bool operator==(const std::unique_ptr<T1, D1> &x, const uniq_ptr<T2, D2> &y) {
+  return x.get() == y.get();
+}
+
+template<class T1, class D1, class T2, class D2>
+bool operator!=(const std::unique_ptr<T1, D1> &x, const uniq_ptr<T2, D2> &y) {
+  return x.get() != y.get();
+}
+
+template<class T1, class D1, class T2, class D2>
+bool operator==(const uniq_ptr<T1, D1> &x, const std::unique_ptr<T1, D1> &y) {
+  return x.get() == y.get();
+}
+
+template<class T1, class D1, class T2, class D2>
+bool operator!=(const uniq_ptr<T1, D1> &x, const std::unique_ptr<T1, D1> &y) {
+  return x.get() != y.get();
+}
+
+template<class T, class D>
+bool operator==(const uniq_ptr<T, D> &x, std::nullptr_t) {
+  return !(bool)x;
+}
+
+template<class T, class D>
+bool operator!=(const uniq_ptr<T, D> &x, std::nullptr_t) {
+  return (bool)x;
+}
+
+template<class T, class D>
+bool operator==(std::nullptr_t, const uniq_ptr<T, D> &y) {
+  return !(bool)y;
+}
+
+template<class T, class D>
+bool operator!=(std::nullptr_t, const uniq_ptr<T, D> &y) {
+  return (bool)y;
+}
+
+template<class T>
+class wrap_ptr {
+public:
+  using element_type = T;
+  using pointer      = element_type *;
+  using reference    = element_type &;
+
+  wrap_ptr() : _own_ptr { false }, _p { nullptr } {}
+  wrap_ptr(pointer p) : _own_ptr { false }, _p { p } {}
+  wrap_ptr(std::unique_ptr<element_type> &&uniq_p) : _own_ptr { true }, _p { uniq_p.release() } {}
+  wrap_ptr(wrap_ptr &&other) : _own_ptr { other._own_ptr }, _p { other._p } {
+    other._own_ptr = false;
+  }
+
+  wrap_ptr &operator=(wrap_ptr &&other) noexcept {
+    if(_own_ptr) {
+      delete _p;
+    }
+
+    _p = other._p;
+
+    _own_ptr       = other._own_ptr;
+    other._own_ptr = false;
+
+    return *this;
+  }
+
+  template<class V>
+  wrap_ptr &operator=(std::unique_ptr<V> &&uniq_ptr) {
+    static_assert(std::is_base_of_v<element_type, V>, "element_type must be base class of V");
+    _own_ptr = true;
+    _p       = uniq_ptr.release();
+
+    return *this;
+  }
+
+  wrap_ptr &operator=(pointer p) {
+    if(_own_ptr) {
+      delete _p;
+    }
+
+    _p       = p;
+    _own_ptr = false;
+
+    return *this;
+  }
+
+  ~wrap_ptr() {
+    if(_own_ptr) {
+      delete _p;
+    }
+
+    _own_ptr = false;
+  }
+
+  const reference operator*() const {
+    return *_p;
+  }
+  reference operator*() {
+    return *_p;
+  }
+  const pointer operator->() const {
+    return _p;
+  }
+  pointer operator->() {
+    return _p;
+  }
+
+private:
+  bool _own_ptr;
+  pointer _p;
+};
+
+template<class T, class V = void>
+struct __false_v;
+
+template<class T>
+struct __false_v<T, std::enable_if_t<instantiation_of_v<std::optional, T>>> {
+  static constexpr std::nullopt_t value = std::nullopt;
+};
+
+template<class T>
+struct __false_v<T, std::enable_if_t<
+                      (
+                        std::is_pointer_v<T> ||
+                        instantiation_of_v<std::unique_ptr, T> ||
+                        instantiation_of_v<std::shared_ptr, T> ||
+                        instantiation_of_v<uniq_ptr, T>)>> {
+  static constexpr std::nullptr_t value = nullptr;
+};
+
+template<class T>
+struct __false_v<T, std::enable_if_t<std::is_same_v<T, bool>>> {
+  static constexpr bool value = false;
+};
+
+template<class T>
+static constexpr auto false_v = __false_v<T>::value;
+
+template<class T>
+using optional_t = either_t<
+  (std::is_same_v<T, bool> ||
+    instantiation_of_v<std::unique_ptr, T> ||
+    instantiation_of_v<std::shared_ptr, T> ||
+    instantiation_of_v<uniq_ptr, T> ||
+    std::is_pointer_v<T>),
+  T, std::optional<T>>;
+
 template<class T>
 class buffer_t {
 public:
   buffer_t() : _els { 0 } {};
-  buffer_t(buffer_t&&) noexcept = default;
-  buffer_t &operator=(buffer_t&& other) noexcept {
-    std::swap(_els, other._els);
-
-    _buf = std::move(other._buf);
-
-    return *this;
-  };
+  buffer_t(buffer_t &&) noexcept = default;
+  buffer_t &operator=(buffer_t &&other) noexcept = default;
 
   explicit buffer_t(size_t elements) : _els { elements }, _buf { std::make_unique<T[]>(elements) } {}
   explicit buffer_t(size_t elements, const T &t) : _els { elements }, _buf { std::make_unique<T[]>(elements) } {
@@ -561,27 +715,56 @@ T either(std::optional<T> &&l, T &&r) {
   return std::forward<T>(r);
 }
 
+template<class ReturnType, class... Args>
+struct Function {
+  typedef ReturnType (*type)(Args...);
+};
+
+template<class T, class ReturnType, typename Function<ReturnType, T>::type function>
+struct Destroy {
+  typedef T pointer;
+
+  void operator()(pointer p) {
+    function(p);
+  }
+};
+
+template<class T, typename Function<void, T *>::type function>
+using safe_ptr = uniq_ptr<T, Destroy<T *, void, function>>;
+
+// You cannot specialize an alias
+template<class T, class ReturnType, typename Function<ReturnType, T *>::type function>
+using safe_ptr_v2 = uniq_ptr<T, Destroy<T *, ReturnType, function>>;
+
+template<class T>
+void c_free(T *p) {
+  free(p);
+}
+
+template<class T>
+using c_ptr = safe_ptr<T, c_free<T>>;
+
 namespace endian {
 template<class T = void>
 struct endianness {
   enum : bool {
 #if defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN || \
-    defined(__BIG_ENDIAN__) || \
-    defined(__ARMEB__) || \
-    defined(__THUMBEB__) || \
-    defined(__AARCH64EB__) || \
-    defined(_MIBSEB) || defined(__MIBSEB) || defined(__MIBSEB__)
+  defined(__BIG_ENDIAN__) ||                                 \
+  defined(__ARMEB__) ||                                      \
+  defined(__THUMBEB__) ||                                    \
+  defined(__AARCH64EB__) ||                                  \
+  defined(_MIBSEB) || defined(__MIBSEB) || defined(__MIBSEB__)
     // It's a big-endian target architecture
     little = false,
 #elif defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN || \
-    defined(__LITTLE_ENDIAN__) || \
-    defined(__ARMEL__) || \
-    defined(__THUMBEL__) || \
-    defined(__AARCH64EL__) || \
-    defined(_MIPSEL) || defined(__MIPSEL) || defined(__MIPSEL__) || \
-    defined(_WIN32)
+  defined(__LITTLE_ENDIAN__) ||                                   \
+  defined(__ARMEL__) ||                                           \
+  defined(__THUMBEL__) ||                                         \
+  defined(__AARCH64EL__) ||                                       \
+  defined(_MIPSEL) || defined(__MIPSEL) || defined(__MIPSEL__) || \
+  defined(_WIN32)
     // It's a little-endian target architecture
-      little = true,
+    little = true,
 #else
 #error "Unknown Endianness"
 #endif
@@ -590,15 +773,14 @@ struct endianness {
 };
 
 template<class T, class S = void>
-struct endian_helper { };
+struct endian_helper {};
 
 template<class T>
 struct endian_helper<T, std::enable_if_t<
-  !(instantiation_of_v<std::optional, T>)
->> {
+                          !(instantiation_of_v<std::optional, T>)>> {
   static inline T big(T x) {
-    if constexpr (endianness<T>::little) {
-      uint8_t *data = reinterpret_cast<uint8_t*>(&x);
+    if constexpr(endianness<T>::little) {
+      uint8_t *data = reinterpret_cast<uint8_t *>(&x);
 
       std::reverse(data, data + sizeof(x));
     }
@@ -607,8 +789,8 @@ struct endian_helper<T, std::enable_if_t<
   }
 
   static inline T little(T x) {
-    if constexpr (endianness<T>::big) {
-      uint8_t *data = reinterpret_cast<uint8_t*>(&x);
+    if constexpr(endianness<T>::big) {
+      uint8_t *data = reinterpret_cast<uint8_t *>(&x);
 
       std::reverse(data, data + sizeof(x));
     }
@@ -619,32 +801,31 @@ struct endian_helper<T, std::enable_if_t<
 
 template<class T>
 struct endian_helper<T, std::enable_if_t<
-  instantiation_of_v<std::optional, T>
->> {
-static inline T little(T x) {
-  if(!x) return x;
+                          instantiation_of_v<std::optional, T>>> {
+  static inline T little(T x) {
+    if(!x) return x;
 
-  if constexpr (endianness<T>::big) {
-    auto *data = reinterpret_cast<uint8_t*>(&*x);
+    if constexpr(endianness<T>::big) {
+      auto *data = reinterpret_cast<uint8_t *>(&*x);
 
-    std::reverse(data, data + sizeof(*x));
+      std::reverse(data, data + sizeof(*x));
+    }
+
+    return x;
   }
 
-  return x;
-}
 
+  static inline T big(T x) {
+    if(!x) return x;
 
-static inline T big(T x) {
-  if(!x) return x;
+    if constexpr(endianness<T>::big) {
+      auto *data = reinterpret_cast<uint8_t *>(&*x);
 
-  if constexpr (endianness<T>::big) {
-    auto *data = reinterpret_cast<uint8_t*>(&*x);
+      std::reverse(data, data + sizeof(*x));
+    }
 
-    std::reverse(data, data + sizeof(*x));
+    return x;
   }
-
-  return x;
-}
 };
 
 template<class T>
@@ -652,7 +833,6 @@ inline auto little(T x) { return endian_helper<T>::little(x); }
 
 template<class T>
 inline auto big(T x) { return endian_helper<T>::big(x); }
-} /* endian */
-
-} /* util */
+} // namespace endian
+} // namespace util
 #endif

sunshine/uuid.h

@@ -18,12 +18,12 @@ union uuid_t {
     std::uniform_int_distribution<std::uint8_t> dist(0, std::numeric_limits<std::uint8_t>::max());
 
     uuid_t buf;
-    for (auto &el : buf.b8) {
+    for(auto &el : buf.b8) {
       el = dist(engine);
     }
 
-    buf.b8[7] &= (std::uint8_t) 0b00101111;
-    buf.b8[9] &= (std::uint8_t) 0b10011111;
+    buf.b8[7] &= (std::uint8_t)0b00101111;
+    buf.b8[9] &= (std::uint8_t)0b10011111;
 
     return buf;
   }
@@ -31,7 +31,7 @@ union uuid_t {
   static uuid_t generate() {
     std::random_device r;
 
-    std::default_random_engine engine{r()};
+    std::default_random_engine engine { r() };
 
     return generate(engine);
   }
@@ -41,7 +41,7 @@ union uuid_t {
 
     result.reserve(sizeof(uuid_t) * 2 + 4);
 
-    auto hex = util::hex(*this, true);
+    auto hex      = util::hex(*this, true);
     auto hex_view = hex.to_string_view();
 
     std::string_view slices[] = {
@@ -75,5 +75,5 @@ union uuid_t {
     return (b64[0] > other.b64[0] || (b64[0] == other.b64[0] && b64[1] > other.b64[1]));
   }
 };
-}
+} // namespace util
 #endif //T_MAN_UUID_H

sunshine/video.h

@@ -5,8 +5,9 @@
 #ifndef SUNSHINE_VIDEO_H
 #define SUNSHINE_VIDEO_H
 
-#include "thread_safe.h"
+#include "input.h"
 #include "platform/common.h"
+#include "thread_safe.h"
 
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -14,16 +15,27 @@ extern "C" {
 
 struct AVPacket;
 namespace video {
-void free_packet(AVPacket *packet);
 
 struct packet_raw_t : public AVPacket {
-  template<class P>
-  explicit packet_raw_t(P *user_data) : channel_data { user_data } {
-    av_init_packet(this);
+  void init_packet() {
+    pts             = AV_NOPTS_VALUE;
+    dts             = AV_NOPTS_VALUE;
+    pos             = -1;
+    duration        = 0;
+    flags           = 0;
+    stream_index    = 0;
+    buf             = nullptr;
+    side_data       = nullptr;
+    side_data_elems = 0;
   }
 
-  explicit packet_raw_t(std::nullptr_t null) : channel_data { nullptr } {
-    av_init_packet(this);
+  template<class P>
+  explicit packet_raw_t(P *user_data) : channel_data { user_data } {
+    init_packet();
+  }
+
+  explicit packet_raw_t(std::nullptr_t) : channel_data { nullptr } {
+    init_packet();
   }
 
   ~packet_raw_t() {
@@ -56,6 +68,8 @@ void capture(
   idr_event_t idr_events,
   config_t config,
   void *channel_data);
-}
+
+int init();
+} // namespace video
 
 #endif //SUNSHINE_VIDEO_H

tools/CMakeLists.txt

@@ -9,7 +9,7 @@ set_target_properties(dxgi-info PROPERTIES CXX_STANDARD 17)
 target_link_libraries(dxgi-info
         ${CMAKE_THREAD_LIBS_INIT}
         dxgi
-	${PLATFORM_LIBRARIES})
+        ${PLATFORM_LIBRARIES})
 target_compile_options(dxgi-info PRIVATE ${SUNSHINE_COMPILE_OPTIONS})
 
 add_executable(audio-info audio.cpp)
@@ -17,5 +17,5 @@ set_target_properties(audio-info PROPERTIES CXX_STANDARD 17)
 target_link_libraries(audio-info
         ${CMAKE_THREAD_LIBS_INIT}
         ksuser
-	${PLATFORM_LIBRARIES})
+        ${PLATFORM_LIBRARIES})
 target_compile_options(audio-info PRIVATE ${SUNSHINE_COMPILE_OPTIONS})

tools/audio.cpp

@@ -2,9 +2,9 @@
 // Created by loki on 1/24/20.
 //
 
-#include <roapi.h>
-#include <mmdeviceapi.h>
 #include <audioclient.h>
+#include <mmdeviceapi.h>
+#include <roapi.h>
 
 #include <synchapi.h>
 
@@ -16,8 +16,8 @@
 
 #include "sunshine/utility.h"
 
-DEFINE_PROPERTYKEY(PKEY_Device_DeviceDesc,            0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 2);     // DEVPROP_TYPE_STRING
-DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName,          0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_DeviceDesc, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 2);    // DEVPROP_TYPE_STRING
+DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); // DEVPROP_TYPE_STRING
 DEFINE_PROPERTYKEY(PKEY_DeviceInterface_FriendlyName, 0x026e516e, 0xb814, 0x414b, 0x83, 0xcd, 0x85, 0x6d, 0x6f, 0xef, 0x48, 0x22, 2);
 
 using namespace std::literals;
@@ -26,7 +26,9 @@ const IID IID_IMMDeviceEnumerator    = __uuidof(IMMDeviceEnumerator);
 const IID IID_IAudioClient           = __uuidof(IAudioClient);
 const IID IID_IAudioCaptureClient    = __uuidof(IAudioCaptureClient);
 
-int device_state_filter = DEVICE_STATE_ACTIVE;
+constexpr auto SAMPLE_RATE = 48000;
+int device_state_filter    = DEVICE_STATE_ACTIVE;
+
 namespace audio {
 template<class T>
 void Release(T *p) {
@@ -66,19 +68,118 @@ public:
 const wchar_t *no_null(const wchar_t *str) {
   return str ? str : L"Unknown";
 }
-void print_device(device_t &device) {
-  HRESULT status;
 
-  audio::wstring_t::pointer wstring_p {};
+struct format_t {
+  std::string_view name;
+  int channels;
+  int channel_mask;
+} formats[] {
+  { "Mono"sv,
+    1,
+    SPEAKER_FRONT_CENTER },
+  { "Stereo"sv,
+    2,
+    SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT },
+  { "Surround 5.1"sv,
+    6,
+    SPEAKER_FRONT_LEFT |
+      SPEAKER_FRONT_RIGHT |
+      SPEAKER_FRONT_CENTER |
+      SPEAKER_LOW_FREQUENCY |
+      SPEAKER_BACK_LEFT |
+      SPEAKER_BACK_RIGHT },
+  { "Surround 7.1"sv,
+    8,
+    SPEAKER_FRONT_LEFT |
+      SPEAKER_FRONT_RIGHT |
+      SPEAKER_FRONT_CENTER |
+      SPEAKER_LOW_FREQUENCY |
+      SPEAKER_BACK_LEFT |
+      SPEAKER_BACK_RIGHT |
+      SPEAKER_SIDE_LEFT |
+      SPEAKER_SIDE_RIGHT }
+};
+
+void set_wave_format(audio::wave_format_t &wave_format, const format_t &format) {
+  wave_format->nChannels       = format.channels;
+  wave_format->nBlockAlign     = wave_format->nChannels * wave_format->wBitsPerSample / 8;
+  wave_format->nAvgBytesPerSec = wave_format->nSamplesPerSec * wave_format->nBlockAlign;
+
+  if(wave_format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
+    ((PWAVEFORMATEXTENSIBLE)wave_format.get())->dwChannelMask = format.channel_mask;
+  }
+}
+
+audio_client_t make_audio_client(device_t &device, const format_t &format) {
+  audio_client_t audio_client;
+  auto status = device->Activate(
+    IID_IAudioClient,
+    CLSCTX_ALL,
+    nullptr,
+    (void **)&audio_client);
+
+  if(FAILED(status)) {
+    std::cout << "Couldn't activate Device: [0x"sv << util::hex(status).to_string_view() << ']' << std::endl;
+
+    return nullptr;
+  }
+
+  wave_format_t wave_format;
+  status = audio_client->GetMixFormat(&wave_format);
+
+  if(FAILED(status)) {
+    std::cout << "Couldn't acquire Wave Format [0x"sv << util::hex(status).to_string_view() << ']' << std::endl;
+
+    return nullptr;
+  }
+
+  wave_format->wBitsPerSample = 16;
+  wave_format->nSamplesPerSec = SAMPLE_RATE;
+  switch(wave_format->wFormatTag) {
+  case WAVE_FORMAT_PCM:
+    break;
+  case WAVE_FORMAT_IEEE_FLOAT:
+    break;
+  case WAVE_FORMAT_EXTENSIBLE: {
+    auto wave_ex = (PWAVEFORMATEXTENSIBLE)wave_format.get();
+    if(IsEqualGUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, wave_ex->SubFormat)) {
+      wave_ex->SubFormat                   = KSDATAFORMAT_SUBTYPE_PCM;
+      wave_ex->Samples.wValidBitsPerSample = 16;
+      break;
+    }
+
+    std::cout << "Unsupported Sub Format for WAVE_FORMAT_EXTENSIBLE: [0x"sv << util::hex(wave_ex->SubFormat).to_string_view() << ']' << std::endl;
+  }
+  default:
+    std::cout << "Unsupported Wave Format: [0x"sv << util::hex(wave_format->wFormatTag).to_string_view() << ']' << std::endl;
+    return nullptr;
+  };
+
+  set_wave_format(wave_format, format);
+
+  status = audio_client->Initialize(
+    AUDCLNT_SHAREMODE_SHARED,
+    AUDCLNT_STREAMFLAGS_LOOPBACK | AUDCLNT_STREAMFLAGS_EVENTCALLBACK,
+    0, 0,
+    wave_format.get(),
+    nullptr);
+
+  if(status) {
+    return nullptr;
+  }
+
+  return audio_client;
+}
+
+void print_device(device_t &device) {
+  audio::wstring_t wstring;
   DWORD device_state;
 
   device->GetState(&device_state);
-  device->GetId(&wstring_p);
-  audio::wstring_t wstring { wstring_p };
+  device->GetId(&wstring);
 
-  audio::prop_t::pointer prop_p {};
-  device->OpenPropertyStore(STGM_READ, &prop_p);
-  audio::prop_t prop { prop_p };
+  audio::prop_t prop;
+  device->OpenPropertyStore(STGM_READ, &prop);
 
   prop_var_t adapter_friendly_name;
   prop_var_t device_friendly_name;
@@ -94,18 +195,18 @@ void print_device(device_t &device) {
 
   std::wstring device_state_string = L"Unknown"s;
   switch(device_state) {
-    case DEVICE_STATE_ACTIVE:
-      device_state_string = L"Active"s;
-      break;
-    case DEVICE_STATE_DISABLED:
-      device_state_string = L"Disabled"s;
-      break;
-    case DEVICE_STATE_UNPLUGGED:
-      device_state_string = L"Unplugged"s;
-      break;
-    case DEVICE_STATE_NOTPRESENT:
-      device_state_string = L"Not present"s;
-      break;
+  case DEVICE_STATE_ACTIVE:
+    device_state_string = L"Active"s;
+    break;
+  case DEVICE_STATE_DISABLED:
+    device_state_string = L"Disabled"s;
+    break;
+  case DEVICE_STATE_UNPLUGGED:
+    device_state_string = L"Unplugged"s;
+    break;
+  case DEVICE_STATE_NOTPRESENT:
+    device_state_string = L"Not present"s;
+    break;
   }
 
   std::wcout
@@ -114,55 +215,21 @@ void print_device(device_t &device) {
     << L"Device name        : "sv << no_null((LPWSTR)device_friendly_name.prop.pszVal) << std::endl
     << L"Adapter name       : "sv << no_null((LPWSTR)adapter_friendly_name.prop.pszVal) << std::endl
     << L"Device description : "sv << no_null((LPWSTR)device_desc.prop.pszVal) << std::endl
-    << L"Device state       : "sv << device_state_string << std::endl << std::endl;
+    << L"Device state       : "sv << device_state_string << std::endl
+    << std::endl;
 
   if(device_state != DEVICE_STATE_ACTIVE) {
     return;
   }
 
-  // Ensure WaveFromat is compatible
-  audio_client_t::pointer audio_client_p{};
-  status = device->Activate(
-    IID_IAudioClient,
-    CLSCTX_ALL,
-    nullptr,
-    (void **) &audio_client_p);
-  audio_client_t audio_client { audio_client_p };
+  for(const auto &format : formats) {
+    // Ensure WaveFromat is compatible
+    auto audio_client = make_audio_client(device, format);
 
-  if (FAILED(status)) {
-    std::cout << "Couldn't activate Device: [0x"sv << util::hex(status).to_string_view() << ']' << std::endl;
-
-    return;
+    std::cout << format.name << ": "sv << (!audio_client ? "unsupported"sv : "supported"sv) << std::endl;
   }
-
-  wave_format_t::pointer wave_format_p{};
-  status = audio_client->GetMixFormat(&wave_format_p);
-  wave_format_t wave_format { wave_format_p };
-
-  if (FAILED(status)) {
-    std::cout << "Couldn't acquire Wave Format [0x"sv << util::hex(status).to_string_view() << ']' << std::endl;
-
-    return;
-  }
-
-  switch(wave_format->wFormatTag) {
-    case WAVE_FORMAT_PCM:
-      break;
-    case WAVE_FORMAT_IEEE_FLOAT:
-      break;
-    case WAVE_FORMAT_EXTENSIBLE: {
-      auto wave_ex = (PWAVEFORMATEXTENSIBLE) wave_format.get();
-      if (IsEqualGUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, wave_ex->SubFormat)) {
-        break;
-      }
-
-      std::cout << "Unsupported Sub Format for WAVE_FORMAT_EXTENSIBLE: [0x"sv << util::hex(wave_ex->SubFormat).to_string_view() << ']' << std::endl;
-    }
-    default:
-      std::cout << "Unsupported Wave Format: [0x"sv << util::hex(wave_format->wFormatTag).to_string_view() << ']' << std::endl;
-  };
-}
 }
+} // namespace audio
 
 void print_help() {
   std::cout
@@ -213,26 +280,24 @@ int main(int argc, char *argv[]) {
 
   HRESULT status;
 
-  audio::device_enum_t::pointer device_enum_p{};
+  audio::device_enum_t device_enum;
   status = CoCreateInstance(
     CLSID_MMDeviceEnumerator,
     nullptr,
     CLSCTX_ALL,
     IID_IMMDeviceEnumerator,
-    (void **) &device_enum_p);
-  audio::device_enum_t device_enum { device_enum_p };
+    (void **)&device_enum);
 
-  if (FAILED(status)) {
+  if(FAILED(status)) {
     std::cout << "Couldn't create Device Enumerator: [0x"sv << util::hex(status).to_string_view() << ']' << std::endl;
 
     return -1;
   }
 
-  audio::collection_t::pointer collection_p {};
-  status = device_enum->EnumAudioEndpoints(eRender, DEVICE_STATEMASK_ALL, &collection_p);
-  audio::collection_t collection { collection_p };
+  audio::collection_t collection;
+  status = device_enum->EnumAudioEndpoints(eRender, device_state_filter, &collection);
 
-  if (FAILED(status)) {
+  if(FAILED(status)) {
     std::cout << "Couldn't enumerate: [0x"sv << util::hex(status).to_string_view() << ']' << std::endl;
 
     return -1;
@@ -241,11 +306,10 @@ int main(int argc, char *argv[]) {
   UINT count;
   collection->GetCount(&count);
 
-  std::cout << "====== Found "sv << count << " potential audio devices ======"sv << std::endl;
+  std::cout << "====== Found "sv << count << " audio devices ======"sv << std::endl;
   for(auto x = 0; x < count; ++x) {
-    audio::device_t::pointer device_p {};
-    collection->Item(x, &device_p);
-    audio::device_t device { device_p };
+    audio::device_t device;
+    collection->Item(x, &device);
 
     audio::print_device(device);
   }

tools/dxgi.cpp

@@ -2,8 +2,8 @@
 // Created by loki on 1/23/20.
 //
 
-#include <dxgi.h>
 #include <d3dcommon.h>
+#include <dxgi.h>
 
 #include <iostream>
 
@@ -16,17 +16,17 @@ void Release(T *dxgi) {
   dxgi->Release();
 }
 
-using factory1_t   = util::safe_ptr<IDXGIFactory1, Release<IDXGIFactory1>>;
-using adapter_t    = util::safe_ptr<IDXGIAdapter1, Release<IDXGIAdapter1>>;
-using output_t     = util::safe_ptr<IDXGIOutput, Release<IDXGIOutput>>;
+using factory1_t = util::safe_ptr<IDXGIFactory1, Release<IDXGIFactory1>>;
+using adapter_t  = util::safe_ptr<IDXGIAdapter1, Release<IDXGIAdapter1>>;
+using output_t   = util::safe_ptr<IDXGIOutput, Release<IDXGIOutput>>;
 
-}
+} // namespace dxgi
 
 int main(int argc, char *argv[]) {
   HRESULT status;
 
   dxgi::factory1_t::pointer factory_p {};
-  status = CreateDXGIFactory1(IID_IDXGIFactory1, (void**)&factory_p);
+  status = CreateDXGIFactory1(IID_IDXGIFactory1, (void **)&factory_p);
   dxgi::factory1_t factory { factory_p };
   if(FAILED(status)) {
     std::cout << "Failed to create DXGIFactory1 [0x"sv << util::hex(status).to_string_view() << ']' << std::endl;
@@ -49,12 +49,13 @@ int main(int argc, char *argv[]) {
       << "Device Device ID : 0x"sv << util::hex(adapter_desc.DeviceId).to_string_view() << std::endl
       << "Device Video Mem : "sv << adapter_desc.DedicatedVideoMemory / 1048576 << " MiB"sv << std::endl
       << "Device Sys Mem   : "sv << adapter_desc.DedicatedSystemMemory / 1048576 << " MiB"sv << std::endl
-      << "Share Sys Mem    : "sv << adapter_desc.SharedSystemMemory / 1048576 << " MiB"sv << std::endl << std::endl
+      << "Share Sys Mem    : "sv << adapter_desc.SharedSystemMemory / 1048576 << " MiB"sv << std::endl
+      << std::endl
       << "    ====== OUTPUT ======"sv << std::endl;
 
     dxgi::output_t::pointer output_p {};
     for(int y = 0; adapter->EnumOutputs(y, &output_p) != DXGI_ERROR_NOT_FOUND; ++y) {
-      dxgi::output_t output {output_p };
+      dxgi::output_t output { output_p };
 
       DXGI_OUTPUT_DESC desc;
       output->GetDesc(&desc);
@@ -66,7 +67,8 @@ int main(int argc, char *argv[]) {
         << L"    Output Name       : "sv << desc.DeviceName << std::endl;
       std::cout
         << "    AttachedToDesktop : "sv << (desc.AttachedToDesktop ? "yes"sv : "no"sv) << std::endl
-        << "    Resolution        : "sv << width << 'x' << height << std::endl << std::endl;
+        << "    Resolution        : "sv << width << 'x' << height << std::endl
+        << std::endl;
     }
   }