Version 2.2.0

This is not always available on Windows Server

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,8 +1,10 @@
 ---
 name: Bug report
-about: Create a report to help us address broken functionality
+about: Ask for help on Discord before reporting a bug
 
 ---
+**READ ME FIRST!**
+This issue tracker is not the right place to ask for troubleshooting help if you're not able to connect or stream at all. For those requests, please use the #pc-help channel on our Discord server where there are many more people who can help (or direct you back here if it looks like a Moonlight bug after all). https://moonlight-stream.org/discord
 
 **Describe the bug**
 A clear and concise description of what the bug is.
@@ -16,6 +18,9 @@ If applicable, add screenshots to help explain your problem. If the issue is rel
 **Affected games**
 List the games you've tried that exhibit the issue. To see if the issue is game-specific, try streaming Steam Big Picture with Moonlight and see if the issue persists there.
 
+**Other Moonlight clients**
+- Does the issue occur when using Moonlight on iOS or Android?
+
 **Moonlight settings (please complete the following information)**
 - Have any settings been adjusted from defaults?
 - If so, which settings have been changed?

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/auto-comment.yml

@@ -0,0 +1,4 @@
+issuesOpened: >
+  If this is a question about Moonlight or you need help troubleshooting a streaming problem, please use the help channels on our [Discord server](https://moonlight-stream.org/discord) instead of GitHub issues. There are many more people available on Discord to help you and answer your questions.<br /><br />
+  This issue tracker should only be used for specific bugs or feature requests.<br /><br />
+  Thank you, and happy streaming!

.travis.yml

@@ -1,53 +0,0 @@
-language: cpp
-
-git:
-  depth: 1
-
-env:
-  - NJOBS=2
-
-matrix:
-  include:
-    - os: osx
-      compiler: clang
-    - os: linux
-      sudo: required
-      dist: xenial
-      compiler: gcc
-      addons:
-        apt:
-          sources:
-            - sourceline: 'ppa:beineri/opt-qt597-xenial'
-            - sourceline: 'ppa:jonathonf/ffmpeg-4'
-          packages:
-            - qt59base
-            - qt59quickcontrols2
-            - qt59svg
-            - libesd0-dev
-            - libgl-dev
-            - libegl1-mesa-dev
-            - libxkbcommon-dev
-            - wayland-protocols
-            - libopus-dev
-            - libavcodec-dev
-            - libavutil-dev
-            - libva-dev
-            - libvdpau-dev
-
-install:
-    - '[ "$TRAVIS_OS_NAME" != osx ] || brew install qt5'
-    - '[ "$TRAVIS_OS_NAME" != osx ] || brew link --force qt5'
-    - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then export SDL2_VER=2.0.9 && wget https://www.libsdl.org/release/SDL2-$SDL2_VER.tar.gz && tar -xvf SDL2-$SDL2_VER.tar.gz && cd SDL2-$SDL2_VER && ./configure && make -j$NJOBS && sudo make install && cd ..; fi
-    - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then export SDL2_TTF_VER=2.0.15 && wget https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$SDL2_TTF_VER.tar.gz && tar -xvf SDL2_ttf-$SDL2_TTF_VER.tar.gz && cd SDL2_ttf-$SDL2_TTF_VER && ./configure && make -j$NJOBS && sudo make install && cd ..; fi
-
-before_script:
-    - '[ "$TRAVIS_OS_NAME" != "linux" ] || source /opt/qt59/bin/qt59-env.sh'
-    - qmake -v
-    - '[[ "$TRAVIS_OS_NAME" != linux || "$CXX" != clang++ ]] || export QMAKESPEC=linux-clang'
-    - '[[ "$TRAVIS_OS_NAME" != linux || "$CXX" != g++     ]] || export QMAKESPEC=linux-g++'
-    - '[ "$TRAVIS_OS_NAME" != osx ]                          || export QMAKESPEC=macx-clang'
-
-script:
-    - qmake moonlight-qt.pro -spec $QMAKESPEC
-    - make -j$NJOBS debug
-    - make -j$NJOBS release

AntiHooking/antihookingprotection.cpp

@@ -131,14 +131,81 @@ private:
     static LoadLibraryExWFunc s_RealLoadLibraryExW;
 
     static constexpr LPCWSTR k_BlacklistedDlls[] = {
-        // This DLL shipped with ASUS Sonic Radar 3 improperly handles
-        // D3D9 exclusive fullscreen in a way that causes CreateDeviceEx()
-        // to deadlock. https://github.com/moonlight-stream/moonlight-qt/issues/102
-        L"NahimicOSD.dll",
+        // These A-Volute DLLs shipped with various audio driver packages improperly handle
+        // D3D9 exclusive fullscreen in a way that causes CreateDeviceEx() to deadlock.
+        // https://github.com/moonlight-stream/moonlight-qt/issues/102
+        L"NahimicOSD.dll", // ASUS Sonic Radar 3
+        L"SSAudioOSD.dll", // SteelSeries headsets
+        L"SS2OSD.dll", // ASUS Sonic Studio 2
+        L"Nahimic2OSD.dll",
+        L"NahimicMSIOSD.dll",
+        L"nhAsusPhoebusOSD.dll" // ASUS Phoebus
+
         // This DLL has been seen in several crash reports. Some Googling
         // suggests it's highly unstable and causes issues in many games.
         L"EZFRD32.dll",
         L"EZFRD64.dll",
+
+        // These are the newer dList DLLs for Optimus hybrid graphics DDI.
+        // https://docs.microsoft.com/en-us/windows-hardware/drivers/display/hybrid-system-ddi
+        //
+        // We forcefully block them from loading because Optimus has a bug that
+        // deadlocks DXVA2 when we present with D3DPRESENT_DONOTWAIT. This will prevent
+        // Optimus from ever using the dGPU even if the user has requested it.
+        // https://github.com/moonlight-stream/moonlight-qt/issues/240
+        // https://github.com/moonlight-stream/moonlight-qt/issues/235
+        L"nvdlist.dll",
+        L"nvdlistx.dll",
+
+        // These are the older dList/AppInit DLLs for Optimus hybrid graphics DDI.
+        // https://docs.microsoft.com/en-us/windows-hardware/drivers/display/hybrid-system-ddi
+        //
+        // These seem to cause a crash in PresentEx() in full-screen exclusive mode.
+        // This block will prevent Optimus from ever using the dGPU even if the user has requested it.
+        // https://github.com/moonlight-stream/moonlight-qt/issues/386
+        //
+        // d3d9!CSwapChain::BltToHybridPrimary+0x200:
+        // 00007ffa`23f37e58 488b01          mov     rax,qword ptr [rcx] ds:00000000`00000038=????????????????
+        // 00 0000004e`496ff4e0 00007ffa`23f39e2c d3d9!CSwapChain::BltToHybridPrimary+0x200
+        // 01 0000004e`496ff880 00007ffa`23ee39ce d3d9!CSwapChain::FlipToSurface+0x15c
+        // 02 0000004e`496ff900 00007ffa`23f4dd75 d3d9!CSwapChain::PresentMain+0x3e13e
+        // 03 0000004e`496ffab0 00007ffa`23f4dccd d3d9!CBaseDevice::PresentMain+0x9d
+        // 04 0000004e`496ffb00 00007ff7`8e31016f d3d9!CBaseDevice::PresentEx+0xbd
+        // 05 0000004e`496ffb50 00007ff7`8e30df1e Moonlight!DXVA2Renderer::renderFrame+0x61f [C:\moonlight-qt\app\streaming\video\ffmpeg-renderers\dxva2.cpp @ 1035]
+        // 06 0000004e`496ffd50 00007ff7`8e30e46a Moonlight!Pacer::renderFrame+0x3e [C:\moonlight-qt\app\streaming\video\ffmpeg-renderers\pacer\pacer.cpp @ 265]
+        // 07 (Inline Function) --------`-------- Moonlight!Pacer::renderLastFrameAndUnlock+0x197 [C:\moonlight-qt\app\streaming\video\ffmpeg-renderers\pacer\pacer.cpp @ 156]
+        // 08 0000004e`496ffda0 00007ffa`14476978 Moonlight!Pacer::renderThread+0x1ca [C:\moonlight-qt\app\streaming\video\ffmpeg-renderers\pacer\pacer.cpp @ 88]
+        // 09 0000004e`496ffde0 00007ffa`14476ee2 SDL2!SDL_RunThread+0x38 [C:\Users\camer\SDL\src\thread\SDL_thread.c @ 276]
+        // 0a 0000004e`496ffe10 00007ffa`2aae0e82 SDL2!RunThread+0x12 [C:\Users\camer\SDL\src\thread\windows\SDL_systhread.c @ 83]
+        // 0b 0000004e`496ffe40 00007ffa`2d627bd4 ucrtbase!thread_start<unsigned int (__cdecl*)(void *),1>+0x42
+        // 0c 0000004e`496ffe70 00007ffa`2da4ce51 kernel32!BaseThreadInitThunk+0x14
+        // 0d 0000004e`496ffea0 00000000`00000000 ntdll!RtlUserThreadStart+0x21
+        //
+        L"nvinit.dll",
+        L"nvinitx.dll",
+
+        // In some unknown circumstances, RTSS tries to hook in the middle of an instruction, leaving garbage
+        // code inside d3d9.dll that causes a crash when executed:
+        //
+        // 0:000> u
+        // d3d9!D3D9GetCurrentOwnershipMode+0x5d:
+        // 00007ff8`95b95861 9b              wait
+        // 00007ff8`95b95862 a7              cmps    dword ptr [rsi],dword ptr [rdi]   <--- crash happens here
+        // 00007ff8`95b95863 ff              ???
+        // 00007ff8`95b95864 bfe8ca8a00      mov     edi,8ACAE8h
+        // 00007ff8`95b95869 00eb            add     bl,ch
+        // 00007ff8`95b9586b f1              ???
+        // 00007ff8`95b9586c b808000000      mov     eax,8
+        // 00007ff8`95b95871 ebe6            jmp     d3d9!D3D9GetCurrentOwnershipMode+0x55 (00007ff8`95b95859)
+        //
+        // Disassembling starting at the exact address of the attempted hook yields the intended jmp instruction
+        //
+        // 0:000> u d3d9!D3D9GetCurrentOwnershipMode+0x5c:
+        // 00007ff8`95b95860 e99ba7ffbf      jmp     00007ff8`55b90000
+        //
+        // Since the RTSS OSD doesn't even work with DXVA2, we'll just block the hooks entirely.
+        L"RTSSHooks.dll",
+        L"RTSSHooks64.dll",
     };
 };
 

README.md

@@ -4,30 +4,33 @@
 
 Moonlight also has mobile versions for [Android](https://github.com/moonlight-stream/moonlight-android) and  [iOS](https://github.com/moonlight-stream/moonlight-ios).
 
-You can follow development on our [Discord server](https://discord.gg/6ERtzFY).
+You can follow development on our [Discord server](https://moonlight-stream.org/discord).
 
- [![Windows AppVeyor Status](https://ci.appveyor.com/api/projects/status/glj5cxqwy2w3bglv/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-qt/branch/master)
- [![Mac and Linux Travis CI Status](https://travis-ci.org/moonlight-stream/moonlight-qt.svg?branch=master)](https://travis-ci.org/moonlight-stream/moonlight-qt)
+ [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/glj5cxqwy2w3bglv/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-qt/branch/master)
+ [![Downloads](https://img.shields.io/github/downloads/moonlight-stream/moonlight-qt/total)](https://github.com/moonlight-stream/moonlight-qt/releases)
 
 ## Features
  - Hardware accelerated video decoding on Windows, Mac, and Linux
  - Supports streaming at up to 120 FPS (high refresh rate monitor recommended)
  - Supports streaming at 720p, 1080p, 1440p, 4K, and the client PC's native screen resolution
- - 5.1 surround sound audio
+ - 7.1 surround sound audio support
+ - Support for both pointer capture (for games) and direct mouse control (for remote desktop)
+ - Direct touchscreen mouse control
  - HEVC support for better image quality at reduced bandwidth
- - Keyboard and mouse support
  - Gamepad support with force feedback for up to 4 players
  
 ## Downloads
 - [Windows, macOS, and Steam Link](https://github.com/moonlight-stream/moonlight-qt/releases)
 - [Snap (for Ubuntu-based Linux distros)](https://snapcraft.io/moonlight)
 - [Flatpak (for other Linux distros)](https://flathub.org/apps/details/com.moonlight_stream.Moonlight)
+- [AppImage](https://github.com/moonlight-stream/moonlight-qt/releases)
+- [Raspberry Pi 4](https://github.com/moonlight-stream/moonlight-docs/wiki/Installing-Moonlight-Qt-on-Raspberry-Pi-4)
+- [NVIDIA Jetson and Nintendo Switch (Ubuntu L4T)](https://github.com/moonlight-stream/moonlight-docs/wiki/Installing-Moonlight-Qt-on-Linux4Tegra-(L4T)-Ubuntu)
 
 ## Building
-### General Build Requirements
-* Qt 5.9 SDK or later
 
-### Windows-specific Build Requirements
+### Windows Build Requirements
+* Qt 5.12.4 SDK or later
 * Windows 7 or later
 * [Visual Studio](https://visualstudio.microsoft.com/downloads/) 2017 (Community edition is fine)
 * Select MSVC Desktop toolchain during Qt installation
@@ -35,17 +38,19 @@ You can follow development on our [Discord server](https://discord.gg/6ERtzFY).
 * [7-Zip](https://www.7-zip.org/) (only if building installers for non-development PCs)
 * [WiX Toolset](http://wixtoolset.org/releases/) v3.11 or later (only if building installers for non-development PCs)
 
-### Mac-specific Build Requirements
-* macOS Sierra (10.12) or later
-* Xcode 10
+### macOS Build Requirements
+* Qt 5.14 SDK or later
+* macOS High Sierra (10.13) or later
+* Xcode 11
 * [create-dmg](https://github.com/sindresorhus/create-dmg) (only if building DMGs for use on non-development Macs)
 
-### Linux-specific Build Requirements
+### Linux/Unix Build Requirements
+* Qt 5.9 SDK or later
 * GCC or Clang
 * Install your distro equivalents of: `openssl-devel qt5-devel SDL2-devel ffmpeg-devel qt5-qtquickcontrols2-devel libva-devel libvdpau-devel opus-devel pulseaudio-libs-devel alsa-lib-devel SDL2_ttf-devel`
 * FFmpeg 4.0 is required to build. If your distro doesn't package FFmpeg 4.0, you can build and install it from source on http://ffmpeg.org/
 
-### Steam Link-specific Build Requirements
+### Steam Link Build Requirements
 * [Steam Link SDK](https://github.com/ValveSoftware/steamlink-sdk) cloned on your build system
 * STEAMLINK_SDK_PATH environment variable set to the Steam Link SDK path
 

app/app.pro

@@ -46,7 +46,7 @@ win32 {
         LIBS += -L$$(DXSDK_DIR)/Lib/x64
     }
 
-    LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib
+    LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib qwave.lib
 }
 macx {
     INCLUDEPATH += $$PWD/../libs/mac/include
@@ -59,20 +59,6 @@ unix:!macx {
     CONFIG += link_pkgconfig
     PKGCONFIG += openssl sdl2 SDL2_ttf opus
 
-    # SLAudio is used on Steam Link
-    !config_SL {
-        CONFIG += soundio
-    }
-
-    soundio {
-        packagesExist(libpulse) {
-            PKGCONFIG += libpulse
-        }
-        packagesExist(alsa) {
-            PKGCONFIG += alsa
-        }
-    }
-
     packagesExist(libavcodec) {
         PKGCONFIG += libavcodec libavutil
         CONFIG += ffmpeg
@@ -84,6 +70,9 @@ unix:!macx {
             packagesExist(libva-wayland) {
                 CONFIG += libva-wayland
             }
+            packagesExist(libva-drm) {
+                CONFIG += libva-drm
+            }
             CONFIG += libva
         }
 
@@ -101,25 +90,36 @@ unix:!macx {
             CONFIG += libdrm
         }
     }
+
+    packagesExist(wayland-client) {
+        DEFINES += HAS_WAYLAND
+        PKGCONFIG += wayland-client
+    }
+
+    packagesExist(x11) {
+        DEFINES += HAS_X11
+        PKGCONFIG += x11
+    }
 }
 win32 {
     LIBS += -llibssl -llibcrypto -lSDL2 -lSDL2_ttf -lavcodec -lavutil -lopus -ld3dx9
     CONFIG += ffmpeg
 }
 win32:!winrt {
-    CONFIG += soundio
+    CONFIG += soundio discord-rpc
 }
 macx {
     LIBS += -lssl -lcrypto -lavcodec.58 -lavutil.56 -lopus -framework SDL2 -framework SDL2_ttf
-    LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit
+    LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal
 
     # For libsoundio
     LIBS += -framework CoreAudio -framework AudioUnit
 
-    CONFIG += ffmpeg soundio
+    CONFIG += ffmpeg soundio discord-rpc
 }
 
 SOURCES += \
+    backend/nvapp.cpp \
     main.cpp \
     backend/computerseeker.cpp \
     backend/identitymanager.cpp \
@@ -128,11 +128,17 @@ SOURCES += \
     backend/nvpairingmanager.cpp \
     backend/computermanager.cpp \
     backend/boxartmanager.cpp \
+    backend/richpresencemanager.cpp \
     cli/commandlineparser.cpp \
     cli/quitstream.cpp \
     cli/startstream.cpp \
     settings/streamingpreferences.cpp \
-    streaming/input.cpp \
+    streaming/input/abstouch.cpp \
+    streaming/input/gamepad.cpp \
+    streaming/input/input.cpp \
+    streaming/input/keyboard.cpp \
+    streaming/input/mouse.cpp \
+    streaming/input/reltouch.cpp \
     streaming/session.cpp \
     streaming/audio/audio.cpp \
     streaming/audio/renderers/sdlaud.cpp \
@@ -144,9 +150,11 @@ SOURCES += \
     settings/mappingmanager.cpp \
     gui/sdlgamepadkeynavigation.cpp \
     streaming/video/overlaymanager.cpp \
-    backend/systemproperties.cpp
+    backend/systemproperties.cpp \
+    wm.cpp
 
 HEADERS += \
+    backend/nvapp.h \
     utils.h \
     backend/computerseeker.h \
     backend/identitymanager.h \
@@ -155,11 +163,12 @@ HEADERS += \
     backend/nvpairingmanager.h \
     backend/computermanager.h \
     backend/boxartmanager.h \
+    backend/richpresencemanager.h \
     cli/commandlineparser.h \
     cli/quitstream.h \
     cli/startstream.h \
     settings/streamingpreferences.h \
-    streaming/input.h \
+    streaming/input/input.h \
     streaming/session.h \
     streaming/audio/renderers/renderer.h \
     streaming/audio/renderers/sdl.h \
@@ -182,6 +191,7 @@ ffmpeg {
     SOURCES += \
         streaming/video/ffmpeg.cpp \
         streaming/video/ffmpeg-renderers/sdlvid.cpp \
+        streaming/video/ffmpeg-renderers/cuda.cpp \
         streaming/video/ffmpeg-renderers/pacer/pacer.cpp \
         streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.cpp
 
@@ -189,6 +199,7 @@ ffmpeg {
         streaming/video/ffmpeg.h \
         streaming/video/ffmpeg-renderers/renderer.h \
         streaming/video/ffmpeg-renderers/sdlvid.h \
+        streaming/video/ffmpeg-renderers/cuda.h \
         streaming/video/ffmpeg-renderers/pacer/pacer.h \
         streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.h
 }
@@ -212,6 +223,12 @@ libva-wayland {
     PKGCONFIG += libva-wayland
     DEFINES += HAVE_LIBVA_WAYLAND
 }
+libva-wayland {
+    message(VAAPI DRM support enabled)
+
+    PKGCONFIG += libva-drm
+    DEFINES += HAVE_LIBVA_DRM
+}
 libvdpau {
     message(VDPAU renderer selected)
 
@@ -233,6 +250,16 @@ libdrm {
     SOURCES += streaming/video/ffmpeg-renderers/drm.cpp
     HEADERS += streaming/video/ffmpeg-renderers/drm.h
 }
+config_EGL {
+    message(EGL renderer selected)
+
+    CONFIG += egl
+    DEFINES += HAVE_EGL
+    SOURCES += \
+        streaming/video/ffmpeg-renderers/eglvid.cpp \
+        streaming/video/ffmpeg-renderers/egl_extensions.cpp
+    HEADERS += streaming/video/ffmpeg-renderers/eglvid.h
+}
 config_SL {
     message(Steam Link build configuration selected)
 
@@ -273,6 +300,12 @@ soundio {
     SOURCES += streaming/audio/renderers/soundioaudiorenderer.cpp
     HEADERS += streaming/audio/renderers/soundioaudiorenderer.h
 }
+discord-rpc {
+    message(Discord integration enabled)
+
+    LIBS += -ldiscord-rpc
+    DEFINES += HAVE_DISCORD
+}
 
 RESOURCES += \
     resources.qrc \
@@ -365,10 +398,13 @@ macx {
     APP_BUNDLE_RESOURCES.files = moonlight.icns
     APP_BUNDLE_RESOURCES.path = Contents/Resources
 
-    APP_BUNDLE_FRAMEWORKS.files = $$files(../libs/mac/Frameworks/*.framework, true)
+    APP_BUNDLE_FRAMEWORKS.files = $$files(../libs/mac/Frameworks/*.framework, true) $$files(../libs/mac/lib/*.dylib, true)
     APP_BUNDLE_FRAMEWORKS.path = Contents/Frameworks
 
-    QMAKE_BUNDLE_DATA += APP_BUNDLE_RESOURCES APP_BUNDLE_FRAMEWORKS
+    APP_BUNDLE_PLIST.files = $$OUT_PWD/Info.plist
+    APP_BUNDLE_PLIST.path = Contents
+
+    QMAKE_BUNDLE_DATA += APP_BUNDLE_RESOURCES APP_BUNDLE_FRAMEWORKS APP_BUNDLE_PLIST
 
     QMAKE_RPATHDIR += @executable_path/../Frameworks
 }

app/backend/autoupdatechecker.cpp

@@ -28,7 +28,15 @@ AutoUpdateChecker::AutoUpdateChecker(QObject *parent) :
 
 void AutoUpdateChecker::start()
 {
-#if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN) // Only run update checker on platforms without auto-update
+#if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN) || defined(STEAM_LINK) || defined(APP_IMAGE) // Only run update checker on platforms without auto-update
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && QT_VERSION < QT_VERSION_CHECK(5, 15, 1) && !defined(QT_NO_BEARERMANAGEMENT)
+    // HACK: Set network accessibility to work around QTBUG-80947 (introduced in Qt 5.14.0 and fixed in Qt 5.15.1)
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
+    m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);
+    QT_WARNING_POP
+#endif
+
     // We'll get a callback when this is finished
     QUrl url("https://moonlight-stream.org/updates/qt.json");
     m_Nam.get(QNetworkRequest(url));
@@ -43,6 +51,17 @@ void AutoUpdateChecker::parseStringToVersionQuad(QString& string, QVector<int>&
     }
 }
 
+QString AutoUpdateChecker::getPlatform()
+{
+#if defined(STEAM_LINK)
+    return QStringLiteral("steamlink");
+#elif defined(APP_IMAGE)
+    return QStringLiteral("appimage");
+#else
+    return QSysInfo::productType();
+#endif
+}
+
 void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
 {
     Q_ASSERT(reply->isFinished());
@@ -88,7 +107,7 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
                 }
 
                 if (updateObj["arch"] == QSysInfo::buildCpuArchitecture() &&
-                        updateObj["platform"] == QSysInfo::productType()) {
+                        updateObj["platform"] == getPlatform()) {
                     qDebug() << "Found update manifest match for current platform";
 
                     QString latestVersion = updateObj["version"].toString();
@@ -137,7 +156,7 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
         }
 
         qWarning() << "No entry in update manifest found for current platform: "
-                   << QSysInfo::buildCpuArchitecture() << QSysInfo::productType();
+                   << QSysInfo::buildCpuArchitecture() << getPlatform();
     }
     else {
         qWarning() << "Update checking failed with error: " << reply->error();

app/backend/autoupdatechecker.h

@@ -20,6 +20,8 @@ private slots:
 private:
     void parseStringToVersionQuad(QString& string, QVector<int>& version);
 
+    QString getPlatform();
+
     QVector<int> m_CurrentVersionQuad;
     QNetworkAccessManager m_Nam;
 };

app/backend/boxartmanager.cpp

@@ -71,10 +71,10 @@ private:
 
 QUrl BoxArtManager::loadBoxArt(NvComputer* computer, NvApp& app)
 {
-    // Try to open the cached file
-    QString cacheFilePath = getFilePathForBoxArt(computer, app.id);
-    if (QFile::exists(cacheFilePath)) {
-        return QUrl::fromLocalFile(cacheFilePath);
+    // Try to open the cached file if it exists and contains data
+    QFile cacheFile(getFilePathForBoxArt(computer, app.id));
+    if (cacheFile.exists() && cacheFile.size() > 0) {
+        return QUrl::fromLocalFile(cacheFile.fileName());
     }
 
     // If we get here, we need to fetch asynchronously.
@@ -87,6 +87,16 @@ QUrl BoxArtManager::loadBoxArt(NvComputer* computer, NvApp& app)
     return QUrl("qrc:/res/no_app_image.png");
 }
 
+void BoxArtManager::deleteBoxArt(NvComputer* computer)
+{
+    QDir dir(Path::getBoxArtCacheDir());
+
+    // Delete everything in this computer's box art directory
+    if (dir.cd(computer->uuid)) {
+        dir.removeRecursively();
+    }
+}
+
 void BoxArtManager::handleBoxArtLoadComplete(NvComputer* computer, NvApp app, QUrl image)
 {
     if (!image.isEmpty()) {
@@ -109,6 +119,10 @@ QUrl BoxArtManager::loadBoxArtFromNetwork(NvComputer* computer, int appId)
         if (image.save(cachePath)) {
             return QUrl::fromLocalFile(cachePath);
         }
+        else {
+            // A failed save() may leave a zero byte file. Make sure that's removed.
+            QFile(cachePath).remove();
+        }
     }
 
     return QUrl();

app/backend/boxartmanager.h

@@ -18,6 +18,10 @@ public:
     QUrl
     loadBoxArt(NvComputer* computer, NvApp& app);
 
+    static
+    void
+    deleteBoxArt(NvComputer* computer);
+
 signals:
     void
     boxArtLoadComplete(NvComputer* computer, NvApp app, QUrl image);

app/backend/computermanager.cpp

@@ -1,4 +1,5 @@
 #include "computermanager.h"
+#include "boxartmanager.h"
 #include "nvhttp.h"
 #include "settings/streamingpreferences.h"
 
@@ -32,7 +33,7 @@ private:
 
         QString serverInfo;
         try {
-            serverInfo = http.getServerInfo(NvHTTP::NvLogLevel::NVLL_NONE);
+            serverInfo = http.getServerInfo(NvHTTP::NvLogLevel::NVLL_NONE, true);
         } catch (...) {
             return false;
         }
@@ -67,12 +68,7 @@ private:
         }
 
         QWriteLocker lock(&m_Computer->lock);
-        if (m_Computer->appList != appList) {
-            m_Computer->appList = appList;
-            m_Computer->sortAppList();
-            changed = true;
-        }
-
+        changed = m_Computer->updateAppList(appList);
         return true;
     }
 
@@ -84,7 +80,7 @@ private:
             bool stateChanged = false;
             bool online = false;
             bool wasOnline = m_Computer->state == NvComputer::CS_ONLINE;
-            for (int i = 0; i < TRIES_BEFORE_OFFLINING && !online; i++) {
+            for (int i = 0; i < (wasOnline ? TRIES_BEFORE_OFFLINING : 1) && !online; i++) {
                 for (auto& address : m_Computer->uniqueAddresses()) {
                     if (isInterruptionRequested()) {
                         return;
@@ -209,13 +205,50 @@ void ComputerManager::saveHosts()
 
     settings.remove(SER_HOSTS);
     settings.beginWriteArray(SER_HOSTS);
-    for (int i = 0; i < m_KnownHosts.count(); i++) {
-        settings.setArrayIndex(i);
-        m_KnownHosts.value(m_KnownHosts.keys()[i])->serialize(settings);
+    int i = 0;
+    for (const NvComputer* computer : m_KnownHosts) {
+        settings.setArrayIndex(i++);
+        computer->serialize(settings);
     }
     settings.endArray();
 }
 
+QHostAddress ComputerManager::getBestGlobalAddressV6(QVector<QHostAddress> &addresses)
+{
+    for (const QHostAddress& address : addresses) {
+        if (address.protocol() == QAbstractSocket::IPv6Protocol) {
+            if (address.isInSubnet(QHostAddress("fe80::"), 10)) {
+                // Link-local
+                continue;
+            }
+
+            if (address.isInSubnet(QHostAddress("fec0::"), 10)) {
+                qInfo() << "Ignoring site-local address:" << address;
+                continue;
+            }
+
+            if (address.isInSubnet(QHostAddress("fc00::"), 7)) {
+                qInfo() << "Ignoring ULA:" << address;
+                continue;
+            }
+
+            if (address.isInSubnet(QHostAddress("2002::"), 16)) {
+                qInfo() << "Ignoring 6to4 address:" << address;
+                continue;
+            }
+
+            if (address.isInSubnet(QHostAddress("2001::"), 32)) {
+                qInfo() << "Ignoring Teredo address:" << address;
+                continue;
+            }
+
+            return address;
+        }
+    }
+
+    return QHostAddress();
+}
+
 void ComputerManager::startPolling()
 {
     QWriteLocker lock(&m_Lock);
@@ -233,9 +266,9 @@ void ComputerManager::startPolling()
                 this, [this](const QMdnsEngine::Service& service) {
             qInfo() << "Discovered mDNS host:" << service.hostname();
 
-            MdnsPendingComputer* pendingComputer = new MdnsPendingComputer(&m_MdnsServer, &m_MdnsCache, service);
-            connect(pendingComputer, SIGNAL(resolvedv4(MdnsPendingComputer*,QHostAddress)),
-                    this, SLOT(handleMdnsServiceResolved(MdnsPendingComputer*,QHostAddress)));
+            MdnsPendingComputer* pendingComputer = new MdnsPendingComputer(&m_MdnsServer, service);
+            connect(pendingComputer, &MdnsPendingComputer::resolvedHost,
+                    this, &ComputerManager::handleMdnsServiceResolved);
             m_PendingResolution.append(pendingComputer);
         });
     }
@@ -277,11 +310,39 @@ void ComputerManager::startPollingComputer(NvComputer* computer)
 }
 
 void ComputerManager::handleMdnsServiceResolved(MdnsPendingComputer* computer,
-                                                const QHostAddress& address)
+                                                QVector<QHostAddress>& addresses)
 {
-    qInfo() << "Resolved" << computer->hostname() << "to" << address.toString();
+    QHostAddress v6Global = getBestGlobalAddressV6(addresses);
+    bool added = false;
 
-    addNewHost(address.toString(), true);
+    // Add the host using the IPv4 address
+    for (const QHostAddress& address : addresses) {
+        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
+            // NB: We don't just call addNewHost() here with v6Global because the IPv6
+            // address may not be reachable (if the user hasn't installed the IPv6 helper yet
+            // or if this host lacks outbound IPv6 capability). We want to add IPv6 even if
+            // it's not currently reachable.
+            addNewHost(address.toString(), true, v6Global);
+            added = true;
+            break;
+        }
+    }
+
+    if (!added) {
+        // If we get here, there wasn't an IPv4 address so we'll do it v6-only
+        for (const QHostAddress& address : addresses) {
+            if (address.protocol() == QAbstractSocket::IPv6Protocol) {
+                // Use a link-local or site-local address for the "local address"
+                if (address.isInSubnet(QHostAddress("fe80::"), 10) ||
+                        address.isInSubnet(QHostAddress("fec0::"), 10) ||
+                        address.isInSubnet(QHostAddress("fc00::"), 7)) {
+                    addNewHost(address.toString(), true, v6Global);
+                    added = true;
+                    break;
+                }
+            }
+        }
+    }
 
     m_PendingResolution.removeOne(computer);
     computer->deleteLater();
@@ -334,6 +395,9 @@ public:
         // Delete the polling entry first. This will stop all polling threads too.
         delete pollingEntry;
 
+        // Delete cached box art
+        BoxArtManager::deleteBoxArt(m_Computer);
+
         // Finally, delete the computer itself. This must be done
         // last because the polling thread might be using it.
         delete m_Computer;
@@ -351,6 +415,28 @@ void ComputerManager::deleteHost(NvComputer* computer)
     QThreadPool::globalInstance()->start(new DeferredHostDeletionTask(this, computer));
 }
 
+void ComputerManager::renameHost(NvComputer* computer, QString name)
+{
+    {
+        QWriteLocker(&computer->lock);
+
+        computer->name = name;
+        computer->hasCustomName = true;
+    }
+
+    // Notify the UI of the state change
+    handleComputerStateChanged(computer);
+}
+
+void ComputerManager::clientSideAttributeUpdated(NvComputer* computer)
+{
+    // Persist the change
+    saveHosts();
+
+    // Notify the UI of the state change
+    handleComputerStateChanged(computer);
+}
+
 void ComputerManager::handleAboutToQuit()
 {
     QWriteLocker lock(&m_Lock);
@@ -508,9 +594,10 @@ class PendingAddTask : public QObject, public QRunnable
     Q_OBJECT
 
 public:
-    PendingAddTask(ComputerManager* computerManager, QString address, bool mdns)
+    PendingAddTask(ComputerManager* computerManager, QString address, QHostAddress mdnsIpv6Address, bool mdns)
         : m_ComputerManager(computerManager),
           m_Address(address),
+          m_MdnsIpv6Address(mdnsIpv6Address),
           m_Mdns(mdns)
     {
         connect(this, &PendingAddTask::computerAddCompleted,
@@ -520,7 +607,7 @@ public:
     }
 
 signals:
-    void computerAddCompleted(QVariant success);
+    void computerAddCompleted(QVariant success, QVariant detectedPortBlocking);
 
     void computerStateChanged(NvComputer* computer);
 
@@ -550,7 +637,20 @@ private:
             return serverInfo;
         } catch (...) {
             if (!m_Mdns) {
-                emit computerAddCompleted(false);
+                StreamingPreferences prefs;
+                int portTestResult;
+
+                if (prefs.detectNetworkBlocking) {
+                    // We failed to connect to the specified PC. Let's test to make sure this network
+                    // isn't blocking Moonlight, so we can tell the user about it.
+                    portTestResult = LiTestClientConnectivity("qt.conntest.moonlight-stream.org", 443,
+                                                              ML_PORT_FLAG_TCP_47984 | ML_PORT_FLAG_TCP_47989);
+                }
+                else {
+                    portTestResult = 0;
+                }
+
+                emit computerAddCompleted(false, portTestResult != 0 && portTestResult != ML_TEST_RESULT_INCONCLUSIVE);
             }
             return QString();
         }
@@ -560,16 +660,21 @@ private:
     {
         NvHTTP http(m_Address, QSslCertificate());
 
-        qInfo() << "Processing new PC at" << m_Address << "from" << (m_Mdns ? "mDNS" : "user");
+        qInfo() << "Processing new PC at" << m_Address << "from" << (m_Mdns ? "mDNS" : "user") << m_MdnsIpv6Address;
 
         // Perform initial serverinfo fetch over HTTP since we don't know which cert to use
         QString serverInfo = fetchServerInfo(http);
+        if (serverInfo.isEmpty() && !m_MdnsIpv6Address.isNull()) {
+            // Retry using the global IPv6 address if the IPv4 or link-local IPv6 address fails
+            http.setAddress(m_MdnsIpv6Address.toString());
+            serverInfo = fetchServerInfo(http);
+        }
         if (serverInfo.isEmpty()) {
             return;
         }
 
         // Create initial newComputer using HTTP serverinfo with no pinned cert
-        NvComputer* newComputer = new NvComputer(m_Address, serverInfo, QSslCertificate());
+        NvComputer* newComputer = new NvComputer(http.address(), serverInfo, QSslCertificate());
 
         // Check if we have a record of this host UUID to pull the pinned cert
         NvComputer* existingComputer;
@@ -589,28 +694,46 @@ private:
             }
 
             // Update the polled computer with the HTTPS information
-            NvComputer httpsComputer(m_Address, serverInfo, QSslCertificate());
+            NvComputer httpsComputer(http.address(), serverInfo, QSslCertificate());
             newComputer->update(httpsComputer);
         }
 
         // Update addresses depending on the context
         if (m_Mdns) {
-            newComputer->localAddress = m_Address;
-
-            // Get the WAN IP address using STUN if we're on mDNS
-            quint32 addr;
-            int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &addr);
-            if (err == 0) {
-                newComputer->remoteAddress = QHostAddress(qFromBigEndian(addr)).toString();
+            // Only update local address if we actually reached the PC via this address.
+            // If we reached it via the IPv6 address after the local address failed,
+            // don't store the non-working local address.
+            if (http.address() == m_Address) {
+                newComputer->localAddress = m_Address;
             }
-            else {
-                qWarning() << "STUN failed to get WAN address:" << err;
+
+            // Get the WAN IP address using STUN if we're on mDNS over IPv4
+            if (QHostAddress(newComputer->localAddress).protocol() == QAbstractSocket::IPv4Protocol) {
+                quint32 addr;
+                int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &addr);
+                if (err == 0) {
+                    newComputer->remoteAddress = QHostAddress(qFromBigEndian(addr)).toString();
+                }
+                else {
+                    qWarning() << "STUN failed to get WAN address:" << err;
+                }
+            }
+
+            if (!m_MdnsIpv6Address.isNull()) {
+                Q_ASSERT(m_MdnsIpv6Address.protocol() == QAbstractSocket::IPv6Protocol);
+                newComputer->ipv6Address = m_MdnsIpv6Address.toString();
             }
         }
         else {
             newComputer->manualAddress = m_Address;
         }
 
+        QHostAddress hostAddress(m_Address);
+        bool addressIsSiteLocalV4 =
+                hostAddress.isInSubnet(QHostAddress("10.0.0.0"), 8) ||
+                hostAddress.isInSubnet(QHostAddress("172.16.0.0"), 12) ||
+                hostAddress.isInSubnet(QHostAddress("192.168.0.0"), 16);
+
         {
             // Check if this PC already exists
             QWriteLocker lock(&m_ComputerManager->m_Lock);
@@ -625,7 +748,7 @@ private:
 
                 // For non-mDNS clients, let them know it succeeded
                 if (!m_Mdns) {
-                    emit computerAddCompleted(true);
+                    emit computerAddCompleted(true, false);
                 }
 
                 // Tell our client if something changed
@@ -644,9 +767,24 @@ private:
                 // Drop the lock before notifying
                 lock.unlock();
 
+                // If this wasn't added via mDNS but it is a RFC 1918 IPv4 address and not a VPN,
+                // go ahead and do the STUN request now to populate an external address.
+                if (!m_Mdns && addressIsSiteLocalV4 && !newComputer->isReachableOverVpn()) {
+                    quint32 addr;
+                    int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &addr);
+                    if (err == 0) {
+                        lock.relock();
+                        newComputer->remoteAddress = QHostAddress(qFromBigEndian(addr)).toString();
+                        lock.unlock();
+                    }
+                    else {
+                        qWarning() << "STUN failed to get WAN address:" << err;
+                    }
+                }
+
                 // For non-mDNS clients, let them know it succeeded
                 if (!m_Mdns) {
-                    emit computerAddCompleted(true);
+                    emit computerAddCompleted(true, false);
                 }
 
                 // Tell our client about this new PC
@@ -657,14 +795,15 @@ private:
 
     ComputerManager* m_ComputerManager;
     QString m_Address;
+    QHostAddress m_MdnsIpv6Address;
     bool m_Mdns;
 };
 
-void ComputerManager::addNewHost(QString address, bool mdns)
+void ComputerManager::addNewHost(QString address, bool mdns, QHostAddress mdnsIpv6Address)
 {
     // Punt to a worker thread to avoid stalling the
     // UI while waiting for serverinfo query to complete
-    PendingAddTask* addTask = new PendingAddTask(this, address, mdns);
+    PendingAddTask* addTask = new PendingAddTask(this, address, mdnsIpv6Address, mdns);
     QThreadPool::globalInstance()->start(addTask);
 }
 

app/backend/computermanager.h

@@ -13,6 +13,7 @@
 #include <QReadWriteLock>
 #include <QSettings>
 #include <QRunnable>
+#include <QTimer>
 
 class MdnsPendingComputer : public QObject
 {
@@ -20,13 +21,18 @@ class MdnsPendingComputer : public QObject
 
 public:
     explicit MdnsPendingComputer(QMdnsEngine::Server* server,
-                                 QMdnsEngine::Cache* cache,
                                  const QMdnsEngine::Service& service)
         : m_Hostname(service.hostname()),
-          m_Resolver(server, m_Hostname, cache)
+          m_Server(server),
+          m_Resolver(nullptr)
     {
-        connect(&m_Resolver, SIGNAL(resolved(QHostAddress)),
-                this, SLOT(handleResolved(QHostAddress)));
+        // Start resolving
+        resolve();
+    }
+
+    virtual ~MdnsPendingComputer()
+    {
+        delete m_Resolver;
     }
 
     QString hostname()
@@ -35,20 +41,42 @@ public:
     }
 
 private slots:
-    void handleResolved(const QHostAddress& address)
+    void handleResolvedTimeout()
     {
-        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
-            m_Resolver.disconnect();
-            emit resolvedv4(this, address);
+        if (m_Addresses.isEmpty()) {
+            // Try again
+            qInfo() << "Resolving" << hostname() << "timed out. Retrying...";
+            resolve();
+        }
+        else {
+            Q_ASSERT(!m_Addresses.isEmpty());
+            emit resolvedHost(this, m_Addresses);
         }
     }
 
+    void handleResolvedAddress(const QHostAddress& address)
+    {
+        qInfo() << "Resolved" << hostname() << "to" << address;
+        m_Addresses.push_back(address);
+    }
+
 signals:
-    void resolvedv4(MdnsPendingComputer*, const QHostAddress&);
+    void resolvedHost(MdnsPendingComputer*,QVector<QHostAddress>&);
 
 private:
+    void resolve()
+    {
+        delete m_Resolver;
+        m_Resolver = new QMdnsEngine::Resolver(m_Server, m_Hostname);
+        connect(m_Resolver, &QMdnsEngine::Resolver::resolved,
+                this, &MdnsPendingComputer::handleResolvedAddress);
+        QTimer::singleShot(2000, this, SLOT(handleResolvedTimeout()));
+    }
+
     QByteArray m_Hostname;
-    QMdnsEngine::Resolver m_Resolver;
+    QMdnsEngine::Server* m_Server;
+    QMdnsEngine::Resolver* m_Resolver;
+    QVector<QHostAddress> m_Addresses;
 };
 
 class ComputerPollingEntry
@@ -140,7 +168,7 @@ public:
 
     Q_INVOKABLE void stopPollingAsync();
 
-    Q_INVOKABLE void addNewHost(QString address, bool mdns);
+    Q_INVOKABLE void addNewHost(QString address, bool mdns, QHostAddress mdnsIpv6Address = QHostAddress());
 
     void pairHost(NvComputer* computer, QString pin);
 
@@ -151,12 +179,16 @@ public:
     // computer is deleted inside this call
     void deleteHost(NvComputer* computer);
 
+    void renameHost(NvComputer* computer, QString name);
+
+    void clientSideAttributeUpdated(NvComputer* computer);
+
 signals:
     void computerStateChanged(NvComputer* computer);
 
     void pairingCompleted(NvComputer* computer, QString error);
 
-    void computerAddCompleted(QVariant success);
+    void computerAddCompleted(QVariant success, QVariant detectedPortBlocking);
 
     void quitAppCompleted(QVariant error);
 
@@ -165,11 +197,13 @@ private slots:
 
     void handleComputerStateChanged(NvComputer* computer);
 
-    void handleMdnsServiceResolved(MdnsPendingComputer* computer, const QHostAddress& address);
+    void handleMdnsServiceResolved(MdnsPendingComputer* computer, QVector<QHostAddress>& addresses);
 
 private:
     void saveHosts();
 
+    QHostAddress getBestGlobalAddressV6(QVector<QHostAddress>& addresses);
+
     void startPollingComputer(NvComputer* computer);
 
     int m_PollingRef;

app/backend/computerseeker.cpp

@@ -39,11 +39,18 @@ void ComputerSeeker::onComputerUpdated(NvComputer *computer)
 bool ComputerSeeker::matchComputer(NvComputer *computer) const
 {
     QString value = m_ComputerName.toLower();
-    return computer->name.toLower() == value ||
-           computer->localAddress.toLower() == value ||
-           computer->remoteAddress.toLower() == value ||
-           computer->manualAddress.toLower() == value ||
-           computer->uuid.toLower() == value;
+
+    if (computer->name.toLower() == value || computer->uuid.toLower() == value) {
+        return true;
+    }
+
+    for (const QString& addr : computer->uniqueAddresses()) {
+        if (addr.toLower() == value) {
+            return true;
+        }
+    }
+
+    return false;
 }
 
 bool ComputerSeeker::isOnline(NvComputer *computer) const

app/backend/identitymanager.cpp

@@ -5,7 +5,6 @@
 
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
-#include <openssl/bn.h>
 #include <openssl/x509.h>
 #include <openssl/rand.h>
 
@@ -32,20 +31,19 @@ void IdentityManager::createCredentials(QSettings& settings)
     X509* cert = X509_new();
     THROW_BAD_ALLOC_IF_NULL(cert);
 
-    EVP_PKEY* pk = EVP_PKEY_new();
+    EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL);
+    THROW_BAD_ALLOC_IF_NULL(ctx);
+
+    EVP_PKEY_keygen_init(ctx);
+    EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 2048);
+
+    // pk must be initialized on input
+    EVP_PKEY* pk = NULL;
+    EVP_PKEY_keygen(ctx, &pk);
+
+    EVP_PKEY_CTX_free(ctx);
     THROW_BAD_ALLOC_IF_NULL(pk);
 
-    BIGNUM* bne = BN_new();
-    THROW_BAD_ALLOC_IF_NULL(bne);
-
-    RSA* rsa = RSA_new();
-    THROW_BAD_ALLOC_IF_NULL(rsa);
-
-    BN_set_word(bne, RSA_F4);
-    RSA_generate_key_ex(rsa, 2048, bne, nullptr);
-
-    EVP_PKEY_assign_RSA(pk, rsa);
-
     X509_set_version(cert, 2);
     ASN1_INTEGER_set(X509_get_serialNumber(cert), 0);
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
@@ -75,7 +73,7 @@ void IdentityManager::createCredentials(QSettings& settings)
                                -1, -1, 0);
     X509_set_issuer_name(cert, name);
 
-    X509_sign(cert, pk, EVP_sha1());
+    X509_sign(cert, pk, EVP_sha256());
 
     BIO* biokey = BIO_new(BIO_s_mem());
     THROW_BAD_ALLOC_IF_NULL(biokey);
@@ -94,7 +92,6 @@ void IdentityManager::createCredentials(QSettings& settings)
 
     X509_free(cert);
     EVP_PKEY_free(pk);
-    BN_free(bne);
     BIO_free(biokey);
     BIO_free(biocert);
 

app/backend/nvapp.cpp

@@ -0,0 +1,25 @@
+#include "nvapp.h"
+
+#define SER_APPNAME "name"
+#define SER_APPID "id"
+#define SER_APPHDR "hdr"
+#define SER_APPCOLLECTOR "appcollector"
+#define SER_HIDDEN "hidden"
+
+NvApp::NvApp(QSettings& settings)
+{
+    name = settings.value(SER_APPNAME).toString();
+    id = settings.value(SER_APPID).toInt();
+    hdrSupported = settings.value(SER_APPHDR).toBool();
+    isAppCollectorGame = settings.value(SER_APPCOLLECTOR).toBool();
+    hidden = settings.value(SER_HIDDEN).toBool();
+}
+
+void NvApp::serialize(QSettings& settings) const
+{
+    settings.setValue(SER_APPNAME, name);
+    settings.setValue(SER_APPID, id);
+    settings.setValue(SER_APPHDR, hdrSupported);
+    settings.setValue(SER_APPCOLLECTOR, isAppCollectorGame);
+    settings.setValue(SER_HIDDEN, hidden);
+}

app/backend/nvapp.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <QSettings>
+
+class NvApp
+{
+public:
+    NvApp() {}
+    explicit NvApp(QSettings& settings);
+
+    bool operator==(const NvApp& other) const
+    {
+        return id == other.id &&
+                name == other.name &&
+                hdrSupported == other.hdrSupported &&
+                isAppCollectorGame == other.isAppCollectorGame &&
+                hidden == other.hidden;
+    }
+
+    bool operator!=(const NvApp& other) const
+    {
+        return !operator==(other);
+    }
+
+    bool isInitialized()
+    {
+        return id != 0 && !name.isEmpty();
+    }
+
+    void
+    serialize(QSettings& settings) const;
+
+    int id = 0;
+    QString name;
+    bool hdrSupported = false;
+    bool isAppCollectorGame = false;
+    bool hidden = false;
+};
+
+Q_DECLARE_METATYPE(NvApp)

app/backend/nvcomputer.cpp

@@ -1,8 +1,10 @@
 #include "nvcomputer.h"
+#include "nvapp.h"
 
 #include <QUdpSocket>
 #include <QHostInfo>
 #include <QNetworkInterface>
+#include <QNetworkProxy>
 
 #define SER_NAME "hostname"
 #define SER_UUID "uuid"
@@ -10,33 +12,28 @@
 #define SER_LOCALADDR "localaddress"
 #define SER_REMOTEADDR "remoteaddress"
 #define SER_MANUALADDR "manualaddress"
+#define SER_IPV6ADDR "ipv6address"
 #define SER_APPLIST "apps"
 #define SER_SRVCERT "srvcert"
-
-#define SER_APPNAME "name"
-#define SER_APPID "id"
-#define SER_APPHDR "hdr"
+#define SER_CUSTOMNAME "customname"
 
 NvComputer::NvComputer(QSettings& settings)
 {
     this->name = settings.value(SER_NAME).toString();
     this->uuid = settings.value(SER_UUID).toString();
+    this->hasCustomName = settings.value(SER_CUSTOMNAME).toBool();
     this->macAddress = settings.value(SER_MAC).toByteArray();
     this->localAddress = settings.value(SER_LOCALADDR).toString();
     this->remoteAddress = settings.value(SER_REMOTEADDR).toString();
+    this->ipv6Address = settings.value(SER_IPV6ADDR).toString();
     this->manualAddress = settings.value(SER_MANUALADDR).toString();
     this->serverCert = QSslCertificate(settings.value(SER_SRVCERT).toByteArray());
 
     int appCount = settings.beginReadArray(SER_APPLIST);
     for (int i = 0; i < appCount; i++) {
-        NvApp app;
-
         settings.setArrayIndex(i);
 
-        app.name = settings.value(SER_APPNAME).toString();
-        app.id = settings.value(SER_APPID).toInt();
-        app.hdrSupported = settings.value(SER_APPHDR).toBool();
-
+        NvApp app(settings);
         this->appList.append(app);
     }
     settings.endArray();
@@ -54,15 +51,17 @@ NvComputer::NvComputer(QSettings& settings)
     this->gpuModel = nullptr;
 }
 
-void NvComputer::serialize(QSettings& settings)
+void NvComputer::serialize(QSettings& settings) const
 {
     QReadLocker lock(&this->lock);
 
     settings.setValue(SER_NAME, name);
+    settings.setValue(SER_CUSTOMNAME, hasCustomName);
     settings.setValue(SER_UUID, uuid);
     settings.setValue(SER_MAC, macAddress);
     settings.setValue(SER_LOCALADDR, localAddress);
     settings.setValue(SER_REMOTEADDR, remoteAddress);
+    settings.setValue(SER_IPV6ADDR, ipv6Address);
     settings.setValue(SER_MANUALADDR, manualAddress);
     settings.setValue(SER_SRVCERT, serverCert.toPem());
 
@@ -72,10 +71,7 @@ void NvComputer::serialize(QSettings& settings)
         settings.beginWriteArray(SER_APPLIST);
         for (int i = 0; i < appList.count(); i++) {
             settings.setArrayIndex(i);
-
-            settings.setValue(SER_APPNAME, appList[i].name);
-            settings.setValue(SER_APPID, appList[i].id);
-            settings.setValue(SER_APPHDR, appList[i].hdrSupported);
+            appList[i].serialize(settings);
         }
         settings.endArray();
     }
@@ -92,6 +88,7 @@ NvComputer::NvComputer(QString address, QString serverInfo, QSslCertificate serv
 {
     this->serverCert = serverCert;
 
+    this->hasCustomName = false;
     this->name = NvHTTP::getXmlString(serverInfo, "hostname");
     if (this->name.isEmpty()) {
         this->name = "UNKNOWN";
@@ -129,7 +126,12 @@ NvComputer::NvComputer(QString address, QString serverInfo, QSslCertificate serv
                 mode2.width * mode2.height * mode2.refreshRate;
     });
 
+    // We can get an IPv4 loopback address if we're using the GS IPv6 Forwarder
     this->localAddress = NvHTTP::getXmlString(serverInfo, "LocalIP");
+    if (this->localAddress.startsWith("127.")) {
+        this->localAddress = QString();
+    }
+
     this->remoteAddress = NvHTTP::getXmlString(serverInfo, "ExternalIP");
     this->pairState = NvHTTP::getXmlString(serverInfo, "PairStatus") == "1" ?
                 PS_PAIRED : PS_NOT_PAIRED;
@@ -155,8 +157,9 @@ bool NvComputer::wake()
     }
 
     const quint16 WOL_PORTS[] = {
-        7, 9, // Standard WOL ports
+        9, // Standard WOL port (privileged port)
         47998, 47999, 48000, 48002, 48010, // Ports opened by GFE
+        47009, // Port opened by Moonlight Internet Hosting Tool for WoL (non-privileged port)
     };
 
     // Create the WoL payload
@@ -229,7 +232,101 @@ bool NvComputer::wake()
     return success;
 }
 
-QVector<QString> NvComputer::uniqueAddresses()
+bool NvComputer::isReachableOverVpn()
+{
+    if (activeAddress.isEmpty()) {
+        return false;
+    }
+
+    QTcpSocket s;
+
+    s.setProxy(QNetworkProxy::NoProxy);
+    s.connectToHost(activeAddress, 47984);
+    if (s.waitForConnected(3000)) {
+        Q_ASSERT(!s.localAddress().isNull());
+
+        for (const QNetworkInterface& nic : QNetworkInterface::allInterfaces()) {
+            // Ensure the interface is up
+            if ((nic.flags() & QNetworkInterface::IsUp) == 0) {
+                continue;
+            }
+
+            for (const QNetworkAddressEntry& addr : nic.addressEntries()) {
+                if (addr.ip() == s.localAddress()) {
+                    qInfo() << "Found matching interface:" << nic.humanReadableName() << nic.hardwareAddress() << nic.flags();
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+                    qInfo() << "Interface Type:" << nic.type();
+                    qInfo() << "Interface MTU:" << nic.maximumTransmissionUnit();
+
+                    if (nic.type() == QNetworkInterface::Virtual ||
+                            nic.type() == QNetworkInterface::Ppp) {
+                        // Treat PPP and virtual interfaces as likely VPNs
+                        return true;
+                    }
+
+                    if (nic.maximumTransmissionUnit() != 0 && nic.maximumTransmissionUnit() < 1500) {
+                        // Treat MTUs under 1500 as likely VPNs
+                        return true;
+                    }
+#endif
+
+                    if (nic.flags() & QNetworkInterface::IsPointToPoint) {
+                        // Treat point-to-point links as likely VPNs.
+                        // This check detects OpenVPN on Unix-like OSes.
+                        return true;
+                    }
+
+                    if (nic.hardwareAddress().startsWith("00:FF", Qt::CaseInsensitive)) {
+                        // OpenVPN TAP interfaces have a MAC address starting with 00:FF on Windows
+                        return true;
+                    }
+
+                    if (nic.humanReadableName().startsWith("ZeroTier")) {
+                        // ZeroTier interfaces always start with "ZeroTier"
+                        return true;
+                    }
+
+                    if (nic.humanReadableName().contains("VPN")) {
+                        // This one is just a final heuristic if all else fails
+                        return true;
+                    }
+
+                    // Didn't meet any of our VPN heuristics
+                    return false;
+                }
+            }
+        }
+
+        qWarning() << "No match found for address:" << s.localAddress();
+        return false;
+    }
+    else {
+        // If we fail to connect, just pretend that it's not a VPN
+        return false;
+    }
+}
+
+bool NvComputer::updateAppList(QVector<NvApp> newAppList) {
+    if (appList == newAppList) {
+        return false;
+    }
+
+    // Propagate client-side attributes to the new app list
+    for (const NvApp& existingApp : appList) {
+        for (NvApp& newApp : newAppList) {
+            if (existingApp.id == newApp.id) {
+                newApp.hidden = existingApp.hidden;
+            }
+        }
+    }
+
+    appList = newAppList;
+    sortAppList();
+    return true;
+}
+
+QVector<QString> NvComputer::uniqueAddresses() const
 {
     QVector<QString> uniqueAddressList;
 
@@ -237,6 +334,7 @@ QVector<QString> NvComputer::uniqueAddresses()
     uniqueAddressList.append(activeAddress);
     uniqueAddressList.append(localAddress);
     uniqueAddressList.append(remoteAddress);
+    uniqueAddressList.append(ipv6Address);
     uniqueAddressList.append(manualAddress);
 
     // Prune duplicates (always giving precedence to the first)
@@ -292,10 +390,14 @@ bool NvComputer::update(NvComputer& that)
         changed = true;                       \
     }
 
-    ASSIGN_IF_CHANGED(name);
+    if (!hasCustomName) {
+        // Only overwrite the name if it's not custom
+        ASSIGN_IF_CHANGED(name);
+    }
     ASSIGN_IF_CHANGED_AND_NONEMPTY(macAddress);
     ASSIGN_IF_CHANGED_AND_NONEMPTY(localAddress);
     ASSIGN_IF_CHANGED_AND_NONEMPTY(remoteAddress);
+    ASSIGN_IF_CHANGED_AND_NONEMPTY(ipv6Address);
     ASSIGN_IF_CHANGED_AND_NONEMPTY(manualAddress);
     ASSIGN_IF_CHANGED(pairState);
     ASSIGN_IF_CHANGED(serverCodecModeSupport);
@@ -307,7 +409,12 @@ bool NvComputer::update(NvComputer& that)
     ASSIGN_IF_CHANGED(maxLumaPixelsHEVC);
     ASSIGN_IF_CHANGED(gpuModel);
     ASSIGN_IF_CHANGED_AND_NONNULL(serverCert);
-    ASSIGN_IF_CHANGED_AND_NONEMPTY(appList);
     ASSIGN_IF_CHANGED_AND_NONEMPTY(displayModes);
+
+    if (!that.appList.isEmpty()) {
+        // updateAppList() handles merging client-side attributes
+        updateAppList(that.appList);
+    }
+
     return changed;
 }

app/backend/nvcomputer.h

@@ -16,6 +16,8 @@ class NvComputer
 private:
     void sortAppList();
 
+    bool updateAppList(QVector<NvApp> newAppList);
+
     bool pendingQuit;
 
 public:
@@ -29,11 +31,14 @@ public:
     bool
     wake();
 
+    bool
+    isReachableOverVpn();
+
     QVector<QString>
-    uniqueAddresses();
+    uniqueAddresses() const;
 
     void
-    serialize(QSettings& settings);
+    serialize(QSettings& settings) const;
 
     enum PairState
     {
@@ -64,13 +69,15 @@ public:
     // Persisted traits
     QString localAddress;
     QString remoteAddress;
+    QString ipv6Address;
     QString manualAddress;
     QByteArray macAddress;
     QString name;
+    bool hasCustomName;
     QString uuid;
     QSslCertificate serverCert;
     QVector<NvApp> appList;
 
     // Synchronization
-    QReadWriteLock lock;
+    mutable QReadWriteLock lock;
 };

app/backend/nvhttp.cpp

@@ -12,24 +12,22 @@
 #include <QtEndian>
 #include <QNetworkProxy>
 
+#define FAST_FAIL_TIMEOUT_MS 2000
 #define REQUEST_TIMEOUT_MS 5000
 #define LAUNCH_TIMEOUT_MS 120000
 #define RESUME_TIMEOUT_MS 30000
 #define QUIT_TIMEOUT_MS 30000
 
 NvHTTP::NvHTTP(QString address, QSslCertificate serverCert) :
-    m_Address(address),
     m_ServerCert(serverCert)
 {
-    Q_ASSERT(!address.isEmpty());
-
     m_BaseUrlHttp.setScheme("http");
     m_BaseUrlHttps.setScheme("https");
-    m_BaseUrlHttp.setHost(address);
-    m_BaseUrlHttps.setHost(address);
     m_BaseUrlHttp.setPort(47989);
     m_BaseUrlHttps.setPort(47984);
 
+    setAddress(address);
+
     // Never use a proxy server
     QNetworkProxy noProxy(QNetworkProxy::NoProxy);
     m_Nam.setProxy(noProxy);
@@ -42,6 +40,21 @@ void NvHTTP::setServerCert(QSslCertificate serverCert)
     m_ServerCert = serverCert;
 }
 
+void NvHTTP::setAddress(QString address)
+{
+    Q_ASSERT(!address.isEmpty());
+
+    m_Address = address;
+
+    m_BaseUrlHttp.setHost(address);
+    m_BaseUrlHttps.setHost(address);
+}
+
+QString NvHTTP::address()
+{
+    return m_Address;
+}
+
 QVector<int>
 NvHTTP::parseQuad(QString quad)
 {
@@ -80,7 +93,7 @@ NvHTTP::getCurrentGame(QString serverInfo)
 }
 
 QString
-NvHTTP::getServerInfo(NvLogLevel logLevel)
+NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
 {
     QString serverInfo;
 
@@ -94,7 +107,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel)
             serverInfo = openConnectionToString(m_BaseUrlHttps,
                                                 "serverinfo",
                                                 nullptr,
-                                                REQUEST_TIMEOUT_MS,
+                                                fastFail ? FAST_FAIL_TIMEOUT_MS : REQUEST_TIMEOUT_MS,
                                                 logLevel);
             // Throws if the request failed
             verifyResponseStatus(serverInfo);
@@ -107,7 +120,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel)
                 serverInfo = openConnectionToString(m_BaseUrlHttp,
                                                     "serverinfo",
                                                     nullptr,
-                                                    REQUEST_TIMEOUT_MS,
+                                                    fastFail ? FAST_FAIL_TIMEOUT_MS : REQUEST_TIMEOUT_MS,
                                                     logLevel);
                 verifyResponseStatus(serverInfo);
             }
@@ -124,7 +137,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel)
         serverInfo = openConnectionToString(m_BaseUrlHttp,
                                             "serverinfo",
                                             nullptr,
-                                            REQUEST_TIMEOUT_MS,
+                                            fastFail ? FAST_FAIL_TIMEOUT_MS : REQUEST_TIMEOUT_MS,
                                             logLevel);
         verifyResponseStatus(serverInfo);
     }
@@ -132,30 +145,6 @@ NvHTTP::getServerInfo(NvLogLevel logLevel)
     return serverInfo;
 }
 
-static QString
-getSurroundAudioInfoString(int audioConfig)
-{
-    int channelMask;
-    int channelCount;
-
-    switch (audioConfig)
-    {
-    case AUDIO_CONFIGURATION_STEREO:
-        channelCount = 2;
-        channelMask = 0x3;
-        break;
-    case AUDIO_CONFIGURATION_51_SURROUND:
-        channelCount = 6;
-        channelMask = 0xFC;
-        break;
-    default:
-        Q_ASSERT(false);
-        return 0;
-    }
-
-    return QString::number(channelMask << 16 | channelCount);
-}
-
 void
 NvHTTP::launchApp(int appId,
                   PSTREAM_CONFIGURATION streamConfig,
@@ -175,9 +164,10 @@ NvHTTP::launchApp(int appId,
                                    "&mode="+QString::number(streamConfig->width)+"x"+
                                    QString::number(streamConfig->height)+"x"+
                                    // Using an FPS value over 60 causes SOPS to default to 720p60,
-                                   // so force it to 60 when starting. This won't impact our ability
-                                   // to get > 60 FPS while actually streaming though.
-                                   QString::number(streamConfig->fps > 60 ? 60 : streamConfig->fps)+
+                                   // so force it to 0 to ensure the correct resolution is set. We
+                                   // used to use 60 here but that locked the frame rate to 60 FPS
+                                   // on GFE 3.20.3.
+                                   QString::number(streamConfig->fps > 60 ? 0 : streamConfig->fps)+
                                    "&additionalStates=1&sops="+QString::number(sops ? 1 : 0)+
                                    "&rikey="+QByteArray(streamConfig->remoteInputAesKey, sizeof(streamConfig->remoteInputAesKey)).toHex()+
                                    "&rikeyid="+QString::number(riKeyId)+
@@ -185,7 +175,7 @@ NvHTTP::launchApp(int appId,
                                        "&hdrMode=1&clientHdrCapVersion=0&clientHdrCapSupportedFlagsInUint32=0&clientHdrCapMetaDataId=NV_STATIC_METADATA_TYPE_1&clientHdrCapDisplayData=0x0x0x0x0x0x0x0x0x0x0" :
                                         "")+
                                    "&localAudioPlayMode="+QString::number(localAudio ? 1 : 0)+
-                                   "&surroundAudioInfo="+getSurroundAudioInfoString(streamConfig->audioConfiguration)+
+                                   "&surroundAudioInfo="+QString::number(SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION(streamConfig->audioConfiguration))+
                                    "&remoteControllersBitmap="+QString::number(gamepadMask)+
                                    "&gcmap="+QString::number(gamepadMask),
                                    LAUNCH_TIMEOUT_MS);
@@ -207,7 +197,7 @@ NvHTTP::resumeApp(PSTREAM_CONFIGURATION streamConfig)
                                    "resume",
                                    "rikey="+QString(QByteArray(streamConfig->remoteInputAesKey, sizeof(streamConfig->remoteInputAesKey)).toHex())+
                                    "&rikeyid="+QString::number(riKeyId)+
-                                   "&surroundAudioInfo="+getSurroundAudioInfoString(streamConfig->audioConfiguration),
+                                   "&surroundAudioInfo="+QString::number(SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION(streamConfig->audioConfiguration)),
                                    RESUME_TIMEOUT_MS);
 
     // Throws if the request failed
@@ -244,16 +234,16 @@ NvHTTP::getDisplayModeList(QString serverInfo)
     while (!xmlReader.atEnd()) {
         while (xmlReader.readNextStartElement()) {
             QStringRef name = xmlReader.name();
-            if (xmlReader.name() == "DisplayMode") {
+            if (name == "DisplayMode") {
                 modes.append(NvDisplayMode());
             }
-            else if (xmlReader.name() == "Width") {
+            else if (name == "Width") {
                 modes.last().width = xmlReader.readElementText().toInt();
             }
-            else if (xmlReader.name() == "Height") {
+            else if (name == "Height") {
                 modes.last().height = xmlReader.readElementText().toInt();
             }
-            else if (xmlReader.name() == "RefreshRate") {
+            else if (name == "RefreshRate") {
                 modes.last().refreshRate = xmlReader.readElementText().toInt();
             }
         }
@@ -277,7 +267,7 @@ NvHTTP::getAppList()
     while (!xmlReader.atEnd()) {
         while (xmlReader.readNextStartElement()) {
             QStringRef name = xmlReader.name();
-            if (xmlReader.name() == "App") {
+            if (name == "App") {
                 // We must have a valid app before advancing to the next one
                 if (!apps.isEmpty() && !apps.last().isInitialized()) {
                     qWarning() << "Invalid applist XML";
@@ -286,15 +276,18 @@ NvHTTP::getAppList()
                 }
                 apps.append(NvApp());
             }
-            else if (xmlReader.name() == "AppTitle") {
+            else if (name == "AppTitle") {
                 apps.last().name = xmlReader.readElementText();
             }
-            else if (xmlReader.name() == "ID") {
+            else if (name == "ID") {
                 apps.last().id = xmlReader.readElementText().toInt();
             }
-            else if (xmlReader.name() == "IsHdrSupported") {
+            else if (name == "IsHdrSupported") {
                 apps.last().hdrSupported = xmlReader.readElementText() == "1";
             }
+            else if (name == "IsAppCollectorGame") {
+                apps.last().isAppCollectorGame = xmlReader.readElementText() == "1";
+            }
         }
     }
 
@@ -310,7 +303,10 @@ NvHTTP::verifyResponseStatus(QString xml)
     {
         if (xmlReader.name() == "root")
         {
-            int statusCode = xmlReader.attributes().value("status_code").toInt();
+            // Status code can be 0xFFFFFFFF in some rare cases on GFE 3.20.3, and
+            // QString::toInt() will fail in that case, so use QString::toUInt()
+            // and cast the result to an int instead.
+            int statusCode = (int)xmlReader.attributes().value("status_code").toUInt();
             if (statusCode == 200)
             {
                 // Successful
@@ -323,6 +319,12 @@ NvHTTP::verifyResponseStatus(QString xml)
                     // 401 is expected for unpaired PCs when we fetch serverinfo over HTTPS
                     qWarning() << "Request failed:" << statusCode << statusMessage;
                 }
+                if (statusCode == -1 && statusMessage == "Invalid") {
+                    // Special case handling an audio capture error which GFE doesn't
+                    // provide any useful status message for.
+                    statusCode = 418;
+                    statusMessage = "Missing audio capture device. Reinstalling GeForce Experience should resolve this error.";
+                }
                 throw GfeHttpResponseException(statusCode, statusMessage);
             }
         }
@@ -442,6 +444,14 @@ NvHTTP::openConnection(QUrl baseUrl,
     // Add our client certificate
     request.setSslConfiguration(IdentityManager::get()->getSslConfig());
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && QT_VERSION < QT_VERSION_CHECK(5, 15, 1) && !defined(QT_NO_BEARERMANAGEMENT)
+    // HACK: Set network accessibility to work around QTBUG-80947 (introduced in Qt 5.14.0 and fixed in Qt 5.15.1)
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
+    m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);
+    QT_WARNING_POP
+#endif
+
     QNetworkReply* reply = m_Nam.get(request);
 
     // Run the request with a timeout if requested

app/backend/nvhttp.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "identitymanager.h"
+#include "nvapp.h"
 
 #include <Limelight.h>
 
@@ -8,26 +9,6 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 
-class NvApp
-{
-public:
-    bool operator==(const NvApp& other) const
-    {
-        return id == other.id;
-    }
-
-    bool isInitialized()
-    {
-        return id != 0 && !name.isEmpty();
-    }
-
-    int id;
-    QString name;
-    bool hdrSupported;
-};
-
-Q_DECLARE_METATYPE(NvApp)
-
 class NvDisplayMode
 {
 public:
@@ -131,7 +112,7 @@ public:
     getCurrentGame(QString serverInfo);
 
     QString
-    getServerInfo(NvLogLevel logLevel);
+    getServerInfo(NvLogLevel logLevel, bool fastFail = false);
 
     static
     void
@@ -156,6 +137,10 @@ public:
 
     void setServerCert(QSslCertificate serverCert);
 
+    void setAddress(QString address);
+
+    QString address();
+
     static
     QVector<int>
     parseQuad(QString quad);

app/backend/nvpairingmanager.cpp

@@ -1,8 +1,9 @@
 #include "nvpairingmanager.h"
 #include "utils.h"
 
+#include <stdexcept>
+
 #include <openssl/bio.h>
-#include <openssl/aes.h>
 #include <openssl/rand.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
@@ -51,39 +52,63 @@ NvPairingManager::generateRandomBytes(int length)
 }
 
 QByteArray
-NvPairingManager::encrypt(QByteArray plaintext, AES_KEY* key)
+NvPairingManager::encrypt(const QByteArray& plaintext, const QByteArray& key)
 {
     QByteArray ciphertext(plaintext.size(), 0);
+    EVP_CIPHER_CTX* cipher;
+    int ciphertextLen;
 
-    for (int i = 0; i < plaintext.size(); i += 16)
-    {
-        AES_encrypt(reinterpret_cast<unsigned char*>(&plaintext.data()[i]),
-                    reinterpret_cast<unsigned char*>(&ciphertext.data()[i]),
-                    key);
-    }
+    cipher = EVP_CIPHER_CTX_new();
+    THROW_BAD_ALLOC_IF_NULL(cipher);
+
+    EVP_EncryptInit(cipher, EVP_aes_128_ecb(), reinterpret_cast<const unsigned char*>(key.data()), NULL);
+    EVP_CIPHER_CTX_set_padding(cipher, 0);
+
+    EVP_EncryptUpdate(cipher,
+                      reinterpret_cast<unsigned char*>(ciphertext.data()),
+                      &ciphertextLen,
+                      reinterpret_cast<const unsigned char*>(plaintext.data()),
+                      plaintext.length());
+    Q_ASSERT(ciphertextLen == ciphertext.length());
+
+    EVP_CIPHER_CTX_free(cipher);
 
     return ciphertext;
 }
 
 QByteArray
-NvPairingManager::decrypt(QByteArray ciphertext, AES_KEY* key)
+NvPairingManager::decrypt(const QByteArray& ciphertext, const QByteArray& key)
 {
     QByteArray plaintext(ciphertext.size(), 0);
+    EVP_CIPHER_CTX* cipher;
+    int plaintextLen;
 
-    for (int i = 0; i < plaintext.size(); i += 16)
-    {
-        AES_decrypt(reinterpret_cast<unsigned char*>(&ciphertext.data()[i]),
-                    reinterpret_cast<unsigned char*>(&plaintext.data()[i]),
-                    key);
-    }
+    cipher = EVP_CIPHER_CTX_new();
+    THROW_BAD_ALLOC_IF_NULL(cipher);
+
+    EVP_DecryptInit(cipher, EVP_aes_128_ecb(), reinterpret_cast<const unsigned char*>(key.data()), NULL);
+    EVP_CIPHER_CTX_set_padding(cipher, 0);
+
+    EVP_DecryptUpdate(cipher,
+                      reinterpret_cast<unsigned char*>(plaintext.data()),
+                      &plaintextLen,
+                      reinterpret_cast<const unsigned char*>(ciphertext.data()),
+                      ciphertext.length());
+    Q_ASSERT(plaintextLen == plaintext.length());
+
+    EVP_CIPHER_CTX_free(cipher);
 
     return plaintext;
 }
 
 QByteArray
-NvPairingManager::getSignatureFromPemCert(QByteArray certificate)
+NvPairingManager::getSignatureFromPemCert(const QByteArray& certificate)
 {
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+    BIO* bio = BIO_new_mem_buf(const_cast<char*>(certificate.data()), -1);
+#else
     BIO* bio = BIO_new_mem_buf(certificate.data(), -1);
+#endif
     THROW_BAD_ALLOC_IF_NULL(bio);
 
     X509* cert = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr);
@@ -107,9 +132,13 @@ NvPairingManager::getSignatureFromPemCert(QByteArray certificate)
 }
 
 bool
-NvPairingManager::verifySignature(QByteArray data, QByteArray signature, QByteArray serverCertificate)
+NvPairingManager::verifySignature(const QByteArray& data, const QByteArray& signature, const QByteArray& serverCertificate)
 {
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+    BIO* bio = BIO_new_mem_buf(const_cast<char*>(serverCertificate.data()), -1);
+#else
     BIO* bio = BIO_new_mem_buf(serverCertificate.data(), -1);
+#endif
     THROW_BAD_ALLOC_IF_NULL(bio);
 
     X509* cert = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr);
@@ -123,7 +152,7 @@ NvPairingManager::verifySignature(QByteArray data, QByteArray signature, QByteAr
 
     EVP_DigestVerifyInit(mdctx, nullptr, EVP_sha256(), nullptr, pubKey);
     EVP_DigestVerifyUpdate(mdctx, data.data(), data.length());
-    int result = EVP_DigestVerifyFinal(mdctx, reinterpret_cast<unsigned char*>(signature.data()), signature.length());
+    int result = EVP_DigestVerifyFinal(mdctx, reinterpret_cast<unsigned char*>(const_cast<char*>(signature.data())), signature.length());
 
     EVP_PKEY_free(pubKey);
     EVP_MD_CTX_destroy(mdctx);
@@ -133,7 +162,7 @@ NvPairingManager::verifySignature(QByteArray data, QByteArray signature, QByteAr
 }
 
 QByteArray
-NvPairingManager::signMessage(QByteArray message)
+NvPairingManager::signMessage(const QByteArray& message)
 {
     EVP_MD_CTX *ctx = EVP_MD_CTX_create();
     THROW_BAD_ALLOC_IF_NULL(ctx);
@@ -143,7 +172,7 @@ NvPairingManager::signMessage(QByteArray message)
 
     EVP_DigestInit_ex(ctx, md, NULL);
     EVP_DigestSignInit(ctx, NULL, md, NULL, m_PrivateKey);
-    EVP_DigestSignUpdate(ctx, reinterpret_cast<unsigned char*>(message.data()), message.length());
+    EVP_DigestSignUpdate(ctx, reinterpret_cast<unsigned char*>(const_cast<char*>(message.data())), message.length());
 
     size_t signatureLength = 0;
     EVP_DigestSignFinal(ctx, NULL, &signatureLength);
@@ -157,7 +186,7 @@ NvPairingManager::signMessage(QByteArray message)
 }
 
 QByteArray
-NvPairingManager::saltPin(QByteArray salt, QString pin)
+NvPairingManager::saltPin(const QByteArray& salt, QString pin)
 {
     return QByteArray().append(salt).append(pin.toLatin1());
 }
@@ -186,9 +215,8 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
     QByteArray salt = generateRandomBytes(16);
     QByteArray saltedPin = saltPin(salt, pin);
 
-    AES_KEY encKey, decKey;
-    AES_set_decrypt_key(reinterpret_cast<const unsigned char*>(QCryptographicHash::hash(saltedPin, hashAlgo).data()), 128, &decKey);
-    AES_set_encrypt_key(reinterpret_cast<const unsigned char*>(QCryptographicHash::hash(saltedPin, hashAlgo).data()), 128, &encKey);
+    QByteArray aesKey = QCryptographicHash::hash(saltedPin, hashAlgo).data();
+    aesKey.truncate(16);
 
     QString getCert = m_Http.openConnectionToString(m_Http.m_BaseUrlHttp,
                                                     "pair",
@@ -223,7 +251,7 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
     m_Http.setServerCert(serverCert);
 
     QByteArray randomChallenge = generateRandomBytes(16);
-    QByteArray encryptedChallenge = encrypt(randomChallenge, &encKey);
+    QByteArray encryptedChallenge = encrypt(randomChallenge, aesKey);
     QString challengeXml = m_Http.openConnectionToString(m_Http.m_BaseUrlHttp,
                                                          "pair",
                                                          "devicename=roth&updateState=1&clientchallenge=" +
@@ -237,7 +265,7 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
         return PairState::FAILED;
     }
 
-    QByteArray challengeResponseData = decrypt(m_Http.getXmlStringFromHex(challengeXml, "challengeresponse"), &decKey);
+    QByteArray challengeResponseData = decrypt(m_Http.getXmlStringFromHex(challengeXml, "challengeresponse"), aesKey);
     QByteArray clientSecretData = generateRandomBytes(16);
     QByteArray challengeResponse;
     QByteArray serverResponse(challengeResponseData.data(), hashLength);
@@ -256,7 +284,9 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
     challengeResponse.append(reinterpret_cast<char*>(asnSignature->data), asnSignature->length);
     challengeResponse.append(clientSecretData);
 
-    QByteArray encryptedChallengeResponseHash = encrypt(QCryptographicHash::hash(challengeResponse, hashAlgo), &encKey);
+    QByteArray paddedHash = QCryptographicHash::hash(challengeResponse, hashAlgo);
+    paddedHash.resize(32);
+    QByteArray encryptedChallengeResponseHash = encrypt(paddedHash, aesKey);
     QString respXml = m_Http.openConnectionToString(m_Http.m_BaseUrlHttp,
                                                     "pair",
                                                     "devicename=roth&updateState=1&serverchallengeresp=" +

app/backend/nvpairingmanager.h

@@ -3,7 +3,6 @@
 #include "identitymanager.h"
 #include "nvhttp.h"
 
-#include <openssl/aes.h>
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 
@@ -30,22 +29,22 @@ private:
     generateRandomBytes(int length);
 
     QByteArray
-    saltPin(QByteArray salt, QString pin);
+    saltPin(const QByteArray& salt, QString pin);
 
     QByteArray
-    encrypt(QByteArray plaintext, AES_KEY* key);
+    encrypt(const QByteArray& plaintext, const QByteArray& key);
 
     QByteArray
-    decrypt(QByteArray ciphertext, AES_KEY* key);
+    decrypt(const QByteArray& ciphertext, const QByteArray& key);
 
     QByteArray
-    getSignatureFromPemCert(QByteArray certificate);
+    getSignatureFromPemCert(const QByteArray& certificate);
 
     bool
-    verifySignature(QByteArray data, QByteArray signature, QByteArray serverCertificate);
+    verifySignature(const QByteArray& data, const QByteArray& signature, const QByteArray& serverCertificate);
 
     QByteArray
-    signMessage(QByteArray message);
+    signMessage(const QByteArray& message);
 
     NvHTTP m_Http;
     X509* m_Cert;

app/backend/richpresencemanager.cpp

@@ -0,0 +1,67 @@
+#include "richpresencemanager.h"
+
+#include <QDebug>
+
+RichPresenceManager::RichPresenceManager(StreamingPreferences& prefs, QString gameName)
+    : m_DiscordActive(false)
+{
+#ifdef HAVE_DISCORD
+    if (prefs.richPresence) {
+        DiscordEventHandlers handlers = {};
+        handlers.ready = discordReady;
+        handlers.disconnected = discordDisconnected;
+        handlers.errored = discordErrored;
+        Discord_Initialize("594668102021677159", &handlers, 0, nullptr);
+        m_DiscordActive = true;
+    }
+
+    if (m_DiscordActive) {
+        QByteArray stateStr = (QString("Streaming ") + gameName).toUtf8();
+
+        DiscordRichPresence discordPresence = {};
+        discordPresence.state = stateStr.data();
+        discordPresence.startTimestamp = time(nullptr);
+        discordPresence.largeImageKey = "icon";
+        Discord_UpdatePresence(&discordPresence);
+    }
+#else
+    Q_UNUSED(prefs)
+    Q_UNUSED(gameName)
+#endif
+}
+
+RichPresenceManager::~RichPresenceManager()
+{
+#ifdef HAVE_DISCORD
+    if (m_DiscordActive) {
+        Discord_ClearPresence();
+        Discord_Shutdown();
+    }
+#endif
+}
+
+void RichPresenceManager::runCallbacks()
+{
+#ifdef HAVE_DISCORD
+    if (m_DiscordActive) {
+        Discord_RunCallbacks();
+    }
+#endif
+}
+
+#ifdef HAVE_DISCORD
+void RichPresenceManager::discordReady(const DiscordUser* request)
+{
+    qInfo() << "Discord integration ready for user:" << request->username;
+}
+
+void RichPresenceManager::discordDisconnected(int errorCode, const char *message)
+{
+    qInfo() << "Discord integration disconnected:" << errorCode << message;
+}
+
+void RichPresenceManager::discordErrored(int errorCode, const char *message)
+{
+    qWarning() << "Discord integration error:" << errorCode << message;
+}
+#endif

app/backend/richpresencemanager.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "settings/streamingpreferences.h"
+
+#ifdef HAVE_DISCORD
+#include <discord_rpc.h>
+#endif
+
+class RichPresenceManager
+{
+public:
+    RichPresenceManager(StreamingPreferences& prefs, QString gameName);
+    ~RichPresenceManager();
+
+    void runCallbacks();
+
+private:
+#ifdef HAVE_DISCORD
+    static void discordReady(const DiscordUser* request);
+    static void discordDisconnected(int errorCode, const char* message);
+    static void discordErrored(int errorCode, const char* message);
+#endif
+
+    bool m_DiscordActive;
+};
+

app/backend/systemproperties.cpp

@@ -1,4 +1,5 @@
 #include "systemproperties.h"
+#include "utils.h"
 
 #include <QGuiApplication>
 
@@ -7,8 +8,10 @@
 
 SystemProperties::SystemProperties()
 {
-    isRunningWayland = qgetenv("XDG_SESSION_TYPE") == "wayland";
-    isRunningXWayland = qgetenv("XDG_SESSION_TYPE") == "wayland" && QGuiApplication::platformName() == "xcb";
+    versionString = QString(VERSION_STR);
+    hasWindowManager = WMUtils::isRunningWindowManager();
+    isRunningWayland = WMUtils::isRunningWayland();
+    isRunningXWayland = isRunningWayland && QGuiApplication::platformName() == "xcb";
 
 #ifdef Q_OS_WIN32
     isWow64 = QSysInfo::currentCpuArchitecture() != QSysInfo::buildCpuArchitecture();
@@ -17,11 +20,18 @@ SystemProperties::SystemProperties()
 #endif
 
 #ifndef STEAM_LINK
-    hasBrowser = true;
+    // Assume we can probably launch a browser if we're in a GUI environment
+    hasBrowser = hasWindowManager;
 #else
     hasBrowser = false;
 #endif
 
+#ifdef HAVE_DISCORD
+    hasDiscordIntegration = true;
+#else
+    hasDiscordIntegration = false;
+#endif
+
     unmappedGamepads = SdlInputHandler::getUnmappedGamepads();
 
     // Populate data that requires talking to SDL. We do it all in one shot
@@ -68,7 +78,14 @@ void SystemProperties::querySdlVideoInfo()
 
         err = SDL_GetDesktopDisplayMode(displayIndex, &desktopMode);
         if (err == 0) {
-            monitorDesktopResolutions.insert(displayIndex, QRect(0, 0, desktopMode.w, desktopMode.h));
+            if (desktopMode.w <= 8192 && desktopMode.h <= 8192) {
+                monitorDesktopResolutions.insert(displayIndex, QRect(0, 0, desktopMode.w, desktopMode.h));
+            }
+            else {
+                SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                            "Skipping resolution over 8K: %dx%d",
+                            desktopMode.w, desktopMode.h);
+            }
         }
         else {
             SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -77,7 +94,14 @@ void SystemProperties::querySdlVideoInfo()
         }
 
         if (StreamUtils::getRealDesktopMode(displayIndex, &desktopMode)) {
-            monitorNativeResolutions.insert(displayIndex, QRect(0, 0, desktopMode.w, desktopMode.h));
+            if (desktopMode.w <= 8192 && desktopMode.h <= 8192) {
+                monitorNativeResolutions.insert(displayIndex, QRect(0, 0, desktopMode.w, desktopMode.h));
+            }
+            else {
+                SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                            "Skipping resolution over 8K: %dx%d",
+                            desktopMode.w, desktopMode.h);
+            }
 
             // Start at desktop mode and work our way up
             bestMode = desktopMode;
@@ -96,20 +120,24 @@ void SystemProperties::querySdlVideoInfo()
         }
     }
 
-    SDL_Window* testWindow = SDL_CreateWindow("", 0, 0, 1280, 720, SDL_WINDOW_HIDDEN);
+    SDL_Window* testWindow = SDL_CreateWindow("", 0, 0, 1280, 720,
+                                              SDL_WINDOW_HIDDEN | StreamUtils::getPlatformWindowFlags());
     if (!testWindow) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Failed to create window for hardware decode test: %s",
-                     SDL_GetError());
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-        return;
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                    "Failed to create test window with platform flags: %s",
+                    SDL_GetError());
+
+        testWindow = SDL_CreateWindow("", 0, 0, 1280, 720, SDL_WINDOW_HIDDEN);
+        if (!testWindow) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "Failed to create window for hardware decode test: %s",
+                         SDL_GetError());
+            SDL_QuitSubSystem(SDL_INIT_VIDEO);
+            return;
+        }
     }
 
-    hasHardwareAcceleration =
-            Session::isHardwareDecodeAvailable(testWindow,
-                                               StreamingPreferences::VDS_AUTO,
-                                               VIDEO_FORMAT_H264,
-                                               1920, 1080, 60);
+    Session::getDecoderInfo(testWindow, hasHardwareAcceleration, rendererAlwaysFullScreen, maximumResolution);
 
     SDL_DestroyWindow(testWindow);
 

app/backend/systemproperties.h

@@ -11,12 +11,17 @@ public:
     SystemProperties();
 
     Q_PROPERTY(bool hasHardwareAcceleration MEMBER hasHardwareAcceleration CONSTANT)
+    Q_PROPERTY(bool rendererAlwaysFullScreen MEMBER rendererAlwaysFullScreen CONSTANT)
     Q_PROPERTY(bool isRunningWayland MEMBER isRunningWayland CONSTANT)
     Q_PROPERTY(bool isRunningXWayland MEMBER isRunningXWayland CONSTANT)
     Q_PROPERTY(bool isWow64 MEMBER isWow64 CONSTANT)
+    Q_PROPERTY(bool hasWindowManager MEMBER hasWindowManager CONSTANT)
     Q_PROPERTY(bool hasBrowser MEMBER hasBrowser CONSTANT)
+    Q_PROPERTY(bool hasDiscordIntegration MEMBER hasDiscordIntegration CONSTANT)
     Q_PROPERTY(QString unmappedGamepads MEMBER unmappedGamepads NOTIFY unmappedGamepadsChanged)
     Q_PROPERTY(int maximumStreamingFrameRate MEMBER maximumStreamingFrameRate CONSTANT)
+    Q_PROPERTY(QSize maximumResolution MEMBER maximumResolution CONSTANT)
+    Q_PROPERTY(QString versionString MEMBER versionString CONSTANT)
 
     Q_INVOKABLE QRect getDesktopResolution(int displayIndex);
     Q_INVOKABLE QRect getNativeResolution(int displayIndex);
@@ -28,13 +33,18 @@ private:
     void querySdlVideoInfo();
 
     bool hasHardwareAcceleration;
+    bool rendererAlwaysFullScreen;
     bool isRunningWayland;
     bool isRunningXWayland;
     bool isWow64;
+    bool hasWindowManager;
     bool hasBrowser;
+    bool hasDiscordIntegration;
     QString unmappedGamepads;
     int maximumStreamingFrameRate;
+    QSize maximumResolution;
     QList<QRect> monitorDesktopResolutions;
     QList<QRect> monitorNativeResolutions;
+    QString versionString;
 };
 

app/cli/commandlineparser.cpp

@@ -172,20 +172,31 @@ GlobalCommandLineParser::ParseResult GlobalCommandLineParser::parse(const QStrin
     parser.addPositionalArgument("action", "Action to execute", "<action>");
     parser.parse(args);
     auto posArgs = parser.positionalArguments();
-    QString action = posArgs.isEmpty() ? QString() : posArgs.first().toLower();
 
-    if (action == "") {
+    if (posArgs.isEmpty()) {
         // This method will not return and terminates the process if --version
         // or --help is specified
         parser.handleHelpAndVersionOptions();
         parser.handleUnknownOptions();
         return NormalStartRequested;
-    } else if (action == "quit") {
-        return QuitRequested;
-    } else if (action == "stream") {
-        return StreamRequested;
-    } else {
-        parser.showError(QString("Invalid action: %1").arg(action));
+    }
+    else {
+        // If users supply arguments that accept values prior to the "quit"
+        // or "stream" positional arguments, we will not be able to correctly
+        // parse the value out of the input because this QCommandLineParser
+        // doesn't know about all of the options that "quit" and "stream"
+        // commands can accept. To work around this issue, we just look
+        // for "quit" or "stream" positional arguments anywhere.
+        for (int i = 0; i < posArgs.size(); i++) {
+            QString action = posArgs.at(i).toLower();
+            if (action == "quit") {
+                return QuitRequested;
+            } else if (action == "stream") {
+                return StreamRequested;
+            }
+        }
+
+        parser.showError(QString("Invalid action"));
     }
 }
 
@@ -241,6 +252,7 @@ StreamCommandLineParser::StreamCommandLineParser()
     m_AudioConfigMap = {
         {"stereo",       StreamingPreferences::AC_STEREO},
         {"5.1-surround", StreamingPreferences::AC_51_SURROUND},
+        {"7.1-surround", StreamingPreferences::AC_71_SURROUND},
     };
     m_VideoCodecMap = {
         {"auto",  StreamingPreferences::VCC_AUTO},
@@ -249,8 +261,8 @@ StreamCommandLineParser::StreamCommandLineParser()
     };
     m_VideoDecoderMap = {
         {"auto",     StreamingPreferences::VDS_AUTO},
-        {"software", StreamingPreferences::VDS_FORCE_HARDWARE},
-        {"hardware", StreamingPreferences::VDS_FORCE_SOFTWARE},
+        {"software", StreamingPreferences::VDS_FORCE_SOFTWARE},
+        {"hardware", StreamingPreferences::VDS_FORCE_HARDWARE},
     };
 }
 
@@ -280,11 +292,14 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
     parser.addToggleOption("vsync", "V-Sync");
     parser.addValueOption("fps", "FPS");
     parser.addValueOption("bitrate", "bitrate in Kbps");
+    parser.addValueOption("packet-size", "video packet size");
     parser.addChoiceOption("display-mode", "display mode", m_WindowModeMap.keys());
     parser.addChoiceOption("audio-config", "audio config", m_AudioConfigMap.keys());
     parser.addToggleOption("multi-controller", "multiple controller support");
     parser.addToggleOption("quit-after", "quit app after session");
-    parser.addToggleOption("mouse-acceleration", "mouse acceleration");
+    parser.addToggleOption("absolute-mouse", "remote desktop optimized mouse control");
+    parser.addToggleOption("mouse-buttons-swap", "left and right mouse buttons swap");
+    parser.addToggleOption("touchscreen-trackpad", "touchscreen in trackpad mode");
     parser.addToggleOption("game-optimization", "game optimizations");
     parser.addToggleOption("audio-on-host", "audio on host PC");
     parser.addToggleOption("frame-pacing", "frame pacing");
@@ -345,6 +360,14 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
             preferences->width, preferences->height, preferences->fps);
     }
 
+    // Resolve --packet-size option
+    if (parser.isSet("packet-size")) {
+        preferences->packetSize = parser.getIntOption("packet-size");
+        if (preferences->packetSize < 1024) {
+            parser.showError("Packet size must be greater than 1024 bytes");
+        }
+    }
+
     // Resolve --display option
     if (parser.isSet("display-mode")) {
         preferences->windowMode = mapValue(m_WindowModeMap, parser.getChoiceOptionValue("display-mode"));
@@ -364,8 +387,14 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
     // Resolve --quit-after and --no-quit-after options
     preferences->quitAppAfter = parser.getToggleOptionValue("quit-after", preferences->quitAppAfter);
 
-    // Resolve --mouse-acceleration and --no-mouse-acceleration options
-    preferences->mouseAcceleration = parser.getToggleOptionValue("mouse-acceleration", preferences->mouseAcceleration);
+    // Resolve --absolute-mouse and --no-absolute-mouse options
+    preferences->absoluteMouseMode = parser.getToggleOptionValue("absolute-mouse", preferences->absoluteMouseMode);
+
+    // Resolve --mouse-buttons-swap and --no-mouse-buttons-swap options
+    preferences->swapMouseButtons = parser.getToggleOptionValue("mouse-buttons-swap", preferences->swapMouseButtons);
+
+    // Resolve --touchscreen-trackpad and --no-touchscreen-trackpad options
+    preferences->absoluteTouchMode = !parser.getToggleOptionValue("touchscreen-trackpad", !preferences->absoluteTouchMode);
 
     // Resolve --game-optimization and --no-game-optimization options
     preferences->gameOptimizations = parser.getToggleOptionValue("game-optimization", preferences->gameOptimizations);

app/deploy/linux/com.moonlight_stream.Moonlight.appdata.xml

@@ -7,13 +7,15 @@
 	<summary>Play games remotely from your NVIDIA GameStream-enabled PC</summary>
 
 	<description>
-		<p>Moonlight can stream games and other applications from a PC with an NVIDIA GeForce GTX 600-series or higher GPU and GeForce Experience installed.</p>
+		<p>Moonlight can stream games and other applications from a PC with an NVIDIA GeForce GTX/RTX or NVIDIA Quadro GPU and GeForce/Quadro Experience installed.</p>
 		<p>Features include:</p>
 		<ul>
 			<li>Streaming at up to 4K resolution</li>
 			<li>Support for up to 120 FPS streaming (high refresh rate monitor recommended)</li>
-			<li>Hardware accelerated video decoding with VAAPI and VDPAU support</li>
-			<li>5.1 surround sound audio support</li>
+			<li>Hardware accelerated video decoding with VAAPI, VDPAU, and NVDEC support</li>
+			<li>7.1 surround sound audio support</li>
+			<li>Support for both pointer capture (for games) and direct mouse control (for remote desktop)</li>
+			<li>Direct touchscreen mouse control</li>
 			<li>HEVC support for better video compression efficiency</li>
 			<li>Gamepad support with force feedback for up to 4 players</li>
 		</ul>
@@ -33,6 +35,122 @@
 	</screenshots>
 
 	<releases>
+		<release version="2.2.0" date="2020-09-10">
+			<description>
+				<p>New features:</p>
+				<ul>
+					<li>Added the ability to hide unwanted apps and games</li>
+					<li>Added a network test to determine if your Internet connection is blocking Moonlight</li>
+					<li>Added the option to swap mouse buttons</li>
+					<li>Added codec and resolution to the on-screen performance stats</li>
+					<li>Added a warning if the connection is too unstable to receive any complete video frames</li>
+					<li>Added a Discord link to the toolbar in settings</li>
+					<li>Enabled the new EGL renderer by default on Linux</li>
+				</ul>
+				<p>Bugfixes:</p>
+				<ul>
+					<li>Fixed streaming over networks that block QoS-tagged packets</li>
+					<li>Selecting a frame rate higher than 60 FPS no longer sets the host desktop to 720p</li>
+					<li>Right-side modifier keys no longer press the corresponding left-side keys too</li>
+					<li>Fixed mouse position never reaching the edge of the screen with certain desktop resolutions</li>
+					<li>Improved synchronization between host and client mouse cursor in remote desktop mouse mode</li>
+					<li>Cached box art is now deleted when the PC is removed from Moonlight</li>
+					<li>Fixed several CLI options not properly overriding GUI options</li>
+					<li>Updated included gamepad mappings</li>
+					<li>Updated to Qt 5.15.1</li>
+				</ul>
+			</description>
+		</release>
+		<release version="2.1.0" date="2020-05-17">
+			<description>
+				<p>New features:</p>
+				<ul>
+					<li>Remote desktop mode now allows interaction with the host without having to click to focus the Moonlight window first</li>
+					<li>Added a new EGL renderer for improved performance on Wayland and XWayland</li>
+					<li>Added the option to toggle between direct touchscreen mode and the old trackpad mode</li>
+					<li>Added the option to rename host PCs</li>
+					<li>Added the ability to scroll the settings page with the right analog stick</li>
+					<li>Various UI improvements</li>
+				</ul>
+				<p>Bugfixes:</p>
+				<ul>
+					<li>Fixed unreliable mouse capture when the stream begins</li>
+					<li>Fixed cursor being trapped in full-screen mode even when the mouse wasn't captured</li>
+					<li>Fixed key presses not being sent to the host if the Super/Meta/Windows key is pressed</li>
+					<li>Updated included gamepad mappings</li>
+				</ul>
+			</description>
+		</release>
+		<release version="2.0.0" date="2020-04-28">
+			<description>
+				<p>New features:</p>
+				<ul>
+					<li>Remote desktop-optimized mouse mode which doesn't require capturing the mouse cursor</li>
+					<li>Touchscreen input now directly controls the mouse cursor</li>
+					<li>7.1 surround sound support</li>
+				</ul>
+				<p>Bugfixes:</p>
+				<ul>
+					<li>Improved performance on some lossy networks</li>
+					<li>Fixed disconnect delay when streaming from GeForce Experience 3.20.3.63</li>
+					<li>Fixed frame rate not exceeding 60 when streaming from GeForce Experience 3.20.3.63</li>
+					<li>Fixed parsing of command-line options when passing flags prior to the action</li>
+					<li>Fixed an issue that may cause excessive mDNS network traffic while Moonlight is running</li>
+					<li>Fixed hardware decoding on Intel GPUs running Mesa 20.0 and/or the Iris driver</li>
+					<li>Fixed hardware decoding on Comet Lake and later Intel GPUs using the iHD VA-API driver</li>
+					<li>Fixed hardware decoding on AMD Radeon GPUs with XWayland</li>
+					<li>Fixed a crash when using the iHD VA-API driver on Wayland</li>
+					<li>Fixed delay after exiting the stream on Wayland</li>
+					<li>Updated included gamepad mappings</li>
+				</ul>
+			</description>
+		</release>
+		<release version="1.2.0" date="2019-12-17">
+			<description>
+				<p>Bugfixes:</p>
+				<ul>
+					<li>Improved video encoding efficiency</li>
+					<li>Improved performance when streaming over a VPN</li>
+					<li>Fixed RTSP handshake error on certain networks</li>
+					<li>Fixed rumble not working on certain gamepads</li>
+					<li>Fixed pairing error when double-clicking on an unpaired PC</li>
+					<li>Updated included SDL gamepad mappings</li>
+				</ul>
+			</description>
+		</release>
+		<release version="1.1.1" date="2019-09-29">
+			<description>
+				<p>Bugfixes:</p>
+				<ul>
+					<li>Improved reliability of public IP address detection</li>
+					<li>Fixed connecting to a host PC with multiple network connections</li>
+					<li>Fixed a hang after exiting a full-screen stream with GNOME on Wayland</li>
+					<li>Fixed gamepad hotplugging</li>
+					<li>Updated to SDL 2.0.10</li>
+					<li>Updated to Qt 5.13.1</li>
+				</ul>
+			</description>
+		</release>
+		<release version="1.1.0" date="2019-08-05">
+			<description>
+				<p>New features:</p>
+				<ul>
+					<li>Added support for NVDEC for NVIDIA GPUs on Wayland</li>
+					<li>Added an option to disable gamepad mouse mode for games that require holding the Start button</li>
+					<li>Added automatic detection of IPv6 addresses for Internet streaming over IPv6 networks</li>
+				</ul>
+				<p>Bugfixes:</p>
+				<ul>
+					<li>Improved speed and reliability of automatic PC detection on the local network</li>
+					<li>Fixed audio latency increasing under certain network conditions</li>
+					<li>Fixed 5.1 surround sound sometimes causing no audio to play when streaming over the Internet</li>
+					<li>Fixed graceful termination of games not being detected properly on GFE 3.19</li>
+					<li>Fixed several audio issues on Linux by switching back to SDL for audio</li>
+					<li>Changed client certificate signature algorithm from SHA-1 to SHA-256 for Debian Buster compatibility</li>
+					<li>Updated included gamepad mappings</li>
+				</ul>
+			</description>
+		</release>
 		<release version="1.0.1" date="2019-05-27">
 			<description>
 				<p>Bugfixes:</p>

app/deploy/steamlink/moonlight.sh

@@ -5,9 +5,19 @@
 # pairing data will be lost each reboot.
 HOME=/usr/local/moonlight
 
+# For a seamless transition across the Qt 5.9 -> Qt 5.14 boundary,
+# we bundle binaries built with both Qt 5.9 and Qt 5.14 and pick
+# the correct one at runtime.
+if [ -d "/usr/local/Qt-5.14.1" ]; then
+    BIN="moonlight"
+else
+    BIN="moonlight59"
+fi
+
 # Renice PE_Single_CPU which seems to host A/V stuff
 renice -10 -p $(pidof PE_Single_CPU)
 
 # Renice Moonlight itself to avoid preemption by background tasks
 # Write output to a logfile in /tmp
-exec nice -n -10 ./bin/moonlight > /tmp/moonlight.log
+echo Launching $BIN
+exec nice -n -10 ./bin/$BIN > /tmp/moonlight.log

app/gui/AppView.qml

@@ -9,6 +9,7 @@ CenteredGridView {
     property int computerIndex
     property AppModel appModel : createModel()
     property bool activated
+    property bool showHiddenGames
 
     id: appGrid
     focus: true
@@ -48,7 +49,7 @@ CenteredGridView {
     function createModel()
     {
         var model = Qt.createQmlObject('import AppModel 1.0; AppModel {}', parent, '')
-        model.initialize(ComputerManager, computerIndex)
+        model.initialize(ComputerManager, computerIndex, showHiddenGames)
         return model
     }
 
@@ -58,6 +59,9 @@ CenteredGridView {
         width: 220; height: 287;
         grid: appGrid
 
+        // Dim the app if it's hidden
+        opacity: model.hidden ? 0.4 : 1.0
+
         Image {
             property bool isPlaceholder: false
 
@@ -151,6 +155,8 @@ CenteredGridView {
             text: model.name
             width: appIcon.width
             height: model.running ? 175 : appIcon.height
+            leftPadding: 20
+            rightPadding: 20
             anchors.left: appIcon.left
             anchors.right: appIcon.right
             anchors.bottom: appIcon.bottom
@@ -163,8 +169,8 @@ CenteredGridView {
 
         function launchOrResumeSelectedApp()
         {
-            var runningIndex = appModel.getRunningAppIndex()
-            if (runningIndex >= 0 && runningIndex !== index) {
+            var runningId = appModel.getRunningAppId()
+            if (runningId !== 0 && runningId !== model.appid) {
                 quitAppDialog.appName = appModel.getRunningAppName()
                 quitAppDialog.segueToStream = true
                 quitAppDialog.nextAppName = model.name
@@ -188,6 +194,25 @@ CenteredGridView {
             }
         }
 
+        onPressAndHold: {
+            // popup() ensures the menu appears under the mouse cursor
+            if (appContextMenu.popup) {
+                appContextMenu.popup()
+            }
+            else {
+                // Qt 5.9 doesn't have popup()
+                appContextMenu.open()
+            }
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.RightButton;
+            onClicked: {
+                parent.onPressAndHold()
+            }
+        }
+
         Keys.onReturnPressed: {
             // Open the app context menu if activated via the gamepad or keyboard
             // for running games. If the game isn't running, the above onClicked
@@ -226,6 +251,14 @@ CenteredGridView {
                 onTriggered: doQuitGame()
                 visible: model.running
             }
+            NavigableMenuItem {
+                parentMenu: appContextMenu
+                checkable: true
+                checked: model.hidden
+                text: "Hide Game"
+                onTriggered: appModel.setAppHidden(model.index, !model.hidden)
+                visible: !model.running || model.hidden
+            }
         }
     }
 
@@ -261,18 +294,5 @@ CenteredGridView {
         onAccepted: quitApp()
     }
 
-    ScrollBar.vertical: ScrollBar {
-        // Manually hide the scrollbar to prevent it from being drawn on top
-        // of the StreamSegue during the transition. It can sometimes get stuck
-        // there since we're not consistently pumping the event loop while
-        // starting the stream.
-        visible: activated
-
-        parent: appGrid.parent
-        anchors {
-            top: parent.top
-            right: parent.right
-            bottom: parent.bottom
-        }
-    }
+    ScrollBar.vertical: ScrollBar {}
 }

app/gui/AutoResizingComboBox.qml

@@ -6,8 +6,10 @@ import SdlGamepadKeyNavigation 1.0
 // https://stackoverflow.com/questions/45029968/how-do-i-set-the-combobox-width-to-fit-the-largest-item
 ComboBox {
     property int textWidth
+    property int desiredWidth : leftPadding + textWidth + indicator.width + rightPadding
+    property int maximumWidth : parent.width
 
-    implicitWidth: leftPadding + textWidth + indicator.width + rightPadding
+    implicitWidth: desiredWidth < maximumWidth ? desiredWidth : maximumWidth
 
     TextMetrics {
         id: popupMetrics

app/gui/CenteredGridView.qml

@@ -38,4 +38,6 @@ GridView {
 
         updateMargins()
     }
+
+    boundsBehavior: Flickable.OvershootBounds
 }

app/gui/CliStartStreamSegue.qml

@@ -2,6 +2,7 @@ import QtQuick 2.0
 import QtQuick.Controls 2.2
 
 import ComputerManager 1.0
+import SdlGamepadKeyNavigation 1.0
 
 Item {
     function onSearchingComputer() {
@@ -35,6 +36,11 @@ Item {
     StackView.onActivated: {
         if (!launcher.isExecuted()) {
             toolBar.visible = false
+
+            // Normally this is enabled by PcView, but we will won't
+            // load PcView when streaming from the command-line.
+            SdlGamepadKeyNavigation.enable()
+
             launcher.searchingComputer.connect(onSearchingComputer)
             launcher.searchingApp.connect(onSearchingApp)
             launcher.sessionCreated.connect(onSessionCreated)

app/gui/NavigableMessageDialog.qml

@@ -6,6 +6,8 @@ NavigableDialog {
     id: dialog
 
     property alias text: dialogLabel.dialogText
+    property alias showSpinner: dialogSpinner.visible
+    property alias imageSrc: dialogImage.source
 
     property string helpText
     property string helpUrl : "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting"
@@ -19,7 +21,13 @@ NavigableDialog {
     RowLayout {
         spacing: 10
 
+        BusyIndicator {
+            id: dialogSpinner
+            visible: false
+        }
+
         Image {
+            id: dialogImage
             source: (standardButtons & Dialog.Yes) ?
                         "qrc:/res/baseline-help_outline-24px.svg" :
                         "qrc:/res/baseline-error_outline-24px.svg"
@@ -28,6 +36,7 @@ NavigableDialog {
                 width: 50
                 height: 50
             }
+            visible: !showSpinner
         }
 
         Label {

app/gui/PcView.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.3
 
 import ComputerModel 1.0
 
@@ -25,6 +26,9 @@ CenteredGridView {
         currentIndex = -1
     }
 
+    // Note: Any initialization done here that is critical for streaming must
+    // also be done in CliStartStreamSegue.qml, since this code does not run
+    // for command-line initiated streams.
     StackView.onActivated: {
         // Setup signals on CM
         ComputerManager.computerAddCompleted.connect(addComplete)
@@ -57,11 +61,18 @@ CenteredGridView {
         }
     }
 
-    function addComplete(success)
+    function addComplete(success, detectedPortBlocking)
     {
         if (!success) {
             errorDialog.text = "Unable to connect to the specified PC."
-            errorDialog.helpText = "Click the Help button for possible solutions."
+
+            if (detectedPortBlocking) {
+                errorDialog.text += "\n\nThis PC's Internet connection is blocking Moonlight. Streaming over the Internet may not work while connected to this network."
+            }
+            else {
+                errorDialog.helpText = "Click the Help button for possible solutions."
+            }
+
             errorDialog.open()
         }
     }
@@ -71,6 +82,7 @@ CenteredGridView {
         var model = Qt.createQmlObject('import ComputerModel 1.0; ComputerModel {}', parent, '')
         model.initialize(ComputerManager)
         model.pairingCompleted.connect(pairingComplete)
+        model.connectionTestCompleted.connect(testConnectionDialog.connectionTestComplete)
         return model
     }
 
@@ -104,7 +116,7 @@ CenteredGridView {
         Image {
             id: pcIcon
             anchors.horizontalCenter: parent.horizontalCenter
-            source: "qrc:/res/ic_tv_white_48px.svg"
+            source: "qrc:/res/desktop_windows-48px.svg"
             sourceSize {
                 width: 200
                 height: 200
@@ -116,7 +128,7 @@ CenteredGridView {
             id: stateIcon
             anchors.horizontalCenter: pcIcon.horizontalCenter
             anchors.verticalCenter: pcIcon.verticalCenter
-            anchors.verticalCenterOffset: -10
+            anchors.verticalCenterOffset: -15
             visible: !model.statusUnknown && (!model.online || !model.paired)
             source: !model.online ? "qrc:/res/baseline-warning-24px.svg" : "qrc:/res/baseline-lock-24px.svg"
             sourceSize {
@@ -129,7 +141,7 @@ CenteredGridView {
             id: statusUnknownSpinner
             anchors.horizontalCenter: pcIcon.horizontalCenter
             anchors.verticalCenter: pcIcon.verticalCenter
-            anchors.verticalCenterOffset: -10
+            anchors.verticalCenterOffset: -15
             width: 75
             height: 75
             visible: model.statusUnknown
@@ -152,12 +164,23 @@ CenteredGridView {
             id: pcContextMenu
             NavigableMenuItem {
                 parentMenu: pcContextMenu
-                text: "Delete PC"
+                text: "View Apps"
                 onTriggered: {
-                    deletePcDialog.pcIndex = index
-                    // get confirmation first, actual closing is called from the dialog
-                    deletePcDialog.open()
+                    var component = Qt.createComponent("AppView.qml")
+                    var appView = component.createObject(stackView, {"computerIndex": index, "objectName": model.name})
+                    stackView.push(appView)
                 }
+                visible: model.online && model.paired
+            }
+            NavigableMenuItem {
+                parentMenu: pcContextMenu
+                text: "View Hidden Apps"
+                onTriggered: {
+                    var component = Qt.createComponent("AppView.qml")
+                    var appView = component.createObject(stackView, {"computerIndex": index, "objectName": model.name, "showHiddenGames": true})
+                    stackView.push(appView)
+                }
+                visible: model.online && model.paired
             }
             NavigableMenuItem {
                 parentMenu: pcContextMenu
@@ -165,6 +188,33 @@ CenteredGridView {
                 onTriggered: computerModel.wakeComputer(index)
                 visible: !model.online && model.wakeable
             }
+            NavigableMenuItem {
+                parentMenu: pcContextMenu
+                text: "Test Network"
+                onTriggered: {
+                    computerModel.testConnectionForComputer(index)
+                    testConnectionDialog.open()
+                }
+            }
+
+            NavigableMenuItem {
+                parentMenu: pcContextMenu
+                text: "Rename PC"
+                onTriggered: {
+                    renamePcDialog.pcIndex = index
+                    renamePcDialog.originalName = model.name
+                    renamePcDialog.open()
+                }
+            }
+            NavigableMenuItem {
+                parentMenu: pcContextMenu
+                text: "Delete PC"
+                onTriggered: {
+                    deletePcDialog.pcIndex = index
+                    // get confirmation first, actual closing is called from the dialog
+                    deletePcDialog.open()
+                }
+            }
         }
 
         onClicked: {
@@ -177,7 +227,7 @@ CenteredGridView {
                 }
                 else {
                     if (!model.busy) {
-                        var pin = ("0000" + Math.floor(Math.random() * 10000)).slice(-4)
+                        var pin = computerModel.generatePinString()
 
                         // Kick off pairing in the background
                         computerModel.pairComputer(index, pin)
@@ -235,6 +285,12 @@ CenteredGridView {
 
     NavigableMessageDialog {
         id: pairDialog
+
+        // Pairing dialog must be modal to prevent double-clicks from triggering
+        // pairing twice
+        modal: true
+        closePolicy: Popup.CloseOnEscape
+
         // don't allow edits to the rest of the window while open
         property string pin : "0000"
         text:"Please enter " + pin + " on your GameStream PC. This dialog will close when pairing is completed."
@@ -259,12 +315,78 @@ CenteredGridView {
         onAccepted: deletePc()
     }
 
-    ScrollBar.vertical: ScrollBar {
-        parent: pcGrid.parent
-        anchors {
-            top: parent.top
-            right: parent.right
-            bottom: parent.bottom
+    NavigableMessageDialog {
+        id: testConnectionDialog
+        closePolicy: Popup.CloseOnEscape
+        standardButtons: Dialog.Ok
+
+        onAboutToShow: {
+            testConnectionDialog.text = "Moonlight is testing your network connection to determine if NVIDIA GameStream is blocked.\n\nThis may take a few seconds…"
+            showSpinner = true
+        }
+
+        function connectionTestComplete(result, blockedPorts)
+        {
+            if (result === -1) {
+                text = "The network test could not be performed because none of Moonlight's connection testing servers were reachable from this PC. Check your Internet connection or try again later."
+                imageSrc = "qrc:/res/baseline-warning-24px.svg"
+            }
+            else if (result === 0) {
+                text = "This network does not appear to be blocking Moonlight. If you still have trouble connecting, check your PC's firewall settings.\n\nIf you are trying to stream over the Internet, install the Moonlight Internet Hosting Tool on your gaming PC and run the included Internet Streaming Tester to check your gaming PC's Internet connection."
+                imageSrc = "qrc:/res/baseline-check_circle_outline-24px.svg"
+            }
+            else {
+                text = "Your PC's current network connection seems to be blocking Moonlight. Streaming over the Internet may not work while connected to this network.\n\nThe following network ports were blocked:\n"
+                text += blockedPorts
+                imageSrc = "qrc:/res/baseline-error_outline-24px.svg"
+            }
+
+            // Stop showing the spinner and show the image instead
+            showSpinner = false
         }
     }
+
+    NavigableDialog {
+        id: renamePcDialog
+        property string label: "Enter the new name for this PC:"
+        property string originalName
+        property int pcIndex : -1;
+
+        standardButtons: Dialog.Ok | Dialog.Cancel
+
+        onOpened: {
+            // Force keyboard focus on the textbox so keyboard navigation works
+            editText.forceActiveFocus()
+        }
+
+        onClosed: {
+            editText.clear()
+        }
+
+        onAccepted: {
+            if (editText.text) {
+                computerModel.renameComputer(pcIndex, editText.text)
+            }
+        }
+
+        ColumnLayout {
+            Label {
+                text: renamePcDialog.label
+                font.bold: true
+            }
+
+            TextField {
+                id: editText
+                placeholderText: renamePcDialog.originalName
+                Layout.fillWidth: true
+                focus: true
+
+                Keys.onReturnPressed: {
+                    renamePcDialog.accept()
+                }
+            }
+        }
+    }
+
+    ScrollBar.vertical: ScrollBar {}
 }

app/gui/SettingsView.qml

@@ -10,16 +10,14 @@ Flickable {
     id: settingsPage
     objectName: "Settings"
 
+    boundsBehavior: Flickable.OvershootBounds
+
     contentWidth: settingsColumn1.width > settingsColumn2.width ? settingsColumn1.width : settingsColumn2.width
     contentHeight: settingsColumn1.height > settingsColumn2.height ? settingsColumn1.height : settingsColumn2.height
 
     ScrollBar.vertical: ScrollBar {
-        parent: settingsPage.parent
         anchors {
-            top: settingsPage.top
-            left: settingsPage.right
-            bottom: settingsPage.bottom
-
+            left: parent.right
             leftMargin: -10
         }
     }
@@ -45,11 +43,12 @@ Flickable {
     Column {
         padding: 10
         id: settingsColumn1
-        width: settingsPage.width / 2 - padding
+        width: settingsPage.width / 2
+        spacing: 15
 
         GroupBox {
             id: basicSettingsGroupBox
-            width: (parent.width - 2 * parent.padding)
+            width: (parent.width - (parent.leftPadding + parent.rightPadding))
             padding: 12
             title: "<font color=\"skyblue\">Basic Settings</font>"
             font.pointSize: 12
@@ -76,6 +75,7 @@ Flickable {
 
                 Row {
                     spacing: 5
+                    width: parent.width
 
                     AutoResizingComboBox {
                         // ignore setting the index at first, and actually set it when the component is loaded
@@ -88,7 +88,7 @@ Flickable {
 
                                     // Some platforms have different desktop resolutions
                                     // and native resolutions (like macOS with Retina displays)
-                                    if (displayResIndex == 0) {
+                                    if (displayResIndex === 0) {
                                         screenRect = SystemProperties.getDesktopResolution(displayIndex)
                                     }
                                     else {
@@ -129,6 +129,20 @@ Flickable {
                                 }
                             }
 
+                            // Prune resolutions that are over the decoder's maximum
+                            var max_pixels = SystemProperties.maximumResolution.width * SystemProperties.maximumResolution.height;
+                            if (max_pixels > 0) {
+                                for (var j = 0; j < resolutionComboBox.count; j++) {
+                                    var existing_width = parseInt(resolutionListModel.get(j).video_width);
+                                    var existing_height = parseInt(resolutionListModel.get(j).video_height);
+
+                                    if (existing_width * existing_height > max_pixels) {
+                                        resolutionListModel.remove(j)
+                                        j--
+                                    }
+                                }
+                            }
+
                             // load the saved width/height, and iterate through the ComboBox until a match is found
                             // and set it to that index.
                             var saved_width = StreamingPreferences.width
@@ -149,6 +163,7 @@ Flickable {
                         }
 
                         id: resolutionComboBox
+                        maximumWidth: parent.width / 2
                         textRole: "text"
                         model: ListModel {
                             id: resolutionListModel
@@ -265,6 +280,7 @@ Flickable {
                         }
 
                         id: fpsComboBox
+                        maximumWidth: parent.width / 2
                         textRole: "text"
                         // ::onActivated must be used, as it only listens for when the index is changed by a human
                         onActivated : {
@@ -328,25 +344,40 @@ Flickable {
                 AutoResizingComboBox {
                     // ignore setting the index at first, and actually set it when the component is loaded
                     Component.onCompleted: {
-                        var savedWm = StreamingPreferences.windowMode
-                        currentIndex = 0
+                        // Set the recommended option based on the OS
                         for (var i = 0; i < windowModeListModel.count; i++) {
                              var thisWm = windowModeListModel.get(i).val;
-                             if (savedWm === thisWm) {
-                                 currentIndex = i
+                             if (thisWm === StreamingPreferences.recommendedFullScreenMode) {
+                                 windowModeListModel.get(i).text += " (Recommended)"
+                                 windowModeListModel.move(i, 0, 1);
                                  break
                              }
                         }
+
+                        currentIndex = 0
+
+                        if (SystemProperties.hasWindowManager && !SystemProperties.rendererAlwaysFullScreen) {
+                            var savedWm = StreamingPreferences.windowMode
+                            for (var i = 0; i < windowModeListModel.count; i++) {
+                                 var thisWm = windowModeListModel.get(i).val;
+                                 if (savedWm === thisWm) {
+                                     currentIndex = i
+                                     break
+                                 }
+                            }
+                        }
+
                         activated(currentIndex)
                     }
 
                     id: windowModeComboBox
+                    enabled: SystemProperties.hasWindowManager && !SystemProperties.rendererAlwaysFullScreen
                     hoverEnabled: true
                     textRole: "text"
                     model: ListModel {
                         id: windowModeListModel
                         ListElement {
-                            text: "Full-screen (Recommended)"
+                            text: "Full-screen"
                             val: StreamingPreferences.WM_FULLSCREEN
                         }
                         ListElement {
@@ -370,6 +401,7 @@ Flickable {
 
                 CheckBox {
                     id: vsyncCheck
+                    width: parent.width
                     hoverEnabled: true
                     text: "V-Sync"
                     font.pointSize:  12
@@ -386,6 +418,7 @@ Flickable {
 
                 CheckBox {
                     id: framePacingCheck
+                    width: parent.width
                     hoverEnabled: true
                     text: "Frame pacing"
                     font.pointSize:  12
@@ -405,7 +438,7 @@ Flickable {
         GroupBox {
 
             id: audioSettingsGroupBox
-            width: (parent.width - 2 * parent.padding)
+            width: (parent.width - (parent.leftPadding + parent.rightPadding))
             padding: 12
             title: "<font color=\"skyblue\">Audio Settings</font>"
             font.pointSize: 12
@@ -449,6 +482,10 @@ Flickable {
                             text: "5.1 surround sound"
                             val: StreamingPreferences.AC_51_SURROUND
                         }
+                        ListElement {
+                            text: "7.1 surround sound"
+                            val: StreamingPreferences.AC_71_SURROUND
+                        }
                     }
                     // ::onActivated must be used, as it only listens for when the index is changed by a human
                     onActivated : {
@@ -461,7 +498,7 @@ Flickable {
 
         GroupBox {
             id: uiSettingsGroupBox
-            width: (parent.width - 2 * parent.padding)
+            width: (parent.width - (parent.leftPadding + parent.rightPadding))
             padding: 12
             title: "<font color=\"skyblue\">UI Settings</font>"
             font.pointSize: 12
@@ -472,9 +509,11 @@ Flickable {
 
                 CheckBox {
                     id: startMaximizedCheck
+                    width: parent.width
                     text: "Maximize Moonlight window on startup"
                     font.pointSize: 12
-                    checked: !StreamingPreferences.startWindowed
+                    enabled: SystemProperties.hasWindowManager
+                    checked: !StreamingPreferences.startWindowed || !SystemProperties.hasWindowManager
                     onCheckedChanged: {
                         StreamingPreferences.startWindowed = !checked
                     }
@@ -482,6 +521,7 @@ Flickable {
 
                 CheckBox {
                     id: connectionWarningsCheck
+                    width: parent.width
                     text: "Show connection quality warnings"
                     font.pointSize: 12
                     checked: StreamingPreferences.connectionWarnings
@@ -489,19 +529,38 @@ Flickable {
                         StreamingPreferences.connectionWarnings = checked
                     }
                 }
+
+                CheckBox {
+                    visible: SystemProperties.hasDiscordIntegration
+                    id: discordPresenceCheck
+                    width: parent.width
+                    text: "Discord Rich Presence integration"
+                    font.pointSize: 12
+                    checked: StreamingPreferences.richPresence
+                    onCheckedChanged: {
+                        StreamingPreferences.richPresence = checked
+                    }
+
+                    ToolTip.delay: 1000
+                    ToolTip.timeout: 5000
+                    ToolTip.visible: hovered
+                    ToolTip.text: "Updates your Discord status to display the name of the game you're streaming."
+                }
             }
         }
     }
 
     Column {
         padding: 10
+        rightPadding: 20
         anchors.left: settingsColumn1.right
         id: settingsColumn2
-        width: settingsPage.width / 2 - padding
+        width: settingsPage.width / 2
+        spacing: 15
 
         GroupBox {
             id: gamepadSettingsGroupBox
-            width: (parent.width - parent.padding)
+            width: (parent.width - (parent.leftPadding + parent.rightPadding))
             padding: 12
             title: "<font color=\"skyblue\">Input Settings</font>"
             font.pointSize: 12
@@ -512,6 +571,7 @@ Flickable {
 
                 CheckBox {
                     id: singleControllerCheck
+                    width: parent.width
                     text: "Force gamepad #1 always present"
                     font.pointSize:  12
                     checked: !StreamingPreferences.multiController
@@ -527,26 +587,80 @@ Flickable {
                 }
 
                 CheckBox {
-                    id: rawInputCheck
+                    id: absoluteMouseCheck
                     hoverEnabled: true
-                    text: "Raw mouse input"
+                    width: parent.width
+                    text: "Optimize mouse for remote desktop instead of games"
                     font.pointSize:  12
-                    checked: !StreamingPreferences.mouseAcceleration
+                    enabled: SystemProperties.hasWindowManager
+                    checked: StreamingPreferences.absoluteMouseMode && SystemProperties.hasWindowManager
                     onCheckedChanged: {
-                        StreamingPreferences.mouseAcceleration = !checked
+                        StreamingPreferences.absoluteMouseMode = checked
+                    }
+
+                    ToolTip.delay: 1000
+                    ToolTip.timeout: 5000
+                    ToolTip.visible: hovered
+                    ToolTip.text: "This enables mouse control without capturing the client's mouse cursor. It will not work in most games.\n
+                                   You can toggle this while streaming using Ctrl+Alt+Shift+M."
+                }
+
+                CheckBox {
+                    id: absoluteTouchCheck
+                    hoverEnabled: true
+                    width: parent.width
+                    text: "Use touchscreen as a trackpad"
+                    font.pointSize:  12
+                    checked: !StreamingPreferences.absoluteTouchMode
+                    onCheckedChanged: {
+                        StreamingPreferences.absoluteTouchMode = !checked
+                    }
+
+                    ToolTip.delay: 1000
+                    ToolTip.timeout: 5000
+                    ToolTip.visible: hovered
+                    ToolTip.text: "When checked, the touchscreen acts like a trackpad. When unchecked, the touchscreen will directly control the mouse pointer."
+                }
+
+                CheckBox {
+                    id: gamepadMouseCheck
+                    hoverEnabled: true
+                    width: parent.width
+                    text: "Gamepad mouse mode support"
+                    font.pointSize:  12
+                    checked: StreamingPreferences.gamepadMouse
+                    onCheckedChanged: {
+                        StreamingPreferences.gamepadMouse = checked
                     }
 
                     ToolTip.delay: 1000
                     ToolTip.timeout: 3000
                     ToolTip.visible: hovered
-                    ToolTip.text: "When checked, mouse input is not accelerated or scaled by the OS before passing to Moonlight"
+                    ToolTip.text: "When enabled, holding the Start button will toggle mouse mode"
+                }
+
+                CheckBox {
+                    id: swapMouseButtonsCheck
+                    hoverEnabled: true
+                    width: parent.width
+                    text: "Swap mouse buttons"
+                    font.pointSize:  12
+                    checked: StreamingPreferences.swapMouseButtons
+                    onCheckedChanged: {
+                        StreamingPreferences.swapMouseButtons = checked
+                    }
+
+                    ToolTip.delay: 1000
+                    ToolTip.timeout: 3000
+                    ToolTip.visible: hovered
+                    ToolTip.text: "When checked, swap the left and right mouse buttons"
                 }
             }
         }
 
         GroupBox {
             id: hostSettingsGroupBox
-            width: (parent.width - parent.padding)
+            width: (parent.width - (parent.leftPadding + parent.rightPadding))
             padding: 12
             title: "<font color=\"skyblue\">Host Settings</font>"
             font.pointSize: 12
@@ -557,7 +671,8 @@ Flickable {
 
                 CheckBox {
                     id: optimizeGameSettingsCheck
-                    text: "Optimize game settings"
+                    width: parent.width
+                    text: "Optimize game settings for streaming"
                     font.pointSize:  12
                     checked: StreamingPreferences.gameOptimizations
                     onCheckedChanged: {
@@ -567,6 +682,7 @@ Flickable {
 
                 CheckBox {
                     id: audioPcCheck
+                    width: parent.width
                     text: "Play audio on host PC"
                     font.pointSize:  12
                     checked: StreamingPreferences.playAudioOnHost
@@ -574,12 +690,28 @@ Flickable {
                         StreamingPreferences.playAudioOnHost = checked
                     }
                 }
+
+                CheckBox {
+                    id: quitAppAfter
+                    width: parent.width
+                    text: "Quit app on host PC after ending stream"
+                    font.pointSize: 12
+                    checked: StreamingPreferences.quitAppAfter
+                    onCheckedChanged: {
+                        StreamingPreferences.quitAppAfter = checked
+                    }
+
+                    ToolTip.delay: 1000
+                    ToolTip.timeout: 5000
+                    ToolTip.visible: hovered
+                    ToolTip.text: "This will close the app or game you are streaming when you end your stream. You will lose any unsaved progress!"
+                }
             }
         }
 
         GroupBox {
             id: advancedSettingsGroupBox
-            width: (parent.width - parent.padding)
+            width: (parent.width - (parent.leftPadding + parent.rightPadding))
             padding: 12
             title: "<font color=\"skyblue\">Advanced Settings</font>"
             font.pointSize: 12
@@ -666,20 +798,17 @@ Flickable {
                             val: StreamingPreferences.VCC_AUTO
                         }
                         ListElement {
-                            text: "Force H.264"
+                            text: "H.264"
                             val: StreamingPreferences.VCC_FORCE_H264
                         }
                         ListElement {
-                            text: "Force HEVC"
+                            text: "HEVC (H.265)"
                             val: StreamingPreferences.VCC_FORCE_HEVC
                         }
-                        // HDR seems to be broken in GFE 3.14.1, and even when that's fixed
-                        // we'll probably need to gate this feature on OS support in our
-                        // renderers.
-                        /* ListElement {
-                            text: "Force HEVC HDR"
+                        /*ListElement {
+                            text: "HEVC HDR (Experimental)"
                             val: StreamingPreferences.VCC_FORCE_HEVC_HDR
-                        } */
+                        }*/
                     }
                     // ::onActivated must be used, as it only listens for when the index is changed by a human
                     onActivated : {
@@ -689,6 +818,7 @@ Flickable {
 
                 CheckBox {
                     id: unlockUnsupportedFps
+                    width: parent.width
                     text: "Unlock unsupported FPS options"
                     font.pointSize: 12
                     checked: StreamingPreferences.unsupportedFps
@@ -707,6 +837,7 @@ Flickable {
 
                 CheckBox {
                     id: enableMdns
+                    width: parent.width
                     text: "Automatically find PCs on the local network (Recommended)"
                     font.pointSize: 12
                     checked: StreamingPreferences.enableMdns
@@ -730,12 +861,21 @@ Flickable {
                 }
 
                 CheckBox {
-                    id: quitAppAfter
-                    text: "Quit app after quitting session"
+                    id: detectNetworkBlocking
+                    width: parent.width
+                    text: "Automatically detect blocked connections (Recommended)"
                     font.pointSize: 12
-                    checked: StreamingPreferences.quitAppAfter
+                    checked: StreamingPreferences.detectNetworkBlocking
                     onCheckedChanged: {
-                        StreamingPreferences.quitAppAfter = checked
+                        // This is called on init, so only do the work if we've
+                        // actually changed the value.
+                        if (StreamingPreferences.detectNetworkBlocking != checked) {
+                            StreamingPreferences.detectNetworkBlocking = checked
+
+                            // We must save the updated preference to ensure
+                            // ComputerManager can observe the change internally.
+                            StreamingPreferences.save()
+                        }
                     }
                 }
             }

app/gui/StreamSegue.qml

@@ -62,8 +62,12 @@ Item {
         window.visible = true
     }
 
-    function sessionFinished()
+    function sessionFinished(portTestResult)
     {
+        if (portTestResult !== 0 && portTestResult !== -1 && streamSegueErrorDialog.text) {
+            streamSegueErrorDialog.text += "\n\nThis PC's Internet connection is blocking Moonlight. Streaming over the Internet may not work while connected to this network."
+        }
+
         // Enable GUI gamepad usage now
         SdlGamepadKeyNavigation.enable()
 
@@ -117,9 +121,22 @@ Item {
         session.sessionFinished.connect(sessionFinished)
 
         // Kick off the stream
+        spinnerTimer.start()
         streamLoader.active = true
     }
 
+    Timer {
+        id: spinnerTimer
+
+        // Display the spinner appearance a bit to allow us to reach
+        // the code in Session.exec() that pumps the event loop.
+        // If we display it immediately, it will briefly hang in the
+        // middle of the animation on Windows, which looks very
+        // obviously broken.
+        interval: 100
+        onTriggered: stageSpinner.running = true
+    }
+
     Loader {
         id: streamLoader
         active: false
@@ -150,6 +167,7 @@ Item {
 
         BusyIndicator {
             id: stageSpinner
+            running: false
         }
 
         Label {

app/gui/appmodel.cpp

@@ -7,7 +7,7 @@ AppModel::AppModel(QObject *parent)
             this, &AppModel::handleBoxArtLoaded);
 }
 
-void AppModel::initialize(ComputerManager* computerManager, int computerIndex)
+void AppModel::initialize(ComputerManager* computerManager, int computerIndex, bool showHiddenGames)
 {
     m_ComputerManager = computerManager;
     connect(m_ComputerManager, &ComputerManager::computerStateChanged,
@@ -15,29 +15,23 @@ void AppModel::initialize(ComputerManager* computerManager, int computerIndex)
 
     Q_ASSERT(computerIndex < m_ComputerManager->getComputers().count());
     m_Computer = m_ComputerManager->getComputers().at(computerIndex);
-    m_Apps = m_Computer->appList;
     m_CurrentGameId = m_Computer->currentGameId;
+    m_ShowHiddenGames = showHiddenGames;
+
+    updateAppList(m_Computer->appList);
 }
 
-int AppModel::getRunningAppIndex()
+int AppModel::getRunningAppId()
 {
-    if (m_CurrentGameId != 0) {
-        for (int i = 0; i < m_Apps.count(); i++) {
-            if (m_Apps[i].id == m_CurrentGameId) {
-                return i;
-            }
-        }
-    }
-
-    return -1;
+    return m_CurrentGameId;
 }
 
 QString AppModel::getRunningAppName()
 {
     if (m_CurrentGameId != 0) {
-        for (int i = 0; i < m_Apps.count(); i++) {
-            if (m_Apps[i].id == m_CurrentGameId) {
-                return m_Apps[i].name;
+        for (int i = 0; i < m_AllApps.count(); i++) {
+            if (m_AllApps[i].id == m_CurrentGameId) {
+                return m_AllApps[i].name;
             }
         }
     }
@@ -47,8 +41,8 @@ QString AppModel::getRunningAppName()
 
 Session* AppModel::createSessionForApp(int appIndex)
 {
-    Q_ASSERT(appIndex < m_Apps.count());
-    NvApp app = m_Apps.at(appIndex);
+    Q_ASSERT(appIndex < m_VisibleApps.count());
+    NvApp app = m_VisibleApps.at(appIndex);
 
     return new Session(m_Computer, app);
 }
@@ -60,7 +54,7 @@ int AppModel::rowCount(const QModelIndex &parent) const
     if (parent.isValid())
         return 0;
 
-    return m_Apps.count();
+    return m_VisibleApps.count();
 }
 
 QVariant AppModel::data(const QModelIndex &index, int role) const
@@ -68,8 +62,8 @@ QVariant AppModel::data(const QModelIndex &index, int role) const
     if (!index.isValid())
         return QVariant();
 
-    Q_ASSERT(index.row() < m_Apps.count());
-    NvApp app = m_Apps.at(index.row());
+    Q_ASSERT(index.row() < m_VisibleApps.count());
+    NvApp app = m_VisibleApps.at(index.row());
 
     switch (role)
     {
@@ -80,6 +74,10 @@ QVariant AppModel::data(const QModelIndex &index, int role) const
     case BoxArtRole:
         // FIXME: const-correctness
         return const_cast<BoxArtManager&>(m_BoxArtManager).loadBoxArt(m_Computer, app);
+    case HiddenRole:
+        return app.hidden;
+    case AppIdRole:
+        return app.id;
     default:
         return QVariant();
     }
@@ -92,6 +90,8 @@ QHash<int, QByteArray> AppModel::roleNames() const
     names[NameRole] = "name";
     names[RunningRole] = "running";
     names[BoxArtRole] = "boxart";
+    names[HiddenRole] = "hidden";
+    names[AppIdRole] = "appid";
 
     return names;
 }
@@ -101,6 +101,112 @@ void AppModel::quitRunningApp()
     m_ComputerManager->quitRunningApp(m_Computer);
 }
 
+bool AppModel::isAppCurrentlyVisible(const NvApp& app)
+{
+    for (const NvApp& visibleApp : m_VisibleApps) {
+        if (app.id == visibleApp.id) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+QVector<NvApp> AppModel::getVisibleApps(const QVector<NvApp>& appList)
+{
+    QVector<NvApp> visibleApps;
+
+    for (const NvApp& app : appList) {
+        // Don't immediately hide games that were previously visible. This
+        // allows users to easily uncheck the "Hide App" checkbox if they
+        // check it by mistake.
+        if (m_ShowHiddenGames || !app.hidden || isAppCurrentlyVisible(app)) {
+            visibleApps.append(app);
+        }
+    }
+
+    return visibleApps;
+}
+
+void AppModel::updateAppList(QVector<NvApp> newList)
+{
+    m_AllApps = newList;
+
+    QVector<NvApp> newVisibleList = getVisibleApps(newList);
+
+    // Process removals and updates first
+    for (int i = 0; i < m_VisibleApps.count(); i++) {
+        const NvApp& existingApp = m_VisibleApps.at(i);
+
+        bool found = false;
+        for (const NvApp& newApp : newVisibleList) {
+            if (existingApp.id == newApp.id) {
+                // If the data changed, update it in our list
+                if (existingApp != newApp) {
+                    m_VisibleApps.replace(i, newApp);
+                    emit dataChanged(createIndex(i, 0), createIndex(i, 0));
+                }
+
+                found = true;
+                break;
+            }
+        }
+
+        if (!found) {
+            beginRemoveRows(QModelIndex(), i, i);
+            m_VisibleApps.removeAt(i);
+            endRemoveRows();
+            i--;
+        }
+    }
+
+    // Process additions now
+    for (const NvApp& newApp : newVisibleList) {
+        int insertionIndex = m_VisibleApps.size();
+        bool found = false;
+
+        for (int i = 0; i < m_VisibleApps.count(); i++) {
+            const NvApp& existingApp = m_VisibleApps.at(i);
+
+            if (existingApp.id == newApp.id) {
+                found = true;
+                break;
+            }
+            else if (existingApp.name.toLower() > newApp.name.toLower()) {
+                insertionIndex = i;
+                break;
+            }
+        }
+
+        if (!found) {
+            beginInsertRows(QModelIndex(), insertionIndex, insertionIndex);
+            m_VisibleApps.insert(insertionIndex, newApp);
+            endInsertRows();
+        }
+    }
+
+    Q_ASSERT(newVisibleList == m_VisibleApps);
+}
+
+void AppModel::setAppHidden(int appIndex, bool hidden)
+{
+    Q_ASSERT(appIndex < m_VisibleApps.count());
+    int appId = m_VisibleApps.at(appIndex).id;
+
+    {
+        QWriteLocker lock(&m_Computer->lock);
+
+        for (NvApp& app : m_Computer->appList) {
+            if (app.id == appId) {
+                app.hidden = hidden;
+                break;
+            }
+        }
+    }
+
+    m_ComputerManager->clientSideAttributeUpdated(m_Computer);
+}
+
 void AppModel::handleComputerStateChanged(NvComputer* computer)
 {
     // Ignore updates for computers that aren't ours
@@ -119,20 +225,15 @@ void AppModel::handleComputerStateChanged(NvComputer* computer)
     // First, process additions/removals from the app list. This
     // is required because the new game may now be running, so
     // we can't check that first.
-    if (computer->appList != m_Apps) {
-        // Just reset the whole thing if the list changes
-        beginResetModel();
-        m_Apps = computer->appList;
-        m_CurrentGameId = computer->currentGameId;
-        endResetModel();
-        return;
+    if (computer->appList != m_AllApps) {
+        updateAppList(computer->appList);
     }
 
     // Finally, process changes to the active app
     if (computer->currentGameId != m_CurrentGameId) {
         // First, invalidate the running state of newly running game
-        for (int i = 0; i < m_Apps.count(); i++) {
-            if (m_Apps[i].id == computer->currentGameId) {
+        for (int i = 0; i < m_VisibleApps.count(); i++) {
+            if (m_VisibleApps[i].id == computer->currentGameId) {
                 emit dataChanged(createIndex(i, 0),
                                  createIndex(i, 0),
                                  QVector<int>() << RunningRole);
@@ -142,8 +243,8 @@ void AppModel::handleComputerStateChanged(NvComputer* computer)
 
         // Next, invalidate the running state of the old game (if it exists)
         if (m_CurrentGameId != 0) {
-            for (int i = 0; i < m_Apps.count(); i++) {
-                if (m_Apps[i].id == m_CurrentGameId) {
+            for (int i = 0; i < m_VisibleApps.count(); i++) {
+                if (m_VisibleApps[i].id == m_CurrentGameId) {
                     emit dataChanged(createIndex(i, 0),
                                      createIndex(i, 0),
                                      QVector<int>() << RunningRole);
@@ -161,7 +262,7 @@ void AppModel::handleBoxArtLoaded(NvComputer* computer, NvApp app, QUrl /* image
 {
     Q_ASSERT(computer == m_Computer);
 
-    int index = m_Apps.indexOf(app);
+    int index = m_VisibleApps.indexOf(app);
 
     // Make sure we're not delivering a callback to an app that's already been removed
     if (index >= 0) {

app/gui/appmodel.h

@@ -14,23 +14,27 @@ class AppModel : public QAbstractListModel
     {
         NameRole = Qt::UserRole,
         RunningRole,
-        BoxArtRole
+        BoxArtRole,
+        HiddenRole,
+        AppIdRole,
     };
 
 public:
     explicit AppModel(QObject *parent = nullptr);
 
     // Must be called before any QAbstractListModel functions
-    Q_INVOKABLE void initialize(ComputerManager* computerManager, int computerIndex);
+    Q_INVOKABLE void initialize(ComputerManager* computerManager, int computerIndex, bool showHiddenGames);
 
     Q_INVOKABLE Session* createSessionForApp(int appIndex);
 
-    Q_INVOKABLE int getRunningAppIndex();
+    Q_INVOKABLE int getRunningAppId();
 
     Q_INVOKABLE QString getRunningAppName();
 
     Q_INVOKABLE void quitRunningApp();
 
+    Q_INVOKABLE void setAppHidden(int appIndex, bool hidden);
+
     QVariant data(const QModelIndex &index, int role) const override;
 
     int rowCount(const QModelIndex &parent) const override;
@@ -46,9 +50,16 @@ signals:
     void computerLost();
 
 private:
+    void updateAppList(QVector<NvApp> newList);
+
+    QVector<NvApp> getVisibleApps(const QVector<NvApp>& appList);
+
+    bool isAppCurrentlyVisible(const NvApp& app);
+
     NvComputer* m_Computer;
     BoxArtManager m_BoxArtManager;
     ComputerManager* m_ComputerManager;
-    QVector<NvApp> m_Apps;
+    QVector<NvApp> m_VisibleApps, m_AllApps;
     int m_CurrentGameId;
+    bool m_ShowHiddenGames;
 };

app/gui/computermodel.cpp

@@ -2,6 +2,8 @@
 
 #include <QThreadPool>
 
+#include <random>
+
 ComputerModel::ComputerModel(QObject* object)
     : QAbstractListModel(object) {}
 
@@ -128,6 +130,69 @@ void ComputerModel::wakeComputer(int computerIndex)
     QThreadPool::globalInstance()->start(wakeTask);
 }
 
+void ComputerModel::renameComputer(int computerIndex, QString name)
+{
+    Q_ASSERT(computerIndex < m_Computers.count());
+
+    m_ComputerManager->renameHost(m_Computers[computerIndex], name);
+}
+
+// TODO: Use QRandomGenerator when we drop Qt 5.9 support
+QString ComputerModel::generatePinString()
+{
+    std::uniform_int_distribution<int> dist(0, 9999);
+    std::random_device rd;
+    std::mt19937 engine(rd());
+
+    return QString::asprintf("%04u", dist(engine));
+}
+
+class DeferredTestConnectionTask : public QObject, public QRunnable
+{
+    Q_OBJECT
+public:
+    void run()
+    {
+        unsigned int portTestResult = LiTestClientConnectivity("qt.conntest.moonlight-stream.org", 443, ML_PORT_FLAG_ALL);
+        if (portTestResult == ML_TEST_RESULT_INCONCLUSIVE) {
+            emit connectionTestCompleted(-1, QString());
+        }
+        else {
+            QString blockedPorts;
+
+            for (int i = 0; i < 32; i++) {
+                if (portTestResult & (1 << i)) {
+                    if (!blockedPorts.isEmpty()) {
+                        blockedPorts += "\n";
+                    }
+
+                    if (LiGetProtocolFromPortFlagIndex(i) == 17 /* IPPROTO_UDP */) {
+                        blockedPorts += "UDP ";
+                    }
+                    else {
+                        blockedPorts += "TCP ";
+                    }
+
+                    blockedPorts += QString::number(LiGetPortFromPortFlagIndex(i));
+                }
+            }
+
+            emit connectionTestCompleted(portTestResult, blockedPorts);
+        }
+    }
+
+signals:
+    void connectionTestCompleted(int result, QString blockedPorts);
+};
+
+void ComputerModel::testConnectionForComputer(int)
+{
+    DeferredTestConnectionTask* testConnectionTask = new DeferredTestConnectionTask();
+    QObject::connect(testConnectionTask, &DeferredTestConnectionTask::connectionTestCompleted,
+                     this, &ComputerModel::connectionTestCompleted);
+    QThreadPool::globalInstance()->start(testConnectionTask);
+}
+
 void ComputerModel::pairComputer(int computerIndex, QString pin)
 {
     Q_ASSERT(computerIndex < m_Computers.count());
@@ -158,3 +223,4 @@ void ComputerModel::handleComputerStateChanged(NvComputer* computer)
     }
 }
 
+#include "computermodel.moc"

app/gui/computermodel.h

@@ -31,14 +31,21 @@ public:
 
     Q_INVOKABLE void deleteComputer(int computerIndex);
 
+    Q_INVOKABLE QString generatePinString();
+
     Q_INVOKABLE void pairComputer(int computerIndex, QString pin);
 
+    Q_INVOKABLE void testConnectionForComputer(int computerIndex);
+
     Q_INVOKABLE void wakeComputer(int computerIndex);
 
+    Q_INVOKABLE void renameComputer(int computerIndex, QString name);
+
     Q_INVOKABLE Session* createSessionForCurrentGame(int computerIndex);
 
 signals:
     void pairingCompleted(QVariant error);
+    void connectionTestCompleted(int result, QString blockedPorts);
 
 private slots:
     void handleComputerStateChanged(NvComputer* computer);

app/gui/main.qml

@@ -17,7 +17,7 @@ ApplicationWindow {
     width: 1280
     height: 600
 
-    visibility: StreamingPreferences.startWindowed ? "Windowed" : "Maximized"
+    visibility: (SystemProperties.hasWindowManager && StreamingPreferences.startWindowed) ? "Windowed" : "Maximized"
 
     StackView {
         id: stackView
@@ -175,6 +175,17 @@ ApplicationWindow {
         anchors.topMargin: 5
         anchors.bottomMargin: 5
 
+        Label {
+            id: titleLabel
+            visible: toolBar.width > 700
+            anchors.fill: parent
+            text: stackView.currentItem.objectName
+            font.pointSize: 20
+            elide: Label.ElideRight
+            horizontalAlignment: Qt.AlignHCenter
+            verticalAlignment: Qt.AlignVCenter
+        }
+
         RowLayout {
             spacing: 20
             anchors.leftMargin: 10
@@ -194,14 +205,49 @@ ApplicationWindow {
                 }
             }
 
+            // This label will appear when the window gets too small and
+            // we need to ensure the toolbar controls don't collide
             Label {
-                id: titleLabel
-                text: stackView.currentItem.objectName
-                font.pointSize: 15
+                id: titleRowLabel
+                font.pointSize: titleLabel.font.pointSize
                 elide: Label.ElideRight
                 horizontalAlignment: Qt.AlignHCenter
                 verticalAlignment: Qt.AlignVCenter
                 Layout.fillWidth: true
+
+                // We need this label to always be visible so it can occupy
+                // the remaining space in the RowLayout. To "hide" it, we
+                // just set the text to empty string.
+                text: !titleLabel.visible ? stackView.currentItem.objectName : ""
+            }
+
+            Label {
+                id: versionLabel
+                visible: stackView.currentItem.objectName === "Settings"
+                text: "Version " + SystemProperties.versionString
+                font.pointSize: 12
+                horizontalAlignment: Qt.AlignRight
+                verticalAlignment: Qt.AlignVCenter
+            }
+
+            NavigableToolButton {
+                id: discordButton
+                visible: SystemProperties.hasBrowser &&
+                         stackView.currentItem.objectName === "Settings"
+
+                iconSource: "qrc:/res/Discord-Logo-White.svg"
+
+                ToolTip.delay: 1000
+                ToolTip.timeout: 3000
+                ToolTip.visible: hovered
+                ToolTip.text: "Join our community on Discord"
+
+                // TODO need to make sure browser is brought to foreground.
+                onClicked: Qt.openUrlExternally("https://moonlight-stream.org/discord");
+
+                Keys.onDownPressed: {
+                    stackView.currentItem.forceActiveFocus(Qt.TabFocus)
+                }
             }
 
             NavigableToolButton {
@@ -239,13 +285,17 @@ ApplicationWindow {
 
                 ToolTip.delay: 1000
                 ToolTip.timeout: 3000
-                ToolTip.visible: hovered
+                ToolTip.visible: hovered || visible
 
                 // Invisible until we get a callback notifying us that
                 // an update is available
                 visible: false
 
-                onClicked: Qt.openUrlExternally(browserUrl);
+                onClicked: {
+                    if (SystemProperties.hasBrowser) {
+                        Qt.openUrlExternally(browserUrl);
+                    }
+                }
 
                 function updateAvailable(version, url)
                 {
@@ -409,6 +459,10 @@ ApplicationWindow {
             editText.forceActiveFocus()
         }
 
+        onClosed: {
+            editText.clear()
+        }
+
         onAccepted: {
             if (editText.text) {
                 ComputerManager.addNewHost(editText.text, false)

app/gui/sdlgamepadkeynavigation.cpp

@@ -205,6 +205,31 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
             sendKey(QEvent::Type::KeyRelease, Qt::Key_Right);
             m_LastAxisNavigationEventTime = SDL_GetTicks();
         }
+
+        // In UI navigation mode (settings page), use the right stick to scroll
+        if (m_UiNavMode) {
+            short rightX = SDL_GameControllerGetAxis(gc, SDL_CONTROLLER_AXIS_RIGHTX);
+            short rightY = SDL_GameControllerGetAxis(gc, SDL_CONTROLLER_AXIS_RIGHTY);
+
+            QPoint wheelDelta;
+            if (rightX > 30000) {
+                wheelDelta.setX(30);
+            }
+            else if (rightX < -30000) {
+                wheelDelta.setX(-30);
+            }
+
+            if (rightY > 30000) {
+                wheelDelta.setY(-30);
+            }
+            else if (rightY < -30000) {
+                wheelDelta.setY(30);
+            }
+
+            if (!wheelDelta.isNull()) {
+                sendWheel(wheelDelta);
+            }
+        }
     }
 }
 
@@ -218,6 +243,22 @@ void SdlGamepadKeyNavigation::sendKey(QEvent::Type type, Qt::Key key, Qt::Keyboa
     }
 }
 
+void SdlGamepadKeyNavigation::sendWheel(QPoint& angleDelta)
+{
+    QGuiApplication* app = static_cast<QGuiApplication*>(QGuiApplication::instance());
+    QWindow* focusWindow = app->focusWindow();
+    if (focusWindow != nullptr) {
+        QPoint mousePos(focusWindow->width() / 2, focusWindow->height() / 2);
+        QPoint globalPos(focusWindow->mapToGlobal(mousePos));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
+        QWheelEvent wheelEvent(mousePos, globalPos, QPoint(), angleDelta, Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, false, Qt::MouseEventSynthesizedByApplication);
+#else
+        QWheelEvent wheelEvent(mousePos, globalPos, QPoint(), angleDelta, angleDelta.y(), Qt::Vertical, Qt::NoButton, Qt::NoModifier, Qt::NoScrollPhase, Qt::MouseEventSynthesizedByApplication, false);
+#endif
+        app->sendEvent(focusWindow, &wheelEvent);
+    }
+}
+
 void SdlGamepadKeyNavigation::setUiNavMode(bool uiNavMode)
 {
     m_UiNavMode = uiNavMode;

app/gui/sdlgamepadkeynavigation.h

@@ -24,6 +24,7 @@ public:
 
 private:
     void sendKey(QEvent::Type type, Qt::Key key, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+    void sendWheel(QPoint& angleDelta);
 
 private slots:
     void onPollingTimerFired();

app/main.cpp

@@ -9,6 +9,8 @@
 #include <QPalette>
 #include <QFont>
 #include <QCursor>
+#include <QElapsedTimer>
+#include <QFile>
 
 // Don't let SDL hook our main function, since Qt is already
 // doing the same thing. This needs to be before any headers
@@ -20,14 +22,17 @@
 #include "streaming/video/ffmpeg.h"
 #endif
 
-#ifdef Q_OS_WIN32
+#if defined(Q_OS_WIN32)
 #include "antihookingprotection.h"
+#elif defined(Q_OS_LINUX)
+#include <openssl/ssl.h>
 #endif
 
 #include "cli/quitstream.h"
 #include "cli/startstream.h"
 #include "cli/commandlineparser.h"
 #include "path.h"
+#include "utils.h"
 #include "gui/computermodel.h"
 #include "gui/appmodel.h"
 #include "backend/autoupdatechecker.h"
@@ -52,7 +57,7 @@
 #endif
 
 #ifdef USE_CUSTOM_LOGGER
-static QTime s_LoggerTime;
+static QElapsedTimer s_LoggerTime;
 static QTextStream s_LoggerStream(stdout);
 static QMutex s_LoggerLock;
 #ifdef LOG_TO_FILE
@@ -71,7 +76,12 @@ void logToLoggerStream(QString& message)
         return;
     }
     else if (s_LogLinesWritten == MAX_LOG_LINES) {
-        s_LoggerStream << "Log size limit reached!" << endl;
+        s_LoggerStream << "Log size limit reached!";
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        s_LoggerStream << Qt::endl;
+#else
+        s_LoggerStream << endl;
+#endif
         s_LogLimitReached = true;
         return;
     }
@@ -278,13 +288,44 @@ int main(int argc, char *argv[])
     SetUnhandledExceptionFilter(UnhandledExceptionHandler);
 #endif
 
-#ifdef Q_OS_WIN32
+#if defined(Q_OS_WIN32)
     // Force AntiHooking.dll to be statically imported and loaded
     // by ntdll by calling a dummy function.
     AntiHookingDummyImport();
+#elif defined(Q_OS_LINUX)
+    // Force libssl.so to be directly linked to our binary, so
+    // linuxdeployqt can find it and include it in our AppImage.
+    // QtNetwork will pull it in via dlopen().
+    SSL_free(nullptr);
 #endif
 
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    // Avoid using High DPI on EGLFS. It breaks font rendering.
+    // https://bugreports.qt.io/browse/QTBUG-64377
+    //
+    // NB: We can't use QGuiApplication::platformName() here because it is only
+    // set once the QGuiApplication is created, which is too late to enable High DPI :(
+    if (WMUtils::isRunningWindowManager()) {
+        // Enable High DPI support
+        QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        // Enable fractional High DPI scaling on Qt 5.14 and later
+        QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
+#endif
+    }
+    else {
+#ifndef STEAM_LINK
+        if (!qEnvironmentVariableIsSet("QT_QPA_PLATFORM")) {
+            qInfo() << "Unable to detect Wayland or X11, so EGLFS will be used by default. Set QT_QPA_PLATFORM to override this.";
+            qputenv("QT_QPA_PLATFORM", "eglfs");
+
+            if (!QFile("/dev/dri").exists()) {
+                qWarning() << "Unable to find a KMSDRM display device!";
+                qWarning() << "On the Raspberry Pi, you must enable the 'fake KMS' driver in raspi-config to use Moonlight outside of the GUI environment.";
+            }
+        }
+#endif
+    }
 
     // This avoids using the default keychain for SSL, which may cause
     // password prompts on macOS.
@@ -309,11 +350,29 @@ int main(int argc, char *argv[])
     // Register custom metatypes for use in signals
     qRegisterMetaType<NvApp>("NvApp");
 
+    SDL_version compileVersion;
+    SDL_VERSION(&compileVersion);
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Compiled with SDL %d.%d.%d",
+                compileVersion.major, compileVersion.minor, compileVersion.patch);
+
+    SDL_version runtimeVersion;
+    SDL_GetVersion(&runtimeVersion);
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Running with SDL %d.%d.%d",
+                runtimeVersion.major, runtimeVersion.minor, runtimeVersion.patch);
+
     // Allow the display to sleep by default. We will manually use SDL_DisableScreenSaver()
     // and SDL_EnableScreenSaver() when appropriate. This hint must be set before
     // initializing the SDL video subsystem to have any effect.
     SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "1");
 
+    // For SDL backends that support it, use double buffering instead of triple buffering
+    // to save a frame of latency. This doesn't matter for MMAL or DRM renderers since they
+    // are drawing directly to the screen without involving SDL, but it may matter for other
+    // future KMSDRM platforms that use SDL for rendering.
+    SDL_SetHint(SDL_HINT_VIDEO_DOUBLE_BUFFER, "1");
+
     if (SDL_InitSubSystem(SDL_INIT_TIMER) != 0) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "SDL_InitSubSystem(SDL_INIT_TIMER) failed: %s",
@@ -344,6 +403,11 @@ int main(int argc, char *argv[])
     // Disable minimize on focus loss by default. Users seem to want this off by default.
     SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0");
 
+    // SDL 2.0.12 changes the default behavior to use the button label rather than the button
+    // position as most other software does. Set this back to 0 to stay consistent with prior
+    // releases of Moonlight.
+    SDL_SetHint("SDL_GAMECONTROLLER_USE_BUTTON_LABELS", "0");
+
 #ifdef QT_DEBUG
     // Allow thread naming using exceptions on debug builds. SDL doesn't use SEH
     // when throwing the exceptions, so we don't enable it for release builds out
@@ -355,12 +419,12 @@ int main(int argc, char *argv[])
 
     // After the QGuiApplication is created, the platform stuff will be initialized
     // and we can set the SDL video driver to match Qt.
-    if (qgetenv("XDG_SESSION_TYPE") == "wayland" && QGuiApplication::platformName() == "xcb") {
+    if (WMUtils::isRunningWayland() && QGuiApplication::platformName() == "xcb") {
         SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
                     "Detected XWayland. This will probably break hardware decoding! Try running with QT_QPA_PLATFORM=wayland or switch to X11.");
     }
     else if (QGuiApplication::platformName().startsWith("wayland")) {
-        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Detected Wayland. Performance may be worse than X11.");
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Detected Wayland");
         qputenv("SDL_VIDEODRIVER", "wayland");
     }
 
@@ -378,6 +442,17 @@ int main(int argc, char *argv[])
     // Move the mouse to the bottom right so it's invisible when using
     // gamepad-only navigation.
     QCursor().setPos(0xFFFF, 0xFFFF);
+#elif !SDL_VERSION_ATLEAST(2, 0, 11) && defined(Q_OS_LINUX) && (defined(__arm__) || defined(__aarch64__))
+    if (qgetenv("SDL_VIDEO_GL_DRIVER").isEmpty() && QGuiApplication::platformName() == "eglfs") {
+        // Look for Raspberry Pi GLES libraries. SDL 2.0.10 and earlier needs some help finding
+        // the correct libraries for the KMSDRM backend if not compiled with the RPI backend enabled.
+        if (SDL_LoadObject("libbrcmGLESv2.so") != nullptr) {
+            qputenv("SDL_VIDEO_GL_DRIVER", "libbrcmGLESv2.so");
+        }
+        else if (SDL_LoadObject("/opt/vc/lib/libbrcmGLESv2.so") != nullptr) {
+            qputenv("SDL_VIDEO_GL_DRIVER", "/opt/vc/lib/libbrcmGLESv2.so");
+        }
+    }
 #endif
 
     app.setWindowIcon(QIcon(":/res/moonlight.svg"));
@@ -412,6 +487,9 @@ int main(int argc, char *argv[])
                                                        return new StreamingPreferences();
                                                    });
 
+    // Create the identity manager on the main thread
+    IdentityManager::get();
+
 #ifndef Q_OS_WINRT
     // Use the dense material dark theme by default
     if (!qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_STYLE")) {

app/res/Discord-Logo-White.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 245 240"><style>.st0{fill:#FFFFFF;}</style><path class="st0" d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/><path class="st0" d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/></svg>

app/res/baseline-check_circle_outline-24px.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24" fill="#FFFFFF"><path d="M0 0h24v24H0V0zm0 0h24v24H0V0z" fill="none"/><path d="M16.59 7.58L10 14.17l-3.59-3.58L5 12l5 5 8-8zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"/></svg>

app/res/desktop_windows-48px.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="#FFFFFF" width="48" height="48" viewBox="0 0 24 24">
+    <path fill="none" d="M0 0h24v24H0V0z"/>
+    <path d="M21 2H3c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h7v2H8v2h8v-2h-2v-2h7c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm0 14H3V4h18v12z"/>
+</svg>

app/res/ic_remove_circle_outline_white_48px.svg

@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="48" viewBox="0 0 24 24" width="48" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M7 11v2h10v-2H7zm5-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/>
-</svg>

app/res/ic_remove_from_queue_white_48px.svg

@@ -1,9 +0,0 @@
-<svg fill="#FFFFFF" height="48" viewBox="0 0 24 24" width="48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <path d="M0 0h24v24H0V0z" id="a"/>
-    </defs>
-    <clipPath id="b">
-        <use overflow="visible" xlink:href="#a"/>
-    </clipPath>
-    <path clip-path="url(#b)" d="M21 3H3c-1.11 0-2 .89-2 2v12c0 1.1.89 2 2 2h5v2h8v-2h5c1.1 0 1.99-.9 1.99-2L23 5c0-1.11-.9-2-2-2zm0 14H3V5h18v12zm-5-7v2H8v-2h8z"/>
-</svg>

app/res/ic_tv_white_48px.svg

@@ -1,4 +0,0 @@
-<svg fill="#FFFFFF" height="48" viewBox="0 0 24 24" width="48" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M21 3H3c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h5v2h8v-2h5c1.1 0 1.99-.9 1.99-2L23 5c0-1.1-.9-2-2-2zm0 14H3V5h18v12z"/>
-</svg>

app/resources.qrc

@@ -1,9 +1,7 @@
 <RCC>
     <qresource prefix="/">
-        <file>res/ic_remove_circle_outline_white_48px.svg</file>
-        <file>res/ic_remove_from_queue_white_48px.svg</file>
         <file>res/ic_videogame_asset_white_48px.svg</file>
-        <file>res/ic_tv_white_48px.svg</file>
+        <file>res/desktop_windows-48px.svg</file>
         <file>res/ic_add_to_queue_white_48px.svg</file>
         <file>res/baseline-lock-24px.svg</file>
         <file>res/baseline-play_circle_filled_white-48px.svg</file>
@@ -17,9 +15,13 @@
         <file>res/update.svg</file>
         <file>res/baseline-help_outline-24px.svg</file>
         <file>res/baseline-error_outline-24px.svg</file>
+        <file>res/baseline-check_circle_outline-24px.svg</file>
+        <file>res/Discord-Logo-White.svg</file>
     </qresource>
     <qresource prefix="/data">
         <file alias="gamecontrollerdb.txt">SDL_GameControllerDB/gamecontrollerdb.txt</file>
         <file alias="ModeSeven.ttf">ModeSeven.ttf</file>
+        <file alias="egl.frag">shaders/egl.frag</file>
+        <file alias="egl.vert">shaders/egl.vert</file>
     </qresource>
 </RCC>

app/settings/mappingmanager.cpp

@@ -26,7 +26,13 @@ MappingManager::MappingManager()
     settings.endArray();
 
     // Finally load mappings from SDL_HINT_GAMECONTROLLERCONFIG
-    QStringList sdlMappings = QString::fromLocal8Bit(SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG)).split('\n', QString::SkipEmptyParts);
+    QStringList sdlMappings =
+            QString::fromLocal8Bit(SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG))
+        #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+            .split('\n', Qt::SkipEmptyParts);
+        #else
+            .split('\n', QString::SkipEmptyParts);
+        #endif
     for (QString sdlMapping : sdlMappings) {
         SdlGamepadMapping mapping(sdlMapping);
         addMapping(mapping);

app/settings/streamingpreferences.cpp

@@ -19,10 +19,19 @@
 #define SER_UNSUPPORTEDFPS "unsupportedfps"
 #define SER_MDNS "mdns"
 #define SER_QUITAPPAFTER "quitAppAfter"
-#define SER_MOUSEACCELERATION "mouseacceleration"
+#define SER_ABSMOUSEMODE "mouseacceleration"
+#define SER_ABSTOUCHMODE "abstouchmode"
 #define SER_STARTWINDOWED "startwindowed"
 #define SER_FRAMEPACING "framepacing"
 #define SER_CONNWARNINGS "connwarnings"
+#define SER_RICHPRESENCE "richpresence"
+#define SER_GAMEPADMOUSE "gamepadmouse"
+#define SER_DEFAULTVER "defaultver"
+#define SER_PACKETSIZE "packetsize"
+#define SER_DETECTNETBLOCKING "detectnetblocking"
+#define SER_SWAPMOUSEBUTTONS "swapmousebuttons"
+
+#define CURRENT_DEFAULT_VER 1
 
 StreamingPreferences::StreamingPreferences(QObject *parent)
     : QObject(parent)
@@ -34,6 +43,14 @@ void StreamingPreferences::reload()
 {
     QSettings settings;
 
+    int defaultVer = settings.value(SER_DEFAULTVER, 0).toInt();
+
+#ifdef Q_OS_DARWIN
+    recommendedFullScreenMode = WindowMode::WM_FULLSCREEN_DESKTOP;
+#else
+    recommendedFullScreenMode = WindowMode::WM_FULLSCREEN;
+#endif
+
     width = settings.value(SER_WIDTH, 1280).toInt();
     height = settings.value(SER_HEIGHT, 720).toInt();
     fps = settings.value(SER_FPS, 60).toInt();
@@ -45,10 +62,16 @@ void StreamingPreferences::reload()
     unsupportedFps = settings.value(SER_UNSUPPORTEDFPS, false).toBool();
     enableMdns = settings.value(SER_MDNS, true).toBool();
     quitAppAfter = settings.value(SER_QUITAPPAFTER, false).toBool();
-    mouseAcceleration = settings.value(SER_MOUSEACCELERATION, false).toBool();
-    startWindowed = settings.value(SER_STARTWINDOWED, false).toBool();
+    absoluteMouseMode = settings.value(SER_ABSMOUSEMODE, false).toBool();
+    absoluteTouchMode = settings.value(SER_ABSTOUCHMODE, true).toBool();
+    startWindowed = settings.value(SER_STARTWINDOWED, true).toBool();
     framePacing = settings.value(SER_FRAMEPACING, false).toBool();
     connectionWarnings = settings.value(SER_CONNWARNINGS, true).toBool();
+    richPresence = settings.value(SER_RICHPRESENCE, true).toBool();
+    gamepadMouse = settings.value(SER_GAMEPADMOUSE, true).toBool();
+    detectNetworkBlocking = settings.value(SER_DETECTNETBLOCKING, true).toBool();
+    packetSize = settings.value(SER_PACKETSIZE, 0).toInt();
+    swapMouseButtons = settings.value(SER_SWAPMOUSEBUTTONS, false).toBool();
     audioConfig = static_cast<AudioConfig>(settings.value(SER_AUDIOCFG,
                                                   static_cast<int>(AudioConfig::AC_STEREO)).toInt());
     videoCodecConfig = static_cast<VideoCodecConfig>(settings.value(SER_VIDEOCFG,
@@ -58,7 +81,17 @@ void StreamingPreferences::reload()
     windowMode = static_cast<WindowMode>(settings.value(SER_WINDOWMODE,
                                                         // Try to load from the old preference value too
                                                         static_cast<int>(settings.value(SER_FULLSCREEN, true).toBool() ?
-                                                                             WindowMode::WM_FULLSCREEN : WindowMode::WM_WINDOWED)).toInt());
+                                                                             recommendedFullScreenMode : WindowMode::WM_WINDOWED)).toInt());
+
+    // Perform default settings updates as required based on last default version
+    if (defaultVer == 0) {
+#ifdef Q_OS_DARWIN
+        // Update window mode setting on macOS from full-screen (old default) to borderless windowed (new default)
+        if (windowMode == WindowMode::WM_FULLSCREEN) {
+            windowMode = WindowMode::WM_FULLSCREEN_DESKTOP;
+        }
+#endif
+    }
 }
 
 void StreamingPreferences::save()
@@ -76,14 +109,21 @@ void StreamingPreferences::save()
     settings.setValue(SER_UNSUPPORTEDFPS, unsupportedFps);
     settings.setValue(SER_MDNS, enableMdns);
     settings.setValue(SER_QUITAPPAFTER, quitAppAfter);
-    settings.setValue(SER_MOUSEACCELERATION, mouseAcceleration);
+    settings.setValue(SER_ABSMOUSEMODE, absoluteMouseMode);
+    settings.setValue(SER_ABSTOUCHMODE, absoluteTouchMode);
     settings.setValue(SER_STARTWINDOWED, startWindowed);
     settings.setValue(SER_FRAMEPACING, framePacing);
     settings.setValue(SER_CONNWARNINGS, connectionWarnings);
+    settings.setValue(SER_RICHPRESENCE, richPresence);
+    settings.setValue(SER_GAMEPADMOUSE, gamepadMouse);
+    settings.setValue(SER_PACKETSIZE, packetSize);
+    settings.setValue(SER_DETECTNETBLOCKING, detectNetworkBlocking);
     settings.setValue(SER_AUDIOCFG, static_cast<int>(audioConfig));
     settings.setValue(SER_VIDEOCFG, static_cast<int>(videoCodecConfig));
     settings.setValue(SER_VIDEODEC, static_cast<int>(videoDecoderSelection));
     settings.setValue(SER_WINDOWMODE, static_cast<int>(windowMode));
+    settings.setValue(SER_DEFAULTVER, CURRENT_DEFAULT_VER);
+    settings.setValue(SER_SWAPMOUSEBUTTONS, swapMouseButtons);
 }
 
 int StreamingPreferences::getDefaultBitrate(int width, int height, int fps)

app/settings/streamingpreferences.h

@@ -20,7 +20,8 @@ public:
     enum AudioConfig
     {
         AC_STEREO,
-        AC_51_SURROUND
+        AC_51_SURROUND,
+        AC_71_SURROUND
     };
     Q_ENUM(AudioConfig)
 
@@ -60,14 +61,20 @@ public:
     Q_PROPERTY(bool unsupportedFps MEMBER unsupportedFps NOTIFY unsupportedFpsChanged)
     Q_PROPERTY(bool enableMdns MEMBER enableMdns NOTIFY enableMdnsChanged)
     Q_PROPERTY(bool quitAppAfter MEMBER quitAppAfter NOTIFY quitAppAfterChanged)
-    Q_PROPERTY(bool mouseAcceleration MEMBER mouseAcceleration NOTIFY mouseAccelerationChanged)
+    Q_PROPERTY(bool absoluteMouseMode MEMBER absoluteMouseMode NOTIFY absoluteMouseModeChanged)
+    Q_PROPERTY(bool absoluteTouchMode MEMBER absoluteTouchMode NOTIFY absoluteTouchModeChanged)
     Q_PROPERTY(bool startWindowed MEMBER startWindowed NOTIFY startWindowedChanged)
     Q_PROPERTY(bool framePacing MEMBER framePacing NOTIFY framePacingChanged)
     Q_PROPERTY(bool connectionWarnings MEMBER connectionWarnings NOTIFY connectionWarningsChanged)
+    Q_PROPERTY(bool richPresence MEMBER richPresence NOTIFY richPresenceChanged)
+    Q_PROPERTY(bool gamepadMouse MEMBER gamepadMouse NOTIFY gamepadMouseChanged)
+    Q_PROPERTY(bool detectNetworkBlocking MEMBER detectNetworkBlocking NOTIFY detectNetworkBlockingChanged);
     Q_PROPERTY(AudioConfig audioConfig MEMBER audioConfig NOTIFY audioConfigChanged)
     Q_PROPERTY(VideoCodecConfig videoCodecConfig MEMBER videoCodecConfig NOTIFY videoCodecConfigChanged)
     Q_PROPERTY(VideoDecoderSelection videoDecoderSelection MEMBER videoDecoderSelection NOTIFY videoDecoderSelectionChanged)
     Q_PROPERTY(WindowMode windowMode MEMBER windowMode NOTIFY windowModeChanged)
+    Q_PROPERTY(WindowMode recommendedFullScreenMode MEMBER recommendedFullScreenMode CONSTANT)
+    Q_PROPERTY(bool swapMouseButtons MEMBER swapMouseButtons NOTIFY mouseButtonsChanged)
 
     // Directly accessible members for preferences
     int width;
@@ -81,14 +88,21 @@ public:
     bool unsupportedFps;
     bool enableMdns;
     bool quitAppAfter;
-    bool mouseAcceleration;
+    bool absoluteMouseMode;
+    bool absoluteTouchMode;
     bool startWindowed;
     bool framePacing;
     bool connectionWarnings;
+    bool richPresence;
+    bool gamepadMouse;
+    bool detectNetworkBlocking;
+    bool swapMouseButtons;
+    int packetSize;
     AudioConfig audioConfig;
     VideoCodecConfig videoCodecConfig;
     VideoDecoderSelection videoDecoderSelection;
     WindowMode windowMode;
+    WindowMode recommendedFullScreenMode;
 
 signals:
     void displayModeChanged();
@@ -100,7 +114,8 @@ signals:
     void unsupportedFpsChanged();
     void enableMdnsChanged();
     void quitAppAfterChanged();
-    void mouseAccelerationChanged();
+    void absoluteMouseModeChanged();
+    void absoluteTouchModeChanged();
     void audioConfigChanged();
     void videoCodecConfigChanged();
     void videoDecoderSelectionChanged();
@@ -108,5 +123,9 @@ signals:
     void startWindowedChanged();
     void framePacingChanged();
     void connectionWarningsChanged();
+    void richPresenceChanged();
+    void gamepadMouseChanged();
+    void detectNetworkBlockingChanged();
+    void mouseButtonsChanged();
 };
 

app/shaders/egl.frag

@@ -0,0 +1,21 @@
+#version 300 es
+#extension GL_OES_EGL_image_external : require
+precision mediump float;
+out vec4 FragColor;
+
+in vec2 vTextCoord;
+
+uniform mat3 yuvmat;
+uniform vec3 offset;
+uniform samplerExternalOES plane1;
+uniform samplerExternalOES plane2;
+
+void main() {
+	vec3 YCbCr = vec3(
+		texture2D(plane1, vTextCoord)[0],
+		texture2D(plane2, vTextCoord).xy
+	);
+
+	YCbCr -= offset;
+	FragColor = vec4(clamp(yuvmat * YCbCr, 0.0, 1.0), 1.0f);
+}

app/shaders/egl.vert

@@ -0,0 +1,10 @@
+#version 300 es
+
+layout (location = 0) in vec2 aPosition; // 2D: X,Y
+layout (location = 1) in vec2 aTexCoord;
+out vec2 vTextCoord;
+
+void main() {
+	vTextCoord = aTexCoord;
+	gl_Position = vec4(aPosition, 0, 1);
+}

app/streaming/audio/audio.cpp

@@ -13,54 +13,104 @@
 
 #include <Limelight.h>
 
-IAudioRenderer* Session::createAudioRenderer()
-{
-#if defined(HAVE_SOUNDIO)
-    if (qgetenv("ML_AUDIO") == "SDL") {
-        return new SdlAudioRenderer();
-    }
-
-    return new SoundIoAudioRenderer();
-#elif defined(HAVE_SLAUDIO)
-    return new SLAudioRenderer();
-#else
-    return new SdlAudioRenderer();
-#endif
+#define TRY_INIT_RENDERER(renderer, opusConfig)        \
+{                                                      \
+    IAudioRenderer* __renderer = new renderer();       \
+    if (__renderer->prepareForPlayback(opusConfig))    \
+        return __renderer;                             \
+    delete __renderer;                                 \
 }
 
-bool Session::testAudio(int audioConfiguration)
+IAudioRenderer* Session::createAudioRenderer(const POPUS_MULTISTREAM_CONFIGURATION opusConfig)
 {
-    IAudioRenderer* audioRenderer;
-
-    audioRenderer = createAudioRenderer();
-    if (audioRenderer == nullptr) {
-        return false;
+    // Handle explicit ML_AUDIO setting and fail if the requested backend fails
+    QString mlAudio = qgetenv("ML_AUDIO").toLower();
+    if (mlAudio == "sdl") {
+        TRY_INIT_RENDERER(SdlAudioRenderer, opusConfig)
+        return nullptr;
+    }
+#ifdef HAVE_SOUNDIO
+    else if (mlAudio == "libsoundio") {
+        TRY_INIT_RENDERER(SoundIoAudioRenderer, opusConfig)
+        return nullptr;
+    }
+#endif
+#if defined(HAVE_SLAUDIO)
+    else if (mlAudio == "slaudio") {
+        TRY_INIT_RENDERER(SLAudioRenderer, opusConfig)
+        return nullptr;
+    }
+#endif
+    else if (!mlAudio.isEmpty()) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "Unknown audio backend: %s",
+                     SDL_getenv("ML_AUDIO"));
+        return nullptr;
     }
 
+    // -------------- Automatic backend selection below this line ---------------
+
+#if defined(HAVE_SLAUDIO)
+    // Steam Link should always have SLAudio
+    TRY_INIT_RENDERER(SLAudioRenderer, opusConfig)
+#endif
+
+#if !defined(Q_OS_WIN32) && !defined(Q_OS_DARWIN)
+    // Linux defaults to SDL due to persistent glitching issues under libsoundio.
+    // Platforms that libsoundio doesn't support also default to SDL.
+    TRY_INIT_RENDERER(SdlAudioRenderer, opusConfig)
+#ifdef HAVE_SOUNDIO
+    TRY_INIT_RENDERER(SoundIoAudioRenderer, opusConfig)
+#endif
+#else
+    // Windows and macOS default to libsoundio and fall back to SDL
+#ifdef HAVE_SOUNDIO
+    TRY_INIT_RENDERER(SoundIoAudioRenderer, opusConfig)
+#endif
+    TRY_INIT_RENDERER(SdlAudioRenderer, opusConfig)
+#endif
+
+    return nullptr;
+}
+
+int Session::getAudioRendererCapabilities(int audioConfiguration)
+{
     // Build a fake OPUS_MULTISTREAM_CONFIGURATION to give
     // the renderer the channel count and sample rate.
     OPUS_MULTISTREAM_CONFIGURATION opusConfig = {};
     opusConfig.sampleRate = 48000;
     opusConfig.samplesPerFrame = 240;
+    opusConfig.channelCount = CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION(audioConfiguration);
 
-    switch (audioConfiguration)
-    {
-    case AUDIO_CONFIGURATION_STEREO:
-        opusConfig.channelCount = 2;
-        break;
-    case AUDIO_CONFIGURATION_51_SURROUND:
-        opusConfig.channelCount = 6;
-        break;
-    default:
-        SDL_assert(false);
-        return false;
+    IAudioRenderer* audioRenderer = createAudioRenderer(&opusConfig);
+    if (audioRenderer == nullptr) {
+        return 0;
     }
 
-    bool ret = audioRenderer->prepareForPlayback(&opusConfig);
+    int caps = audioRenderer->getCapabilities();
 
     delete audioRenderer;
 
-    return ret;
+    return caps;
+}
+
+bool Session::testAudio(int audioConfiguration)
+{
+    // Build a fake OPUS_MULTISTREAM_CONFIGURATION to give
+    // the renderer the channel count and sample rate.
+    OPUS_MULTISTREAM_CONFIGURATION opusConfig = {};
+    opusConfig.sampleRate = 48000;
+    opusConfig.samplesPerFrame = 240;
+    opusConfig.channelCount = CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION(audioConfiguration);
+
+    IAudioRenderer* audioRenderer = createAudioRenderer(&opusConfig);
+    if (audioRenderer == nullptr) {
+        return false;
+    }
+
+    delete audioRenderer;
+
+    return true;
 }
 
 int Session::arInit(int /* audioConfiguration */,
@@ -71,30 +121,34 @@ int Session::arInit(int /* audioConfiguration */,
 
     SDL_memcpy(&s_ActiveSession->m_AudioConfig, opusConfig, sizeof(*opusConfig));
 
+    s_ActiveSession->m_AudioRenderer = s_ActiveSession->createAudioRenderer(&s_ActiveSession->m_AudioConfig);
+    if (s_ActiveSession->m_AudioRenderer == nullptr) {
+        return -2;
+    }
+
+    // Allow the chosen renderer to remap Opus channels as needed to ensure proper output
+    s_ActiveSession->m_AudioRenderer->remapChannels(&s_ActiveSession->m_AudioConfig);
+
+    // Create the Opus decoder with the renderer's preferred channel mapping
     s_ActiveSession->m_OpusDecoder =
-            opus_multistream_decoder_create(opusConfig->sampleRate,
-                                            opusConfig->channelCount,
-                                            opusConfig->streams,
-                                            opusConfig->coupledStreams,
-                                            opusConfig->mapping,
+            opus_multistream_decoder_create(s_ActiveSession->m_AudioConfig.sampleRate,
+                                            s_ActiveSession->m_AudioConfig.channelCount,
+                                            s_ActiveSession->m_AudioConfig.streams,
+                                            s_ActiveSession->m_AudioConfig.coupledStreams,
+                                            s_ActiveSession->m_AudioConfig.mapping,
                                             &error);
     if (s_ActiveSession->m_OpusDecoder == NULL) {
+        delete s_ActiveSession->m_AudioRenderer;
+        s_ActiveSession->m_AudioRenderer = nullptr;
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to create decoder: %d",
                      error);
         return -1;
     }
 
-    s_ActiveSession->m_AudioRenderer = s_ActiveSession->createAudioRenderer();
-    if (!s_ActiveSession->m_AudioRenderer->prepareForPlayback(opusConfig)) {
-        delete s_ActiveSession->m_AudioRenderer;
-        opus_multistream_decoder_destroy(s_ActiveSession->m_OpusDecoder);
-        return -2;
-    }
-
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                 "Audio stream has %d channels",
-                opusConfig->channelCount);
+                s_ActiveSession->m_AudioConfig.channelCount);
 
     return 0;
 }
@@ -159,7 +213,7 @@ void Session::arDecodeAndPlaySample(char* sampleData, int sampleLength)
 
         // Update desiredSize with the number of bytes actually populated by the decoding operation
         if (samplesDecoded > 0) {
-            SDL_assert(desiredSize >= sizeof(short) * samplesDecoded * s_ActiveSession->m_AudioConfig.channelCount);
+            SDL_assert(desiredSize >= (int)(sizeof(short) * samplesDecoded * s_ActiveSession->m_AudioConfig.channelCount));
             desiredSize = sizeof(short) * samplesDecoded * s_ActiveSession->m_AudioConfig.channelCount;
         }
         else {
@@ -185,11 +239,7 @@ void Session::arDecodeAndPlaySample(char* sampleData, int sampleLength)
         // so we return to real-time playback and don't accumulate latency.
         Uint32 audioReinitStartTime = SDL_GetTicks();
 
-        s_ActiveSession->m_AudioRenderer = s_ActiveSession->createAudioRenderer();
-        if (!s_ActiveSession->m_AudioRenderer->prepareForPlayback(&s_ActiveSession->m_AudioConfig)) {
-            delete s_ActiveSession->m_AudioRenderer;
-            s_ActiveSession->m_AudioRenderer = nullptr;
-        }
+        s_ActiveSession->m_AudioRenderer = s_ActiveSession->createAudioRenderer(&s_ActiveSession->m_AudioConfig);
 
         Uint32 audioReinitStopTime = SDL_GetTicks();
 

app/streaming/audio/renderers/renderer.h

@@ -13,4 +13,16 @@ public:
 
     // Return false if an unrecoverable error has occurred and the renderer must be reinitialized
     virtual bool submitAudio(int bytesWritten) = 0;
+
+    virtual int getCapabilities() = 0;
+
+    virtual void remapChannels(POPUS_MULTISTREAM_CONFIGURATION) {
+        // Use default channel mapping:
+        // 0 - Front Left
+        // 1 - Front Right
+        // 2 - Center
+        // 3 - LFE
+        // 4 - Surround Left
+        // 5 - Surround Right
+    }
 };

app/streaming/audio/renderers/sdl.h

@@ -16,7 +16,10 @@ public:
 
     virtual bool submitAudio(int bytesWritten);
 
+    virtual int getCapabilities();
+
 private:
     SDL_AudioDeviceID m_AudioDevice;
     void* m_AudioBuffer;
+    int m_FrameSize;
 };

app/streaming/audio/renderers/sdlaud.cpp

@@ -4,12 +4,42 @@
 #include <SDL.h>
 
 #include <QtGlobal>
+#include <QFile>
+#include <QTextStream>
 
 SdlAudioRenderer::SdlAudioRenderer()
     : m_AudioDevice(0),
       m_AudioBuffer(nullptr)
 {
     SDL_assert(!SDL_WasInit(SDL_INIT_AUDIO));
+
+#ifdef HAVE_MMAL
+    // HACK: PulseAudio on Raspberry Pi suffers from horrible underruns,
+    // so switch to ALSA if we detect that we're on a Pi. We need to
+    // actually set a bogus PULSE_SERVER so it doesn't try to get smart on us
+    // and find PA anyway. SDL_AUDIODRIVER=pulseaudio can override this logic.
+    if (qgetenv("SDL_AUDIODRIVER").toLower() != "pulseaudio") {
+        QFile file("/proc/cpuinfo");
+        if (file.open(QIODevice::ReadOnly | QFile::Text)) {
+            QTextStream textStream(&file);
+            if (textStream.readAll().contains("Raspberry Pi")) {
+                SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                            "Avoiding PulseAudio on Raspberry Pi");
+
+                qputenv("PULSE_SERVER", "");
+                if (SDL_InitSubSystem(SDL_INIT_AUDIO) != 0) {
+                    SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                                "ALSA failed; falling back to default");
+                    qunsetenv("PULSE_SERVER");
+                }
+                else {
+                    SDL_QuitSubSystem(SDL_INIT_AUDIO);
+                }
+            }
+        }
+    }
+#endif
+
     if (SDL_InitSubSystem(SDL_INIT_AUDIO) != 0) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "SDL_InitSubSystem(SDL_INIT_AUDIO) failed: %s",
@@ -33,6 +63,8 @@ bool SdlAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION*
     // Specifying non-Po2 seems to work for our supported platforms.
     want.samples = opusConfig->samplesPerFrame;
 
+    m_FrameSize = opusConfig->samplesPerFrame * sizeof(short) * opusConfig->channelCount;
+
     m_AudioDevice = SDL_OpenAudioDevice(NULL, 0, &want, &have, 0);
     if (m_AudioDevice == 0) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -41,7 +73,7 @@ bool SdlAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION*
         return false;
     }
 
-    m_AudioBuffer = malloc(opusConfig->samplesPerFrame * sizeof(short) * opusConfig->channelCount);
+    m_AudioBuffer = malloc(m_FrameSize);
     if (m_AudioBuffer == nullptr) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to allocate audio buffer");
@@ -49,9 +81,9 @@ bool SdlAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION*
     }
 
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Desired audio buffer: %u samples (%lu bytes)",
+                "Desired audio buffer: %u samples (%u bytes)",
                 want.samples,
-                want.samples * sizeof(short) * want.channels);
+                want.samples * (Uint32)sizeof(short) * want.channels);
 
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                 "Obtained audio buffer: %u samples (%u bytes)",
@@ -92,6 +124,18 @@ bool SdlAudioRenderer::submitAudio(int bytesWritten)
         return true;
     }
 
+    // Don't queue if there's already more than 30 ms of audio data waiting
+    // in Moonlight's audio queue.
+    if (LiGetPendingAudioDuration() > 30) {
+        return true;
+    }
+
+    // Provide backpressure on the queue to ensure too many frames don't build up
+    // in SDL's audio queue.
+    while (SDL_GetQueuedAudioSize(m_AudioDevice) / m_FrameSize > 10) {
+        SDL_Delay(1);
+    }
+
     if (SDL_QueueAudio(m_AudioDevice, m_AudioBuffer, bytesWritten) < 0) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to queue audio sample: %s",
@@ -100,3 +144,9 @@ bool SdlAudioRenderer::submitAudio(int bytesWritten)
 
     return true;
 }
+
+int SdlAudioRenderer::getCapabilities()
+{
+    // Direct submit can't be used because we use LiGetPendingAudioDuration()
+    return CAPABILITY_SUPPORTS_ARBITRARY_AUDIO_DURATION;
+}

app/streaming/audio/renderers/slaud.cpp

@@ -23,7 +23,6 @@ bool SLAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION* o
     // it's hard to avoid since we get crushed by CPU limitations.
     m_MaxQueuedAudioMs = 40 * opusConfig->channelCount / 2;
 
-    m_FrameDuration = opusConfig->samplesPerFrame / 48;
     m_AudioBufferSize = opusConfig->samplesPerFrame * sizeof(short) * opusConfig->channelCount;
     m_AudioStream = SLAudio_CreateStream(m_AudioContext,
                                          opusConfig->sampleRate,
@@ -37,12 +36,35 @@ bool SLAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION* o
     }
 
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Using SLAudio renderer with %d ms frames",
-                m_FrameDuration);
+                "Using SLAudio renderer with %d samples per frame",
+                opusConfig->samplesPerFrame);
 
     return true;
 }
 
+void SLAudioRenderer::remapChannels(POPUS_MULTISTREAM_CONFIGURATION opusConfig) {
+    OPUS_MULTISTREAM_CONFIGURATION originalConfig = *opusConfig;
+
+    // The Moonlight's default channel order is FL,FR,C,LFE,RL,RR,SL,SR
+    // SLAudio expects FL,C,FR,RL,RR,(SL,SR),LFE for 5.1/7.1 so we swap the channels around to match
+
+    if (opusConfig->channelCount == 3 || opusConfig->channelCount >= 6) {
+        // Swap FR and C
+        opusConfig->mapping[1] = originalConfig.mapping[2];
+        opusConfig->mapping[2] = originalConfig.mapping[1];
+    }
+
+    if (opusConfig->channelCount >= 6) {
+        // SLAudio expects the LFE channel at the end
+        opusConfig->mapping[opusConfig->channelCount - 1] = originalConfig.mapping[3];
+
+        // Slide the other channels down
+        memcpy(&opusConfig->mapping[3],
+               &originalConfig.mapping[4],
+               opusConfig->channelCount - 4);
+    }
+}
+
 void* SLAudioRenderer::getAudioBuffer(int* size)
 {
     SDL_assert(*size == m_AudioBufferSize);
@@ -77,7 +99,7 @@ bool SLAudioRenderer::submitAudio(int bytesWritten)
         return true;
     }
 
-    if (LiGetPendingAudioFrames() * m_FrameDuration < m_MaxQueuedAudioMs) {
+    if (LiGetPendingAudioDuration() < m_MaxQueuedAudioMs) {
         SLAudio_SubmitFrame(m_AudioStream);
         m_AudioBuffer = nullptr;
     }
@@ -90,6 +112,11 @@ bool SLAudioRenderer::submitAudio(int bytesWritten)
     return true;
 }
 
+int SLAudioRenderer::getCapabilities()
+{
+    return CAPABILITY_SLOW_OPUS_DECODER | CAPABILITY_SUPPORTS_ARBITRARY_AUDIO_DURATION;
+}
+
 void SLAudioRenderer::slLogCallback(void*, ESLAudioLog logLevel, const char *message)
 {
     SDL_LogPriority priority;

app/streaming/audio/renderers/slaud.h

@@ -16,6 +16,10 @@ public:
 
     virtual bool submitAudio(int bytesWritten);
 
+    virtual int getCapabilities();
+
+    virtual void remapChannels(POPUS_MULTISTREAM_CONFIGURATION opusConfig);
+
 private:
     static void slLogCallback(void* context, ESLAudioLog logLevel, const char* message);
 
@@ -24,6 +28,5 @@ private:
 
     void* m_AudioBuffer;
     int m_AudioBufferSize;
-    int m_FrameDuration;
     int m_MaxQueuedAudioMs;
 };

app/streaming/audio/renderers/soundioaudiorenderer.cpp

@@ -4,29 +4,13 @@
 
 #include <QtGlobal>
 
-// GFE sends us packets in 5 ms chunks
-const double SoundIoAudioRenderer::k_RawSampleLengthSec = 0.005;
-
-#ifdef Q_OS_LINUX
-// PulseAudio and ALSA require more than just 5 ms samples
-// for some reason, so write a minimum of 25 ms each time to
-// prevent underruns on Bluetooth.
-// https://github.com/moonlight-stream/moonlight-qt/issues/147
-// https://github.com/moonlight-stream/moonlight-qt/issues/157
-const double SoundIoAudioRenderer::k_MinSampleLengthSec = 0.025;
-#else
-// This determines the size of the buffers we'll
-// get from CoreAudio. It is also the minimum
-// size that we will write when called to fill a buffer.
-const double SoundIoAudioRenderer::k_MinSampleLengthSec = k_RawSampleLengthSec;
-#endif
-
 SoundIoAudioRenderer::SoundIoAudioRenderer()
     : m_OpusChannelCount(0),
       m_SoundIo(nullptr),
       m_Device(nullptr),
       m_OutputStream(nullptr),
       m_RingBuffer(nullptr),
+      m_AudioPacketDuration(0),
       m_Latency(0),
       m_Errored(false)
 {
@@ -88,11 +72,17 @@ int SoundIoAudioRenderer::scoreChannelLayout(const struct SoundIoChannelLayout*
                 score++;
                 break;
 
-            // Score layouts using the back L/R as higher
-            // value than those using side L/R.
             case SoundIoChannelIdBackLeft:
             case SoundIoChannelIdBackRight:
-                score += 2;
+                if (opusConfig->channelCount == 6) {
+                    // Score back channels higher in 5.1 mode to
+                    // discourage selection of side channel layouts.
+                    score += 2;
+                }
+                else {
+                    // Score back channels normally for 7.1 mode
+                    score++;
+                }
                 break;
 
             default:
@@ -172,9 +162,11 @@ bool SoundIoAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATI
         return false;
     }
 
+    m_AudioPacketDuration = (opusConfig->samplesPerFrame / (opusConfig->sampleRate / 1000)) / 1000.0;
+
     m_OutputStream->format = SoundIoFormatS16NE;
     m_OutputStream->sample_rate = opusConfig->sampleRate;
-    m_OutputStream->software_latency = k_MinSampleLengthSec;
+    m_OutputStream->software_latency = m_AudioPacketDuration;
     m_OutputStream->name = "Moonlight";
     m_OutputStream->userdata = this;
     m_OutputStream->error_callback = sioErrorCallback;
@@ -225,37 +217,45 @@ bool SoundIoAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATI
 
     m_EffectiveLayout = m_OutputStream->layout;
     for (int i = 0; i < m_EffectiveLayout.channel_count; i++) {
-        // Fixup the layout to use back L/R so our channel position
-        // logic in sioWriteCallback() works.
-        if (m_EffectiveLayout.channels[i] == SoundIoChannelIdSideLeft) {
-            m_EffectiveLayout.channels[i] = SoundIoChannelIdBackLeft;
+        if (opusConfig->channelCount == 6) {
+            // For 5.1, replace side L/R with back L/R so our channel position
+            // logic in sioWriteCallback() works.
+            if (m_EffectiveLayout.channels[i] == SoundIoChannelIdSideLeft) {
+                m_EffectiveLayout.channels[i] = SoundIoChannelIdBackLeft;
+            }
+            if (m_EffectiveLayout.channels[i] == SoundIoChannelIdSideRight) {
+                m_EffectiveLayout.channels[i] = SoundIoChannelIdBackRight;
+            }
         }
-        if (m_EffectiveLayout.channels[i] == SoundIoChannelIdSideRight) {
-            m_EffectiveLayout.channels[i] = SoundIoChannelIdBackRight;
+        else if (opusConfig->channelCount == 8) {
+            // For 5.1, replace side L/R with LOC/ROC so our channel position
+            // logic in sioWriteCallback() works.
+            if (m_EffectiveLayout.channels[i] == SoundIoChannelIdSideLeft) {
+                m_EffectiveLayout.channels[i] = SoundIoChannelIdFrontLeftCenter;
+            }
+            if (m_EffectiveLayout.channels[i] == SoundIoChannelIdSideRight) {
+                m_EffectiveLayout.channels[i] = SoundIoChannelIdFrontRightCenter;
+            }
         }
     }
 
     int packetsToBuffer;
 
-#ifdef Q_OS_LINUX
-    // PulseAudio and ALSA need the large buffer (see comment on k_MinSampleLengthSec),
-    // so we need a buffer at least double that size to allow packets to arrive
-    // while we're writing to the sink.
-    packetsToBuffer = (int)(k_MinSampleLengthSec / k_RawSampleLengthSec) * 2;
-#else
     if (m_SoundIo->current_backend == SoundIoBackendWasapi) {
         // 15 ms buffer seems to be fine for WASAPI
-        packetsToBuffer = 3;
+        packetsToBuffer = (int)ceil(0.015 / m_AudioPacketDuration);
     }
     else {
         // 30 ms buffer on CoreAudio to avoid glitching on macOS
-        packetsToBuffer = 6;
+        packetsToBuffer = (int)ceil(0.030 / m_AudioPacketDuration);
     }
-#endif
+
+    // Always buffer at least 2 packets
+    packetsToBuffer = qMax(2, packetsToBuffer);
 
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Audio buffer size: %d packets",
-                packetsToBuffer);
+                "Audio buffer size: %f seconds",
+                packetsToBuffer * m_AudioPacketDuration);
 
     m_RingBuffer = soundio_ring_buffer_create(m_SoundIo,
                                               m_OutputStream->bytes_per_sample *
@@ -317,6 +317,12 @@ bool SoundIoAudioRenderer::submitAudio(int bytesWritten)
     return true;
 }
 
+int SoundIoAudioRenderer::getCapabilities()
+{
+    // TODO: Tweak buffer sizes then re-enable arbitrary audio duration
+    return CAPABILITY_DIRECT_SUBMIT /* | CAPABILITY_SUPPORTS_ARBITRARY_AUDIO_DURATION */;
+}
+
 void SoundIoAudioRenderer::sioErrorCallback(SoundIoOutStream* stream, int err)
 {
     auto me = reinterpret_cast<SoundIoAudioRenderer*>(stream->userdata);
@@ -381,15 +387,19 @@ void SoundIoAudioRenderer::sioWriteCallback(SoundIoOutStream* stream, int frameC
             (me->m_OpusChannelCount * stream->bytes_per_sample);
     int bytesRead = 0;
 
-    // Clamp framesLeft to frameCountMax
-    framesLeft = qMin(framesLeft, frameCountMax);
-
     // Ensure we always write at least a buffer, even if it's silence, to avoid
     // busy looping when no audio data is available while libsoundio tries to keep
     // us from starving the output device.
-    frameCountMin = qMax(frameCountMin, (int)(stream->sample_rate * k_MinSampleLengthSec));
+    frameCountMin = qMax(frameCountMin, (int)(stream->sample_rate * me->m_AudioPacketDuration));
+
+    // Clamp frameCountMax to at least 2 packets or 20 ms to stop our latency from growing if audio packets lag.
+    // This makes sure that we never increase our latency far beyond what the sink is consuming.
+    frameCountMax = qMin(frameCountMax, (int)(stream->sample_rate * qMax(me->m_AudioPacketDuration * 2, 0.020)));
     frameCountMin = qMin(frameCountMin, frameCountMax);
 
+    // Clamp framesLeft to frameCountMax
+    framesLeft = qMin(framesLeft, frameCountMax);
+
     // Track latency on queueing-based backends
     if (me->m_SoundIo->current_backend != SoundIoBackendCoreAudio && me->m_SoundIo->current_backend != SoundIoBackendJack) {
         soundio_outstream_get_latency(stream, &me->m_Latency);
@@ -419,9 +429,8 @@ void SoundIoAudioRenderer::sioWriteCallback(SoundIoOutStream* stream, int frameC
 
         for (int frame = 0; frame < frameCount; frame++) {
             for (int ch = 0; ch < me->m_EffectiveLayout.channel_count; ch++) {
-                // SoundIoChannelId - 1 happens to match Moonlight's channel layout.
-                // For side L/R, this logic depends on us fixing those up
-                // in m_EffectiveLayout to back L/R.
+                // SoundIoChannelId - 1 happens to match Moonlight's channel layout
+                // after we've applied our fixups to m_EffectiveLayout for 5.1 and 7.1.
                 int readPtrChannel = me->m_EffectiveLayout.channels[ch] - 1;
 
                 if (frame >= framesLeft || readPtrChannel >= me->m_OpusChannelCount) {

app/streaming/audio/renderers/soundioaudiorenderer.h

@@ -17,6 +17,8 @@ public:
 
     virtual bool submitAudio(int bytesWritten);
 
+    virtual int getCapabilities();
+
 private:
     int scoreChannelLayout(const struct SoundIoChannelLayout* layout, const OPUS_MULTISTREAM_CONFIGURATION* opusConfig);
 
@@ -34,9 +36,7 @@ private:
     struct SoundIoOutStream* m_OutputStream;
     struct SoundIoRingBuffer* m_RingBuffer;
     struct SoundIoChannelLayout m_EffectiveLayout;
+    double m_AudioPacketDuration;
     double m_Latency;
     bool m_Errored;
-
-    static const double k_RawSampleLengthSec;
-    static const double k_MinSampleLengthSec;
 };

app/streaming/input/abstouch.cpp

@@ -0,0 +1,107 @@
+#include "input.h"
+
+#include <Limelight.h>
+#include <SDL.h>
+#include "streaming/streamutils.h"
+
+#include <QtMath>
+
+// How long the fingers must be stationary to start a right click
+#define LONG_PRESS_ACTIVATION_DELAY 650
+
+// How far the finger can move before it cancels a right click
+#define LONG_PRESS_ACTIVATION_DELTA 0.01f
+
+// How long the double tap deadzone stays in effect between touch up and touch down
+#define DOUBLE_TAP_DEAD_ZONE_DELAY 250
+
+// How far the finger can move before it can override the double tap deadzone
+#define DOUBLE_TAP_DEAD_ZONE_DELTA 0.025f
+
+Uint32 SdlInputHandler::longPressTimerCallback(Uint32, void*)
+{
+    // Raise the left click and start a right click
+    LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+    LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
+
+    return 0;
+}
+
+void SdlInputHandler::handleAbsoluteFingerEvent(SDL_TouchFingerEvent* event)
+{
+    // Observations on Windows 10: x and y appear to be relative to 0,0 of the window client area.
+    // Although SDL documentation states they are 0.0 - 1.0 float values, they can actually be higher
+    // or lower than those values as touch events continue for touches started within the client area that
+    // leave the client area during a drag motion.
+    // dx and dy are deltas from the last touch event, not the first touch down.
+
+    // Ignore touch down events with more than one finger
+    if (event->type == SDL_FINGERDOWN && SDL_GetNumTouchFingers(event->touchId) > 1) {
+        return;
+    }
+
+    // Ignore touch move and touch up events from the non-primary finger
+    if (event->type != SDL_FINGERDOWN && event->fingerId != m_LastTouchDownEvent.fingerId) {
+        return;
+    }
+
+    SDL_Rect src, dst;
+    int windowWidth, windowHeight;
+
+    SDL_GetWindowSize(m_Window, &windowWidth, &windowHeight);
+
+    src.x = src.y = 0;
+    src.w = m_StreamWidth;
+    src.h = m_StreamHeight;
+
+    dst.x = dst.y = 0;
+    dst.w = windowWidth;
+    dst.h = windowHeight;
+
+    // Use the stream and window sizes to determine the video region
+    StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
+
+    if (qSqrt(qPow(event->x - m_LastTouchDownEvent.x, 2) + qPow(event->y - m_LastTouchDownEvent.y, 2)) > LONG_PRESS_ACTIVATION_DELTA) {
+        // Moved too far since touch down. Cancel the long press timer.
+        SDL_RemoveTimer(m_LongPressTimer);
+        m_LongPressTimer = 0;
+    }
+
+    // Don't reposition for finger down events within the deadzone. This makes double-clicking easier.
+    if (event->type != SDL_FINGERDOWN ||
+            event->timestamp - m_LastTouchUpEvent.timestamp > DOUBLE_TAP_DEAD_ZONE_DELAY ||
+            qSqrt(qPow(event->x - m_LastTouchUpEvent.x, 2) + qPow(event->y - m_LastTouchUpEvent.y, 2)) > DOUBLE_TAP_DEAD_ZONE_DELTA) {
+        // Scale window-relative events to be video-relative and clamp to video region
+        short x = qMin(qMax((int)(event->x * windowWidth), dst.x), dst.x + dst.w);
+        short y = qMin(qMax((int)(event->y * windowHeight), dst.y), dst.y + dst.h);
+
+        // Update the cursor position relative to the video region
+        LiSendMousePositionEvent(x - dst.x, y - dst.y, dst.w, dst.h);
+    }
+
+    if (event->type == SDL_FINGERDOWN) {
+        m_LastTouchDownEvent = *event;
+
+        // Start/restart the long press timer
+        SDL_RemoveTimer(m_LongPressTimer);
+        m_LongPressTimer = SDL_AddTimer(LONG_PRESS_ACTIVATION_DELAY,
+                                        longPressTimerCallback,
+                                        nullptr);
+
+        // Left button down on finger down
+        LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+    }
+    else if (event->type == SDL_FINGERUP) {
+        m_LastTouchUpEvent = *event;
+
+        // Cancel the long press timer
+        SDL_RemoveTimer(m_LongPressTimer);
+        m_LongPressTimer = 0;
+
+        // Left button up on finger up
+        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+
+        // Raise right button too in case we triggered a long press gesture
+        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
+    }
+}

app/streaming/input/gamepad.cpp

@@ -0,0 +1,595 @@
+#include "streaming/session.h"
+
+#include <Limelight.h>
+#include <SDL.h>
+#include "settings/mappingmanager.h"
+
+#include <QtMath>
+
+// How long the Start button must be pressed to toggle mouse emulation
+#define MOUSE_EMULATION_LONG_PRESS_TIME 750
+
+// How long between polling the gamepad to send virtual mouse input
+#define MOUSE_EMULATION_POLLING_INTERVAL 50
+
+// Determines how fast the mouse will move each interval
+#define MOUSE_EMULATION_MOTION_MULTIPLIER 4
+
+// Determines the maximum motion amount before allowing movement
+#define MOUSE_EMULATION_DEADZONE 2
+
+// Haptic capabilities (in addition to those from SDL_HapticQuery())
+#define ML_HAPTIC_GC_RUMBLE      (1U << 16)
+#define ML_HAPTIC_SIMPLE_RUMBLE  (1U << 17)
+
+const int SdlInputHandler::k_ButtonMap[] = {
+    A_FLAG, B_FLAG, X_FLAG, Y_FLAG,
+    BACK_FLAG, SPECIAL_FLAG, PLAY_FLAG,
+    LS_CLK_FLAG, RS_CLK_FLAG,
+    LB_FLAG, RB_FLAG,
+    UP_FLAG, DOWN_FLAG, LEFT_FLAG, RIGHT_FLAG
+};
+
+GamepadState*
+SdlInputHandler::findStateForGamepad(SDL_JoystickID id)
+{
+    int i;
+
+    for (i = 0; i < MAX_GAMEPADS; i++) {
+        if (m_GamepadState[i].jsId == id) {
+            SDL_assert(!m_MultiController || m_GamepadState[i].index == i);
+            return &m_GamepadState[i];
+        }
+    }
+
+    // This should only happen with > 4 gamepads
+    SDL_assert(SDL_NumJoysticks() > 4);
+    return nullptr;
+}
+
+void SdlInputHandler::sendGamepadState(GamepadState* state)
+{
+    SDL_assert(m_GamepadMask == 0x1 || m_MultiController);
+    LiSendMultiControllerEvent(state->index,
+                               m_GamepadMask,
+                               state->buttons,
+                               state->lt,
+                               state->rt,
+                               state->lsX,
+                               state->lsY,
+                               state->rsX,
+                               state->rsY);
+}
+
+Uint32 SdlInputHandler::mouseEmulationTimerCallback(Uint32 interval, void *param)
+{
+    auto gamepad = reinterpret_cast<GamepadState*>(param);
+
+    short rawX;
+    short rawY;
+
+    // Determine which analog stick is currently receiving the strongest input
+    if ((uint32_t)qAbs(gamepad->lsX) + qAbs(gamepad->lsY) > (uint32_t)qAbs(gamepad->rsX) + qAbs(gamepad->rsY)) {
+        rawX = gamepad->lsX;
+        rawY = -gamepad->lsY;
+    }
+    else {
+        rawX = gamepad->rsX;
+        rawY = -gamepad->rsY;
+    }
+
+    float deltaX;
+    float deltaY;
+
+    // Produce a base vector for mouse movement with increased speed as we deviate further from center
+    deltaX = qPow(rawX / 32766.0f * MOUSE_EMULATION_MOTION_MULTIPLIER, 3);
+    deltaY = qPow(rawY / 32766.0f * MOUSE_EMULATION_MOTION_MULTIPLIER, 3);
+
+    // Enforce deadzones
+    deltaX = qAbs(deltaX) > MOUSE_EMULATION_DEADZONE ? deltaX - MOUSE_EMULATION_DEADZONE : 0;
+    deltaY = qAbs(deltaY) > MOUSE_EMULATION_DEADZONE ? deltaY - MOUSE_EMULATION_DEADZONE : 0;
+
+    if (deltaX != 0 || deltaY != 0) {
+        LiSendMouseMoveEvent((short)deltaX, (short)deltaY);
+    }
+
+    return interval;
+}
+
+void SdlInputHandler::handleControllerAxisEvent(SDL_ControllerAxisEvent* event)
+{
+    SDL_JoystickID gameControllerId = event->which;
+    GamepadState* state = findStateForGamepad(gameControllerId);
+    if (state == NULL) {
+        return;
+    }
+
+    // Batch all pending axis motion events for this gamepad to save CPU time
+    SDL_Event nextEvent;
+    for (;;) {
+        switch (event->axis)
+        {
+            case SDL_CONTROLLER_AXIS_LEFTX:
+                state->lsX = event->value;
+                break;
+            case SDL_CONTROLLER_AXIS_LEFTY:
+                // Signed values have one more negative value than
+                // positive value, so inverting the sign on -32768
+                // could actually cause the value to overflow and
+                // wrap around to be negative again. Avoid that by
+                // capping the value at 32767.
+                state->lsY = -qMax(event->value, (short)-32767);
+                break;
+            case SDL_CONTROLLER_AXIS_RIGHTX:
+                state->rsX = event->value;
+                break;
+            case SDL_CONTROLLER_AXIS_RIGHTY:
+                state->rsY = -qMax(event->value, (short)-32767);
+                break;
+            case SDL_CONTROLLER_AXIS_TRIGGERLEFT:
+                state->lt = (unsigned char)(event->value * 255UL / 32767);
+                break;
+            case SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
+                state->rt = (unsigned char)(event->value * 255UL / 32767);
+                break;
+            default:
+                SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                            "Unhandled controller axis: %d",
+                            event->axis);
+                return;
+        }
+
+        // Check for another event to batch with
+        if (SDL_PeepEvents(&nextEvent, 1, SDL_PEEKEVENT, SDL_CONTROLLERAXISMOTION, SDL_CONTROLLERAXISMOTION) <= 0) {
+            break;
+        }
+
+        event = &nextEvent.caxis;
+        if (event->which != gameControllerId) {
+            // Stop batching if a different gamepad interrupts us
+            break;
+        }
+
+        // Remove the next event to batch
+        SDL_PeepEvents(&nextEvent, 1, SDL_GETEVENT, SDL_CONTROLLERAXISMOTION, SDL_CONTROLLERAXISMOTION);
+    }
+
+    // Only send the gamepad state to the host if it's not in mouse emulation mode
+    if (state->mouseEmulationTimer == 0) {
+        sendGamepadState(state);
+    }
+}
+
+void SdlInputHandler::handleControllerButtonEvent(SDL_ControllerButtonEvent* event)
+{
+    GamepadState* state = findStateForGamepad(event->which);
+    if (state == NULL) {
+        return;
+    }
+
+    if (event->state == SDL_PRESSED) {
+        state->buttons |= k_ButtonMap[event->button];
+
+        if (event->button == SDL_CONTROLLER_BUTTON_START) {
+            state->lastStartDownTime = SDL_GetTicks();
+        }
+        else if (state->mouseEmulationTimer != 0) {
+            if (event->button == SDL_CONTROLLER_BUTTON_A) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_B) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_X) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_MIDDLE);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_LEFTSHOULDER) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_X1);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_RIGHTSHOULDER) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_X2);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_DPAD_UP) {
+                LiSendScrollEvent(1);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_DPAD_DOWN) {
+                LiSendScrollEvent(-1);
+            }
+        }
+    }
+    else {
+        state->buttons &= ~k_ButtonMap[event->button];
+
+        if (event->button == SDL_CONTROLLER_BUTTON_START) {
+            if (SDL_GetTicks() - state->lastStartDownTime > MOUSE_EMULATION_LONG_PRESS_TIME) {
+                if (state->mouseEmulationTimer != 0) {
+                    SDL_RemoveTimer(state->mouseEmulationTimer);
+                    state->mouseEmulationTimer = 0;
+
+                    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                                "Mouse emulation deactivated");
+                    Session::get()->notifyMouseEmulationMode(false);
+                }
+                else if (m_GamepadMouse) {
+                    // Send the start button up event to the host, since we won't do it below
+                    sendGamepadState(state);
+
+                    state->mouseEmulationTimer = SDL_AddTimer(MOUSE_EMULATION_POLLING_INTERVAL, SdlInputHandler::mouseEmulationTimerCallback, state);
+
+                    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                                "Mouse emulation active");
+                    Session::get()->notifyMouseEmulationMode(true);
+                }
+            }
+        }
+        else if (state->mouseEmulationTimer != 0) {
+            if (event->button == SDL_CONTROLLER_BUTTON_A) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_B) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_X) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_MIDDLE);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_LEFTSHOULDER) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_X1);
+            }
+            else if (event->button == SDL_CONTROLLER_BUTTON_RIGHTSHOULDER) {
+                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_X2);
+            }
+        }
+    }
+
+    // Handle Start+Select+L1+R1 as a gamepad quit combo
+    if (state->buttons == (PLAY_FLAG | BACK_FLAG | LB_FLAG | RB_FLAG)) {
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Detected quit gamepad button combo");
+
+        // Push a quit event to the main loop
+        SDL_Event event;
+        event.type = SDL_QUIT;
+        event.quit.timestamp = SDL_GetTicks();
+        SDL_PushEvent(&event);
+
+        // Clear buttons down on this gameapd
+        LiSendMultiControllerEvent(state->index, m_GamepadMask,
+                                   0, 0, 0, 0, 0, 0, 0);
+        return;
+    }
+
+    // Only send the gamepad state to the host if it's not in mouse emulation mode
+    if (state->mouseEmulationTimer == 0) {
+        sendGamepadState(state);
+    }
+}
+
+void SdlInputHandler::handleControllerDeviceEvent(SDL_ControllerDeviceEvent* event)
+{
+    GamepadState* state;
+
+    if (event->type == SDL_CONTROLLERDEVICEADDED) {
+        int i;
+        const char* name;
+        SDL_GameController* controller;
+        const char* mapping;
+        char guidStr[33];
+        uint32_t hapticCaps;
+
+        controller = SDL_GameControllerOpen(event->which);
+        if (controller == NULL) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "Failed to open gamepad: %s",
+                         SDL_GetError());
+            return;
+        }
+
+        // We used to use SDL_GameControllerGetPlayerIndex() here but that
+        // can lead to strange issues due to bugs in Windows where an Xbox
+        // controller will join as player 2, even though no player 1 controller
+        // is connected at all. This pretty much screws any attempt to use
+        // the gamepad in single player games, so just assign them in order from 0.
+        i = 0;
+
+        for (; i < MAX_GAMEPADS; i++) {
+            SDL_assert(m_GamepadState[i].controller != controller);
+            if (m_GamepadState[i].controller == NULL) {
+                // Found an empty slot
+                break;
+            }
+        }
+
+        if (i == MAX_GAMEPADS) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "No open gamepad slots found!");
+            SDL_GameControllerClose(controller);
+            return;
+        }
+
+        state = &m_GamepadState[i];
+        if (m_MultiController) {
+            state->index = i;
+
+#if SDL_VERSION_ATLEAST(2, 0, 12)
+            // This will change indicators on the controller to show the assigned
+            // player index. For Xbox 360 controllers, that means updating the LED
+            // ring to light up the corresponding quadrant for this player.
+            SDL_GameControllerSetPlayerIndex(controller, state->index);
+#endif
+        }
+        else {
+            // Always player 1 in single controller mode
+            state->index = 0;
+        }
+
+        state->controller = controller;
+        state->jsId = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(state->controller));
+
+#if SDL_VERSION_ATLEAST(2, 0, 9)
+        // Perform a tiny rumble to see if haptics are supported.
+        // NB: We cannot use zeros for rumble intensity or SDL will not actually call the JS driver
+        // and we'll get a (potentially false) success value returned.
+        hapticCaps = SDL_GameControllerRumble(controller, 1, 1, 1) == 0 ?
+                        ML_HAPTIC_GC_RUMBLE : 0;
+#else
+        state->haptic = SDL_HapticOpenFromJoystick(SDL_GameControllerGetJoystick(state->controller));
+        state->hapticEffectId = -1;
+        state->hapticMethod = GAMEPAD_HAPTIC_METHOD_NONE;
+        if (state->haptic != nullptr) {
+            // Query for supported haptic effects
+            hapticCaps = SDL_HapticQuery(state->haptic);
+            hapticCaps |= SDL_HapticRumbleSupported(state->haptic) ?
+                            ML_HAPTIC_SIMPLE_RUMBLE : 0;
+
+            if ((SDL_HapticQuery(state->haptic) & SDL_HAPTIC_LEFTRIGHT) == 0) {
+                if (SDL_HapticRumbleSupported(state->haptic)) {
+                    if (SDL_HapticRumbleInit(state->haptic) == 0) {
+                        state->hapticMethod = GAMEPAD_HAPTIC_METHOD_SIMPLERUMBLE;
+                    }
+                }
+                if (state->hapticMethod == GAMEPAD_HAPTIC_METHOD_NONE) {
+                    SDL_HapticClose(state->haptic);
+                    state->haptic = nullptr;
+                }
+            } else {
+                state->hapticMethod = GAMEPAD_HAPTIC_METHOD_LEFTRIGHT;
+            }
+        }
+        else {
+            hapticCaps = 0;
+        }
+#endif
+
+        SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(SDL_GameControllerGetJoystick(state->controller)),
+                                  guidStr, sizeof(guidStr));
+        mapping = SDL_GameControllerMapping(state->controller);
+        name = SDL_GameControllerName(state->controller);
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Gamepad %d (player %d) is: %s (haptic capabilities: 0x%x) (mapping: %s -> %s)",
+                    i,
+                    state->index,
+                    name != nullptr ? name : "<null>",
+                    hapticCaps,
+                    guidStr,
+                    mapping != nullptr ? mapping : "<null>");
+        if (mapping != nullptr) {
+            SDL_free((void*)mapping);
+        }
+
+        // Add this gamepad to the gamepad mask
+        if (m_MultiController) {
+            // NB: Don't assert that it's unset here because we will already
+            // have the mask set for initially attached gamepads to avoid confusing
+            // apps running on the host.
+            m_GamepadMask |= (1 << state->index);
+        }
+        else {
+            SDL_assert(m_GamepadMask == 0x1);
+        }
+
+        // Send an empty event to tell the PC we've arrived
+        sendGamepadState(state);
+    }
+    else if (event->type == SDL_CONTROLLERDEVICEREMOVED) {
+        state = findStateForGamepad(event->which);
+        if (state != NULL) {
+            if (state->mouseEmulationTimer != 0) {
+                Session::get()->notifyMouseEmulationMode(false);
+                SDL_RemoveTimer(state->mouseEmulationTimer);
+            }
+
+            SDL_GameControllerClose(state->controller);
+
+#if !SDL_VERSION_ATLEAST(2, 0, 9)
+            if (state->haptic != nullptr) {
+                SDL_HapticClose(state->haptic);
+            }
+#endif
+
+            // Remove this from the gamepad mask in MC-mode
+            if (m_MultiController) {
+                SDL_assert(m_GamepadMask & (1 << state->index));
+                m_GamepadMask &= ~(1 << state->index);
+            }
+            else {
+                SDL_assert(m_GamepadMask == 0x1);
+            }
+
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Gamepad %d is gone",
+                        state->index);
+
+            // Send a final event to let the PC know this gamepad is gone
+            LiSendMultiControllerEvent(state->index, m_GamepadMask,
+                                       0, 0, 0, 0, 0, 0, 0);
+
+            // Clear all remaining state from this slot
+            SDL_memset(state, 0, sizeof(*state));
+        }
+    }
+}
+
+void SdlInputHandler::handleJoystickArrivalEvent(SDL_JoyDeviceEvent* event)
+{
+    SDL_assert(event->type == SDL_JOYDEVICEADDED);
+
+    if (!SDL_IsGameController(event->which)) {
+        char guidStr[33];
+        SDL_JoystickGetGUIDString(SDL_JoystickGetDeviceGUID(event->which),
+                                  guidStr, sizeof(guidStr));
+        const char* name = SDL_JoystickNameForIndex(event->which);
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                    "Joystick discovered with no mapping: %s %s",
+                    name ? name : "<UNKNOWN>",
+                    guidStr);
+        SDL_Joystick* joy = SDL_JoystickOpen(event->which);
+        if (joy != nullptr) {
+            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                        "Number of axes: %d | Number of buttons: %d | Number of hats: %d",
+                        SDL_JoystickNumAxes(joy), SDL_JoystickNumButtons(joy),
+                        SDL_JoystickNumHats(joy));
+            SDL_JoystickClose(joy);
+        }
+        else {
+            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                        "Unable to open joystick for query: %s",
+                        SDL_GetError());
+        }
+    }
+}
+
+void SdlInputHandler::rumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor)
+{
+    // Make sure the controller number is within our supported count
+    if (controllerNumber >= MAX_GAMEPADS) {
+        return;
+    }
+
+#if SDL_VERSION_ATLEAST(2, 0, 9)
+    if (m_GamepadState[controllerNumber].controller != nullptr) {
+        SDL_GameControllerRumble(m_GamepadState[controllerNumber].controller, lowFreqMotor, highFreqMotor, 30000);
+    }
+#else
+    // Check if the controller supports haptics (and if the controller exists at all)
+    SDL_Haptic* haptic = m_GamepadState[controllerNumber].haptic;
+    if (haptic == nullptr) {
+        return;
+    }
+
+    // Stop the last effect we played
+    if (m_GamepadState[controllerNumber].hapticMethod == GAMEPAD_HAPTIC_METHOD_LEFTRIGHT) {
+        if (m_GamepadState[controllerNumber].hapticEffectId >= 0) {
+            SDL_HapticDestroyEffect(haptic, m_GamepadState[controllerNumber].hapticEffectId);
+        }
+    } else if (m_GamepadState[controllerNumber].hapticMethod == GAMEPAD_HAPTIC_METHOD_SIMPLERUMBLE) {
+        SDL_HapticRumbleStop(haptic);
+    }
+
+    // If this callback is telling us to stop both motors, don't bother queuing a new effect
+    if (lowFreqMotor == 0 && highFreqMotor == 0) {
+        return;
+    }
+
+    if (m_GamepadState[controllerNumber].hapticMethod == GAMEPAD_HAPTIC_METHOD_LEFTRIGHT) {
+        SDL_HapticEffect effect;
+        SDL_memset(&effect, 0, sizeof(effect));
+        effect.type = SDL_HAPTIC_LEFTRIGHT;
+
+        // The effect should last until we are instructed to stop or change it
+        effect.leftright.length = SDL_HAPTIC_INFINITY;
+
+        // SDL haptics range from 0-32767 but XInput uses 0-65535, so divide by 2 to correct for SDL's scaling
+        effect.leftright.large_magnitude = lowFreqMotor / 2;
+        effect.leftright.small_magnitude = highFreqMotor / 2;
+
+        // Play the new effect
+        m_GamepadState[controllerNumber].hapticEffectId = SDL_HapticNewEffect(haptic, &effect);
+        if (m_GamepadState[controllerNumber].hapticEffectId >= 0) {
+            SDL_HapticRunEffect(haptic, m_GamepadState[controllerNumber].hapticEffectId, 1);
+        }
+    } else if (m_GamepadState[controllerNumber].hapticMethod == GAMEPAD_HAPTIC_METHOD_SIMPLERUMBLE) {
+        SDL_HapticRumblePlay(haptic,
+                             std::min(1.0, (GAMEPAD_HAPTIC_SIMPLE_HIFREQ_MOTOR_WEIGHT*highFreqMotor +
+                                            GAMEPAD_HAPTIC_SIMPLE_LOWFREQ_MOTOR_WEIGHT*lowFreqMotor) / 65535.0),
+                             SDL_HAPTIC_INFINITY);
+    }
+#endif
+}
+
+QString SdlInputHandler::getUnmappedGamepads()
+{
+    QString ret;
+
+    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) failed: %s",
+                     SDL_GetError());
+    }
+
+    MappingManager mappingManager;
+    mappingManager.applyMappings();
+
+    for (int i = 0; i < SDL_NumJoysticks(); i++) {
+        if (!SDL_IsGameController(i)) {
+            char guidStr[33];
+            SDL_JoystickGetGUIDString(SDL_JoystickGetDeviceGUID(i),
+                                      guidStr, sizeof(guidStr));
+            const char* name = SDL_JoystickNameForIndex(i);
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Unmapped joystick: %s %s",
+                        name ? name : "<UNKNOWN>",
+                        guidStr);
+            SDL_Joystick* joy = SDL_JoystickOpen(i);
+            if (joy != nullptr) {
+                int numButtons = SDL_JoystickNumButtons(joy);
+                int numHats = SDL_JoystickNumHats(joy);
+                int numAxes = SDL_JoystickNumAxes(joy);
+
+                SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                            "Number of axes: %d | Number of buttons: %d | Number of hats: %d",
+                            numAxes, numButtons, numHats);
+
+                if ((numAxes >= 4 && numAxes <= 8) && numButtons >= 8 && numHats <= 1) {
+                    SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                                "Joystick likely to be an unmapped game controller");
+                    if (!ret.isEmpty()) {
+                        ret += ", ";
+                    }
+
+                    ret += name;
+                }
+
+                SDL_JoystickClose(joy);
+            }
+            else {
+                SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                            "Unable to open joystick for query: %s",
+                            SDL_GetError());
+            }
+        }
+    }
+
+    SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
+
+    return ret;
+}
+
+int SdlInputHandler::getAttachedGamepadMask()
+{
+    int count;
+    int mask;
+
+    if (!m_MultiController) {
+        // Player 1 is always present in non-MC mode
+        return 0x1;
+    }
+
+    count = mask = 0;
+    for (int i = 0; i < SDL_NumJoysticks(); i++) {
+        if (SDL_IsGameController(i)) {
+            mask |= (1 << count++);
+        }
+    }
+
+    return mask;
+}

app/streaming/input/input.cpp

@@ -0,0 +1,346 @@
+#include <Limelight.h>
+#include <SDL.h>
+#include "streaming/session.h"
+#include "settings/mappingmanager.h"
+#include "path.h"
+
+#include <QtGlobal>
+#include <QDir>
+
+#define MOUSE_POLLING_INTERVAL 5
+
+SdlInputHandler::SdlInputHandler(StreamingPreferences& prefs, NvComputer*, int streamWidth, int streamHeight)
+    : m_MultiController(prefs.multiController),
+      m_GamepadMouse(prefs.gamepadMouse),
+      m_SwapMouseButtons(prefs.swapMouseButtons),
+      m_MouseMoveTimer(0),
+      m_MousePositionLock(0),
+      m_MouseWasInVideoRegion(false),
+      m_PendingMouseButtonsAllUpOnVideoRegionLeave(false),
+      m_FakeCaptureActive(false),
+      m_LongPressTimer(0),
+      m_StreamWidth(streamWidth),
+      m_StreamHeight(streamHeight),
+      m_AbsoluteMouseMode(prefs.absoluteMouseMode),
+      m_AbsoluteTouchMode(prefs.absoluteTouchMode),
+      m_PendingMouseLeaveButtonUp(0),
+      m_LeftButtonReleaseTimer(0),
+      m_RightButtonReleaseTimer(0),
+      m_DragTimer(0),
+      m_DragButton(0),
+      m_NumFingersDown(0)
+{
+    // Allow gamepad input when the app doesn't have focus
+    SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
+
+    // If absolute mouse mode is enabled, use relative mode warp (which
+    // is via normal motion events that are influenced by mouse acceleration).
+    // Otherwise, we'll use raw input capture which is straight from the device
+    // without modification by the OS.
+    SDL_SetHintWithPriority(SDL_HINT_MOUSE_RELATIVE_MODE_WARP,
+                            prefs.absoluteMouseMode ? "1" : "0",
+                            SDL_HINT_OVERRIDE);
+
+    // Allow clicks to pass through to us when focusing the window. If we're in
+    // absolute mouse mode, this will avoid the user having to click twice to
+    // trigger a click on the host if the Moonlight window is not focused. In
+    // relative mode, the click event will trigger the mouse to be recaptured.
+    SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1");
+
+#if defined(Q_OS_DARWIN) && !SDL_VERSION_ATLEAST(2, 0, 10)
+    // SDL 2.0.9 on macOS has a broken HIDAPI mapping for the older Xbox One S
+    // firmware, so we have to disable HIDAPI for Xbox gamepads on macOS until
+    // SDL 2.0.10 where the bug is fixed.
+    // https://github.com/moonlight-stream/moonlight-qt/issues/133
+    // https://bugzilla.libsdl.org/show_bug.cgi?id=4395
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_XBOX, "0");
+#endif
+
+#if SDL_VERSION_ATLEAST(2, 0, 9)
+    // Enabling extended input reports allows rumble to function on Bluetooth PS4
+    // controllers, but breaks DirectInput applications. We will enable it because
+    // it's likely that working rumble is what the user is expecting. If they don't
+    // want this behavior, they can override it with the environment variable.
+    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1");
+#endif
+
+    m_OldIgnoreDevices = SDL_GetHint(SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES);
+    m_OldIgnoreDevicesExcept = SDL_GetHint(SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT);
+
+    QString streamIgnoreDevices = qgetenv("STREAM_GAMECONTROLLER_IGNORE_DEVICES");
+    QString streamIgnoreDevicesExcept = qgetenv("STREAM_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT");
+
+    if (!streamIgnoreDevices.isEmpty() && !streamIgnoreDevices.endsWith(',')) {
+        streamIgnoreDevices += ',';
+    }
+    streamIgnoreDevices += m_OldIgnoreDevices;
+
+    // For SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES, we use the union of SDL_GAMECONTROLLER_IGNORE_DEVICES
+    // and STREAM_GAMECONTROLLER_IGNORE_DEVICES while streaming. STREAM_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT
+    // overrides SDL_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT while streaming.
+    SDL_SetHint(SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES, streamIgnoreDevices.toUtf8());
+    SDL_SetHint(SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT, streamIgnoreDevicesExcept.toUtf8());
+
+    // We must initialize joystick explicitly before gamecontroller in order
+    // to ensure we receive gamecontroller attach events for gamepads where
+    // SDL doesn't have a built-in mapping. By starting joystick first, we
+    // can allow mapping manager to update the mappings before GC attach
+    // events are generated.
+    SDL_assert(!SDL_WasInit(SDL_INIT_JOYSTICK));
+    if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_JOYSTICK) failed: %s",
+                     SDL_GetError());
+    }
+
+    MappingManager mappingManager;
+    mappingManager.applyMappings();
+
+    // Flush gamepad arrival and departure events which may be queued before
+    // starting the gamecontroller subsystem again. This prevents us from
+    // receiving duplicate arrival and departure events for the same gamepad.
+    SDL_FlushEvent(SDL_CONTROLLERDEVICEADDED);
+    SDL_FlushEvent(SDL_CONTROLLERDEVICEREMOVED);
+
+    // We need to reinit this each time, since you only get
+    // an initial set of gamepad arrival events once per init.
+    SDL_assert(!SDL_WasInit(SDL_INIT_GAMECONTROLLER));
+    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) failed: %s",
+                     SDL_GetError());
+    }
+
+#if !SDL_VERSION_ATLEAST(2, 0, 9)
+    SDL_assert(!SDL_WasInit(SDL_INIT_HAPTIC));
+    if (SDL_InitSubSystem(SDL_INIT_HAPTIC) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_HAPTIC) failed: %s",
+                     SDL_GetError());
+    }
+#endif
+
+    // Initialize the gamepad mask with currently attached gamepads to avoid
+    // causing gamepads to unexpectedly disappear and reappear on the host
+    // during stream startup as we detect currently attached gamepads one at a time.
+    m_GamepadMask = getAttachedGamepadMask();
+
+    SDL_zero(m_GamepadState);
+    SDL_zero(m_LastTouchDownEvent);
+    SDL_zero(m_LastTouchUpEvent);
+    SDL_zero(m_TouchDownEvent);
+    SDL_zero(m_MousePositionReport);
+
+    SDL_AtomicSet(&m_MouseDeltaX, 0);
+    SDL_AtomicSet(&m_MouseDeltaY, 0);
+    SDL_AtomicSet(&m_MousePositionUpdated, 0);
+
+    Uint32 pollingInterval = QString(qgetenv("MOUSE_POLLING_INTERVAL")).toUInt();
+    if (pollingInterval == 0) {
+        pollingInterval = MOUSE_POLLING_INTERVAL;
+    }
+    else {
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                    "Using custom mouse polling interval: %u ms",
+                    pollingInterval);
+    }
+
+    m_MouseMoveTimer = SDL_AddTimer(pollingInterval, SdlInputHandler::mouseMoveTimerCallback, this);
+}
+
+SdlInputHandler::~SdlInputHandler()
+{
+    for (int i = 0; i < MAX_GAMEPADS; i++) {
+        if (m_GamepadState[i].mouseEmulationTimer != 0) {
+            Session::get()->notifyMouseEmulationMode(false);
+            SDL_RemoveTimer(m_GamepadState[i].mouseEmulationTimer);
+        }
+#if !SDL_VERSION_ATLEAST(2, 0, 9)
+        if (m_GamepadState[i].haptic != nullptr) {
+            SDL_HapticClose(m_GamepadState[i].haptic);
+        }
+#endif
+        if (m_GamepadState[i].controller != nullptr) {
+            SDL_GameControllerClose(m_GamepadState[i].controller);
+        }
+    }
+
+    SDL_RemoveTimer(m_MouseMoveTimer);
+    SDL_RemoveTimer(m_LongPressTimer);
+    SDL_RemoveTimer(m_LeftButtonReleaseTimer);
+    SDL_RemoveTimer(m_RightButtonReleaseTimer);
+    SDL_RemoveTimer(m_DragTimer);
+
+#if !SDL_VERSION_ATLEAST(2, 0, 9)
+    SDL_QuitSubSystem(SDL_INIT_HAPTIC);
+    SDL_assert(!SDL_WasInit(SDL_INIT_HAPTIC));
+#endif
+
+    SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
+    SDL_assert(!SDL_WasInit(SDL_INIT_GAMECONTROLLER));
+
+    SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+    SDL_assert(!SDL_WasInit(SDL_INIT_JOYSTICK));
+
+    // Return background event handling to off
+    SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "0");
+
+    // Restore the ignored devices
+    SDL_SetHint(SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES, m_OldIgnoreDevices.toUtf8());
+    SDL_SetHint(SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT, m_OldIgnoreDevicesExcept.toUtf8());
+
+#ifdef STEAM_LINK
+    // Hide SDL's cursor on Steam Link after quitting the stream.
+    // FIXME: We should also do this for other situations where SDL
+    // and Qt will draw their own mouse cursors like KMSDRM or RPi
+    // video backends.
+    SDL_ShowCursor(SDL_DISABLE);
+#endif
+}
+
+void SdlInputHandler::setWindow(SDL_Window *window)
+{
+    m_Window = window;
+}
+
+void SdlInputHandler::raiseAllKeys()
+{
+    if (m_KeysDown.isEmpty()) {
+        return;
+    }
+
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Raising %d keys",
+                m_KeysDown.count());
+
+    for (auto keyDown : m_KeysDown) {
+        LiSendKeyboardEvent(keyDown, KEY_ACTION_UP, 0);
+    }
+
+    m_KeysDown.clear();
+}
+
+void SdlInputHandler::notifyMouseLeave()
+{
+#ifdef Q_OS_WIN32
+    // SDL on Windows doesn't send the mouse button up until the mouse re-enters the window
+    // after leaving it. This breaks some of the Aero snap gestures, so we'll fake it here.
+    if (m_AbsoluteMouseMode && isCaptureActive()) {
+        // NB: Not using SDL_GetGlobalMouseState() because we want our state not the system's
+        Uint32 mouseState = SDL_GetMouseState(nullptr, nullptr);
+        for (Uint32 button = SDL_BUTTON_LEFT; button <= SDL_BUTTON_X2; button++) {
+            if (mouseState & SDL_BUTTON(button)) {
+                m_PendingMouseLeaveButtonUp = button;
+                break;
+            }
+        }
+    }
+#endif
+}
+
+void SdlInputHandler::notifyFocusLost()
+{
+    // Release mouse cursor when another window is activated (e.g. by using ALT+TAB).
+    // This lets user to interact with our window's title bar and with the buttons in it.
+    // Doing this while the window is full-screen breaks the transition out of FS
+    // (desktop and exclusive), so we must check for that before releasing mouse capture.
+    if (!(SDL_GetWindowFlags(m_Window) & SDL_WINDOW_FULLSCREEN) && !m_AbsoluteMouseMode) {
+        setCaptureActive(false);
+    }
+
+    // Raise all keys that are currently pressed. If we don't do this, certain keys
+    // used in shortcuts that cause focus loss (such as Alt+Tab) may get stuck down.
+    raiseAllKeys();
+}
+
+bool SdlInputHandler::isCaptureActive()
+{
+    if (SDL_GetRelativeMouseMode()) {
+        return true;
+    }
+
+    // Some platforms don't support SDL_SetRelativeMouseMode
+    return m_FakeCaptureActive;
+}
+
+void SdlInputHandler::setCaptureActive(bool active)
+{
+    if (active) {
+        // If we're in full-screen exclusive mode, grab the cursor so it can't accidentally leave our window.
+        if ((SDL_GetWindowFlags(m_Window) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN) {
+            SDL_SetWindowGrab(m_Window, SDL_TRUE);
+        }
+
+        if (!m_AbsoluteMouseMode) {
+            // If our window is occluded when mouse is captured, the mouse may
+            // get stuck on top of the occluding window and not be properly
+            // captured. We can avoid this by raising our window before we
+            // capture the mouse.
+            SDL_RaiseWindow(m_Window);
+        }
+
+        // If we're in relative mode, try to activate SDL's relative mouse mode
+        if (m_AbsoluteMouseMode || SDL_SetRelativeMouseMode(SDL_TRUE) < 0) {
+            // Relative mouse mode didn't work or was disabled, so we'll just hide the cursor
+            SDL_ShowCursor(SDL_DISABLE);
+            m_FakeCaptureActive = true;
+        }
+
+        // Synchronize the client and host cursor when activating absolute capture
+        if (m_AbsoluteMouseMode) {
+            int mouseX, mouseY;
+            int windowX, windowY;
+
+            // We have to use SDL_GetGlobalMouseState() because macOS may not reflect
+            // the new position of the mouse when outside the window.
+            SDL_GetGlobalMouseState(&mouseX, &mouseY);
+
+            // Convert global mouse state to window-relative
+            SDL_GetWindowPosition(m_Window, &windowX, &windowY);
+            mouseX -= windowX;
+            mouseY -= windowY;
+
+            if (isMouseInVideoRegion(mouseX, mouseY)) {
+                updateMousePositionReport(mouseX, mouseY);
+            }
+        }
+    }
+    else {
+        if (m_FakeCaptureActive) {
+            // Display the cursor again
+            SDL_ShowCursor(SDL_ENABLE);
+            m_FakeCaptureActive = false;
+        }
+        else {
+            SDL_SetRelativeMouseMode(SDL_FALSE);
+        }
+
+        // Allow the cursor to leave the bounds of our window again.
+        SDL_SetWindowGrab(m_Window, SDL_FALSE);
+    }
+}
+
+void SdlInputHandler::handleTouchFingerEvent(SDL_TouchFingerEvent* event)
+{
+#if SDL_VERSION_ATLEAST(2, 0, 10)
+    if (SDL_GetTouchDeviceType(event->touchId) != SDL_TOUCH_DEVICE_DIRECT) {
+        // Ignore anything that isn't a touchscreen. We may get callbacks
+        // for trackpads, but we want to handle those in the mouse path.
+        return;
+    }
+#elif defined(Q_OS_DARWIN)
+    // SDL2 sends touch events from trackpads by default on
+    // macOS. This totally screws our actual mouse handling,
+    // so we must explicitly ignore touch events on macOS
+    // until SDL 2.0.10 where we have SDL_GetTouchDeviceType()
+    // to tell them apart.
+    return;
+#endif
+
+    if (m_AbsoluteTouchMode) {
+        handleAbsoluteFingerEvent(event);
+    }
+    else {
+        handleRelativeFingerEvent(event);
+    }
+}

app/streaming/input/input.h

@@ -5,13 +5,19 @@
 
 #include <SDL.h>
 
+#define SDL_CODE_HIDE_CURSOR 1
+#define SDL_CODE_SHOW_CURSOR 2
+
 struct GamepadState {
     SDL_GameController* controller;
     SDL_JoystickID jsId;
+    short index;
+
+#if !SDL_VERSION_ATLEAST(2, 0, 9)
     SDL_Haptic* haptic;
     int hapticMethod;
     int hapticEffectId;
-    short index;
+#endif
 
     SDL_TimerID mouseEmulationTimer;
     uint32_t lastStartDownTime;
@@ -40,6 +46,8 @@ public:
 
     ~SdlInputHandler();
 
+    void setWindow(SDL_Window* window);
+
     void handleKeyEvent(SDL_KeyboardEvent* event);
 
     void handleMouseButtonEvent(SDL_MouseButtonEvent* event);
@@ -64,6 +72,20 @@ public:
 
     void raiseAllKeys();
 
+    void notifyMouseLeave();
+
+    void notifyFocusLost();
+
+    bool isCaptureActive();
+
+    void setCaptureActive(bool active);
+
+    bool isMouseInVideoRegion(int mouseX, int mouseY, int windowWidth = -1, int windowHeight = -1);
+
+    void updateMousePositionReport(int mouseX, int mouseY);
+
+    void flushMousePositionUpdate();
+
     static
     QString getUnmappedGamepads();
 
@@ -73,6 +95,19 @@ private:
 
     void sendGamepadState(GamepadState* state);
 
+    void handleAbsoluteFingerEvent(SDL_TouchFingerEvent* event);
+
+    void handleRelativeFingerEvent(SDL_TouchFingerEvent* event);
+
+    static
+    Uint32 longPressTimerCallback(Uint32 interval, void* param);
+
+    static
+    Uint32 mouseMoveTimerCallback(Uint32 interval, void* param);
+
+    static
+    Uint32 mouseEmulationTimerCallback(Uint32 interval, void* param);
+
     static
     Uint32 releaseLeftButtonTimerCallback(Uint32 interval, void* param);
 
@@ -82,29 +117,45 @@ private:
     static
     Uint32 dragTimerCallback(Uint32 interval, void* param);
 
-    static
-    Uint32 mouseMoveTimerCallback(Uint32 interval, void* param);
-
-    static
-    Uint32 mouseEmulationTimerCallback(Uint32 interval, void* param);
-
+    SDL_Window* m_Window;
     bool m_MultiController;
+    bool m_GamepadMouse;
+    bool m_SwapMouseButtons;
     SDL_TimerID m_MouseMoveTimer;
     SDL_atomic_t m_MouseDeltaX;
     SDL_atomic_t m_MouseDeltaY;
+
+    SDL_SpinLock m_MousePositionLock;
+    struct {
+        int x, y;
+        int windowWidth, windowHeight;
+    } m_MousePositionReport;
+    SDL_atomic_t m_MousePositionUpdated;
+    bool m_MouseWasInVideoRegion;
+    bool m_PendingMouseButtonsAllUpOnVideoRegionLeave;
+
     int m_GamepadMask;
     GamepadState m_GamepadState[MAX_GAMEPADS];
     QSet<short> m_KeysDown;
+    bool m_FakeCaptureActive;
+    QString m_OldIgnoreDevices;
+    QString m_OldIgnoreDevicesExcept;
+
+    SDL_TouchFingerEvent m_LastTouchDownEvent;
+    SDL_TouchFingerEvent m_LastTouchUpEvent;
+    SDL_TimerID m_LongPressTimer;
+    int m_StreamWidth;
+    int m_StreamHeight;
+    bool m_AbsoluteMouseMode;
+    bool m_AbsoluteTouchMode;
+    Uint32 m_PendingMouseLeaveButtonUp;
 
     SDL_TouchFingerEvent m_TouchDownEvent[MAX_FINGERS];
-    float m_CumulativeDelta[MAX_FINGERS];
     SDL_TimerID m_LeftButtonReleaseTimer;
     SDL_TimerID m_RightButtonReleaseTimer;
     SDL_TimerID m_DragTimer;
     char m_DragButton;
     int m_NumFingersDown;
-    int m_StreamWidth;
-    int m_StreamHeight;
 
     static const int k_ButtonMap[];
 };

app/streaming/input/keyboard.cpp

@@ -0,0 +1,420 @@
+#include "streaming/session.h"
+
+#include <Limelight.h>
+#include <SDL.h>
+
+#include <QGuiApplication>
+
+// Until we can fully capture these on all platforms (without conflicting with
+// OS-provided shortcuts), we should avoid passing them through to the host.
+//#define ENABLE_META
+
+#define VK_0 0x30
+#define VK_A 0x41
+
+// These are real Windows VK_* codes
+#ifndef VK_F1
+#define VK_F1 0x70
+#define VK_F13 0x7C
+#define VK_NUMPAD0 0x60
+#endif
+
+void SdlInputHandler::handleKeyEvent(SDL_KeyboardEvent* event)
+{
+    short keyCode;
+    char modifiers;
+
+    // Check for our special key combos
+    if ((event->state == SDL_PRESSED) &&
+            (event->keysym.mod & KMOD_CTRL) &&
+            (event->keysym.mod & KMOD_ALT) &&
+            (event->keysym.mod & KMOD_SHIFT)) {
+        // First we test the SDLK combos for matches,
+        // that way we ensure that latin keyboard users
+        // can match to the key they see on their keyboards.
+        // If nothing matches that, we'll then go on to
+        // checking scancodes so non-latin keyboard users
+        // can have working hotkeys (though possibly in
+        // odd positions). We must do all SDLK tests before
+        // any scancode tests to avoid issues in cases
+        // where the SDLK for one shortcut collides with
+        // the scancode of another.
+
+        // Check for quit combo (Ctrl+Alt+Shift+Q)
+        if (event->keysym.sym == SDLK_q) {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected quit key combo (SDLK)");
+
+            // Push a quit event to the main loop
+            SDL_Event event;
+            event.type = SDL_QUIT;
+            event.quit.timestamp = SDL_GetTicks();
+            SDL_PushEvent(&event);
+            return;
+        }
+        // Check for the unbind combo (Ctrl+Alt+Shift+Z) unless on EGLFS which has no window manager
+        else if (event->keysym.sym == SDLK_z && QGuiApplication::platformName() != "eglfs") {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected mouse capture toggle combo (SDLK)");
+
+            // Stop handling future input
+            setCaptureActive(!isCaptureActive());
+
+            // Force raise all keys to ensure they aren't stuck,
+            // since we won't get their key up events.
+            raiseAllKeys();
+            return;
+        }
+        // Check for the mouse mode combo (Ctrl+Alt+Shift+M) unless on EGLFS which has no window manager
+        else if (event->keysym.sym == SDLK_m && QGuiApplication::platformName() != "eglfs") {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected mouse mode toggle combo (SDLK)");
+
+            // Uncapture input
+            setCaptureActive(false);
+
+            // Toggle mouse mode
+            m_AbsoluteMouseMode = !m_AbsoluteMouseMode;
+
+            // Recapture input
+            setCaptureActive(true);
+            return;
+        }
+        else if (event->keysym.sym == SDLK_x && QGuiApplication::platformName() != "eglfs") {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected full-screen toggle combo (SDLK)");
+            Session::s_ActiveSession->toggleFullscreen();
+
+            // Force raise all keys just be safe across this full-screen/windowed
+            // transition just in case key events get lost.
+            raiseAllKeys();
+            return;
+        }
+        // Check for overlay combo (Ctrl+Alt+Shift+S)
+        else if (event->keysym.sym == SDLK_s) {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected stats toggle combo (SDLK)");
+
+            // Toggle the stats overlay
+            Session::get()->getOverlayManager().setOverlayState(Overlay::OverlayDebug,
+                                                                !Session::get()->getOverlayManager().isOverlayEnabled(Overlay::OverlayDebug));
+
+            // Force raise all keys just be safe across this full-screen/windowed
+            // transition just in case key events get lost.
+            raiseAllKeys();
+            return;
+        }
+        // Check for quit combo (Ctrl+Alt+Shift+Q)
+        else if (event->keysym.scancode == SDL_SCANCODE_Q) {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected quit key combo (scancode)");
+
+            // Push a quit event to the main loop
+            SDL_Event event;
+            event.type = SDL_QUIT;
+            event.quit.timestamp = SDL_GetTicks();
+            SDL_PushEvent(&event);
+            return;
+        }
+        // Check for the unbind combo (Ctrl+Alt+Shift+Z)
+        else if (event->keysym.scancode == SDL_SCANCODE_Z && QGuiApplication::platformName() != "eglfs") {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected mouse capture toggle combo (scancode)");
+
+            // Stop handling future input
+            setCaptureActive(!isCaptureActive());
+
+            // Force raise all keys to ensure they aren't stuck,
+            // since we won't get their key up events.
+            raiseAllKeys();
+            return;
+        }
+        // Check for the full-screen combo (Ctrl+Alt+Shift+X) unless on EGLFS which has no window manager
+        else if (event->keysym.scancode == SDL_SCANCODE_X && QGuiApplication::platformName() != "eglfs") {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected full-screen toggle combo (scancode)");
+            Session::s_ActiveSession->toggleFullscreen();
+
+            // Force raise all keys just be safe across this full-screen/windowed
+            // transition just in case key events get lost.
+            raiseAllKeys();
+            return;
+        }
+        // Check for the mouse mode toggle combo (Ctrl+Alt+Shift+M) unless on EGLFS which has no window manager
+        else if (event->keysym.scancode == SDL_SCANCODE_M && QGuiApplication::platformName() != "eglfs") {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected mouse mode toggle combo (scancode)");
+
+            // Uncapture input
+            setCaptureActive(false);
+
+            // Toggle mouse mode
+            m_AbsoluteMouseMode = !m_AbsoluteMouseMode;
+
+            // Recapture input
+            setCaptureActive(true);
+            return;
+        }
+        else if (event->keysym.scancode == SDL_SCANCODE_S) {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Detected stats toggle combo (scancode)");
+
+            // Toggle the stats overlay
+            Session::get()->getOverlayManager().setOverlayState(Overlay::OverlayDebug,
+                                                                !Session::get()->getOverlayManager().isOverlayEnabled(Overlay::OverlayDebug));
+
+            // Force raise all keys just be safe across this full-screen/windowed
+            // transition just in case key events get lost.
+            raiseAllKeys();
+            return;
+        }
+    }
+
+    if (event->repeat) {
+        // Ignore repeat key down events
+        SDL_assert(event->state == SDL_PRESSED);
+        return;
+    }
+
+    // Set modifier flags
+    modifiers = 0;
+    if (event->keysym.mod & KMOD_CTRL) {
+        modifiers |= MODIFIER_CTRL;
+    }
+    if (event->keysym.mod & KMOD_ALT) {
+        modifiers |= MODIFIER_ALT;
+    }
+    if (event->keysym.mod & KMOD_SHIFT) {
+        modifiers |= MODIFIER_SHIFT;
+    }
+#ifdef ENABLE_META
+    if (event->keysym.mod & KMOD_GUI) {
+        modifiers |= MODIFIER_META;
+    }
+#endif
+
+    // Set keycode. We explicitly use scancode here because GFE will try to correct
+    // for AZERTY layouts on the host but it depends on receiving VK_ values matching
+    // a QWERTY layout to work.
+    if (event->keysym.scancode >= SDL_SCANCODE_1 && event->keysym.scancode <= SDL_SCANCODE_9) {
+        // SDL defines SDL_SCANCODE_0 > SDL_SCANCODE_9, so we need to handle that manually
+        keyCode = (event->keysym.scancode - SDL_SCANCODE_1) + VK_0 + 1;
+    }
+    else if (event->keysym.scancode >= SDL_SCANCODE_A && event->keysym.scancode <= SDL_SCANCODE_Z) {
+        keyCode = (event->keysym.scancode - SDL_SCANCODE_A) + VK_A;
+    }
+    else if (event->keysym.scancode >= SDL_SCANCODE_F1 && event->keysym.scancode <= SDL_SCANCODE_F12) {
+        keyCode = (event->keysym.scancode - SDL_SCANCODE_F1) + VK_F1;
+    }
+    else if (event->keysym.scancode >= SDL_SCANCODE_F13 && event->keysym.scancode <= SDL_SCANCODE_F24) {
+        keyCode = (event->keysym.scancode - SDL_SCANCODE_F13) + VK_F13;
+    }
+    else if (event->keysym.scancode >= SDL_SCANCODE_KP_1 && event->keysym.scancode <= SDL_SCANCODE_KP_9) {
+        // SDL defines SDL_SCANCODE_KP_0 > SDL_SCANCODE_KP_9, so we need to handle that manually
+        keyCode = (event->keysym.scancode - SDL_SCANCODE_KP_1) + VK_NUMPAD0 + 1;
+    }
+    else {
+        switch (event->keysym.scancode) {
+            case SDL_SCANCODE_BACKSPACE:
+                keyCode = 0x08;
+                break;
+            case SDL_SCANCODE_TAB:
+                keyCode = 0x09;
+                break;
+            case SDL_SCANCODE_CLEAR:
+                keyCode = 0x0C;
+                break;
+            case SDL_SCANCODE_KP_ENTER: // FIXME: Is this correct?
+            case SDL_SCANCODE_RETURN:
+                keyCode = 0x0D;
+                break;
+            case SDL_SCANCODE_PAUSE:
+                keyCode = 0x13;
+                break;
+            case SDL_SCANCODE_CAPSLOCK:
+                keyCode = 0x14;
+                break;
+            case SDL_SCANCODE_ESCAPE:
+                keyCode = 0x1B;
+                break;
+            case SDL_SCANCODE_SPACE:
+                keyCode = 0x20;
+                break;
+            case SDL_SCANCODE_PAGEUP:
+                keyCode = 0x21;
+                break;
+            case SDL_SCANCODE_PAGEDOWN:
+                keyCode = 0x22;
+                break;
+            case SDL_SCANCODE_END:
+                keyCode = 0x23;
+                break;
+            case SDL_SCANCODE_HOME:
+                keyCode = 0x24;
+                break;
+            case SDL_SCANCODE_LEFT:
+                keyCode = 0x25;
+                break;
+            case SDL_SCANCODE_UP:
+                keyCode = 0x26;
+                break;
+            case SDL_SCANCODE_RIGHT:
+                keyCode = 0x27;
+                break;
+            case SDL_SCANCODE_DOWN:
+                keyCode = 0x28;
+                break;
+            case SDL_SCANCODE_SELECT:
+                keyCode = 0x29;
+                break;
+            case SDL_SCANCODE_EXECUTE:
+                keyCode = 0x2B;
+                break;
+            case SDL_SCANCODE_PRINTSCREEN:
+                keyCode = 0x2C;
+                break;
+            case SDL_SCANCODE_INSERT:
+                keyCode = 0x2D;
+                break;
+            case SDL_SCANCODE_DELETE:
+                keyCode = 0x2E;
+                break;
+            case SDL_SCANCODE_HELP:
+                keyCode = 0x2F;
+                break;
+            case SDL_SCANCODE_KP_0:
+                // See comment above about why we only handle SDL_SCANCODE_KP_0 here
+                keyCode = VK_NUMPAD0;
+                break;
+            case SDL_SCANCODE_0:
+                // See comment above about why we only handle SDL_SCANCODE_0 here
+                keyCode = VK_0;
+                break;
+            case SDL_SCANCODE_KP_MULTIPLY:
+                keyCode = 0x6A;
+                break;
+            case SDL_SCANCODE_KP_PLUS:
+                keyCode = 0x6B;
+                break;
+            case SDL_SCANCODE_KP_COMMA:
+                keyCode = 0x6C;
+                break;
+            case SDL_SCANCODE_KP_MINUS:
+                keyCode = 0x6D;
+                break;
+            case SDL_SCANCODE_KP_PERIOD:
+                keyCode = 0x6E;
+                break;
+            case SDL_SCANCODE_KP_DIVIDE:
+                keyCode = 0x6F;
+                break;
+            case SDL_SCANCODE_NUMLOCKCLEAR:
+                keyCode = 0x90;
+                break;
+            case SDL_SCANCODE_SCROLLLOCK:
+                keyCode = 0x91;
+                break;
+            case SDL_SCANCODE_LSHIFT:
+                keyCode = 0xA0;
+                break;
+            case SDL_SCANCODE_RSHIFT:
+                keyCode = 0xA1;
+                break;
+            case SDL_SCANCODE_LCTRL:
+                keyCode = 0xA2;
+                break;
+            case SDL_SCANCODE_RCTRL:
+                keyCode = 0xA3;
+                break;
+            case SDL_SCANCODE_LALT:
+                keyCode = 0xA4;
+                break;
+            case SDL_SCANCODE_RALT:
+                keyCode = 0xA5;
+                break;
+            #ifdef ENABLE_META
+            case SDL_SCANCODE_LGUI:
+                keyCode = 0x5B;
+                break;
+            case SDL_SCANCODE_RGUI:
+                keyCode = 0x5C;
+                break;
+            #endif
+            case SDL_SCANCODE_AC_BACK:
+                keyCode = 0xA6;
+                break;
+            case SDL_SCANCODE_AC_FORWARD:
+                keyCode = 0xA7;
+                break;
+            case SDL_SCANCODE_AC_REFRESH:
+                keyCode = 0xA8;
+                break;
+            case SDL_SCANCODE_AC_STOP:
+                keyCode = 0xA9;
+                break;
+            case SDL_SCANCODE_AC_SEARCH:
+                keyCode = 0xAA;
+                break;
+            case SDL_SCANCODE_AC_BOOKMARKS:
+                keyCode = 0xAB;
+                break;
+            case SDL_SCANCODE_AC_HOME:
+                keyCode = 0xAC;
+                break;
+            case SDL_SCANCODE_SEMICOLON:
+                keyCode = 0xBA;
+                break;
+            case SDL_SCANCODE_EQUALS:
+                keyCode = 0xBB;
+                break;
+            case SDL_SCANCODE_COMMA:
+                keyCode = 0xBC;
+                break;
+            case SDL_SCANCODE_MINUS:
+                keyCode = 0xBD;
+                break;
+            case SDL_SCANCODE_PERIOD:
+                keyCode = 0xBE;
+                break;
+            case SDL_SCANCODE_SLASH:
+                keyCode = 0xBF;
+                break;
+            case SDL_SCANCODE_GRAVE:
+                keyCode = 0xC0;
+                break;
+            case SDL_SCANCODE_LEFTBRACKET:
+                keyCode = 0xDB;
+                break;
+            case SDL_SCANCODE_BACKSLASH:
+                keyCode = 0xDC;
+                break;
+            case SDL_SCANCODE_RIGHTBRACKET:
+                keyCode = 0xDD;
+                break;
+            case SDL_SCANCODE_APOSTROPHE:
+                keyCode = 0xDE;
+                break;
+            case SDL_SCANCODE_NONUSBACKSLASH:
+                keyCode = 0xE2;
+                break;
+            default:
+                SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                            "Unhandled button event: %d",
+                             event->keysym.scancode);
+                return;
+        }
+    }
+
+    // Track the key state so we always know which keys are down
+    if (event->state == SDL_PRESSED) {
+        m_KeysDown.insert(keyCode);
+    }
+    else {
+        m_KeysDown.remove(keyCode);
+    }
+
+    LiSendKeyboardEvent(keyCode,
+                        event->state == SDL_PRESSED ?
+                            KEY_ACTION_DOWN : KEY_ACTION_UP,
+                        modifiers);
+}

app/streaming/input/mouse.cpp

@@ -0,0 +1,277 @@
+#include "input.h"
+
+#include <Limelight.h>
+#include <SDL.h>
+#include "streaming/streamutils.h"
+
+void SdlInputHandler::handleMouseButtonEvent(SDL_MouseButtonEvent* event)
+{
+    int button;
+
+    if (event->which == SDL_TOUCH_MOUSEID) {
+        // Ignore synthetic mouse events
+        return;
+    }
+    else if (!isCaptureActive()) {
+        if (event->button == SDL_BUTTON_LEFT && event->state == SDL_RELEASED &&
+                isMouseInVideoRegion(event->x, event->y)) {
+            // Capture the mouse again if clicked when unbound.
+            // We start capture on left button released instead of
+            // pressed to avoid sending an errant mouse button released
+            // event to the host when clicking into our window (since
+            // the pressed event was consumed by this code).
+            setCaptureActive(true);
+        }
+
+        // Not capturing
+        return;
+    }
+    else if (m_AbsoluteMouseMode && !isMouseInVideoRegion(event->x, event->y) && event->state == SDL_PRESSED) {
+        // Ignore button presses outside the video region, but allow button releases
+        return;
+    }
+
+    switch (event->button)
+    {
+        case SDL_BUTTON_LEFT:
+            button = BUTTON_LEFT;
+            break;
+        case SDL_BUTTON_MIDDLE:
+            button = BUTTON_MIDDLE;
+            break;
+        case SDL_BUTTON_RIGHT:
+            button = BUTTON_RIGHT;
+            break;
+        case SDL_BUTTON_X1:
+            button = BUTTON_X1;
+            break;
+        case SDL_BUTTON_X2:
+            button = BUTTON_X2;
+            break;
+        default:
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Unhandled button event: %d",
+                        event->button);
+            return;
+    }
+
+    if (m_SwapMouseButtons) {
+        if (button == BUTTON_RIGHT)
+            button = BUTTON_LEFT;
+        else if (button == BUTTON_LEFT)
+            button = BUTTON_RIGHT;
+    }
+
+    // Ensure any pending mouse position update has been sent before we send
+    // our button event. This ensures that the cursor is in the correct location
+    // when the button event is issued.
+    //
+    // On platforms like macOS, the mouse doesn't track when the window isn't
+    // focused. When we gain focus via mouse click, we immediately get a mouse
+    // move event and a mouse button event. If we don't flush here, the button
+    // will probably arrive before the mouse timer issues the position update.
+    flushMousePositionUpdate();
+
+    LiSendMouseButtonEvent(event->state == SDL_PRESSED ?
+                               BUTTON_ACTION_PRESS :
+                               BUTTON_ACTION_RELEASE,
+                           button);
+}
+
+void SdlInputHandler::updateMousePositionReport(int mouseX, int mouseY)
+{
+    int windowWidth, windowHeight;
+
+    // Call SDL_GetWindowSize() before entering the spinlock
+    SDL_GetWindowSize(m_Window, &windowWidth, &windowHeight);
+
+    SDL_AtomicLock(&m_MousePositionLock);
+    m_MousePositionReport.x = mouseX;
+    m_MousePositionReport.y = mouseY;
+    m_MousePositionReport.windowWidth = windowWidth;
+    m_MousePositionReport.windowHeight = windowHeight;
+    SDL_AtomicUnlock(&m_MousePositionLock);
+    SDL_AtomicSet(&m_MousePositionUpdated, 1);
+}
+
+void SdlInputHandler::flushMousePositionUpdate()
+{
+    bool hasNewPosition = SDL_AtomicSet(&m_MousePositionUpdated, 0) != 0;
+    if (hasNewPosition) {
+        // If the lock is held now, the main thread is trying to update
+        // the mouse position. We'll pick up the new position next time.
+        if (SDL_AtomicTryLock(&m_MousePositionLock)) {
+            SDL_Rect src, dst;
+            bool mouseInVideoRegion;
+
+            src.x = src.y = 0;
+            src.w = m_StreamWidth;
+            src.h = m_StreamHeight;
+
+            dst.x = dst.y = 0;
+            dst.w = m_MousePositionReport.windowWidth;
+            dst.h = m_MousePositionReport.windowHeight;
+
+            // Use the stream and window sizes to determine the video region
+            StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
+
+            mouseInVideoRegion = isMouseInVideoRegion(m_MousePositionReport.x,
+                                                      m_MousePositionReport.y,
+                                                      m_MousePositionReport.windowWidth,
+                                                      m_MousePositionReport.windowHeight);
+
+            // Clamp motion to the video region
+            short x = qMin(qMax(m_MousePositionReport.x - dst.x, 0), dst.w);
+            short y = qMin(qMax(m_MousePositionReport.y - dst.y, 0), dst.h);
+
+            // Release the spinlock to unblock the main thread
+            SDL_AtomicUnlock(&m_MousePositionLock);
+
+            // Send the mouse position update if one of the following is true:
+            // a) it is in the video region now
+            // b) it just left the video region (to ensure the mouse is clamped to the video boundary)
+            // c) a mouse button is still down from before the cursor left the video region (to allow smooth dragging)
+            Uint32 buttonState = SDL_GetMouseState(nullptr, nullptr);
+            if (buttonState == 0) {
+                m_PendingMouseButtonsAllUpOnVideoRegionLeave = false;
+            }
+            if (mouseInVideoRegion || m_MouseWasInVideoRegion || m_PendingMouseButtonsAllUpOnVideoRegionLeave) {
+                LiSendMousePositionEvent(x, y, dst.w, dst.h);
+            }
+
+            // Adjust the cursor visibility if applicable
+            if (mouseInVideoRegion ^ m_MouseWasInVideoRegion) {
+                // We must push an event for the main thread to process, because it's not safe
+                // to directly can SDL_ShowCursor() on the arbitrary thread on which this timer
+                // executes.
+                SDL_Event event;
+                event.type = SDL_USEREVENT;
+                event.user.code = mouseInVideoRegion ? SDL_CODE_HIDE_CURSOR : SDL_CODE_SHOW_CURSOR;
+                SDL_PushEvent(&event);
+
+                if (!mouseInVideoRegion && buttonState != 0) {
+                    // If we still have a button pressed on leave, wait for that to come up
+                    // before we stop sending mouse position events.
+                    m_PendingMouseButtonsAllUpOnVideoRegionLeave = true;
+                }
+            }
+
+            m_MouseWasInVideoRegion = mouseInVideoRegion;
+        }
+    }
+}
+
+void SdlInputHandler::handleMouseMotionEvent(SDL_MouseMotionEvent* event)
+{
+    if (!isCaptureActive()) {
+        // Not capturing
+        return;
+    }
+    else if (event->which == SDL_TOUCH_MOUSEID) {
+        // Ignore synthetic mouse events
+        return;
+    }
+
+    // Batch until the next mouse polling window or we'll get awful
+    // input lag everything except GFE 3.14 and 3.15.
+    if (m_AbsoluteMouseMode) {
+        updateMousePositionReport(event->x, event->y);
+    }
+    else {
+        SDL_AtomicAdd(&m_MouseDeltaX, event->xrel);
+        SDL_AtomicAdd(&m_MouseDeltaY, event->yrel);
+    }
+}
+
+void SdlInputHandler::handleMouseWheelEvent(SDL_MouseWheelEvent* event)
+{
+    if (!isCaptureActive()) {
+        // Not capturing
+        return;
+    }
+    else if (event->which == SDL_TOUCH_MOUSEID) {
+        // Ignore synthetic mouse events
+        return;
+    }
+
+    if (m_AbsoluteMouseMode) {
+        int mouseX, mouseY;
+        SDL_GetMouseState(&mouseX, &mouseY);
+        if (!isMouseInVideoRegion(mouseX, mouseY)) {
+            // Ignore scroll events outside the video region
+            return;
+        }
+    }
+
+    if (event->y != 0) {
+        LiSendScrollEvent((signed char)event->y);
+    }
+}
+
+bool SdlInputHandler::isMouseInVideoRegion(int mouseX, int mouseY, int windowWidth, int windowHeight)
+{
+    SDL_Rect src, dst;
+
+    if (windowWidth < 0 || windowHeight < 0) {
+        SDL_GetWindowSize(m_Window, &windowWidth, &windowHeight);
+    }
+
+    src.x = src.y = 0;
+    src.w = m_StreamWidth;
+    src.h = m_StreamHeight;
+
+    dst.x = dst.y = 0;
+    dst.w = windowWidth;
+    dst.h = windowHeight;
+
+    // Use the stream and window sizes to determine the video region
+    StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
+
+    return (mouseX >= dst.x && mouseX <= dst.x + dst.w) &&
+           (mouseY >= dst.y && mouseY <= dst.y + dst.h);
+}
+
+Uint32 SdlInputHandler::mouseMoveTimerCallback(Uint32 interval, void *param)
+{
+    auto me = reinterpret_cast<SdlInputHandler*>(param);
+
+    short deltaX = (short)SDL_AtomicSet(&me->m_MouseDeltaX, 0);
+    short deltaY = (short)SDL_AtomicSet(&me->m_MouseDeltaY, 0);
+
+    if (deltaX != 0 || deltaY != 0) {
+        LiSendMouseMoveEvent(deltaX, deltaY);
+    }
+
+    // Send mouse position updates if applicable
+    me->flushMousePositionUpdate();
+
+#ifdef Q_OS_WIN32
+    // See comment in SdlInputHandler::notifyMouseLeave()
+    if (me->m_AbsoluteMouseMode && me->m_PendingMouseLeaveButtonUp != 0 && me->isCaptureActive()) {
+        int mouseX, mouseY;
+        int windowX, windowY;
+        Uint32 mouseState = SDL_GetGlobalMouseState(&mouseX, &mouseY);
+        SDL_GetWindowPosition(me->m_Window, &windowX, &windowY);
+
+        // If the button is now up, send the synthetic mouse up event
+        if ((mouseState & SDL_BUTTON(me->m_PendingMouseLeaveButtonUp)) == 0) {
+            SDL_Event event;
+
+            event.button.type = SDL_MOUSEBUTTONUP;
+            event.button.timestamp = SDL_GetTicks();
+            event.button.windowID = SDL_GetWindowID(me->m_Window);
+            event.button.which = 0;
+            event.button.button = me->m_PendingMouseLeaveButtonUp;
+            event.button.state = SDL_RELEASED;
+            event.button.clicks = 1;
+            event.button.x = mouseX - windowX;
+            event.button.y = mouseY - windowY;
+            SDL_PushEvent(&event);
+
+            me->m_PendingMouseLeaveButtonUp = 0;
+        }
+    }
+#endif
+
+    return interval;
+}

app/streaming/input/reltouch.cpp

@@ -0,0 +1,175 @@
+#include "input.h"
+
+#include <Limelight.h>
+#include <SDL.h>
+
+#include <QtMath>
+
+// How long the mouse button will be pressed for a tap to click gesture
+#define TAP_BUTTON_RELEASE_DELAY 100
+
+// How long the fingers must be stationary to start a drag
+#define DRAG_ACTIVATION_DELAY 650
+
+// How far the finger can move before it cancels a drag or tap
+#define DEAD_ZONE_DELTA 0.01f
+
+Uint32 SdlInputHandler::releaseLeftButtonTimerCallback(Uint32, void*)
+{
+    LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+    return 0;
+}
+
+Uint32 SdlInputHandler::releaseRightButtonTimerCallback(Uint32, void*)
+{
+    LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
+    return 0;
+}
+
+Uint32 SdlInputHandler::dragTimerCallback(Uint32, void *param)
+{
+    auto me = reinterpret_cast<SdlInputHandler*>(param);
+
+    // Check how many fingers are down now to decide
+    // which button to hold down
+    if (me->m_NumFingersDown == 2) {
+        me->m_DragButton = BUTTON_RIGHT;
+    }
+    else if (me->m_NumFingersDown == 1) {
+        me->m_DragButton = BUTTON_LEFT;
+    }
+
+    LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, me->m_DragButton);
+
+    return 0;
+}
+
+void SdlInputHandler::handleRelativeFingerEvent(SDL_TouchFingerEvent* event)
+{
+    int fingerIndex = -1;
+
+    // Observations on Windows 10: x and y appear to be relative to 0,0 of the window client area.
+    // Although SDL documentation states they are 0.0 - 1.0 float values, they can actually be higher
+    // or lower than those values as touch events continue for touches started within the client area that
+    // leave the client area during a drag motion.
+    // dx and dy are deltas from the last touch event, not the first touch down.
+
+    // Determine the index of this finger using our list
+    // of fingers that are currently active on screen.
+    // This is also required to handle finger up which
+    // where the finger will not be in SDL_GetTouchFinger()
+    // anymore.
+    if (event->type != SDL_FINGERDOWN) {
+        for (int i = 0; i < MAX_FINGERS; i++) {
+            if (event->fingerId == m_TouchDownEvent[i].fingerId) {
+                fingerIndex = i;
+                break;
+            }
+        }
+    }
+    else {
+        // Resolve the new finger by determining the ID of each
+        // finger on the display.
+        int numTouchFingers = SDL_GetNumTouchFingers(event->touchId);
+        for (int i = 0; i < numTouchFingers; i++) {
+            SDL_Finger* finger = SDL_GetTouchFinger(event->touchId, i);
+            SDL_assert(finger != nullptr);
+            if (finger != nullptr) {
+                if (finger->id == event->fingerId) {
+                    fingerIndex = i;
+                    break;
+                }
+            }
+        }
+    }
+
+    if (fingerIndex < 0 || fingerIndex >= MAX_FINGERS) {
+        // Too many fingers
+        return;
+    }
+
+    // Handle cursor motion based on the position of the
+    // primary finger on screen
+    if (fingerIndex == 0) {
+        // The event x and y values are relative to our window width
+        // and height. However, we want to scale them to be relative
+        // to the host resolution. Fortunately this is easy since we
+        // already have normalized values. We'll just multiply them
+        // by the stream dimensions to get real X and Y values rather
+        // than the client window dimensions.
+        short deltaX = static_cast<short>(event->dx * m_StreamWidth);
+        short deltaY = static_cast<short>(event->dy * m_StreamHeight);
+        if (deltaX != 0 || deltaY != 0) {
+            LiSendMouseMoveEvent(deltaX, deltaY);
+        }
+    }
+
+    // Start a drag timer when primary or secondary
+    // fingers go down
+    if (event->type == SDL_FINGERDOWN &&
+            (fingerIndex == 0 || fingerIndex == 1)) {
+        SDL_RemoveTimer(m_DragTimer);
+        m_DragTimer = SDL_AddTimer(DRAG_ACTIVATION_DELAY,
+                                   dragTimerCallback,
+                                   this);
+    }
+
+    if (event->type == SDL_FINGERMOTION) {
+        // If it's outside the deadzone delta, cancel drags and taps
+        if (qSqrt(qPow(event->x - m_TouchDownEvent[fingerIndex].x, 2) +
+                  qPow(event->y - m_TouchDownEvent[fingerIndex].y, 2)) > DEAD_ZONE_DELTA) {
+            SDL_RemoveTimer(m_DragTimer);
+            m_DragTimer = 0;
+
+            // This effectively cancels the tap logic below
+            m_TouchDownEvent[fingerIndex].timestamp = 0;
+        }
+    }
+
+    if (event->type == SDL_FINGERUP) {
+        // Cancel the drag timer on finger up
+        SDL_RemoveTimer(m_DragTimer);
+        m_DragTimer = 0;
+
+        // Release any drag
+        if (m_DragButton != 0) {
+            LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, m_DragButton);
+            m_DragButton = 0;
+        }
+        // 2 finger tap
+        else if (event->timestamp - m_TouchDownEvent[1].timestamp < 250) {
+            // Zero timestamp of the primary finger to ensure we won't
+            // generate a left click if the primary finger comes up soon.
+            m_TouchDownEvent[0].timestamp = 0;
+
+            // Press down the right mouse button
+            LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
+
+            // Queue a timer to release it in 100 ms
+            SDL_RemoveTimer(m_RightButtonReleaseTimer);
+            m_RightButtonReleaseTimer = SDL_AddTimer(TAP_BUTTON_RELEASE_DELAY,
+                                                     releaseRightButtonTimerCallback,
+                                                     nullptr);
+        }
+        // 1 finger tap
+        else if (event->timestamp - m_TouchDownEvent[0].timestamp < 250) {
+            // Press down the left mouse button
+            LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+
+            // Queue a timer to release it in 100 ms
+            SDL_RemoveTimer(m_LeftButtonReleaseTimer);
+            m_LeftButtonReleaseTimer = SDL_AddTimer(TAP_BUTTON_RELEASE_DELAY,
+                                                    releaseLeftButtonTimerCallback,
+                                                    nullptr);
+        }
+    }
+
+    m_NumFingersDown = SDL_GetNumTouchFingers(event->touchId);
+
+    if (event->type == SDL_FINGERDOWN) {
+        m_TouchDownEvent[fingerIndex] = *event;
+    }
+    else if (event->type == SDL_FINGERUP) {
+        m_TouchDownEvent[fingerIndex] = {};
+    }
+}

app/streaming/session.cpp

@@ -1,6 +1,7 @@
 #include "session.h"
 #include "settings/streamingpreferences.h"
 #include "streaming/streamutils.h"
+#include "backend/richpresencemanager.h"
 
 #include <Limelight.h>
 #include <SDL.h>
@@ -29,6 +30,18 @@
 #include <QSvgRenderer>
 #include <QPainter>
 #include <QImage>
+#include <QGuiApplication>
+#include <QCursor>
+
+#define CONN_TEST_SERVER "qt.conntest.moonlight-stream.org"
+
+// Running the connection process asynchronously seems to reliably
+// cause a crash in QSGRenderThread on Wayland and strange crashes
+// elsewhere. Until these are figured out, avoid the async connect
+// thread on Linux and BSDs.
+#if !defined(Q_OS_UNIX) || defined(Q_OS_DARWIN)
+#define USE_ASYNC_CONNECT_THREAD 1
+#endif
 
 CONNECTION_LISTENER_CALLBACKS Session::k_ConnCallbacks = {
     Session::clStageStarting,
@@ -36,29 +49,11 @@ CONNECTION_LISTENER_CALLBACKS Session::k_ConnCallbacks = {
     Session::clStageFailed,
     nullptr,
     Session::clConnectionTerminated,
-    nullptr,
-    nullptr,
     Session::clLogMessage,
     Session::clRumble,
     Session::clConnectionStatusUpdate
 };
 
-AUDIO_RENDERER_CALLBACKS Session::k_AudioCallbacks = {
-    Session::arInit,
-    nullptr,
-    nullptr,
-    Session::arCleanup,
-    Session::arDecodeAndPlaySample,
-#ifndef STEAM_LINK
-    CAPABILITY_DIRECT_SUBMIT
-#else
-    // We cannot use direct submit for Steam Link because the
-    // SLAudio renderer needs to look at the audio backlog to
-    // cap latency since playback is a blocking operation.
-    CAPABILITY_SLOW_OPUS_DECODER
-#endif
-};
-
 Session* Session::s_ActiveSession;
 QSemaphore Session::s_ActiveSessionSemaphore(1);
 
@@ -68,28 +63,53 @@ void Session::clStageStarting(int stage)
     // which happens to be the main thread, so it's cool to interact
     // with the GUI in these callbacks.
     emit s_ActiveSession->stageStarting(QString::fromLocal8Bit(LiGetStageName(stage)));
+
+#ifndef USE_ASYNC_CONNECT_THREAD
     QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+    QCoreApplication::sendPostedEvents();
+#endif
 }
 
-void Session::clStageFailed(int stage, long errorCode)
+void Session::clStageFailed(int stage, int errorCode)
 {
-    // We know this is called on the same thread as LiStartConnection()
-    // which happens to be the main thread, so it's cool to interact
-    // with the GUI in these callbacks.
+    // Perform the port test now, while we're on the async connection thread and not blocking the UI.
+    s_ActiveSession->m_PortTestResults = LiTestClientConnectivity(CONN_TEST_SERVER, 443, LiGetPortFlagsFromStage(stage));
+
     emit s_ActiveSession->stageFailed(QString::fromLocal8Bit(LiGetStageName(stage)), errorCode);
+
+#ifndef USE_ASYNC_CONNECT_THREAD
     QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+    QCoreApplication::sendPostedEvents();
+#endif
 }
 
-void Session::clConnectionTerminated(long errorCode)
+void Session::clConnectionTerminated(int errorCode)
 {
+    s_ActiveSession->m_PortTestResults = LiTestClientConnectivity(CONN_TEST_SERVER, 443, LiGetPortFlagsFromTerminationErrorCode(errorCode));
+
     // Display the termination dialog if this was not intended
-    if (errorCode != 0) {
+    switch (errorCode) {
+    case ML_ERROR_GRACEFUL_TERMINATION:
+        break;
+
+    case ML_ERROR_NO_VIDEO_TRAFFIC:
+        s_ActiveSession->m_UnexpectedTermination = true;
+        emit s_ActiveSession->displayLaunchError("No video received from host. Check the host PC's firewall and port forwarding rules.");
+        break;
+
+    case ML_ERROR_NO_VIDEO_FRAME:
+        s_ActiveSession->m_UnexpectedTermination = true;
+        emit s_ActiveSession->displayLaunchError("Your network connection isn't performing well. Reduce your video bitrate setting or try a faster connection.");
+        break;
+
+    default:
         s_ActiveSession->m_UnexpectedTermination = true;
         emit s_ActiveSession->displayLaunchError("Connection terminated");
+        break;
     }
 
     SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                 "Connection terminated: %ld",
+                 "Connection terminated: %d",
                  errorCode);
 
     // Push a quit event to the main loop
@@ -265,6 +285,25 @@ int Session::drSubmitDecodeUnit(PDECODE_UNIT du)
     }
 }
 
+void Session::getDecoderInfo(SDL_Window* window,
+                             bool& isHardwareAccelerated, bool& isFullScreenOnly, QSize& maxResolution)
+{
+    IVideoDecoder* decoder;
+
+    if (!chooseDecoder(StreamingPreferences::VDS_AUTO,
+                       window, VIDEO_FORMAT_H264, 1920, 1080, 60,
+                       true, false, true, decoder)) {
+        isHardwareAccelerated = isFullScreenOnly = false;
+        return;
+    }
+
+    isHardwareAccelerated = decoder->isHardwareAccelerated();
+    isFullScreenOnly = decoder->isAlwaysFullScreen();
+    maxResolution = decoder->getDecoderMaxResolution();
+
+    delete decoder;
+}
+
 bool Session::isHardwareDecodeAvailable(SDL_Window* window,
                                         StreamingPreferences::VideoDecoderSelection vds,
                                         int videoFormat, int width, int height, int frameRate)
@@ -282,21 +321,28 @@ bool Session::isHardwareDecodeAvailable(SDL_Window* window,
     return ret;
 }
 
-int Session::getDecoderCapabilities(SDL_Window* window,
-                                    StreamingPreferences::VideoDecoderSelection vds,
-                                    int videoFormat, int width, int height, int frameRate)
+bool Session::populateDecoderProperties(SDL_Window* window)
 {
     IVideoDecoder* decoder;
 
-    if (!chooseDecoder(vds, window, videoFormat, width, height, frameRate, true, false, true, decoder)) {
+    if (!chooseDecoder(m_Preferences->videoDecoderSelection,
+                       window,
+                       m_StreamConfig.enableHdr ? VIDEO_FORMAT_H265_MAIN10 :
+                            (m_StreamConfig.supportsHevc ? VIDEO_FORMAT_H265 : VIDEO_FORMAT_H264),
+                       m_StreamConfig.width,
+                       m_StreamConfig.height,
+                       m_StreamConfig.fps,
+                       true, false, true, decoder)) {
         return false;
     }
 
-    int caps = decoder->getDecoderCapabilities();
+    m_VideoCallbacks.capabilities = decoder->getDecoderCapabilities();
+
+    m_StreamConfig.colorSpace = decoder->getDecoderColorspace();
 
     delete decoder;
 
-    return caps;
+    return true;
 }
 
 Session::Session(NvComputer* computer, NvApp& app, StreamingPreferences *preferences)
@@ -315,6 +361,8 @@ Session::Session(NvComputer* computer, NvApp& app, StreamingPreferences *prefere
       m_InputHandler(nullptr),
       m_InputHandlerLock(0),
       m_MouseEmulationRefCount(0),
+      m_AsyncConnectionSuccess(false),
+      m_PortTestResults(0),
       m_OpusDecoder(nullptr),
       m_AudioRenderer(nullptr),
       m_AudioSampleCount(0),
@@ -342,13 +390,21 @@ bool Session::initialize()
     }
 
     // Create a hidden window to use for decoder initialization tests
-    SDL_Window* testWindow = SDL_CreateWindow("", 0, 0, 1280, 720, SDL_WINDOW_HIDDEN);
+    SDL_Window* testWindow = SDL_CreateWindow("", 0, 0, 1280, 720,
+                                              SDL_WINDOW_HIDDEN | StreamUtils::getPlatformWindowFlags());
     if (!testWindow) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Failed to create window for hardware decode test: %s",
-                     SDL_GetError());
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-        return false;
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                    "Failed to create test window with platform flags: %s",
+                    SDL_GetError());
+
+        testWindow = SDL_CreateWindow("", 0, 0, 1280, 720, SDL_WINDOW_HIDDEN);
+        if (!testWindow) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "Failed to create window for hardware decode test: %s",
+                         SDL_GetError());
+            SDL_QuitSubSystem(SDL_INIT_VIDEO);
+            return false;
+        }
     }
 
     qInfo() << "Server GPU:" << m_Computer->gpuModel;
@@ -358,21 +414,12 @@ bool Session::initialize()
     m_VideoCallbacks.setup = drSetup;
     m_VideoCallbacks.submitDecodeUnit = drSubmitDecodeUnit;
 
-    // Slice up to 4 times for parallel decode, once slice per core
-    int slices = qMin(MAX_SLICES, SDL_GetCPUCount());
-    m_VideoCallbacks.capabilities |= CAPABILITY_SLICES_PER_FRAME(slices);
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Encoder configured for %d slices per frame",
-                slices);
-
     LiInitializeStreamConfiguration(&m_StreamConfig);
     m_StreamConfig.width = m_Preferences->width;
     m_StreamConfig.height = m_Preferences->height;
     m_StreamConfig.fps = m_Preferences->fps;
     m_StreamConfig.bitrate = m_Preferences->bitrateKbps;
     m_StreamConfig.hevcBitratePercentageMultiplier = 75;
-    m_StreamConfig.streamingRemotely = STREAM_CFG_AUTO;
-    m_StreamConfig.packetSize = 1392;
 
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                 "Video bitrate: %d kbps",
@@ -392,11 +439,23 @@ bool Session::initialize()
     case StreamingPreferences::AC_51_SURROUND:
         m_StreamConfig.audioConfiguration = AUDIO_CONFIGURATION_51_SURROUND;
         break;
+    case StreamingPreferences::AC_71_SURROUND:
+        m_StreamConfig.audioConfiguration = AUDIO_CONFIGURATION_71_SURROUND;
+        break;
     }
 
+    LiInitializeAudioCallbacks(&m_AudioCallbacks);
+    m_AudioCallbacks.init = arInit;
+    m_AudioCallbacks.cleanup = arCleanup;
+    m_AudioCallbacks.decodeAndPlaySample = arDecodeAndPlaySample;
+    m_AudioCallbacks.capabilities = getAudioRendererCapabilities(m_StreamConfig.audioConfiguration);
+
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Audio configuration: %d",
-                m_StreamConfig.audioConfiguration);
+                "Audio channel count: %d",
+                CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION(m_StreamConfig.audioConfiguration));
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Audio channel mask: %X",
+                CHANNEL_MASK_FROM_AUDIO_CONFIGURATION(m_StreamConfig.audioConfiguration));
 
     switch (m_Preferences->videoCodecConfig)
     {
@@ -441,30 +500,38 @@ bool Session::initialize()
         break;
     }
 
-    // Add the capability flags from the chosen decoder/renderer
-    // Requires m_StreamConfig.supportsHevc to be initialized
-    m_VideoCallbacks.capabilities |= getDecoderCapabilities(testWindow,
-                                                            m_Preferences->videoDecoderSelection,
-                                                            m_StreamConfig.supportsHevc ? VIDEO_FORMAT_H265 : VIDEO_FORMAT_H264,
-                                                            m_StreamConfig.width,
-                                                            m_StreamConfig.height,
-                                                            m_StreamConfig.fps);
-
     switch (m_Preferences->windowMode)
     {
+    default:
     case StreamingPreferences::WM_FULLSCREEN_DESKTOP:
         m_FullScreenFlag = SDL_WINDOW_FULLSCREEN_DESKTOP;
         break;
     case StreamingPreferences::WM_FULLSCREEN:
-    default:
         m_FullScreenFlag = SDL_WINDOW_FULLSCREEN;
         break;
     }
 
+#if !SDL_VERSION_ATLEAST(2, 0, 11)
+    // HACK: Using a full-screen window breaks mouse capture on the Pi's LXDE
+    // GUI environment. Force the session to use windowed mode (which won't
+    // really matter anyway because the MMAL renderer always draws full-screen).
+    if (qgetenv("DESKTOP_SESSION") == "LXDE-pi") {
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Forcing windowed mode on LXDE-Pi");
+        m_FullScreenFlag = 0;
+    }
+#endif
+
     // Check for validation errors/warnings and emit
     // signals for them, if appropriate
     bool ret = validateLaunch(testWindow);
 
+    if (ret) {
+        // Populate decoder-dependent properties.
+        // Must be done after validateLaunch() since m_StreamConfig is finalized.
+        ret = populateDecoderProperties(testWindow);
+    }
+
     SDL_DestroyWindow(testWindow);
 
     if (!ret) {
@@ -488,6 +555,7 @@ void Session::emitLaunchWarning(QString text)
         // Pump the UI loop while we wait
         SDL_Delay(5);
         QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+        QCoreApplication::sendPostedEvents();
     }
 }
 
@@ -495,8 +563,18 @@ bool Session::validateLaunch(SDL_Window* testWindow)
 {
     QStringList warningList;
 
+    if (m_Preferences->absoluteMouseMode && !m_App.isAppCollectorGame) {
+        emitLaunchWarning("Your selection to enable remote desktop mouse mode may cause problems in games.");
+    }
+
     if (m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_FORCE_SOFTWARE) {
-        emitLaunchWarning("Your settings selection to force software decoding may cause poor streaming performance.");
+        if (m_Preferences->videoCodecConfig == StreamingPreferences::VCC_FORCE_HEVC_HDR) {
+            emitLaunchWarning("HDR is not supported with software decoding.");
+            m_StreamConfig.enableHdr = false;
+        }
+        else {
+            emitLaunchWarning("Your settings selection to force software decoding may cause poor streaming performance.");
+        }
     }
 
     if (m_Preferences->unsupportedFps && m_StreamConfig.fps > 60) {
@@ -511,13 +589,14 @@ bool Session::validateLaunch(SDL_Window* testWindow)
         bool hevcForced = m_Preferences->videoCodecConfig == StreamingPreferences::VCC_FORCE_HEVC ||
                 m_Preferences->videoCodecConfig == StreamingPreferences::VCC_FORCE_HEVC_HDR;
 
-        if (!isHardwareDecodeAvailable(testWindow,
-                                       m_Preferences->videoDecoderSelection,
-                                       VIDEO_FORMAT_H265,
-                                       m_StreamConfig.width,
-                                       m_StreamConfig.height,
-                                       m_StreamConfig.fps) &&
-                m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_AUTO) {
+        if (m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_AUTO && // Force hardware decoding checked below
+                m_Preferences->videoCodecConfig != StreamingPreferences::VCC_AUTO && // Already checked in initialize()
+                !isHardwareDecodeAvailable(testWindow,
+                                           m_Preferences->videoDecoderSelection,
+                                           VIDEO_FORMAT_H265,
+                                           m_StreamConfig.width,
+                                           m_StreamConfig.height,
+                                           m_StreamConfig.fps)) {
             if (hevcForced) {
                 emitLaunchWarning("Using software decoding due to your selection to force HEVC without GPU support. This may cause poor streaming performance.");
             }
@@ -582,12 +661,12 @@ bool Session::validateLaunch(SDL_Window* testWindow)
     // Test if audio works at the specified audio configuration
     bool audioTestPassed = testAudio(m_StreamConfig.audioConfiguration);
 
-    // Gracefully degrade to stereo if 5.1 doesn't work
-    if (!audioTestPassed && m_StreamConfig.audioConfiguration == AUDIO_CONFIGURATION_51_SURROUND) {
+    // Gracefully degrade to stereo if surround sound doesn't work
+    if (!audioTestPassed && CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION(m_StreamConfig.audioConfiguration) > 2) {
         audioTestPassed = testAudio(AUDIO_CONFIGURATION_STEREO);
         if (audioTestPassed) {
             m_StreamConfig.audioConfiguration = AUDIO_CONFIGURATION_STEREO;
-            emitLaunchWarning("5.1 surround sound is not supported by the current audio device.");
+            emitLaunchWarning("Your selected surround sound setting is not supported by the current audio device.");
         }
     }
 
@@ -602,7 +681,20 @@ bool Session::validateLaunch(SDL_Window* testWindow)
         emitLaunchWarning("An attached gamepad has no mapping and won't be usable. Visit the Moonlight help to resolve this.");
     }
 
+    // NVENC will fail to initialize when using dimensions over 4096 and H.264.
+    if (m_StreamConfig.width > 4096 || m_StreamConfig.height > 4096) {
+        if (m_Computer->maxLumaPixelsHEVC == 0) {
+            emit displayLaunchError("Your host PC's GPU doesn't support streaming video resolutions over 4K.");
+            return false;
+        }
+        else if (!m_StreamConfig.supportsHevc) {
+            emit displayLaunchError("Video resolutions over 4K are only supported by the HEVC codec.");
+            return false;
+        }
+    }
+
     if (m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_FORCE_HARDWARE &&
+            !m_StreamConfig.enableHdr && // HEVC Main10 was already checked for hardware decode support above
             !isHardwareDecodeAvailable(testWindow,
                                        m_Preferences->videoDecoderSelection,
                                        m_StreamConfig.supportsHevc ? VIDEO_FORMAT_H265 : VIDEO_FORMAT_H264,
@@ -650,7 +742,7 @@ private:
             emit m_Session->quitStarting();
         }
         else {
-            emit m_Session->sessionFinished();
+            emit m_Session->sessionFinished(m_Session->m_PortTestResults);
         }
 
         // Finish cleanup of the connection state
@@ -668,7 +760,7 @@ private:
             }
 
             // Session is finished now
-            emit m_Session->sessionFinished();
+            emit m_Session->sessionFinished(m_Session->m_PortTestResults);
         }
     }
 
@@ -821,10 +913,18 @@ void Session::toggleFullscreen()
     bool fullScreen = !(SDL_GetWindowFlags(m_Window) & m_FullScreenFlag);
 
     if (fullScreen) {
+        if (m_FullScreenFlag == SDL_WINDOW_FULLSCREEN && m_InputHandler->isCaptureActive()) {
+            // Confine the cursor to the window if we're capturing input
+            SDL_SetWindowGrab(m_Window, SDL_TRUE);
+        }
+
         SDL_SetWindowResizable(m_Window, SDL_FALSE);
         SDL_SetWindowFullscreen(m_Window, m_FullScreenFlag);
     }
     else {
+        // Unconfine the cursor
+        SDL_SetWindowGrab(m_Window, SDL_FALSE);
+
         SDL_SetWindowFullscreen(m_Window, 0);
         SDL_SetWindowResizable(m_Window, SDL_TRUE);
 
@@ -849,39 +949,37 @@ void Session::notifyMouseEmulationMode(bool enabled)
     }
 }
 
-void Session::exec(int displayOriginX, int displayOriginY)
+class AsyncConnectionStartThread : public QThread
 {
-    m_DisplayOriginX = displayOriginX;
-    m_DisplayOriginY = displayOriginY;
+public:
+    AsyncConnectionStartThread(Session* session) :
+        QThread(nullptr),
+        m_Session(session) {}
 
-    // Complete initialization in this deferred context to avoid
-    // calling expensive functions in the constructor (during the
-    // process of loading the StreamSegue).
-    if (!initialize()) {
-        emit sessionFinished();
-        return;
+    void run() override
+    {
+        m_Session->m_AsyncConnectionSuccess = m_Session->startConnectionAsync();
     }
 
+    Session* m_Session;
+};
+
+// Called in a non-main thread
+bool Session::startConnectionAsync()
+{
     // Wait 1.5 seconds before connecting to let the user
     // have time to read any messages present on the segue
+#ifdef USE_ASYNC_CONNECT_THREAD
+    SDL_Delay(1500);
+#else
     uint32_t start = SDL_GetTicks();
     while (!SDL_TICKS_PASSED(SDL_GetTicks(), start + 1500)) {
-        // Pump the UI loop while we wait
+        // Pump the UI loop while we wait since we're not async
         SDL_Delay(5);
         QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+        QCoreApplication::sendPostedEvents();
     }
-
-    // Wait for any old session to finish cleanup
-    s_ActiveSessionSemaphore.acquire();
-
-    // We're now active
-    s_ActiveSession = this;
-
-    // Initialize the gamepad code with our preferences
-    StreamingPreferences prefs;
-    m_InputHandler = new SdlInputHandler(prefs, m_Computer,
-                                         m_StreamConfig.width,
-                                         m_StreamConfig.height);
+#endif
 
     // The UI should have ensured the old game was already quit
     // if we decide to stream a different game.
@@ -898,7 +996,7 @@ void Session::exec(int displayOriginX, int displayOriginY)
             SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                         "Found host supported resolution: %dx%d",
                         mode.width, mode.height);
-            enableGameOptimizations = prefs.gameOptimizations;
+            enableGameOptimizations = m_Preferences->gameOptimizations;
             break;
         }
     }
@@ -911,23 +1009,15 @@ void Session::exec(int displayOriginX, int displayOriginY)
         else {
             http.launchApp(m_App.id, &m_StreamConfig,
                            enableGameOptimizations,
-                           prefs.playAudioOnHost,
+                           m_Preferences->playAudioOnHost,
                            m_InputHandler->getAttachedGamepadMask());
         }
     } catch (const GfeHttpResponseException& e) {
-        delete m_InputHandler;
-        m_InputHandler = nullptr;
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
         emit displayLaunchError("GeForce Experience returned error: " + e.toQString());
-        QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
-        return;
+        return false;
     } catch (const QtNetworkReplyException& e) {
-        delete m_InputHandler;
-        m_InputHandler = nullptr;
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
         emit displayLaunchError(e.toQString());
-        QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
-        return;
+        return false;
     }
 
     QByteArray hostnameStr = m_Computer->activeAddress.toLatin1();
@@ -946,13 +1036,91 @@ void Session::exec(int displayOriginX, int displayOriginY)
         hostInfo.serverInfoGfeVersion = siGfeVersion.data();
     }
 
+    if (m_Preferences->packetSize != 0) {
+        // Override default packet size and remote streaming detection
+        // NB: Using STREAM_CFG_AUTO will cap our packet size at 1024 for remote hosts.
+        m_StreamConfig.streamingRemotely = STREAM_CFG_LOCAL;
+        m_StreamConfig.packetSize = m_Preferences->packetSize;
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                    "Using custom packet size: %d bytes",
+                    m_Preferences->packetSize);
+    }
+    else {
+        // isReachableOverVpn() does network I/O, so we only attempt to check
+        // VPN reachability if we've already contacted the PC successfully
+        if (m_Computer->isReachableOverVpn()) {
+            // It looks like our route to this PC is over a VPN.
+            // Treat it as remote even if the target address is in RFC 1918 address space.
+            m_StreamConfig.streamingRemotely = STREAM_CFG_REMOTE;
+            m_StreamConfig.packetSize = 1024;
+        }
+        else {
+            m_StreamConfig.streamingRemotely = STREAM_CFG_AUTO;
+            m_StreamConfig.packetSize = 1392;
+        }
+    }
+
     int err = LiStartConnection(&hostInfo, &m_StreamConfig, &k_ConnCallbacks,
                                 &m_VideoCallbacks,
-                                m_AudioDisabled ? nullptr : &k_AudioCallbacks,
+                                m_AudioDisabled ? nullptr : &m_AudioCallbacks,
                                 NULL, 0, NULL, 0);
     if (err != 0) {
         // We already displayed an error dialog in the stage failure
         // listener.
+        return false;
+    }
+
+    emit connectionStarted();
+    return true;
+}
+
+void Session::exec(int displayOriginX, int displayOriginY)
+{
+    m_DisplayOriginX = displayOriginX;
+    m_DisplayOriginY = displayOriginY;
+
+    // Complete initialization in this deferred context to avoid
+    // calling expensive functions in the constructor (during the
+    // process of loading the StreamSegue).
+    //
+    // NB: This initializes the SDL video subsystem, so it must be
+    // called on the main thread.
+    if (!initialize()) {
+        emit sessionFinished(0);
+        return;
+    }
+
+    // Wait for any old session to finish cleanup
+    s_ActiveSessionSemaphore.acquire();
+
+    // We're now active
+    s_ActiveSession = this;
+
+    // Initialize the gamepad code with our preferences
+    // NB: m_InputHandler must be initialize before starting the connection.
+    m_InputHandler = new SdlInputHandler(*m_Preferences, m_Computer,
+                                         m_StreamConfig.width,
+                                         m_StreamConfig.height);
+
+    // Kick off the async connection thread while we sit here and pump the event loop
+    AsyncConnectionStartThread asyncConnThread(this);
+#ifdef USE_ASYNC_CONNECT_THREAD
+    asyncConnThread.start();
+    while (!asyncConnThread.wait(10)) {
+        QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+        QCoreApplication::sendPostedEvents();
+    }
+#else
+    asyncConnThread.run();
+#endif
+
+    // Pump the event loop one last time to ensure we pick up any events from
+    // the thread that happened while it was in the final successful QThread::wait().
+    QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+    QCoreApplication::sendPostedEvents();
+
+    // If the connection failed, clean up and abort the connection.
+    if (!m_AsyncConnectionSuccess) {
         delete m_InputHandler;
         m_InputHandler = nullptr;
         SDL_QuitSubSystem(SDL_INIT_VIDEO);
@@ -960,30 +1128,48 @@ void Session::exec(int displayOriginX, int displayOriginY)
         return;
     }
 
-    // Pump the message loop to update the UI
-    emit connectionStarted();
-    QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-
     int x, y, width, height;
     getWindowDimensions(x, y, width, height);
 
+#ifdef STEAM_LINK
+    // We need a little delay before creating the window or we will trigger some kind
+    // of graphics driver bug on Steam Link that causes a jagged overlay to appear in
+    // the top right corner randomly.
+    SDL_Delay(500);
+#endif
+
     m_Window = SDL_CreateWindow("Moonlight",
                                 x,
                                 y,
                                 width,
                                 height,
-                                SDL_WINDOW_ALLOW_HIGHDPI);
+                                SDL_WINDOW_ALLOW_HIGHDPI | StreamUtils::getPlatformWindowFlags());
     if (!m_Window) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_CreateWindow() failed: %s",
-                     SDL_GetError());
-        delete m_InputHandler;
-        m_InputHandler = nullptr;
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-        QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
-        return;
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                    "SDL_CreateWindow() failed with platform flags: %s",
+                    SDL_GetError());
+
+        m_Window = SDL_CreateWindow("Moonlight",
+                                    x,
+                                    y,
+                                    width,
+                                    height,
+                                    SDL_WINDOW_ALLOW_HIGHDPI);
+        if (!m_Window) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "SDL_CreateWindow() failed: %s",
+                         SDL_GetError());
+
+            delete m_InputHandler;
+            m_InputHandler = nullptr;
+            SDL_QuitSubSystem(SDL_INIT_VIDEO);
+            QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
+            return;
+        }
     }
 
+    m_InputHandler->setWindow(m_Window);
+
     QSvgRenderer svgIconRenderer(QString(":/res/moonlight.svg"));
     QImage svgImage(ICON_SIZE, ICON_SIZE, QImage::Format_RGBA8888);
     svgImage.fill(0);
@@ -1028,14 +1214,21 @@ void Session::exec(int displayOriginX, int displayOriginY)
         SDL_SetWindowFullscreen(m_Window, m_FullScreenFlag);
     }
 
-#ifndef QT_DEBUG
-    // Capture the mouse by default on release builds only.
-    // This prevents the mouse from becoming trapped inside
-    // Moonlight when it's halted at a debug break.
-    if (m_Preferences->windowMode != StreamingPreferences::WM_WINDOWED) {
-        SDL_SetRelativeMouseMode(SDL_TRUE);
+    bool needsFirstEnterCapture = false;
+    bool needsPostDecoderCreationCapture = false;
+
+    // HACK: For Wayland, we wait until we get the first SDL_WINDOWEVENT_ENTER
+    // event where it seems to work consistently on GNOME. For other platforms,
+    // especially where SDL may call SDL_RecreateWindow(), we must only capture
+    // after the decoder is created.
+    if (strcmp(SDL_GetCurrentVideoDriver(), "wayland") == 0) {
+        // Native Wayland: Capture on SDL_WINDOWEVENT_ENTER
+        needsFirstEnterCapture = true;
+    }
+    else {
+        // X11/XWayland: Capture after decoder creation
+        needsPostDecoderCreationCapture = true;
     }
-#endif
 
     // Stop text input. SDL enables it by default
     // when we initialize the video subsystem, but this
@@ -1046,6 +1239,11 @@ void Session::exec(int displayOriginX, int displayOriginY)
     // Disable the screen saver
     SDL_DisableScreenSaver();
 
+    // Hide Qt's fake mouse cursor on EGLFS systems
+    if (QGuiApplication::platformName() == "eglfs") {
+        QGuiApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
+    }
+
     // Set timer resolution to 1 ms on Windows for greater
     // sleep precision and more accurate callback timing.
     SDL_SetHint(SDL_HINT_TIMER_RESOLUTION, "1");
@@ -1057,6 +1255,9 @@ void Session::exec(int displayOriginX, int displayOriginY)
     // (m_UnexpectedTermination is set back to true).
     m_UnexpectedTermination = false;
 
+    // Start rich presence to indicate we're in game
+    RichPresenceManager presence(*m_Preferences, m_App.name);
+
     // Hijack this thread to be the SDL main thread. We have to do this
     // because we want to suspend all Qt processing until the stream is over.
     SDL_Event event;
@@ -1073,6 +1274,7 @@ void Session::exec(int displayOriginX, int displayOriginY)
             // ARM core in the Steam Link, so we will wait 10 ms instead.
             SDL_Delay(10);
 #endif
+            presence.runCallbacks();
             continue;
         }
         switch (event.type) {
@@ -1082,49 +1284,33 @@ void Session::exec(int displayOriginX, int displayOriginY)
             goto DispatchDeferredCleanup;
 
         case SDL_USEREVENT:
-            SDL_assert(event.user.code == SDL_CODE_FRAME_READY);
-            m_VideoDecoder->renderFrameOnMainThread();
+            switch (event.user.code) {
+            case SDL_CODE_FRAME_READY:
+                m_VideoDecoder->renderFrameOnMainThread();
+                break;
+            case SDL_CODE_HIDE_CURSOR:
+                SDL_ShowCursor(SDL_DISABLE);
+                break;
+            case SDL_CODE_SHOW_CURSOR:
+                SDL_ShowCursor(SDL_ENABLE);
+                break;
+            default:
+                SDL_assert(false);
+            }
             break;
 
         case SDL_WINDOWEVENT:
-            // Capture mouse cursor when user actives the window by clicking on
-            // window's client area (borders and title bar excluded).
-            // Without this you would have to click the window twice (once to
-            // activate it, second time to enable capture). With this you need to
-            // click it only once.
-            // On Linux, the button press event is delivered after the focus gain
-            // so this is not neccessary (and leads to a click sent to the host
-            // when focusing the window by clicking).
-            // By excluding window's borders and title bar out, lets user still
-            // interact with them without mouse capture kicking in.
-#if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN)
-            if (event.window.event == SDL_WINDOWEVENT_FOCUS_GAINED) {
-                int mouseX, mouseY;
-                Uint32 mouseState = SDL_GetGlobalMouseState(&mouseX, &mouseY);
-                if (mouseState & SDL_BUTTON(SDL_BUTTON_LEFT)) {
-                    int x, y, width, height;
-                    SDL_GetWindowPosition(m_Window, &x, &y);
-                    SDL_GetWindowSize(m_Window, &width, &height);
-                    if (mouseX > x && mouseX < x+width && mouseY > y && mouseY < y+height) {
-                        SDL_SetRelativeMouseMode(SDL_TRUE);
-                    }
-                }
-            }
-#endif
-
-
             if (event.window.event == SDL_WINDOWEVENT_FOCUS_LOST) {
-                // Release mouse cursor when another window is activated (e.g. by using ALT+TAB).
-                // This lets user to interact with our window's title bar and with the buttons in it.
-                // Doing this while the window is full-screen breaks the transition out of FS
-                // (desktop and exclusive), so we must check for that before releasing mouse capture.
-                if (!(SDL_GetWindowFlags(m_Window) & SDL_WINDOW_FULLSCREEN)) {
-                    SDL_SetRelativeMouseMode(SDL_FALSE);
-                }
+                m_InputHandler->notifyFocusLost();
+            }
+            else if (event.window.event == SDL_WINDOWEVENT_LEAVE) {
+                m_InputHandler->notifyMouseLeave();
+            }
 
-                // Raise all keys that are currently pressed. If we don't do this, certain keys
-                // used in shortcuts that cause focus loss (such as Alt+Tab) may get stuck down.
-                m_InputHandler->raiseAllKeys();
+            // Capture the mouse on SDL_WINDOWEVENT_ENTER if needed
+            if (needsFirstEnterCapture && event.window.event == SDL_WINDOWEVENT_ENTER) {
+                m_InputHandler->setCaptureActive(true);
+                needsFirstEnterCapture = false;
             }
 
             // We want to recreate the decoder for resizes (full-screen toggles) and the initial shown event.
@@ -1153,6 +1339,12 @@ void Session::exec(int displayOriginX, int displayOriginY)
                 SDL_SetWindowPosition(m_Window, x, y);
             }
 
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Recreating renderer for window event: %d (%d %d)",
+                        event.window.event,
+                        event.window.data1,
+                        event.window.data2);
+
             // Fall through
         case SDL_RENDER_DEVICE_RESET:
         case SDL_RENDER_TARGETS_RESET:
@@ -1205,6 +1397,14 @@ void Session::exec(int displayOriginX, int displayOriginY)
                     emit displayLaunchError("Unable to initialize video decoder. Please check your streaming settings and try again.");
                     goto DispatchDeferredCleanup;
                 }
+
+                // As of SDL 2.0.12, SDL_RecreateWindow() doesn't carry over mouse capture
+                // or mouse hiding state to the new window. By capturing after the decoder
+                // is set up, this ensures the window re-creation is already done.
+                if (needsPostDecoderCreationCapture) {
+                    m_InputHandler->setCaptureActive(true);
+                    needsFirstEnterCapture = false;
+                }
             }
 
             // Request an IDR frame to complete the reset
@@ -1241,26 +1441,23 @@ void Session::exec(int displayOriginX, int displayOriginY)
         case SDL_JOYDEVICEADDED:
             m_InputHandler->handleJoystickArrivalEvent(&event.jdevice);
             break;
-
-        // SDL2 sends touch events from trackpads by default on
-        // macOS. This totally screws our actual mouse handling,
-        // so we must explicitly ignore touch events on macOS.
-#ifndef Q_OS_DARWIN
         case SDL_FINGERDOWN:
         case SDL_FINGERMOTION:
         case SDL_FINGERUP:
             m_InputHandler->handleTouchFingerEvent(&event.tfinger);
             break;
-#endif
         }
     }
 
 DispatchDeferredCleanup:
     // Uncapture the mouse and hide the window immediately,
     // so we can return to the Qt GUI ASAP.
-    SDL_SetRelativeMouseMode(SDL_FALSE);
+    m_InputHandler->setCaptureActive(false);
     SDL_EnableScreenSaver();
     SDL_SetHint(SDL_HINT_TIMER_RESOLUTION, "0");
+    if (QGuiApplication::platformName() == "eglfs") {
+        QGuiApplication::restoreOverrideCursor();
+    }
 
     // Raise any keys that are still down
     m_InputHandler->raiseAllKeys();

app/streaming/session.h

@@ -5,7 +5,7 @@
 #include <Limelight.h>
 #include <opus_multistream.h>
 #include "settings/streamingpreferences.h"
-#include "input.h"
+#include "input/input.h"
 #include "video/decoder.h"
 #include "audio/renderers/renderer.h"
 #include "video/overlaymanager.h"
@@ -16,6 +16,7 @@ class Session : public QObject
 
     friend class SdlInputHandler;
     friend class DeferredSessionCleanupTask;
+    friend class AsyncConnectionStartThread;
 
 public:
     explicit Session(NvComputer* computer, NvApp& app, StreamingPreferences *preferences = nullptr);
@@ -25,9 +26,8 @@ public:
     Q_INVOKABLE void exec(int displayOriginX, int displayOriginY);
 
     static
-    bool isHardwareDecodeAvailable(SDL_Window* window,
-                                   StreamingPreferences::VideoDecoderSelection vds,
-                                   int videoFormat, int width, int height, int frameRate);
+    void getDecoderInfo(SDL_Window* window,
+                       bool& isHardwareAccelerated, bool& isFullScreenOnly, QSize& maxResolution);
 
     static Session* get()
     {
@@ -42,7 +42,7 @@ public:
 signals:
     void stageStarting(QString stage);
 
-    void stageFailed(QString stage, long errorCode);
+    void stageFailed(QString stage, int errorCode);
 
     void connectionStarted();
 
@@ -52,26 +52,25 @@ signals:
 
     void quitStarting();
 
-    void sessionFinished();
+    void sessionFinished(int portTestResult);
 
 private:
     bool initialize();
 
+    bool startConnectionAsync();
+
     bool validateLaunch(SDL_Window* testWindow);
 
     void emitLaunchWarning(QString text);
 
-    static
-    int getDecoderCapabilities(SDL_Window* window,
-                               StreamingPreferences::VideoDecoderSelection vds,
-                               int videoFormat, int width, int height, int frameRate);
+    bool populateDecoderProperties(SDL_Window* window);
 
-    IAudioRenderer* createAudioRenderer();
-
-    int detectAudioConfiguration();
+    IAudioRenderer* createAudioRenderer(const POPUS_MULTISTREAM_CONFIGURATION opusConfig);
 
     bool testAudio(int audioConfiguration);
 
+    int getAudioRendererCapabilities(int audioConfiguration);
+
     void getWindowDimensions(int& x, int& y,
                              int& width, int& height);
 
@@ -81,6 +80,11 @@ private:
 
     void updateOptimalWindowDisplayMode();
 
+    static
+    bool isHardwareDecodeAvailable(SDL_Window* window,
+                                   StreamingPreferences::VideoDecoderSelection vds,
+                                   int videoFormat, int width, int height, int frameRate);
+
     static
     bool chooseDecoder(StreamingPreferences::VideoDecoderSelection vds,
                        SDL_Window* window, int videoFormat, int width, int height,
@@ -92,10 +96,10 @@ private:
     void clStageStarting(int stage);
 
     static
-    void clStageFailed(int stage, long errorCode);
+    void clStageFailed(int stage, int errorCode);
 
     static
-    void clConnectionTerminated(long errorCode);
+    void clConnectionTerminated(int errorCode);
 
     static
     void clLogMessage(const char* format, ...);
@@ -129,6 +133,7 @@ private:
     StreamingPreferences* m_Preferences;
     STREAM_CONFIGURATION m_StreamConfig;
     DECODER_RENDERER_CALLBACKS m_VideoCallbacks;
+    AUDIO_RENDERER_CALLBACKS m_AudioCallbacks;
     NvComputer* m_Computer;
     NvApp m_App;
     SDL_Window* m_Window;
@@ -145,6 +150,9 @@ private:
     SDL_SpinLock m_InputHandlerLock;
     int m_MouseEmulationRefCount;
 
+    bool m_AsyncConnectionSuccess;
+    int m_PortTestResults;
+
     int m_ActiveVideoFormat;
     int m_ActiveVideoWidth;
     int m_ActiveVideoHeight;
@@ -158,7 +166,6 @@ private:
 
     Overlay::OverlayManager m_OverlayManager;
 
-    static AUDIO_RENDERER_CALLBACKS k_AudioCallbacks;
     static CONNECTION_LISTENER_CALLBACKS k_ConnCallbacks;
     static Session* s_ActiveSession;
     static QSemaphore s_ActiveSessionSemaphore;

app/streaming/streamutils.cpp

@@ -6,20 +6,27 @@
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
+Uint32 StreamUtils::getPlatformWindowFlags()
+{
+#ifdef Q_OS_DARWIN
+    return SDL_WINDOW_METAL;
+#else
+    return 0;
+#endif
+}
+
 void StreamUtils::scaleSourceToDestinationSurface(SDL_Rect* src, SDL_Rect* dst)
 {
     int dstH = dst->w * src->h / src->w;
     int dstW = dst->h * src->w / src->h;
 
     if (dstH > dst->h) {
-        dst->y = 0;
-        dst->x = (dst->w - dstW) / 2;
+        dst->x += (dst->w - dstW) / 2;
         dst->w = dstW;
         SDL_assert(dst->w * src->h / src->w <= dst->h);
     }
     else {
-        dst->x = 0;
-        dst->y = (dst->h - dstH) / 2;
+        dst->y += (dst->h - dstH) / 2;
         dst->h = dstH;
         SDL_assert(dst->h * src->w / src->h <= dst->w);
     }

app/streaming/streamutils.h

@@ -5,6 +5,9 @@
 class StreamUtils
 {
 public:
+    static
+    Uint32 getPlatformWindowFlags();
+
     static
     void scaleSourceToDestinationSurface(SDL_Rect* src, SDL_Rect* dst);
 

app/streaming/video/decoder.h

@@ -43,7 +43,10 @@ public:
     virtual ~IVideoDecoder() {}
     virtual bool initialize(PDECODER_PARAMETERS params) = 0;
     virtual bool isHardwareAccelerated() = 0;
+    virtual bool isAlwaysFullScreen() = 0;
     virtual int getDecoderCapabilities() = 0;
+    virtual int getDecoderColorspace() = 0;
+    virtual QSize getDecoderMaxResolution() = 0;
     virtual int submitDecodeUnit(PDECODE_UNIT du) = 0;
     virtual void renderFrameOnMainThread() = 0;
 };

app/streaming/video/ffmpeg-renderers/cuda.cpp

@@ -0,0 +1,57 @@
+#include "cuda.h"
+
+CUDARenderer::CUDARenderer()
+    : m_HwContext(nullptr)
+{
+
+}
+
+CUDARenderer::~CUDARenderer()
+{
+    if (m_HwContext != nullptr) {
+        av_buffer_unref(&m_HwContext);
+    }
+}
+
+bool CUDARenderer::initialize(PDECODER_PARAMETERS)
+{
+    int err;
+
+    err = av_hwdevice_ctx_create(&m_HwContext, AV_HWDEVICE_TYPE_CUDA, nullptr, nullptr, 0);
+    if (err != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "av_hwdevice_ctx_create(CUDA) failed: %d",
+                     err);
+        return false;
+    }
+
+    return true;
+}
+
+bool CUDARenderer::prepareDecoderContext(AVCodecContext* context, AVDictionary**)
+{
+    context->hw_device_ctx = av_buffer_ref(m_HwContext);
+
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Using CUDA accelerated decoder");
+
+    return true;
+}
+
+void CUDARenderer::renderFrame(AVFrame*)
+{
+    // We only support indirect rendering
+    SDL_assert(false);
+}
+
+bool CUDARenderer::needsTestFrame()
+{
+    return true;
+}
+
+bool CUDARenderer::isDirectRenderingSupported()
+{
+    // We only support rendering via SDL read-back
+    return false;
+}
+

app/streaming/video/ffmpeg-renderers/cuda.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "renderer.h"
+
+class CUDARenderer : public IFFmpegRenderer {
+public:
+    CUDARenderer();
+    virtual ~CUDARenderer() override;
+    virtual bool initialize(PDECODER_PARAMETERS) override;
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override;
+    virtual void renderFrame(AVFrame* frame) override;
+    virtual bool needsTestFrame() override;
+    virtual bool isDirectRenderingSupported() override;
+
+private:
+    AVBufferRef* m_HwContext;
+};
+

app/streaming/video/ffmpeg-renderers/drm.cpp

@@ -33,7 +33,7 @@ DrmRenderer::~DrmRenderer()
     }
 }
 
-bool DrmRenderer::prepareDecoderContext(AVCodecContext*)
+bool DrmRenderer::prepareDecoderContext(AVCodecContext*, AVDictionary**)
 {
     /* Nothing to do */
 
@@ -194,8 +194,19 @@ enum AVPixelFormat DrmRenderer::getPreferredPixelFormat(int)
     return AV_PIX_FMT_DRM_PRIME;
 }
 
+int DrmRenderer::getRendererAttributes()
+{
+    // This renderer can only draw in full-screen
+    return RENDERER_ATTRIBUTE_FULLSCREEN_ONLY;
+}
+
 void DrmRenderer::renderFrame(AVFrame* frame)
 {
+    if (frame == nullptr) {
+        // End of stream - nothing to do for us
+        return;
+    }
+
     AVDRMFrameDescriptor* drmFrame = (AVDRMFrameDescriptor*)frame->data[0];
     int err;
     uint32_t primeHandle;

app/streaming/video/ffmpeg-renderers/drm.h

@@ -10,9 +10,10 @@ public:
     DrmRenderer();
     virtual ~DrmRenderer() override;
     virtual bool initialize(PDECODER_PARAMETERS params) override;
-    virtual bool prepareDecoderContext(AVCodecContext* context) override;
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override;
     virtual void renderFrame(AVFrame* frame) override;
     virtual enum AVPixelFormat getPreferredPixelFormat(int videoFormat) override;
+    virtual int getRendererAttributes() override;
 
 private:
     int m_DrmFd;

app/streaming/video/ffmpeg-renderers/dxva2.cpp

@@ -80,7 +80,7 @@ AVBufferRef* DXVA2Renderer::ffPoolAlloc(void* opaque, int)
     return NULL;
 }
 
-bool DXVA2Renderer::prepareDecoderContext(AVCodecContext* context)
+bool DXVA2Renderer::prepareDecoderContext(AVCodecContext* context, AVDictionary**)
 {
     // m_DXVAContext.workaround and report_id already initialized elsewhere
     m_DXVAContext.decoder = m_Decoder;
@@ -382,9 +382,6 @@ bool DXVA2Renderer::isDecoderBlacklisted()
     HRESULT hr;
     bool result = false;
 
-    // TODO: Update for HEVC Main10
-    SDL_assert(m_VideoFormat != VIDEO_FORMAT_H265_MAIN10);
-
     if (qgetenv("DXVA2_DISABLE_DECODER_BLACKLIST") == "1") {
         SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
                     "DXVA2 decoder blacklist is disabled");
@@ -432,6 +429,15 @@ bool DXVA2Renderer::isDecoderBlacklisted()
                                     "GPU blacklisted for HEVC due to hybrid decode");
                         result = (m_VideoFormat & VIDEO_FORMAT_MASK_H265) != 0;
                         break;
+                    case 0x1900: // Skylake
+                        // Blacklist these for HEVC Main10 to avoid hybrid decode.
+                        // Regular HEVC Main is fine though.
+                        if (m_VideoFormat == VIDEO_FORMAT_H265_MAIN10) {
+                            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                                        "GPU blacklisted for HEVC Main10 due to hybrid decode");
+                            result = false;
+                            break;
+                        }
                     default:
                         // Intel drivers from before late-2017 had a bug that caused some strange artifacts
                         // when decoding HEVC. Avoid HEVC on drivers prior to build 4836 which I confirmed
@@ -440,7 +446,7 @@ bool DXVA2Renderer::isDecoderBlacklisted()
                         // https://www.intel.com/content/www/us/en/support/articles/000005654/graphics-drivers.html
                         if (LOWORD(id.DriverVersion.LowPart) < 4836) {
                             SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                                        "Intel driver version blacklisted for HEVC");
+                                        "Detected buggy Intel GPU driver installed. Update your Intel GPU driver to enable HEVC!");
                             result = (m_VideoFormat & VIDEO_FORMAT_MASK_H265) != 0;
                         }
                         else {
@@ -540,12 +546,34 @@ bool DXVA2Renderer::initializeDevice(SDL_Window* window, bool enableVsync)
     d3dpp.hDeviceWindow = info.info.win.window;
     d3dpp.Flags = D3DPRESENTFLAG_VIDEO;
 
+    if (m_VideoFormat == VIDEO_FORMAT_H265_MAIN10) {
+        // Verify 10-bit A2R10G10B10 color support. This is only available
+        // as a display format in full-screen exclusive mode on DX9.
+        hr = d3d9ex->CheckDeviceType(adapterIndex,
+                                     D3DDEVTYPE_HAL,
+                                     D3DFMT_A2R10G10B10,
+                                     D3DFMT_A2R10G10B10,
+                                     FALSE);
+        if (FAILED(hr)) {
+            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                        "GPU/driver doesn't support A2R10G10B10");
+            d3d9ex->Release();
+            return false;
+        }
+    }
+
     if ((windowFlags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN) {
         d3dpp.Windowed = false;
         d3dpp.BackBufferWidth = currentMode.Width;
         d3dpp.BackBufferHeight = currentMode.Height;
         d3dpp.FullScreen_RefreshRateInHz = currentMode.RefreshRate;
-        d3dpp.BackBufferFormat = currentMode.Format;
+
+        if (m_VideoFormat == VIDEO_FORMAT_H265_MAIN10) {
+            d3dpp.BackBufferFormat = currentMode.Format = D3DFMT_A2R10G10B10;
+        }
+        else {
+            d3dpp.BackBufferFormat = currentMode.Format;
+        }
     }
     else {
         d3dpp.Windowed = true;
@@ -680,7 +708,13 @@ bool DXVA2Renderer::initialize(PDECODER_PARAMETERS params)
     m_Desc.SampleFormat.VideoPrimaries = DXVA2_VideoPrimaries_Unknown;
     m_Desc.SampleFormat.VideoTransferFunction = DXVA2_VideoTransFunc_Unknown;
     m_Desc.SampleFormat.SampleFormat = DXVA2_SampleProgressiveFrame;
-    m_Desc.Format = (D3DFORMAT)MAKEFOURCC('N','V','1','2');
+
+    if (m_VideoFormat == VIDEO_FORMAT_H265_MAIN10) {
+        m_Desc.Format = (D3DFORMAT)MAKEFOURCC('P','0','1','0');
+    }
+    else {
+        m_Desc.Format = (D3DFORMAT)MAKEFOURCC('N','V','1','2');
+    }
 
     if (!initializeDevice(params->window, params->enableVsync)) {
         return false;
@@ -762,8 +796,27 @@ void DXVA2Renderer::notifyOverlayUpdated(Overlay::OverlayType type)
     }
 }
 
+int DXVA2Renderer::getDecoderColorspace()
+{
+    if (isDXVideoProcessorAPIBlacklisted()) {
+        // StretchRect() assumes Rec 601 on Intel GPUs
+        return COLORSPACE_REC_601;
+    }
+    else {
+        // VideoProcessBlt() *should* properly handle whatever, since
+        // we provide colorspace information. However, AMD GPUs seem to
+        // always assume Rec 709, so we'll use that as our default.
+        return COLORSPACE_REC_709;
+    }
+}
+
 void DXVA2Renderer::renderFrame(AVFrame *frame)
 {
+    if (frame == nullptr) {
+        // End of stream - nothing to do for us
+        return;
+    }
+
     IDirect3DSurface9* surface = reinterpret_cast<IDirect3DSurface9*>(frame->data[3]);
     HRESULT hr;
 

app/streaming/video/ffmpeg-renderers/dxva2.h

@@ -17,9 +17,10 @@ public:
     DXVA2Renderer();
     virtual ~DXVA2Renderer() override;
     virtual bool initialize(PDECODER_PARAMETERS params) override;
-    virtual bool prepareDecoderContext(AVCodecContext* context) override;
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override;
     virtual void renderFrame(AVFrame* frame) override;
     virtual void notifyOverlayUpdated(Overlay::OverlayType) override;
+    virtual int getDecoderColorspace() override;
 
 private:
     bool initializeDecoder();

app/streaming/video/ffmpeg-renderers/egl_extensions.cpp

@@ -0,0 +1,21 @@
+// vim: noai:ts=4:sw=4:softtabstop=4:expandtab
+#include "renderer.h"
+
+#include <SDL_egl.h>
+
+static QStringList egl_get_extensions(EGLDisplay dpy) {
+    const auto EGLExtensionsStr = eglQueryString(dpy, EGL_EXTENSIONS);
+    if (!EGLExtensionsStr) {
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, "Unable to get EGL extensions");
+        return QStringList();
+    }
+    return QString(EGLExtensionsStr).split(" ");
+}
+
+EGLExtensions::EGLExtensions(EGLDisplay dpy) :
+    m_Extensions(egl_get_extensions(dpy))
+{}
+
+bool EGLExtensions::isSupported(const QString &extension) const {
+    return m_Extensions.contains(extension);
+}

app/streaming/video/ffmpeg-renderers/eglvid.cpp

@@ -0,0 +1,633 @@
+// vim: noai:ts=4:sw=4:softtabstop=4:expandtab
+#include "eglvid.h"
+
+#include "path.h"
+#include "streaming/session.h"
+#include "streaming/streamutils.h"
+
+#include <QDir>
+
+#include <Limelight.h>
+#include <unistd.h>
+
+#include <SDL_egl.h>
+#include <SDL_opengles2.h>
+#include <SDL_render.h>
+#include <SDL_syswm.h>
+
+#ifndef EGL_VERSION_1_5
+typedef intptr_t EGLAttrib;
+#endif
+
+#if !defined(EGL_VERSION_1_5) || !defined(EGL_EGL_PROTOTYPES)
+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum platform, void *native_display, const EGLAttrib *attrib_list);
+#endif
+
+#ifndef EGL_EXT_platform_base
+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
+#endif
+
+// These are EGL extensions, so some platform headers may not provide them
+#ifndef EGL_PLATFORM_WAYLAND_KHR
+#define EGL_PLATFORM_WAYLAND_KHR 0x31D8
+#endif
+#ifndef EGL_PLATFORM_X11_KHR
+#define EGL_PLATFORM_X11_KHR 0x31D5
+#endif
+
+/* TODO:
+ *  - handle more pixel formats
+ *  - handle software decoding
+ */
+
+/* DOC/misc:
+ *  - https://kernel-recipes.org/en/2016/talks/video-and-colorspaces/
+ *  - http://www.brucelindbloom.com/
+ *  - https://learnopengl.com/Getting-started/Shaders
+ *  - https://github.com/stunpix/yuvit
+ *  - https://en.wikipedia.org/wiki/YCbCr#ITU-R_BT.601_conversion
+ *  - https://www.renesas.com/eu/en/www/doc/application-note/an9717.pdf
+ *  - https://www.xilinx.com/support/documentation/application_notes/xapp283.pdf
+ *  - https://www.itu.int/dms_pubrec/itu-r/rec/bt/R-REC-BT.709-6-201506-I!!PDF-E.pdf
+ *  - https://www.khronos.org/registry/OpenGL/extensions/OES/OES_EGL_image_external.txt
+ *  - https://gist.github.com/rexguo/6696123
+ *  - https://wiki.libsdl.org/CategoryVideo
+ */
+
+#define EGL_LOG(Category, ...) SDL_Log ## Category(\
+        SDL_LOG_CATEGORY_APPLICATION, \
+        "EGLRenderer: " __VA_ARGS__)
+
+SDL_Window* EGLRenderer::s_LastFailedWindow = nullptr;
+
+EGLRenderer::EGLRenderer(IFFmpegRenderer *backendRenderer)
+    :
+        m_SwPixelFormat(AV_PIX_FMT_NONE),
+        m_EGLDisplay(EGL_NO_DISPLAY),
+        m_Textures{0},
+        m_ShaderProgram(0),
+        m_Context(0),
+        m_Window(nullptr),
+        m_Backend(backendRenderer),
+        m_VAO(0),
+        m_ColorSpace(AVCOL_SPC_NB),
+        m_ColorFull(false),
+        m_BlockingSwapBuffers(false),
+        m_glEGLImageTargetTexture2DOES(nullptr),
+        m_glGenVertexArraysOES(nullptr),
+        m_glBindVertexArrayOES(nullptr),
+        m_glDeleteVertexArraysOES(nullptr),
+        m_DummyRenderer(nullptr)
+{
+    SDL_assert(backendRenderer);
+    SDL_assert(backendRenderer->canExportEGL());
+
+    // Save these global parameters so we can restore them in our destructor
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &m_OldContextProfileMask);
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &m_OldContextMajorVersion);
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &m_OldContextMinorVersion);
+}
+
+EGLRenderer::~EGLRenderer()
+{
+    if (m_Context) {
+        // Reattach the GL context to the main thread for destruction
+        SDL_GL_MakeCurrent(m_Window, m_Context);
+        if (m_ShaderProgram) {
+            glDeleteProgram(m_ShaderProgram);
+        }
+        if (m_VAO) {
+            SDL_assert(m_glDeleteVertexArraysOES != nullptr);
+            m_glDeleteVertexArraysOES(1, &m_VAO);
+        }
+        SDL_GL_DeleteContext(m_Context);
+    }
+
+    if (m_DummyRenderer) {
+        SDL_DestroyRenderer(m_DummyRenderer);
+    }
+
+    // Reset the global properties back to what they were before
+    SDL_SetHint(SDL_HINT_OPENGL_ES_DRIVER, "0");
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, m_OldContextProfileMask);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, m_OldContextMajorVersion);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, m_OldContextMinorVersion);
+}
+
+bool EGLRenderer::prepareDecoderContext(AVCodecContext*, AVDictionary**)
+{
+    /* Nothing to do */
+
+    EGL_LOG(Info, "Using EGL renderer");
+
+    return true;
+}
+
+void EGLRenderer::notifyOverlayUpdated(Overlay::OverlayType)
+{
+    // TODO: FIXME
+}
+
+bool EGLRenderer::isPixelFormatSupported(int, AVPixelFormat pixelFormat)
+{
+    // Remember to keep this in sync with EGLRenderer::renderFrame()!
+    switch (pixelFormat)
+    {
+    case AV_PIX_FMT_NV12:
+        return true;
+    default:
+        return false;
+    }
+}
+
+int EGLRenderer::loadAndBuildShader(int shaderType,
+                                    const char *file) {
+    GLuint shader = glCreateShader(shaderType);
+    if (!shader || shader == GL_INVALID_ENUM) {
+        EGL_LOG(Error, "Can't create shader: %d", glGetError());
+        return 0;
+    }
+
+    auto sourceData = Path::readDataFile(file);
+    GLint len = sourceData.size();
+    const char *buf = sourceData.data();
+
+    glShaderSource(shader, 1, &buf, &len);
+    glCompileShader(shader);
+    GLint status;
+    glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
+    if (!status) {
+        char shaderLog[512];
+        glGetShaderInfoLog(shader, sizeof (shaderLog), nullptr, shaderLog);
+        EGL_LOG(Error, "Cannot load shader \"%s\": %s", file, shaderLog);
+        return 0;
+    }
+
+    return shader;
+}
+
+bool EGLRenderer::openDisplay(unsigned int platform, void* nativeDisplay)
+{
+    PFNEGLGETPLATFORMDISPLAYPROC eglGetPlatformDisplayProc;
+    PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXTProc;
+
+    m_EGLDisplay = EGL_NO_DISPLAY;
+
+    // NB: eglGetPlatformDisplay() and eglGetPlatformDisplayEXT() have slightly different definitions
+    eglGetPlatformDisplayProc = (typeof(eglGetPlatformDisplayProc))eglGetProcAddress("eglGetPlatformDisplay");
+    eglGetPlatformDisplayEXTProc = (typeof(eglGetPlatformDisplayEXTProc))eglGetProcAddress("eglGetPlatformDisplayEXT");
+
+    if (m_EGLDisplay == EGL_NO_DISPLAY) {
+        // eglGetPlatformDisplay() is part of the EGL 1.5 core specification
+        if (eglGetPlatformDisplayProc != nullptr) {
+            m_EGLDisplay = eglGetPlatformDisplayProc(platform, nativeDisplay, nullptr);
+            if (m_EGLDisplay == EGL_NO_DISPLAY) {
+                EGL_LOG(Warn, "eglGetPlatformDisplay() failed: %d", eglGetError());
+            }
+        }
+    }
+
+    if (m_EGLDisplay == EGL_NO_DISPLAY) {
+        // eglGetPlatformDisplayEXT() is an extension for EGL 1.4
+        const EGLExtensions eglExtensions(EGL_NO_DISPLAY);
+        if (eglExtensions.isSupported("EGL_EXT_platform_base")) {
+            if (eglGetPlatformDisplayEXTProc != nullptr) {
+                m_EGLDisplay = eglGetPlatformDisplayEXTProc(platform, nativeDisplay, nullptr);
+                if (m_EGLDisplay == EGL_NO_DISPLAY) {
+                    EGL_LOG(Warn, "eglGetPlatformDisplayEXT() failed: %d", eglGetError());
+                }
+            }
+            else {
+                EGL_LOG(Warn, "EGL_EXT_platform_base supported but no eglGetPlatformDisplayEXT() export!");
+            }
+        }
+    }
+
+    if (m_EGLDisplay == EGL_NO_DISPLAY) {
+        // Finally, if all else fails, use eglGetDisplay()
+        m_EGLDisplay = eglGetDisplay((EGLNativeDisplayType)nativeDisplay);
+        if (m_EGLDisplay == EGL_NO_DISPLAY) {
+            EGL_LOG(Error, "eglGetDisplay() failed: %d", eglGetError());
+        }
+    }
+
+    return m_EGLDisplay != EGL_NO_DISPLAY;
+}
+
+bool EGLRenderer::compileShader() {
+    SDL_assert(!m_ShaderProgram);
+    SDL_assert(m_SwPixelFormat != AV_PIX_FMT_NONE);
+
+    // XXX: TODO: other formats
+    SDL_assert(m_SwPixelFormat == AV_PIX_FMT_NV12);
+
+    bool ret = false;
+
+    GLuint vertexShader = loadAndBuildShader(GL_VERTEX_SHADER, "egl.vert");
+    if (!vertexShader)
+        return false;
+
+    GLuint fragmentShader = loadAndBuildShader(GL_FRAGMENT_SHADER, "egl.frag");
+    if (!fragmentShader)
+        goto fragError;
+
+    m_ShaderProgram = glCreateProgram();
+    if (!m_ShaderProgram) {
+        EGL_LOG(Error, "Cannot create shader program");
+        goto progFailCreate;
+    }
+
+    glAttachShader(m_ShaderProgram, vertexShader);
+    glAttachShader(m_ShaderProgram, fragmentShader);
+    glLinkProgram(m_ShaderProgram);
+    int status;
+    glGetProgramiv(m_ShaderProgram, GL_LINK_STATUS, &status);
+    if (status) {
+        ret = true;
+    } else {
+        char shader_log[512];
+        glGetProgramInfoLog(m_ShaderProgram, sizeof (shader_log), nullptr, shader_log);
+        EGL_LOG(Error, "Cannot link shader program: %s", shader_log);
+        glDeleteProgram(m_ShaderProgram);
+        m_ShaderProgram = 0;
+    }
+
+progFailCreate:
+    glDeleteShader(fragmentShader);
+fragError:
+    glDeleteShader(vertexShader);
+    return ret;
+}
+
+bool EGLRenderer::initialize(PDECODER_PARAMETERS params)
+{
+    m_Window = params->window;
+
+    if (params->videoFormat == VIDEO_FORMAT_H265_MAIN10) {
+        // EGL doesn't support rendering YUV 10-bit textures yet
+        return false;
+    }
+
+    // It's not safe to attempt to opportunistically create a GLES2
+    // renderer prior to 2.0.10. If GLES2 isn't available, SDL will
+    // attempt to dereference a null pointer and crash Moonlight.
+    // https://bugzilla.libsdl.org/show_bug.cgi?id=4350
+    // https://hg.libsdl.org/SDL/rev/84618d571795
+    if (!SDL_VERSION_ATLEAST(2, 0, 10)) {
+        EGL_LOG(Error, "Not supported until SDL 2.0.10");
+        return false;
+    }
+
+    // HACK: Work around bug where renderer will repeatedly fail with:
+    // SDL_CreateRenderer() failed: Could not create GLES window surface
+    if (m_Window == s_LastFailedWindow) {
+        EGL_LOG(Error, "SDL_CreateRenderer() already failed on this window!");
+        return false;
+    }
+
+    /*
+     * Create a dummy renderer in order to craft an accelerated SDL Window.
+     * Request opengl ES 3.0 context, otherwise it will SIGSEGV
+     * https://gitlab.freedesktop.org/mesa/mesa/issues/1011
+     */
+    SDL_SetHint(SDL_HINT_OPENGL_ES_DRIVER, "1");
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+
+    int renderIndex;
+    int maxRenderers = SDL_GetNumRenderDrivers();
+    SDL_assert(maxRenderers >= 0);
+
+    SDL_RendererInfo renderInfo;
+    for (renderIndex = 0; renderIndex < maxRenderers; ++renderIndex) {
+        if (SDL_GetRenderDriverInfo(renderIndex, &renderInfo))
+            continue;
+        if (!strcmp(renderInfo.name, "opengles2")) {
+            SDL_assert(renderInfo.flags & SDL_RENDERER_ACCELERATED);
+            break;
+        }
+    }
+    if (renderIndex == maxRenderers) {
+        EGL_LOG(Error, "Could not find a suitable SDL_Renderer");
+        return false;
+    }
+
+    if (!(m_DummyRenderer = SDL_CreateRenderer(m_Window, renderIndex, SDL_RENDERER_ACCELERATED))) {
+        EGL_LOG(Error, "SDL_CreateRenderer() failed: %s", SDL_GetError());
+        s_LastFailedWindow = m_Window;
+        return false;
+    }
+
+    SDL_SysWMinfo info;
+    SDL_VERSION(&info.version);
+    if (!SDL_GetWindowWMInfo(params->window, &info)) {
+        EGL_LOG(Error, "SDL_GetWindowWMInfo() failed: %s", SDL_GetError());
+        return false;
+    }
+    switch (info.subsystem) {
+#ifdef SDL_VIDEO_DRIVER_WAYLAND
+    case SDL_SYSWM_WAYLAND:
+        if (!openDisplay(EGL_PLATFORM_WAYLAND_KHR, info.info.wl.display)) {
+            return false;
+        }
+        break;
+#endif
+#ifdef SDL_VIDEO_DRIVER_X11
+    case SDL_SYSWM_X11:
+        if (!openDisplay(EGL_PLATFORM_X11_KHR, info.info.x11.display)) {
+            return false;
+        }
+        break;
+#endif
+    default:
+        EGL_LOG(Error, "not compatible with SYSWM");
+        return false;
+    }
+
+    if (m_EGLDisplay == EGL_NO_DISPLAY) {
+        EGL_LOG(Error, "Cannot get EGL display: %d", eglGetError());
+        return false;
+    }
+
+    if (!(m_Context = SDL_GL_CreateContext(params->window))) {
+        EGL_LOG(Error, "Cannot create OpenGL context: %s", SDL_GetError());
+        return false;
+    }
+    if (SDL_GL_MakeCurrent(params->window, m_Context)) {
+        EGL_LOG(Error, "Cannot use created EGL context: %s", SDL_GetError());
+        return false;
+    }
+
+    const EGLExtensions eglExtensions(m_EGLDisplay);
+    if (!eglExtensions.isSupported("EGL_KHR_image_base") &&
+        !eglExtensions.isSupported("EGL_KHR_image")) {
+        EGL_LOG(Error, "EGL_KHR_image unsupported");
+        return false;
+    }
+    else if (!SDL_GL_ExtensionSupported("GL_OES_EGL_image")) {
+        EGL_LOG(Error, "GL_OES_EGL_image unsupported");
+        return false;
+    }
+
+    if (!m_Backend->initializeEGL(m_EGLDisplay, eglExtensions))
+        return false;
+
+    if (!(m_glEGLImageTargetTexture2DOES = (typeof(m_glEGLImageTargetTexture2DOES))eglGetProcAddress("glEGLImageTargetTexture2DOES"))) {
+        EGL_LOG(Error,
+                "EGL: cannot retrieve `glEGLImageTargetTexture2DOES` address");
+        return false;
+    }
+
+    // Vertex arrays are an extension on OpenGL ES 2.0
+    if (SDL_GL_ExtensionSupported("GL_OES_vertex_array_object")) {
+        m_glGenVertexArraysOES = (typeof(m_glGenVertexArraysOES))eglGetProcAddress("glGenVertexArraysOES");
+        m_glBindVertexArrayOES = (typeof(m_glBindVertexArrayOES))eglGetProcAddress("glBindVertexArrayOES");
+        m_glDeleteVertexArraysOES = (typeof(m_glDeleteVertexArraysOES))eglGetProcAddress("glDeleteVertexArraysOES");
+    }
+    else {
+        // They are included in OpenGL ES 3.0 as part of the standard
+        m_glGenVertexArraysOES = (typeof(m_glGenVertexArraysOES))eglGetProcAddress("glGenVertexArrays");
+        m_glBindVertexArrayOES = (typeof(m_glBindVertexArrayOES))eglGetProcAddress("glBindVertexArray");
+        m_glDeleteVertexArraysOES = (typeof(m_glDeleteVertexArraysOES))eglGetProcAddress("glDeleteVertexArrays");
+    }
+
+    if (!m_glGenVertexArraysOES || !m_glBindVertexArrayOES || !m_glDeleteVertexArraysOES) {
+        EGL_LOG(Error, "Failed to find VAO functions");
+        return false;
+    }
+
+    /* Compute the video region size in order to keep the aspect ratio of the
+     * video stream.
+     */
+    SDL_Rect src, dst;
+    src.x = src.y = dst.x = dst.y = 0;
+    src.w = params->width;
+    src.h = params->height;
+    SDL_GetWindowSize(m_Window, &dst.w, &dst.h);
+    StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
+
+    glViewport(dst.x, dst.y, dst.w, dst.h);
+
+    glClearColor(0, 0, 0, 1);
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    if (params->enableVsync) {
+        SDL_GL_SetSwapInterval(1);
+        m_BlockingSwapBuffers = true;
+    } else {
+        SDL_GL_SetSwapInterval(0);
+    }
+
+    SDL_GL_SwapWindow(params->window);
+
+    glGenTextures(EGL_MAX_PLANES, m_Textures);
+    for (size_t i = 0; i < EGL_MAX_PLANES; ++i) {
+        glBindTexture(GL_TEXTURE_EXTERNAL_OES, m_Textures[i]);
+        glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    }
+
+    GLenum err = glGetError();
+    if (err != GL_NO_ERROR)
+        EGL_LOG(Error, "OpenGL error: %d", err);
+
+    // Detach the context from this thread, so the render thread can attach it
+    SDL_GL_MakeCurrent(m_Window, nullptr);
+
+    return err == GL_NO_ERROR;
+}
+
+const float *EGLRenderer::getColorMatrix() {
+    /* The conversion matrices are shamelessly stolen from linux:
+     * drivers/media/platform/imx-pxp.c:pxp_setup_csc
+     */
+    static const float bt601Lim[] = {
+        1.1644f, 1.1644f, 1.1644f,
+        0.0f, -0.3917f, 2.0172f,
+        1.5960f, -0.8129f, 0.0f
+    };
+    static const float bt601Full[] = {
+        1.0f, 1.0f, 1.0f,
+        0.0f, -0.3441f, 1.7720f,
+        1.4020f, -0.7141f, 0.0f
+    };
+    static const float bt709Lim[] = {
+        1.1644f, 1.1644f, 1.1644f,
+        0.0f, -0.2132f, 2.1124f,
+        1.7927f, -0.5329f, 0.0f
+    };
+    static const float bt709Full[] = {
+        1.0f, 1.0f, 1.0f,
+        0.0f, -0.1873f, 1.8556f,
+        1.5748f, -0.4681f, 0.0f
+    };
+    static const float bt2020Lim[] = {
+        1.1644f, 1.1644f, 1.1644f,
+        0.0f, -0.1874f, 2.1418f,
+        1.6781f, -0.6505f, 0.0f
+    };
+    static const float bt2020Full[] = {
+        1.0f, 1.0f, 1.0f,
+        0.0f, -0.1646f, 1.8814f,
+        1.4746f, -0.5714f, 0.0f
+    };
+
+    switch (m_ColorSpace) {
+        case AVCOL_SPC_SMPTE170M:
+        case AVCOL_SPC_BT470BG:
+            EGL_LOG(Info, "BT-601 pixels");
+            return m_ColorFull ? bt601Full : bt601Lim;
+        case AVCOL_SPC_BT709:
+            EGL_LOG(Info, "BT-709 pixels");
+            return m_ColorFull ? bt709Full : bt709Lim;
+        case AVCOL_SPC_BT2020_NCL:
+        case AVCOL_SPC_BT2020_CL:
+            EGL_LOG(Info, "BT-2020 pixels");
+            return m_ColorFull ? bt2020Full : bt2020Lim;
+    };
+    EGL_LOG(Warn, "unknown color space: %d, falling back to BT-601",
+            m_ColorSpace);
+    return bt601Lim;
+}
+
+bool EGLRenderer::specialize() {
+    SDL_assert(!m_VAO);
+
+    // Attach our GL context to the render thread
+    SDL_GL_MakeCurrent(m_Window, m_Context);
+
+    if (!compileShader())
+        return false;
+
+    // The viewport should have the aspect ratio of the video stream
+    static const float vertices[] = {
+        // pos .... // tex coords
+        1.0f, 1.0f, 1.0f, 0.0f,
+        1.0f, -1.0f, 1.0f, 1.0f,
+        -1.0f, -1.0f, 0.0f, 1.0f,
+        -1.0f, 1.0f, 0.0f, 0.0f,
+
+    };
+    static const unsigned int indices[] = {
+        0, 1, 3,
+        1, 2, 3,
+    };
+
+    glUseProgram(m_ShaderProgram);
+
+    unsigned int VBO, EBO;
+    m_glGenVertexArraysOES(1, &m_VAO);
+    glGenBuffers(1, &VBO);
+    glGenBuffers(1, &EBO);
+
+    m_glBindVertexArrayOES(m_VAO);
+
+    glBindBuffer(GL_ARRAY_BUFFER, VBO);
+    glBufferData(GL_ARRAY_BUFFER, sizeof (vertices), vertices, GL_STATIC_DRAW);
+
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO);
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof (indices), indices, GL_STATIC_DRAW);
+
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void*)0);
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof(float), (void*)(2 * sizeof (float)));
+    glEnableVertexAttribArray(1);
+
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    m_glBindVertexArrayOES(0);
+
+    int yuvmatLocation = glGetUniformLocation(m_ShaderProgram, "yuvmat");
+    glUniformMatrix3fv(yuvmatLocation, 1, GL_FALSE, getColorMatrix());
+
+    static const float limitedOffsets[] = { 16.0f / 255.0f, 128.0f / 255.0f, 128.0f / 255.0f };
+    static const float fullOffsets[] = { 0.0f, 128.0f / 255.0f, 128.0f / 255.0f };
+
+    int offLocation = glGetUniformLocation(m_ShaderProgram, "offset");
+    glUniform3fv(offLocation, 1, m_ColorFull ? fullOffsets : limitedOffsets);
+
+    int colorPlane = glGetUniformLocation(m_ShaderProgram, "plane1");
+    glUniform1i(colorPlane, 0);
+    colorPlane = glGetUniformLocation(m_ShaderProgram, "plane2");
+    glUniform1i(colorPlane, 1);
+
+    glDeleteBuffers(1, &VBO);
+    glDeleteBuffers(1, &EBO);
+
+    GLenum err = glGetError();
+    if (err != GL_NO_ERROR) {
+        EGL_LOG(Error, "OpenGL error: %d", err);
+    }
+
+    return err == GL_NO_ERROR;
+}
+
+void EGLRenderer::renderFrame(AVFrame* frame)
+{
+    EGLImage imgs[EGL_MAX_PLANES];
+
+    if (frame == nullptr) {
+        // End of stream - unbind the GL context
+        SDL_GL_MakeCurrent(m_Window, nullptr);
+        return;
+    }
+
+    if (frame->hw_frames_ctx != nullptr) {
+        // Find the native read-back format and load the shader
+        if (m_SwPixelFormat == AV_PIX_FMT_NONE) {
+            auto hwFrameCtx = (AVHWFramesContext*)frame->hw_frames_ctx->data;
+
+            m_SwPixelFormat = hwFrameCtx->sw_format;
+            SDL_assert(m_SwPixelFormat != AV_PIX_FMT_NONE);
+
+            EGL_LOG(Info, "Selected read-back format: %d", m_SwPixelFormat);
+
+            // XXX: TODO: Handle other pixel formats
+            SDL_assert(m_SwPixelFormat == AV_PIX_FMT_NV12);
+            m_ColorSpace = frame->colorspace;
+            m_ColorFull = frame->color_range == AVCOL_RANGE_JPEG;
+
+            if (!specialize()) {
+                m_SwPixelFormat = AV_PIX_FMT_NONE;
+                return;
+            }
+        }
+
+        ssize_t plane_count = m_Backend->exportEGLImages(frame, m_EGLDisplay, imgs);
+        if (plane_count < 0)
+            return;
+        for (ssize_t i = 0; i < plane_count; ++i) {
+            glActiveTexture(GL_TEXTURE0 + i);
+            glBindTexture(GL_TEXTURE_EXTERNAL_OES, m_Textures[i]);
+            m_glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, imgs[i]);
+        }
+    } else {
+        // TODO: load texture for SW decoding ?
+        EGL_LOG(Error, "EGL rendering only supports hw frames");
+        return;
+    }
+
+    glClear(GL_COLOR_BUFFER_BIT);
+    glUseProgram(m_ShaderProgram);
+    m_glBindVertexArrayOES(m_VAO);
+    glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
+
+    SDL_GL_SwapWindow(m_Window);
+
+    if (m_BlockingSwapBuffers) {
+        // This glClear() forces us to block until the buffer swap is
+        // complete to continue rendering. Mesa won't actually wait
+        // for the swap with just glFinish() alone. Waiting here keeps us
+        // in lock step with the display refresh rate. If we don't wait
+        // here, we'll stall on the first GL call next frame. Doing the
+        // wait here instead allows more time for a newer frame to arrive
+        // for next renderFrame() call.
+        glClear(GL_COLOR_BUFFER_BIT);
+        glFinish();
+    }
+
+    if (frame->hw_frames_ctx != nullptr)
+        m_Backend->freeEGLImages(m_EGLDisplay, imgs);
+}

app/streaming/video/ffmpeg-renderers/eglvid.h

@@ -0,0 +1,51 @@
+#pragma once
+
+#include "renderer.h"
+
+#include <SDL_opengles2.h>
+#include <SDL_opengles2_gl2ext.h>
+
+class EGLRenderer : public IFFmpegRenderer {
+public:
+    EGLRenderer(IFFmpegRenderer *backendRenderer);
+    virtual ~EGLRenderer() override;
+    virtual bool initialize(PDECODER_PARAMETERS params) override;
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override;
+    virtual void renderFrame(AVFrame* frame) override;
+    virtual void notifyOverlayUpdated(Overlay::OverlayType) override;
+    virtual bool isPixelFormatSupported(int videoFormat, enum AVPixelFormat pixelFormat) override;
+
+private:
+
+    bool compileShader();
+    bool specialize();
+    const float *getColorMatrix();
+    static int loadAndBuildShader(int shaderType, const char *filename);
+    bool openDisplay(unsigned int platform, void* nativeDisplay);
+
+    int m_SwPixelFormat;
+    void *m_EGLDisplay;
+    unsigned m_Textures[EGL_MAX_PLANES];
+    unsigned m_ShaderProgram;
+    SDL_GLContext m_Context;
+    SDL_Window *m_Window;
+    IFFmpegRenderer *m_Backend;
+    unsigned int m_VAO;
+    int m_ColorSpace;
+    bool m_ColorFull;
+    bool m_BlockingSwapBuffers;
+    PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_glEGLImageTargetTexture2DOES;
+    PFNGLGENVERTEXARRAYSOESPROC m_glGenVertexArraysOES;
+    PFNGLBINDVERTEXARRAYOESPROC m_glBindVertexArrayOES;
+    PFNGLDELETEVERTEXARRAYSOESPROC m_glDeleteVertexArraysOES;
+
+    int m_OldContextProfileMask;
+    int m_OldContextMajorVersion;
+    int m_OldContextMinorVersion;
+
+    SDL_Renderer *m_DummyRenderer;
+
+    // HACK: Work around bug where renderer will repeatedly fail with:
+    // SDL_CreateRenderer() failed: Could not create GLES window surface
+    static SDL_Window* s_LastFailedWindow;
+};

app/streaming/video/ffmpeg-renderers/mmal.cpp

@@ -22,9 +22,16 @@ MmalRenderer::~MmalRenderer()
     }
 }
 
-bool MmalRenderer::prepareDecoderContext(AVCodecContext*)
+bool MmalRenderer::prepareDecoderContext(AVCodecContext* context, AVDictionary** options)
 {
-    /* Nothing to do */
+    // FFmpeg defaults this to 10 which is too large to fit in the default 64 MB VRAM split.
+    // Reducing to 2 seems to work fine for our bitstreams (max of 1 buffered frame needed).
+    av_dict_set_int(options, "extra_buffers", 2, 0);
+
+    // MMAL seems to dislike certain initial width and height values, but it seems okay
+    // with getting zero for the width and height. We'll zero them all the time to be safe.
+    context->width = 0;
+    context->height = 0;
 
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                 "Using MMAL renderer");
@@ -82,7 +89,7 @@ bool MmalRenderer::initialize(PDECODER_PARAMETERS params)
         dr.alpha = 255;
 
         dr.set |= MMAL_DISPLAY_SET_FULLSCREEN;
-        dr.fullscreen = (SDL_GetWindowFlags(params->window) & SDL_WINDOW_FULLSCREEN) != 0;
+        dr.fullscreen = true;
 
         {
             SDL_Rect src, dst;
@@ -125,6 +132,12 @@ enum AVPixelFormat MmalRenderer::getPreferredPixelFormat(int videoFormat)
     return AV_PIX_FMT_MMAL;
 }
 
+int MmalRenderer::getRendererAttributes()
+{
+    // This renderer can only draw in full-screen and maxes out at 1080p
+    return RENDERER_ATTRIBUTE_FULLSCREEN_ONLY | RENDERER_ATTRIBUTE_1080P_MAX;
+}
+
 bool MmalRenderer::needsTestFrame()
 {
     // We won't be able to decode if the GPU memory is 64 MB or lower,
@@ -134,6 +147,11 @@ bool MmalRenderer::needsTestFrame()
 
 void MmalRenderer::renderFrame(AVFrame* frame)
 {
+    if (frame == nullptr) {
+        // End of stream - nothing to do for us
+        return;
+    }
+
     MMAL_BUFFER_HEADER_T* buffer = (MMAL_BUFFER_HEADER_T*)frame->data[3];
     MMAL_STATUS_T status;
 

app/streaming/video/ffmpeg-renderers/mmal.h

@@ -12,10 +12,11 @@ public:
     MmalRenderer();
     virtual ~MmalRenderer() override;
     virtual bool initialize(PDECODER_PARAMETERS params) override;
-    virtual bool prepareDecoderContext(AVCodecContext* context) override;
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override;
     virtual void renderFrame(AVFrame* frame) override;
     virtual enum AVPixelFormat getPreferredPixelFormat(int videoFormat) override;
     virtual bool needsTestFrame() override;
+    virtual int getRendererAttributes() override;
 
 private:
     static void InputPortCallback(MMAL_PORT_T* port, MMAL_BUFFER_HEADER_T* buffer);

app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp

@@ -45,6 +45,10 @@ Pacer::~Pacer()
         m_RenderQueueNotEmpty.wakeAll();
         SDL_WaitThread(m_RenderThread, nullptr);
     }
+    else {
+        // Send a null AVFrame to indicate end of stream on the main thread
+        m_VsyncRenderer->renderFrame(nullptr);
+    }
 
     // Delete any remaining unconsumed frames
     while (!m_RenderQueue.isEmpty()) {
@@ -106,6 +110,9 @@ int Pacer::renderThread(void* context)
         me->renderLastFrameAndUnlock();
     }
 
+    // Send a null AVFrame to indicate end of stream on the render thread
+    me->m_VsyncRenderer->renderFrame(nullptr);
+
     return 0;
 }
 
@@ -258,7 +265,7 @@ void Pacer::renderFrame(AVFrame* frame)
 {
     // Count time spent in Pacer's queues
     Uint32 beforeRender = SDL_GetTicks();
-    m_VideoStats->totalPacerTime += beforeRender - frame->pts;
+    m_VideoStats->totalPacerTime += beforeRender - frame->pkt_dts;
 
     // Render it
     m_VsyncRenderer->renderFrame(frame);

app/streaming/video/ffmpeg-renderers/renderer.h

@@ -9,16 +9,30 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 }
 
+#ifdef HAVE_EGL
+// SDL_egl.h have too many conflicts, we will do without
+typedef void *EGLDisplay;
+typedef void *EGLImage;
+#define EGL_MAX_PLANES 4
+
+class EGLExtensions {
+public:
+    EGLExtensions(EGLDisplay dpy);
+    ~EGLExtensions() {}
+    bool isSupported(const QString &extension) const;
+private:
+    const QStringList m_Extensions;
+};
+
+#endif
+
+#define RENDERER_ATTRIBUTE_FULLSCREEN_ONLY 0x01
+#define RENDERER_ATTRIBUTE_1080P_MAX 0x02
+
 class IFFmpegRenderer : public Overlay::IOverlayRenderer {
 public:
-    enum FramePacingConstraint {
-        PACING_FORCE_OFF,
-        PACING_FORCE_ON,
-        PACING_ANY
-    };
-
     virtual bool initialize(PDECODER_PARAMETERS params) = 0;
-    virtual bool prepareDecoderContext(AVCodecContext* context) = 0;
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) = 0;
     virtual void renderFrame(AVFrame* frame) = 0;
 
     virtual bool needsTestFrame() {
@@ -31,9 +45,14 @@ public:
         return 0;
     }
 
-    virtual FramePacingConstraint getFramePacingConstraint() {
-        // No pacing preference
-        return PACING_ANY;
+    virtual int getRendererAttributes() {
+        // No special attributes by default
+        return 0;
+    }
+
+    virtual int getDecoderColorspace() {
+        // Rec 601 is default
+        return COLORSPACE_REC_601;
     }
 
     virtual bool isRenderThreadSupported() {
@@ -47,13 +66,44 @@ public:
     }
 
     virtual enum AVPixelFormat getPreferredPixelFormat(int videoFormat) {
-        // Planar YUV 4:2:0
-        SDL_assert(videoFormat != VIDEO_FORMAT_H265_MAIN10);
-        return AV_PIX_FMT_YUV420P;
+        if (videoFormat == VIDEO_FORMAT_H265_MAIN10) {
+            // 10-bit YUV 4:2:0
+            return AV_PIX_FMT_P010;
+        }
+        else {
+            // Planar YUV 4:2:0
+            return AV_PIX_FMT_YUV420P;
+        }
+    }
+
+    virtual bool isPixelFormatSupported(int videoFormat, enum AVPixelFormat pixelFormat) {
+        // By default, we only support the preferred pixel format
+        return getPreferredPixelFormat(videoFormat) == pixelFormat;
     }
 
     // IOverlayRenderer
     virtual void notifyOverlayUpdated(Overlay::OverlayType) override {
         // Nothing
     }
+
+#ifdef HAVE_EGL
+    // By default we can't do EGL
+    virtual bool canExportEGL() {
+        return false;
+    }
+
+    virtual bool initializeEGL(EGLDisplay,
+                               const EGLExtensions &) {
+        return false;
+    }
+
+    virtual ssize_t exportEGLImages(AVFrame *,
+                                    EGLDisplay,
+                                    EGLImage[EGL_MAX_PLANES]) {
+        return -1;
+    }
+
+    // Free the ressources allocated during the last `exportEGLImages` call
+    virtual void freeEGLImages(EGLDisplay, EGLImage[EGL_MAX_PLANES]) {}
+#endif
 };

app/streaming/video/ffmpeg-renderers/sdlvid.cpp

@@ -1,22 +1,17 @@
 #include "sdlvid.h"
 
 #include "streaming/session.h"
+#include "streaming/streamutils.h"
 #include "path.h"
 
 #include <QDir>
 
 #include <Limelight.h>
 
-const std::vector<int> SdlRenderer::k_SwFormats({
-    AV_PIX_FMT_YUV420P,
-    AV_PIX_FMT_NV12,
-    AV_PIX_FMT_NV21
-});
-
 SdlRenderer::SdlRenderer()
     : m_Renderer(nullptr),
       m_Texture(nullptr),
-      m_SwPixelFormat(AV_PIX_FMT_YUV420P),
+      m_SwPixelFormat(AV_PIX_FMT_NONE),
       m_FontData(Path::readDataFile("ModeSeven.ttf"))
 {
     SDL_assert(TTF_WasInit() == 0);
@@ -64,7 +59,7 @@ SdlRenderer::~SdlRenderer()
     }
 }
 
-bool SdlRenderer::prepareDecoderContext(AVCodecContext*)
+bool SdlRenderer::prepareDecoderContext(AVCodecContext*, AVDictionary**)
 {
     /* Nothing to do */
 
@@ -74,13 +69,6 @@ bool SdlRenderer::prepareDecoderContext(AVCodecContext*)
     return true;
 }
 
-int SdlRenderer::getDecoderCapabilities()
-{
-    // The FFmpeg CPU decoder can handle reference frame invalidation,
-    // but only for H.264.
-    return CAPABILITY_REFERENCE_FRAME_INVALIDATION_AVC;
-}
-
 void SdlRenderer::notifyOverlayUpdated(Overlay::OverlayType type)
 {
     // Construct the required font to render the overlay
@@ -140,10 +128,30 @@ bool SdlRenderer::isRenderThreadSupported()
     return true;
 }
 
+bool SdlRenderer::isPixelFormatSupported(int, AVPixelFormat pixelFormat)
+{
+    // Remember to keep this in sync with SdlRenderer::renderFrame()!
+    switch (pixelFormat)
+    {
+    case AV_PIX_FMT_YUV420P:
+    case AV_PIX_FMT_NV12:
+    case AV_PIX_FMT_NV21:
+        return true;
+
+    default:
+        return false;
+    }
+}
+
 bool SdlRenderer::initialize(PDECODER_PARAMETERS params)
 {
     Uint32 rendererFlags = SDL_RENDERER_ACCELERATED;
 
+    if (params->videoFormat == VIDEO_FORMAT_H265_MAIN10) {
+        // SDL doesn't support rendering YUV 10-bit textures yet
+        return false;
+    }
+
     if ((SDL_GetWindowFlags(params->window) & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN) {
         // In full-screen exclusive mode, we enable V-sync if requested. For other modes, Windows and Mac
         // have compositors that make rendering tear-free. Linux compositor varies by distro and user
@@ -169,9 +177,26 @@ bool SdlRenderer::initialize(PDECODER_PARAMETERS params)
         return false;
     }
 
-    // The window may be smaller than the stream size, so ensure our
-    // logical rendering surface size is equal to the stream size
-    SDL_RenderSetLogicalSize(m_Renderer, params->width, params->height);
+    // SDL_CreateRenderer() can end up having to recreate our window (SDL_RecreateWindow())
+    // to ensure it's compatible with the renderer's OpenGL context. If that happens, we
+    // can get spurious SDL_WINDOWEVENT events that will cause us to (again) recreate our
+    // renderer. This can lead to an infinite to renderer recreation, so discard all
+    // SDL_WINDOWEVENT events after SDL_CreateRenderer().
+    SDL_PumpEvents();
+    SDL_FlushEvent(SDL_WINDOWEVENT);
+
+    // Calculate the video region size, scaling to fill the output size while
+    // preserving the aspect ratio of the video stream.
+    SDL_Rect src, dst;
+    src.x = src.y = 0;
+    src.w = params->width;
+    src.h = params->height;
+    dst.x = dst.y = 0;
+    SDL_GetRendererOutputSize(m_Renderer, &dst.w, &dst.h);
+    StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
+
+    // Ensure the viewport is set to the desired video region
+    SDL_RenderSetViewport(m_Renderer, &dst);
 
     // Draw a black frame until the video stream starts rendering
     SDL_SetRenderDrawColor(m_Renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
@@ -204,10 +229,10 @@ void SdlRenderer::renderOverlay(Overlay::OverlayType type)
 
             if (type == Overlay::OverlayStatusUpdate) {
                 // Bottom Left
-                int unused;
-                SDL_RenderGetLogicalSize(m_Renderer, &unused, &m_OverlayRects[type].y);
+                SDL_Rect viewportRect;
+                SDL_RenderGetViewport(m_Renderer, &viewportRect);
                 m_OverlayRects[type].x = 0;
-                m_OverlayRects[type].y -= surface->h;
+                m_OverlayRects[type].y = viewportRect.h - surface->h;
             }
             else if (type == Overlay::OverlayDebug) {
                 // Top left
@@ -234,11 +259,28 @@ void SdlRenderer::renderFrame(AVFrame* frame)
     int err;
     AVFrame* swFrame = nullptr;
 
+    if (frame == nullptr) {
+        // End of stream - nothing to do for us
+        return;
+    }
+
     if (frame->hw_frames_ctx != nullptr) {
         // If we are acting as the frontend for a hardware
         // accelerated decoder, we'll need to read the frame
         // back to render it.
 
+        // Find the native read-back format
+        if (m_SwPixelFormat == AV_PIX_FMT_NONE) {
+            auto hwFrameCtx = (AVHWFramesContext*)frame->hw_frames_ctx->data;
+
+            m_SwPixelFormat = hwFrameCtx->sw_format;
+            SDL_assert(m_SwPixelFormat != AV_PIX_FMT_NONE);
+
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Selected read-back format: %d",
+                        m_SwPixelFormat);
+        }
+
         swFrame = av_frame_alloc();
         if (swFrame == nullptr) {
             return;
@@ -249,22 +291,6 @@ void SdlRenderer::renderFrame(AVFrame* frame)
         swFrame->format = m_SwPixelFormat;
 
         err = av_hwframe_transfer_data(swFrame, frame, 0);
-        if (err != 0) {
-            // Try to find a supported format
-            for (uint32_t i = 0; i < k_SwFormats.size(); i++) {
-                swFrame->format = k_SwFormats.at(i);
-                err = av_hwframe_transfer_data(swFrame, frame, 0);
-                if (err == 0) {
-                    // The format was supported. Use that automatically in the future.
-                    m_SwPixelFormat = swFrame->format;
-                    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                                "Selected read-back format: %d",
-                                m_SwPixelFormat);
-                    break;
-                }
-            }
-        }
-
         if (err != 0) {
             SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                          "av_hwframe_transfer_data() failed: %d",
@@ -272,12 +298,18 @@ void SdlRenderer::renderFrame(AVFrame* frame)
             goto Exit;
         }
 
+        // av_hwframe_transfer_data() can nuke frame metadata,
+        // so anything other than width, height, and format must
+        // be set *after* calling av_hwframe_transfer_data().
+        swFrame->colorspace = frame->colorspace;
+
         frame = swFrame;
     }
 
     if (m_Texture == nullptr) {
         Uint32 sdlFormat;
 
+        // Remember to keep this in sync with SdlRenderer::isPixelFormatSupported()!
         switch (frame->format)
         {
         case AV_PIX_FMT_YUV420P:
@@ -294,6 +326,18 @@ void SdlRenderer::renderFrame(AVFrame* frame)
             goto Exit;
         }
 
+        switch (frame->colorspace)
+        {
+        case AVCOL_SPC_BT709:
+            SDL_SetYUVConversionMode(SDL_YUV_CONVERSION_BT709);
+            break;
+        case AVCOL_SPC_BT470BG:
+        case AVCOL_SPC_SMPTE170M:
+        default:
+            SDL_SetYUVConversionMode(SDL_YUV_CONVERSION_BT601);
+            break;
+        }
+
         m_Texture = SDL_CreateTexture(m_Renderer,
                                       sdlFormat,
                                       SDL_TEXTUREACCESS_STREAMING,

app/streaming/video/ffmpeg-renderers/sdlvid.h

@@ -9,11 +9,11 @@ public:
     SdlRenderer();
     virtual ~SdlRenderer() override;
     virtual bool initialize(PDECODER_PARAMETERS params) override;
-    virtual bool prepareDecoderContext(AVCodecContext* context) override;
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override;
     virtual void renderFrame(AVFrame* frame) override;
-    virtual int getDecoderCapabilities() override;
     virtual void notifyOverlayUpdated(Overlay::OverlayType) override;
     virtual bool isRenderThreadSupported() override;
+    virtual bool isPixelFormatSupported(int videoFormat, enum AVPixelFormat pixelFormat) override;
 
 private:
     void renderOverlay(Overlay::OverlayType type);
@@ -26,7 +26,5 @@ private:
     SDL_Surface* m_OverlaySurfaces[Overlay::OverlayMax];
     SDL_Texture* m_OverlayTextures[Overlay::OverlayMax];
     SDL_Rect m_OverlayRects[Overlay::OverlayMax];
-
-    static const std::vector<int> k_SwFormats;
 };
 

app/streaming/video/ffmpeg-renderers/vaapi.cpp

@@ -1,14 +1,27 @@
 #include <QString>
 
 #include "vaapi.h"
+#include "utils.h"
 #include <streaming/streamutils.h>
 
 #include <SDL_syswm.h>
+#ifdef HAVE_EGL
+#include <SDL_egl.h>
+#endif
+
+#include <unistd.h>
+#include <fcntl.h>
 
 VAAPIRenderer::VAAPIRenderer()
-    : m_HwContext(nullptr)
+    : m_HwContext(nullptr),
+      m_DrmFd(-1),
+      m_BlacklistedForDirectRendering(false)
 {
-
+#ifdef HAVE_EGL
+    m_PrimeDescriptor.num_layers = 0;
+    m_PrimeDescriptor.num_objects = 0;
+    m_EGLExtDmaBuf = false;
+#endif
 }
 
 VAAPIRenderer::~VAAPIRenderer()
@@ -26,28 +39,112 @@ VAAPIRenderer::~VAAPIRenderer()
             vaTerminate(display);
         }
     }
+
+    if (m_DrmFd != -1) {
+        close(m_DrmFd);
+    }
+}
+
+VADisplay
+VAAPIRenderer::openDisplay(SDL_Window* window)
+{
+    SDL_SysWMinfo info;
+    VADisplay display;
+
+    SDL_VERSION(&info.version);
+
+    if (!SDL_GetWindowWMInfo(window, &info)) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_GetWindowWMInfo() failed: %s",
+                     SDL_GetError());
+        return nullptr;
+    }
+
+    m_WindowSystem = info.subsystem;
+    if (info.subsystem == SDL_SYSWM_X11) {
+        m_XWindow = info.info.x11.window;
+#ifdef HAVE_LIBVA_X11
+        display = vaGetDisplay(info.info.x11.display);
+        if (display == nullptr) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "Unable to open X11 display for VAAPI");
+            return nullptr;
+        }
+#else
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "Moonlight not compiled with VAAPI X11 support!");
+        return nullptr;
+#endif
+    }
+    else if (info.subsystem == SDL_SYSWM_WAYLAND) {
+#ifdef HAVE_LIBVA_WAYLAND
+        display = vaGetDisplayWl(info.info.wl.display);
+        if (display == nullptr) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "Unable to open Wayland display for VAAPI");
+            return nullptr;
+        }
+#else
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "Moonlight not compiled with VAAPI Wayland support!");
+        return nullptr;
+#endif
+    }
+    // TODO: Upstream a better solution for SDL_GetWindowWMInfo on KMSDRM
+    else if (strcmp(SDL_GetCurrentVideoDriver(), "KMSDRM") == 0) {
+#ifdef HAVE_LIBVA_DRM
+        if (m_DrmFd < 0) {
+            const char* device = SDL_getenv("DRM_DEV");
+
+            if (device == nullptr) {
+                device = "/dev/dri/card0";
+            }
+
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Opening DRM device: %s",
+                        device);
+
+            m_DrmFd = open(device, O_RDWR | O_CLOEXEC);
+            if (m_DrmFd < 0) {
+                SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                             "Failed to open DRM device: %d",
+                             errno);
+                return nullptr;
+            }
+        }
+
+        display = vaGetDisplayDRM(m_DrmFd);
+        if (display == nullptr) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "Unable to open DRM display for VAAPI");
+            return nullptr;
+        }
+#else
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "Moonlight not compiled with VAAPI DRM support!");
+        return nullptr;
+#endif
+    }
+    else {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "Unsupported VAAPI rendering subsystem: %d",
+                     info.subsystem);
+        return nullptr;
+    }
+
+    return display;
 }
 
 bool
 VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
 {
     int err;
-    SDL_SysWMinfo info;
 
     m_VideoWidth = params->width;
     m_VideoHeight = params->height;
 
     SDL_GetWindowSize(params->window, &m_DisplayWidth, &m_DisplayHeight);
 
-    SDL_VERSION(&info.version);
-
-    if (!SDL_GetWindowWMInfo(params->window, &info)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_GetWindowWMInfo() failed: %s",
-                     SDL_GetError());
-        return false;
-    }
-
     m_HwContext = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);
     if (!m_HwContext) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -58,46 +155,93 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
     AVHWDeviceContext* deviceContext = (AVHWDeviceContext*)m_HwContext->data;
     AVVAAPIDeviceContext* vaDeviceContext = (AVVAAPIDeviceContext*)deviceContext->hwctx;
 
-    m_WindowSystem = info.subsystem;
-    if (info.subsystem == SDL_SYSWM_X11) {
-#ifdef HAVE_LIBVA_X11
-        m_XWindow = info.info.x11.window;
-        vaDeviceContext->display = vaGetDisplay(info.info.x11.display);
-        if (!vaDeviceContext->display) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "Unable to open X11 display for VAAPI");
-            return false;
-        }
-#else
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Moonlight not compiled with VAAPI X11 support!");
-        return false;
-#endif
-    }
-    else if (info.subsystem == SDL_SYSWM_WAYLAND) {
-#ifdef HAVE_LIBVA_WAYLAND
-        vaDeviceContext->display = vaGetDisplayWl(info.info.wl.display);
-        if (!vaDeviceContext->display) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "Unable to open Wayland display for VAAPI");
-            return false;
-        }
-#else
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Moonlight not compiled with VAAPI Wayland support!");
-        return false;
-#endif
-    }
-    else {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Unsupported VAAPI rendering subsystem: %d",
-                     info.subsystem);
+    vaDeviceContext->display = openDisplay(params->window);
+    if (vaDeviceContext->display == nullptr) {
+        // openDisplay() logs the error
         return false;
     }
 
     int major, minor;
     VAStatus status;
-    status = vaInitialize(vaDeviceContext->display, &major, &minor);
+    bool setPathVar = false;
+
+    for (;;) {
+        status = vaInitialize(vaDeviceContext->display, &major, &minor);
+        if (status != VA_STATUS_SUCCESS && qEnvironmentVariableIsEmpty("LIBVA_DRIVER_NAME")) {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Trying fallback VAAPI driver names");
+
+            // It would be nice to use vaSetDriverName() here, but there's no way to unset
+            // it and get back to the default driver selection logic once we've overridden
+            // the driver name using that API. As a result, we must use LIBVA_DRIVER_NAME.
+
+            if (status != VA_STATUS_SUCCESS) {
+                // The iHD driver supports newer hardware like Ice Lake and Comet Lake.
+                // It should be picked by default on those platforms, but that doesn't
+                // always seem to be the case for some reason.
+                qputenv("LIBVA_DRIVER_NAME", "iHD");
+                status = vaInitialize(vaDeviceContext->display, &major, &minor);
+            }
+
+            if (status != VA_STATUS_SUCCESS) {
+                // The Iris driver in Mesa 20.0 returns a bogus VA driver (iris_drv_video.so)
+                // even though the correct driver is still i965. If we hit this path, we'll
+                // explicitly try i965 to handle this case.
+                qputenv("LIBVA_DRIVER_NAME", "i965");
+                status = vaInitialize(vaDeviceContext->display, &major, &minor);
+            }
+
+            if (status != VA_STATUS_SUCCESS) {
+                // The RadeonSI driver is compatible with XWayland but can't be detected by libva
+                // so try it too if all else fails.
+                qputenv("LIBVA_DRIVER_NAME", "radeonsi");
+                status = vaInitialize(vaDeviceContext->display, &major, &minor);
+            }
+
+            if (status != VA_STATUS_SUCCESS) {
+                // Unset LIBVA_DRIVER_NAME if none of the drivers we tried worked. This ensures
+                // we will get a fresh start using the default driver selection behavior after
+                // setting LIBVA_DRIVERS_PATH in the code below.
+                qunsetenv("LIBVA_DRIVER_NAME");
+            }
+        }
+
+        if (status == VA_STATUS_SUCCESS) {
+            // Success!
+            break;
+        }
+
+        if (qEnvironmentVariableIsEmpty("LIBVA_DRIVERS_PATH")) {
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "Trying fallback VAAPI driver paths");
+
+            qputenv("LIBVA_DRIVERS_PATH",
+        #if Q_PROCESSOR_WORDSIZE == 8
+                    "/usr/lib64/dri:" // Fedora x86_64
+                    "/usr/lib64/va/drivers:" // Gentoo x86_64
+        #endif
+                    "/usr/lib/dri:" // Arch i386 & x86_64, Fedora i386
+                    "/usr/lib/va/drivers:" // Gentoo i386
+        #if defined(Q_PROCESSOR_X86_64)
+                    "/usr/lib/x86_64-linux-gnu/dri:" // Ubuntu/Debian x86_64
+        #elif defined(Q_PROCESSOR_X86_32)
+                    "/usr/lib/i386-linux-gnu/dri:" // Ubuntu/Debian i386
+        #endif
+                    );
+           setPathVar = true;
+        }
+        else {
+            if (setPathVar) {
+                // Unset LIBVA_DRIVERS_PATH if we set it ourselves
+                // and we didn't find any working VAAPI drivers.
+                qunsetenv("LIBVA_DRIVERS_PATH");
+            }
+
+            // Give up
+            break;
+        }
+    }
+
     if (status != VA_STATUS_SUCCESS) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to initialize VAAPI: %d",
@@ -110,6 +254,7 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
                 major, minor);
 
     const char* vendorString = vaQueryVendorString(vaDeviceContext->display);
+    QString vendorStr(vendorString);
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                 "Driver: %s",
                 vendorString ? vendorString : "<unknown>");
@@ -118,9 +263,8 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
     // to be leaked for each submitted frame. The Flatpak runtime has a VDPAU
     // driver in place that works well, so use that instead on AMD systems. If
     // we're using Wayland, we have no choice but to use VAAPI because VDPAU
-    // is only supported under X11.
-    if (vendorString && qgetenv("FORCE_VAAPI") != "1" && m_WindowSystem == SDL_SYSWM_X11) {
-        QString vendorStr(vendorString);
+    // is only supported under X11 or XWayland.
+    if (qgetenv("FORCE_VAAPI") != "1" && !WMUtils::isRunningWayland()) {
         if (vendorStr.contains("AMD", Qt::CaseInsensitive) ||
                 vendorStr.contains("Radeon", Qt::CaseInsensitive)) {
             // Fail and let VDPAU pick this up
@@ -130,6 +274,12 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
         }
     }
 
+    if (WMUtils::isRunningWayland()) {
+        // The iHD VAAPI driver can initialize on XWayland but it crashes in
+        // vaPutSurface() so we must also not directly render on XWayland.
+        m_BlacklistedForDirectRendering = vendorStr.contains("iHD");
+    }
+
     // This will populate the driver_quirks
     err = av_hwdevice_ctx_init(m_HwContext);
     if (err < 0) {
@@ -151,13 +301,13 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
 }
 
 bool
-VAAPIRenderer::prepareDecoderContext(AVCodecContext* context)
+VAAPIRenderer::prepareDecoderContext(AVCodecContext* context, AVDictionary**)
 {
     context->hw_device_ctx = av_buffer_ref(m_HwContext);
 
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                 "Using VAAPI accelerated renderer on %s",
-                m_WindowSystem == SDL_SYSWM_X11 ? "X11" : "Wayland");
+                SDL_GetCurrentVideoDriver());
 
     return true;
 }
@@ -173,14 +323,60 @@ VAAPIRenderer::needsTestFrame()
 bool
 VAAPIRenderer::isDirectRenderingSupported()
 {
-    // Many Wayland renderers don't support YUV surfaces, so use
-    // another frontend renderer to draw our frames.
-    return m_WindowSystem == SDL_SYSWM_X11;
+    if (qgetenv("VAAPI_FORCE_DIRECT") == "1") {
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Using direct rendering due to environment variable");
+        return true;
+    }
+    else if (qgetenv("VAAPI_FORCE_INDIRECT") == "1") {
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Using indirect rendering due to environment variable");
+        return false;
+    }
+
+    // We only support direct rendering on X11 with VAEntrypointVideoProc support
+    if (m_WindowSystem != SDL_SYSWM_X11 || m_BlacklistedForDirectRendering) {
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Using indirect rendering due to WM or blacklist");
+        return false;
+    }
+
+    AVHWDeviceContext* deviceContext = (AVHWDeviceContext*)m_HwContext->data;
+    AVVAAPIDeviceContext* vaDeviceContext = (AVVAAPIDeviceContext*)deviceContext->hwctx;
+    VAEntrypoint entrypoints[vaMaxNumEntrypoints(vaDeviceContext->display)];
+    int entrypointCount;
+    VAStatus status = vaQueryConfigEntrypoints(vaDeviceContext->display, VAProfileNone, entrypoints, &entrypointCount);
+    if (status == VA_STATUS_SUCCESS) {
+        for (int i = 0; i < entrypointCount; i++) {
+            // Without VAEntrypointVideoProc support, the driver will crash inside vaPutSurface()
+            if (entrypoints[i] == VAEntrypointVideoProc) {
+                SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                            "Using direct rendering with VAEntrypointVideoProc");
+                return true;
+            }
+        }
+    }
+
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "Using indirect rendering due to lack of VAEntrypointVideoProc");
+    return false;
+}
+
+int VAAPIRenderer::getDecoderColorspace()
+{
+    // Gallium drivers don't support Rec 709 yet - https://gitlab.freedesktop.org/mesa/mesa/issues/1915
+    // Intel-vaapi-driver defaults to Rec 601 - https://github.com/intel/intel-vaapi-driver/blob/021bcb79d1bd873bbd9fbca55f40320344bab866/src/i965_output_dri.c#L186
+    return COLORSPACE_REC_601;
 }
 
 void
 VAAPIRenderer::renderFrame(AVFrame* frame)
 {
+    if (frame == nullptr) {
+        // End of stream - nothing to do for us
+        return;
+    }
+
     VASurfaceID surface = (VASurfaceID)(uintptr_t)frame->data[3];
     AVHWDeviceContext* deviceContext = (AVHWDeviceContext*)m_HwContext->data;
     AVVAAPIDeviceContext* vaDeviceContext = (AVVAAPIDeviceContext*)deviceContext->hwctx;
@@ -197,6 +393,27 @@ VAAPIRenderer::renderFrame(AVFrame* frame)
 
     if (m_WindowSystem == SDL_SYSWM_X11) {
 #ifdef HAVE_LIBVA_X11
+        unsigned int flags = 0;
+
+        // NB: Not all VAAPI drivers respect these flags. Many drivers
+        // just ignore them and do the color conversion as Rec 601.
+        switch (frame->colorspace) {
+        case AVCOL_SPC_BT709:
+            flags |= VA_SRC_BT709;
+            break;
+        case AVCOL_SPC_BT470BG:
+        case AVCOL_SPC_SMPTE170M:
+            flags |= VA_SRC_BT601;
+            break;
+        case AVCOL_SPC_SMPTE240M:
+            flags |= VA_SRC_SMPTE_240;
+            break;
+        default:
+            // Unknown colorspace
+            SDL_assert(false);
+            break;
+        }
+
         vaPutSurface(vaDeviceContext->display,
                      surface,
                      m_XWindow,
@@ -204,7 +421,7 @@ VAAPIRenderer::renderFrame(AVFrame* frame)
                      m_VideoWidth, m_VideoHeight,
                      dst.x, dst.y,
                      dst.w, dst.h,
-                     NULL, 0, 0);
+                     NULL, 0, flags);
 #endif
     }
     else if (m_WindowSystem == SDL_SYSWM_WAYLAND) {
@@ -218,3 +435,173 @@ VAAPIRenderer::renderFrame(AVFrame* frame)
         SDL_assert(false);
     }
 }
+
+#ifdef HAVE_EGL
+
+// Ensure that vaExportSurfaceHandle() is supported by the VA-API driver
+bool
+VAAPIRenderer::canExportEGL() {
+    AVHWDeviceContext* deviceContext = (AVHWDeviceContext*)m_HwContext->data;
+    AVVAAPIDeviceContext* vaDeviceContext = (AVVAAPIDeviceContext*)deviceContext->hwctx;
+    VASurfaceID surfaceId;
+    VAStatus st;
+    VADRMPRIMESurfaceDescriptor descriptor;
+    VASurfaceAttrib attrs[2];
+    int attributeCount = 0;
+
+    if (qgetenv("VAAPI_FORCE_DIRECT") == "1") {
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Using direct rendering due to environment variable");
+        return false;
+    }
+
+    // FFmpeg handles setting these quirk flags for us
+    if (!(vaDeviceContext->driver_quirks & AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE)) {
+        attrs[attributeCount].type = VASurfaceAttribMemoryType;
+        attrs[attributeCount].flags = VA_SURFACE_ATTRIB_SETTABLE;
+        attrs[attributeCount].value.type = VAGenericValueTypeInteger;
+        attrs[attributeCount].value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_VA;
+        attributeCount++;
+    }
+
+    // These attributes are required for i965 to create a surface that can
+    // be successfully exported via vaExportSurfaceHandle(). iHD doesn't
+    // need these, but it doesn't seem to hurt either.
+    attrs[attributeCount].type = VASurfaceAttribPixelFormat;
+    attrs[attributeCount].flags = VA_SURFACE_ATTRIB_SETTABLE;
+    attrs[attributeCount].value.type = VAGenericValueTypeInteger;
+    attrs[attributeCount].value.value.i = VA_FOURCC_NV12;
+    attributeCount++;
+
+    st = vaCreateSurfaces(vaDeviceContext->display,
+                          VA_RT_FORMAT_YUV420,
+                          1280,
+                          720,
+                          &surfaceId,
+                          1,
+                          attrs,
+                          attributeCount);
+    if (st != VA_STATUS_SUCCESS) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "vaCreateSurfaces() failed: %d", st);
+        return false;
+    }
+
+    st = vaExportSurfaceHandle(vaDeviceContext->display,
+                               surfaceId,
+                               VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
+                               VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS,
+                               &descriptor);
+
+    vaDestroySurfaces(vaDeviceContext->display, &surfaceId, 1);
+
+    if (st != VA_STATUS_SUCCESS) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "vaExportSurfaceHandle() failed: %d", st);
+        return false;
+    }
+
+    for (size_t i = 0; i < descriptor.num_objects; ++i) {
+        close(descriptor.objects[i].fd);
+    }
+
+    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                "VAAPI driver supports exporting DRM PRIME surface handles");
+    return true;
+}
+
+bool
+VAAPIRenderer::initializeEGL(EGLDisplay,
+                             const EGLExtensions &ext) {
+    if (!ext.isSupported("EGL_EXT_image_dma_buf_import")) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "VAAPI-EGL: DMABUF unsupported");
+        return false;
+    }
+    m_EGLExtDmaBuf = ext.isSupported("EGL_EXT_image_dma_buf_import_modifiers");
+    return true;
+}
+
+ssize_t
+VAAPIRenderer::exportEGLImages(AVFrame *frame, EGLDisplay dpy,
+                               EGLImage images[EGL_MAX_PLANES]) {
+    ssize_t count = 0;
+    auto hwFrameCtx = (AVHWFramesContext*)frame->hw_frames_ctx->data;
+    AVVAAPIDeviceContext* vaDeviceContext = (AVVAAPIDeviceContext*)hwFrameCtx->device_ctx->hwctx;
+
+    VASurfaceID surface_id = (VASurfaceID)(uintptr_t)frame->data[3];
+    VAStatus st = vaExportSurfaceHandle(vaDeviceContext->display,
+                                        surface_id,
+                                        VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
+                                        VA_EXPORT_SURFACE_READ_ONLY | VA_EXPORT_SURFACE_SEPARATE_LAYERS,
+                                        &m_PrimeDescriptor);
+    if (st != VA_STATUS_SUCCESS) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "vaExportSurfaceHandle failed: %d", st);
+        return -1;
+    }
+
+    SDL_assert(m_PrimeDescriptor.num_layers <= EGL_MAX_PLANES);
+
+    st = vaSyncSurface(vaDeviceContext->display, surface_id);
+    if (st != VA_STATUS_SUCCESS) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "vaSyncSurface failed: %d", st);
+        goto sync_fail;
+    }
+
+    for (size_t i = 0; i < m_PrimeDescriptor.num_layers; ++i) {
+        const auto &layer = m_PrimeDescriptor.layers[i];
+        const auto &object = m_PrimeDescriptor.objects[layer.object_index[0]];
+
+        EGLAttrib attribs[17] = {
+            EGL_LINUX_DRM_FOURCC_EXT, (EGLint)layer.drm_format,
+            EGL_WIDTH, i == 0 ? frame->width : frame->width / 2,
+            EGL_HEIGHT, i == 0 ? frame->height : frame->height / 2,
+            EGL_DMA_BUF_PLANE0_FD_EXT, object.fd,
+            EGL_DMA_BUF_PLANE0_OFFSET_EXT, (EGLint)layer.offset[0],
+            EGL_DMA_BUF_PLANE0_PITCH_EXT, (EGLint)layer.pitch[0],
+            EGL_NONE,
+        };
+        if (m_EGLExtDmaBuf) {
+            const EGLAttrib extra[] = {
+                EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT,
+                (EGLint)object.drm_format_modifier,
+                EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT,
+                (EGLint)(object.drm_format_modifier >> 32),
+                EGL_NONE,
+            };
+            memcpy((void *)(&attribs[12]), (void *)extra, sizeof (extra));
+        }
+        images[i] = eglCreateImage(dpy, EGL_NO_CONTEXT,
+                                   EGL_LINUX_DMA_BUF_EXT,
+                                   nullptr, attribs);
+        if (!images[i]) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "eglCreateImage() Failed: %d", eglGetError());
+            goto create_image_fail;
+        }
+        ++count;
+    }
+    return count;
+
+create_image_fail:
+    m_PrimeDescriptor.num_layers = count;
+sync_fail:
+    freeEGLImages(dpy, images);
+    return -1;
+}
+
+void
+VAAPIRenderer::freeEGLImages(EGLDisplay dpy, EGLImage images[EGL_MAX_PLANES]) {
+    for (size_t i = 0; i < m_PrimeDescriptor.num_layers; ++i) {
+        eglDestroyImage(dpy, images[i]);
+    }
+    for (size_t i = 0; i < m_PrimeDescriptor.num_objects; ++i) {
+        close(m_PrimeDescriptor.objects[i].fd);
+    }
+    m_PrimeDescriptor.num_layers = 0;
+    m_PrimeDescriptor.num_objects = 0;
+}
+
+#endif

app/streaming/video/ffmpeg-renderers/vaapi.h

@@ -22,7 +22,13 @@ extern "C" {
 #ifdef HAVE_LIBVA_WAYLAND
 #include <va/va_wayland.h>
 #endif
+#ifdef HAVE_LIBVA_DRM
+#include <va/va_drm.h>
+#endif
 #include <libavutil/hwcontext_vaapi.h>
+#ifdef HAVE_EGL
+#include <va/va_drmcommon.h>
+#endif
 }
 
 class VAAPIRenderer : public IFFmpegRenderer
@@ -31,14 +37,25 @@ public:
     VAAPIRenderer();
     virtual ~VAAPIRenderer() override;
     virtual bool initialize(PDECODER_PARAMETERS params) override;
-    virtual bool prepareDecoderContext(AVCodecContext* context) override;
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override;
     virtual void renderFrame(AVFrame* frame) override;
     virtual bool needsTestFrame() override;
     virtual bool isDirectRenderingSupported() override;
+    virtual int getDecoderColorspace() override;
+#ifdef HAVE_EGL
+    virtual bool canExportEGL() override;
+    virtual bool initializeEGL(EGLDisplay dpy, const EGLExtensions &ext) override;
+    virtual ssize_t exportEGLImages(AVFrame *frame, EGLDisplay dpy, EGLImage images[EGL_MAX_PLANES]) override;
+    virtual void freeEGLImages(EGLDisplay dpy, EGLImage[EGL_MAX_PLANES]) override;
+#endif
 
 private:
+    VADisplay openDisplay(SDL_Window* window);
+
     int m_WindowSystem;
     AVBufferRef* m_HwContext;
+    int m_DrmFd;
+    bool m_BlacklistedForDirectRendering;
 
 #ifdef HAVE_LIBVA_X11
     Window m_XWindow;
@@ -48,4 +65,9 @@ private:
     int m_VideoHeight;
     int m_DisplayWidth;
     int m_DisplayHeight;
+
+#ifdef HAVE_EGL
+    VADRMPRIMESurfaceDescriptor m_PrimeDescriptor;
+    bool m_EGLExtDmaBuf;
+#endif
 };

app/streaming/video/ffmpeg-renderers/vdpau.cpp

@@ -12,11 +12,16 @@
 #define GET_PROC_ADDRESS(id, func) status = vdpauCtx->get_proc_address(m_Device, id, (void**)func); \
                                    BAIL_ON_FAIL(status, id)
 
-const VdpRGBAFormat VDPAURenderer::k_OutputFormats[] = {
+const VdpRGBAFormat VDPAURenderer::k_OutputFormats8Bit[] = {
     VDP_RGBA_FORMAT_B8G8R8A8,
     VDP_RGBA_FORMAT_R8G8B8A8
 };
 
+const VdpRGBAFormat VDPAURenderer::k_OutputFormats10Bit[] = {
+    VDP_RGBA_FORMAT_B10G10R10A2,
+    VDP_RGBA_FORMAT_R10G10B10A2
+};
+
 VDPAURenderer::VDPAURenderer()
     : m_HwContext(nullptr),
       m_PresentationQueueTarget(0),
@@ -59,6 +64,21 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
     int err;
     VdpStatus status;
     SDL_SysWMinfo info;
+    static const char* driverPathsToTry[] = {
+    #if Q_PROCESSOR_WORDSIZE == 8
+        "/usr/lib64",
+        "/usr/lib64/vdpau", // Fedora x86_64
+    #endif
+        "/usr/lib",
+        "/usr/lib/vdpau", // Fedora i386
+    #if defined(Q_PROCESSOR_X86_64)
+        "/usr/lib/x86_64-linux-gnu",
+        "/usr/lib/x86_64-linux-gnu/vdpau", // Ubuntu/Debian x86_64
+    #elif defined(Q_PROCESSOR_X86_32)
+        "/usr/lib/i386-linux-gnu",
+        "/usr/lib/i386-linux-gnu/vdpau", // Ubuntu/Debian i386
+    #endif
+    };
 
     m_VideoWidth = params->width;
     m_VideoHeight = params->height;
@@ -66,6 +86,32 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
     err = av_hwdevice_ctx_create(&m_HwContext,
                                  AV_HWDEVICE_TYPE_VDPAU,
                                  nullptr, nullptr, 0);
+
+    if (err < 0 && qEnvironmentVariableIsEmpty("VDPAU_DRIVER_PATH")) {
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Trying fallback VDPAU driver paths");
+
+        // Unlike libva, libvdpau doesn't support multiple paths in
+        // their VDPAU_DRIVER_PATH variable, so we must try them all
+        // one at a time.
+        for (auto& driverPath : driverPathsToTry) {
+            qputenv("VDPAU_DRIVER_PATH", driverPath);
+            err = av_hwdevice_ctx_create(&m_HwContext,
+                                         AV_HWDEVICE_TYPE_VDPAU,
+                                         nullptr, nullptr, 0);
+            if (err == 0) {
+                // Success!
+                break;
+            }
+        }
+
+        if (err < 0) {
+            // Unset VDPAU_DRIVER_PATH if we set it ourselves
+            // and we didn't find any working VDPAU drivers.
+            qunsetenv("VDPAU_DRIVER_PATH");
+        }
+    }
+
     if (err < 0) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to create VDPAU context: %d",
@@ -143,7 +189,11 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
     for (int i = 0; i < OUTPUT_SURFACE_FORMAT_COUNT; i++) {
         VdpBool supported;
         uint32_t maxWidth, maxHeight;
-        status = m_VdpOutputSurfaceQueryCapabilities(m_Device, k_OutputFormats[i],
+        VdpRGBAFormat candidateFormat =
+                params->videoFormat == VIDEO_FORMAT_H265_MAIN10 ?
+                    k_OutputFormats10Bit[i] : k_OutputFormats8Bit[i];
+
+        status = m_VdpOutputSurfaceQueryCapabilities(m_Device, candidateFormat,
                                                      &supported, &maxWidth, &maxHeight);
         if (status != VDP_STATUS_OK) {
             SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -154,7 +204,7 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
 
         if (supported) {
             if (m_DisplayWidth <= maxWidth && m_DisplayHeight <= maxHeight) {
-                m_OutputSurfaceFormat = k_OutputFormats[i];
+                m_OutputSurfaceFormat = candidateFormat;
                 foundFormat = true;
                 break;
             }
@@ -216,7 +266,7 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
     return true;
 }
 
-bool VDPAURenderer::prepareDecoderContext(AVCodecContext* context)
+bool VDPAURenderer::prepareDecoderContext(AVCodecContext* context, AVDictionary**)
 {
     context->hw_device_ctx = av_buffer_ref(m_HwContext);
 
@@ -241,8 +291,22 @@ bool VDPAURenderer::needsTestFrame()
     return true;
 }
 
+int VDPAURenderer::getDecoderColorspace()
+{
+    // VDPAU defaults to Rec 601.
+    // https://http.download.nvidia.com/XFree86/vdpau/doxygen/html/group___vdp_video_mixer.html#ga65580813e9045d94b739ed2bb8b62b46
+    //
+    // AMD and Nvidia GPUs both correctly process Rec 601, so let's not try our luck using a non-default colorspace.
+    return COLORSPACE_REC_601;
+}
+
 void VDPAURenderer::renderFrame(AVFrame* frame)
 {
+    if (frame == nullptr) {
+        // End of stream - nothing to do for us
+        return;
+    }
+
     VdpStatus status;
     VdpVideoSurface videoSurface = (VdpVideoSurface)(uintptr_t)frame->data[3];
 

app/streaming/video/ffmpeg-renderers/vdpau.h

@@ -14,9 +14,10 @@ public:
     VDPAURenderer();
     virtual ~VDPAURenderer() override;
     virtual bool initialize(PDECODER_PARAMETERS params) override;
-    virtual bool prepareDecoderContext(AVCodecContext* context) override;
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override;
     virtual void renderFrame(AVFrame* frame) override;
     virtual bool needsTestFrame() override;
+    virtual int getDecoderColorspace() override;
 
 private:
     uint32_t m_VideoWidth, m_VideoHeight;
@@ -33,7 +34,8 @@ private:
     int m_NextSurfaceIndex;
 
 #define OUTPUT_SURFACE_FORMAT_COUNT 2
-    static const VdpRGBAFormat k_OutputFormats[OUTPUT_SURFACE_FORMAT_COUNT];
+    static const VdpRGBAFormat k_OutputFormats8Bit[OUTPUT_SURFACE_FORMAT_COUNT];
+    static const VdpRGBAFormat k_OutputFormats10Bit[OUTPUT_SURFACE_FORMAT_COUNT];
 
     VdpGetErrorString* m_VdpGetErrorString;
     VdpPresentationQueueTargetDestroy* m_VdpPresentationQueueTargetDestroy;

app/streaming/video/ffmpeg-renderers/vt.mm

@@ -14,6 +14,20 @@
 #import <VideoToolbox/VideoToolbox.h>
 #import <AVFoundation/AVFoundation.h>
 #import <dispatch/dispatch.h>
+#import <Metal/Metal.h>
+
+@interface VTView : NSView
+- (NSView *)hitTest:(NSPoint)point;
+@end
+
+@implementation VTView
+
+- (NSView *)hitTest:(NSPoint)point {
+    Q_UNUSED(point);
+    return nil;
+}
+
+@end
 
 class VTRenderer : public IFFmpegRenderer
 {
@@ -24,6 +38,7 @@ public:
           m_FormatDesc(nullptr),
           m_StreamView(nullptr),
           m_DisplayLink(nullptr),
+          m_ColorSpace(nullptr),
           m_VsyncMutex(nullptr),
           m_VsyncPassed(nullptr)
     {
@@ -53,6 +68,10 @@ public:
             CFRelease(m_FormatDesc);
         }
 
+        if (m_ColorSpace != nullptr) {
+            CGColorSpaceRelease(m_ColorSpace);
+        }
+
         for (int i = 0; i < Overlay::OverlayMax; i++) {
             if (m_OverlayTextFields[i] != nullptr) {
                 [m_OverlayTextFields[i] removeFromSuperview];
@@ -139,6 +158,11 @@ public:
     // Caller frees frame after we return
     virtual void renderFrame(AVFrame* frame) override
     {
+        if (frame == nullptr) {
+            // End of stream - nothing to do for us
+            return;
+        }
+
         OSStatus status;
         CVPixelBufferRef pixBuf = reinterpret_cast<CVPixelBufferRef>(frame->data[3]);
 
@@ -153,6 +177,91 @@ public:
             return;
         }
 
+        // Strip the attachments added by VT. They are likely wrong.
+        CVBufferRemoveAllAttachments(pixBuf);
+
+        CVBufferSetAttachment(pixBuf,
+                              kCVImageBufferChromaSubsamplingKey,
+                              kCVImageBufferChromaSubsampling_420,
+                              kCVAttachmentMode_ShouldPropagate);
+
+        switch (frame->color_primaries) {
+        case AVCOL_PRI_BT709:
+            CVBufferSetAttachment(pixBuf,
+                                  kCVImageBufferColorPrimariesKey,
+                                  kCVImageBufferColorPrimaries_ITU_R_709_2,
+                                  kCVAttachmentMode_ShouldPropagate);
+            break;
+        case AVCOL_PRI_SMPTE170M:
+            CVBufferSetAttachment(pixBuf,
+                                  kCVImageBufferColorPrimariesKey,
+                                  kCVImageBufferColorPrimaries_SMPTE_C,
+                                  kCVAttachmentMode_ShouldPropagate);
+            break;
+        case AVCOL_PRI_BT2020:
+            CVBufferSetAttachment(pixBuf,
+                                  kCVImageBufferColorPrimariesKey,
+                                  kCVImageBufferColorPrimaries_ITU_R_2020,
+                                  kCVAttachmentMode_ShouldPropagate);
+            break;
+        default:
+            break;
+        }
+
+        switch (frame->color_trc) {
+        case AVCOL_TRC_BT709:
+        case AVCOL_TRC_SMPTE170M:
+            CVBufferSetAttachment(pixBuf,
+                                  kCVImageBufferTransferFunctionKey,
+                                  kCVImageBufferTransferFunction_ITU_R_709_2,
+                                  kCVAttachmentMode_ShouldPropagate);
+            break;
+        case AVCOL_TRC_BT2020_10:
+            CVBufferSetAttachment(pixBuf,
+                                  kCVImageBufferTransferFunctionKey,
+                                  kCVImageBufferTransferFunction_ITU_R_2020,
+                                  kCVAttachmentMode_ShouldPropagate);
+            break;
+        default:
+            break;
+        }
+
+        switch (frame->colorspace) {
+        case AVCOL_SPC_BT709:
+            if (m_ColorSpace == nullptr) {
+                m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_709);
+            }
+            CVBufferSetAttachment(pixBuf,
+                                  kCVImageBufferYCbCrMatrixKey,
+                                  kCVImageBufferYCbCrMatrix_ITU_R_709_2,
+                                  kCVAttachmentMode_ShouldPropagate);
+            break;
+        case AVCOL_SPC_BT2020_NCL:
+            if (m_ColorSpace == nullptr) {
+                m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceITUR_2020);
+            }
+            CVBufferSetAttachment(pixBuf,
+                                  kCVImageBufferYCbCrMatrixKey,
+                                  kCVImageBufferYCbCrMatrix_ITU_R_2020,
+                                  kCVAttachmentMode_ShouldPropagate);
+            break;
+        case AVCOL_SPC_SMPTE170M:
+            if (m_ColorSpace == nullptr) {
+                m_ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
+            }
+            CVBufferSetAttachment(pixBuf,
+                                  kCVImageBufferYCbCrMatrixKey,
+                                  kCVImageBufferYCbCrMatrix_ITU_R_601_4,
+                                  kCVAttachmentMode_ShouldPropagate);
+            break;
+        default:
+            break;
+        }
+
+        if (m_ColorSpace != nullptr) {
+            CVBufferSetAttachment(pixBuf, kCVImageBufferCGColorSpaceKey, m_ColorSpace, kCVAttachmentMode_ShouldPropagate);
+        }
+
         // If the format has changed or doesn't exist yet, construct it with the
         // pixel buffer data
         if (!m_FormatDesc || !CMVideoFormatDescriptionMatchesImageBuffer(m_FormatDesc, pixBuf)) {
@@ -173,7 +282,7 @@ public:
         CMSampleTimingInfo timingInfo = {
             .duration = kCMTimeInvalid,
             .decodeTimeStamp = kCMTimeInvalid,
-            .presentationTimeStamp = CMTimeMake(mach_absolute_time(), 1000 * 1000 * 1000)
+            .presentationTimeStamp = CMClockMakeHostTimeFromSystemUnits(mach_absolute_time())
         };
 
         CMSampleBufferRef sampleBuffer;
@@ -234,6 +343,52 @@ public:
                                 "No HW accelerated HEVC decode via VT");
                     return false;
                 }
+
+                // HEVC Main10 requires more extensive checks because there's no
+                // simple API to check for Main10 hardware decoding, and if we don't
+                // have it, we'll silently get software decoding with horrible performance.
+                if (params->videoFormat == VIDEO_FORMAT_H265_MAIN10) {
+                #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
+                    if (__builtin_available(macOS 10.14, *)) {
+                        id<MTLDevice> device = MTLCreateSystemDefaultDevice();
+                        if (device == nullptr) {
+                            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                                        "Unable to get default Metal device");
+                            return false;
+                        }
+
+                        // Exclude all GPUs earlier than macOSGPUFamily2
+                        // https://developer.apple.com/documentation/metal/mtlfeatureset/mtlfeatureset_macos_gpufamily2_v1
+                        if ([device supportsFeatureSet:MTLFeatureSet_macOS_GPUFamily2_v1]) {
+                            if ([device.name containsString:@"Intel"]) {
+                                // 500-series Intel GPUs are Skylake and don't support Main10 hardware decoding
+                                if ([device.name containsString:@" 5"]) {
+                                    SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                                                "No HEVC Main10 support on Skylake iGPU");
+                                    return false;
+                                }
+                            }
+                            else if ([device.name containsString:@"AMD"]) {
+                                // FirePro D, M200, and M300 series GPUs don't support Main10 hardware decoding
+                                if ([device.name containsString:@"FirePro D"] ||
+                                        [device.name containsString:@" M2"] ||
+                                        [device.name containsString:@" M3"]) {
+                                    SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                                                "No HEVC Main10 support on AMD GPUs until Polaris");
+                                    return false;
+                                }
+                            }
+                        }
+                    }
+                    else
+            #endif
+                    {
+                        // Fail closed for HEVC Main10 if we're not on 10.14+
+                        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                                    "No HEVC Main10 support on < macOS 10.14");
+                        return false;
+                    }
+                }
             }
             else
     #endif
@@ -261,7 +416,7 @@ public:
         // SDL adds its own content view to listen for events.
         // We need to add a subview for our display layer.
         NSView* contentView = info.info.cocoa.window.contentView;
-        m_StreamView = [[NSView alloc] initWithFrame:contentView.bounds];
+        m_StreamView = [[VTView alloc] initWithFrame:contentView.bounds];
 
         m_DisplayLayer = [[AVSampleBufferDisplayLayer alloc] init];
         m_DisplayLayer.bounds = m_StreamView.bounds;
@@ -310,10 +465,10 @@ public:
 
             switch (type) {
             case Overlay::OverlayDebug:
-                [m_OverlayTextFields[type] setAlignment:NSLeftTextAlignment];
+                [m_OverlayTextFields[type] setAlignment:NSTextAlignmentLeft];
                 break;
             case Overlay::OverlayStatusUpdate:
-                [m_OverlayTextFields[type] setAlignment:NSRightTextAlignment];
+                [m_OverlayTextFields[type] setAlignment:NSTextAlignmentRight];
                 break;
             default:
                 break;
@@ -363,7 +518,7 @@ public:
         }
     }
 
-    virtual bool prepareDecoderContext(AVCodecContext* context) override
+    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary**) override
     {
         context->hw_device_ctx = av_buffer_ref(m_HwContext);
 
@@ -382,6 +537,12 @@ public:
         return true;
     }
 
+    int getDecoderColorspace() override
+    {
+        // macOS seems to handle Rec 601 best
+        return COLORSPACE_REC_601;
+    }
+
 private:
     AVBufferRef* m_HwContext;
     AVSampleBufferDisplayLayer* m_DisplayLayer;
@@ -389,6 +550,7 @@ private:
     NSView* m_StreamView;
     NSTextField* m_OverlayTextFields[Overlay::OverlayMax];
     CVDisplayLinkRef m_DisplayLink;
+    CGColorSpaceRef m_ColorSpace;
     SDL_mutex* m_VsyncMutex;
     SDL_cond* m_VsyncPassed;
 };