Fix appstream metadata release date for v0.8.1

2026-10-17 05:54:17 +00:00 · 2019-01-29 18:52:01 -08:00
516 changed files with 8511 additions and 46830 deletions
@@ -1,10 +1,8 @@
 ---
 name: Bug report
-about: Ask for help on Discord before reporting a bug
+about: Create a report to help us address broken functionality

 ---
-**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.
@@ -18,28 +16,24 @@ 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?
 - Does the problem still occur after reverting settings back to default?

 **Client PC details (please complete the following information)**
- - OS: [e.g. Windows 10 1809]
- - Moonlight Version: [e.g. v0.9.0]
+ - OS: [e.g. Windows 10 1803]
+ - Moonlight Version: [e.g. v0.2.0]

 **Server PC details (please complete the following information)**
- - OS: [e.g. Windows 10 1809]
+ - OS: [e.g. Windows 10 1803]
 - GeForce Experience version: [e.g. 3.16.0.140]
 - Nvidia GPU driver: [e.g. 417.35]

 **Moonlight Logs (please attach)**
 - On Windows, `Moonlight-###.log` files can be found in `%TEMP%`. Simply type that into the File Explorer path field to navigate there.
 - On macOS, `Moonlight-###.log` files can be found in `/tmp`. In Finder, press Cmd+Shift+G, then type `/tmp` to navigate there.
- On Linux with the Flatpak, logs print to the terminal when running with the command: `flatpak run com.moonlight_stream.Moonlight`
- On Linux with the Snap, logs print to the terminal when running with the command: `moonlight`
+- On Linux, logs print to the terminal when running via `flatpak run com.moonlight_stream.Moonlight`

 **Additional context**
 Anything else you think may be relevant to the issue
@@ -1 +0,0 @@
-blank_issues_enabled: false
@@ -1,4 +0,0 @@
-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!
@@ -0,0 +1,50 @@
+language: cpp
+
+git:
+  depth: 1
+
+matrix:
+  include:
+    - os: osx
+      compiler: clang
+    - os: linux
+      sudo: required
+      dist: xenial
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:beineri/opt-qt596-xenial'
+            - sourceline: 'ppa:jonathonf/ffmpeg-4'
+          packages:
+            - qt59base
+            - qt59quickcontrols2
+            - qt59svg
+            - qt59multimedia
+            - 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.8 && wget https://www.libsdl.org/release/SDL2-$SDL2_VER.tar.gz && tar -xvf SDL2-$SDL2_VER.tar.gz && cd SDL2-$SDL2_VER && ./configure && make && 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 debug
+    - make release
@@ -3,7 +3,11 @@ QT       -= core gui
 TARGET = AntiHooking
 TEMPLATE = lib

-include(../globaldefs.pri)
+# Support debug and release builds from command line for CI
+CONFIG += debug_and_release
+
+# Ensure symbols are always generated
+CONFIG += force_debug_info

 INCLUDEPATH += $$PWD/../libs/windows/include
 contains(QT_ARCH, i386) {
@@ -131,54 +131,10 @@ private:
    static LoadLibraryExWFunc s_RealLoadLibraryExW;

    static constexpr LPCWSTR k_BlacklistedDlls[] = {
-        // 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 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",
-
-        // 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",
+        // 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"
    };
 };

@@ -4,67 +4,54 @@

 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://moonlight-stream.org/discord).
+You can follow development on our [Discord server](https://discord.gg/6ERtzFY).

- [![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)
+ [![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)

 ## 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
- - 7.1 surround sound audio support
- - Support for both pointer capture (for games) and direct mouse control (for remote desktop)
- - Direct touchscreen mouse control
+ - 5.1 surround sound audio
 - HEVC support for better image quality at reduced bandwidth
- - Gamepad support with force feedback for up to 4 players
+ - Keyboard and mouse support
+ - Gamepad support with SDL gamepad mappings
 
 ## 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)
+- [Windows and macOS](https://github.com/moonlight-stream/moonlight-qt/releases)
+- [Linux](https://flathub.org/apps/details/com.moonlight_stream.Moonlight)

 ## Building
+### General Build Requirements
+* Qt 5.9 SDK or later

-### Windows Build Requirements
-* Qt 5.12.4 SDK or later
+### Windows-specific Requirements
 * Windows 7 or later
-* [Visual Studio](https://visualstudio.microsoft.com/downloads/) 2017 (Community edition is fine)
+* Visual Studio 2015 or later
 * Select MSVC Desktop toolchain during Qt installation
-* [DirectX SDK](https://www.microsoft.com/en-us/download/details.aspx?id=6812)
-* [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)
+* 7-Zip (only if building installers for non-development PCs)
+* WiX Toolset v3.11 or later (only if building installers for non-development PCs)

-### macOS Build Requirements
-* Qt 5.14 SDK or later
-* macOS High Sierra (10.13) or later
-* Xcode 11
+### Mac-specific Requirements
+* macOS Sierra (10.12) or later
+* Xcode 10
 * [create-dmg](https://github.com/sindresorhus/create-dmg) (only if building DMGs for use on non-development Macs)

-### Linux/Unix Build Requirements
-* Qt 5.9 SDK or later
+### Linux-specific Requirements
 * 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`
+* 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`
 * 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 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
-
 ### Build Setup Steps
 1. Install the latest Qt SDK (and optionally, the Qt Creator IDE) from https://www.qt.io/download
    * You can install Qt via Homebrew on macOS, but you will need to use `brew install qt --with-debug` to be able to create debug builds of Moonlight.
    * You may also use your Linux distro's package manager for the Qt SDK as long as the packages are Qt 5.9 or later.
-    * This step is not required for building on Steam Link, because the Steam Link SDK includes Qt 5.9.
 2. Run `git submodule update --init --recursive` from within `moonlight-qt/`
 3. Open the project in Qt Creator or build from qmake on the command line.
    * To build a binary for use on non-development machines, use the scripts in the `scripts` folder.
        * For Windows builds, use `scripts\generate-installers.bat`. Execute this script from the root of the repository within a Qt command prompt. Ensure WiX and 7-Zip binary directories are in your `%PATH%`.
        * For macOS builds, use `scripts/generate-dmg.sh`. Execute this script from the root of the repository and ensure Qt's `bin` folder is in your `$PATH`.
-        * For Steam Link builds, run `scripts/build-steamlink-app.sh` from the root of the repository.
    * To build from the command line for development use, run `qmake moonlight-qt.pro` then `make debug` or `make release`

 ## Contribute
@@ -8,7 +8,11 @@ unix:!macx {
    TARGET = Moonlight
 }

-include(../globaldefs.pri)
+# Support debug and release builds from command line for CI
+CONFIG += debug_and_release
+
+# Ensure symbols are always generated
+CONFIG += force_debug_info

 # Precompile QML files to avoid writing qmlcache on portable versions.
 # Since this binds the app against the Qt runtime version, we will only
@@ -33,44 +37,32 @@ DEFINES += QT_DEPRECATED_WARNINGS
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0

 win32 {
-    INCLUDEPATH += \
-        $$PWD/../libs/windows/include \
-        $$(DXSDK_DIR)/Include
+    INCLUDEPATH += $$PWD/../libs/windows/include

    contains(QT_ARCH, i386) {
        LIBS += -L$$PWD/../libs/windows/lib/x86
-        LIBS += -L$$(DXSDK_DIR)/Lib/x86
    }
    contains(QT_ARCH, x86_64) {
        LIBS += -L$$PWD/../libs/windows/lib/x64
-        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 qwave.lib
+    LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib
 }
 macx {
-    INCLUDEPATH += $$PWD/../libs/mac/include
-    INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers
-    INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2_ttf.framework/Versions/A/Headers
+    INCLUDEPATH += $$PWD/../libs/mac/include $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers
    LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks
 }

 unix:!macx {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += openssl sdl2 SDL2_ttf opus
+    CONFIG += link_pkgconfig soundio
+    PKGCONFIG += openssl sdl2 opus

-    # SLAudio is used on Steam Link
-    !config_SL {
-        CONFIG += soundio
+    # For libsoundio
+    packagesExist(libpulse) {
+        PKGCONFIG += libpulse
    }
-
-    soundio {
-        packagesExist(libpulse) {
-            PKGCONFIG += libpulse
-        }
-        packagesExist(alsa) {
-            PKGCONFIG += alsa
-        }
+    packagesExist(alsa) {
+        PKGCONFIG += alsa
    }

    packagesExist(libavcodec) {
@@ -84,52 +76,26 @@ unix:!macx {
            packagesExist(libva-wayland) {
                CONFIG += libva-wayland
            }
-            packagesExist(libva-drm) {
-                CONFIG += libva-drm
-            }
            CONFIG += libva
        }

        packagesExist(vdpau) {
            CONFIG += libvdpau
        }
-
-        packagesExist(mmal) {
-            PKGCONFIG += mmal
-            CONFIG += mmal
-        }
-
-        packagesExist(libdrm) {
-            PKGCONFIG += libdrm
-            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 discord-rpc
+    LIBS += -llibssl -llibcrypto -lSDL2 -lavcodec -lavutil -lopus
+    CONFIG += ffmpeg soundio
 }
 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 -framework Metal
+    LIBS += -lssl -lcrypto -lavcodec.58 -lavutil.56 -lopus -framework SDL2
+    LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit

    # For libsoundio
    LIBS += -framework CoreAudio -framework AudioUnit

-    CONFIG += ffmpeg soundio discord-rpc
+    CONFIG += ffmpeg soundio
 }

 SOURCES += \
@@ -141,7 +107,6 @@ SOURCES += \
    backend/nvpairingmanager.cpp \
    backend/computermanager.cpp \
    backend/boxartmanager.cpp \
-    backend/richpresencemanager.cpp \
    cli/commandlineparser.cpp \
    cli/quitstream.cpp \
    cli/startstream.cpp \
@@ -156,10 +121,7 @@ SOURCES += \
    backend/autoupdatechecker.cpp \
    path.cpp \
    settings/mappingmanager.cpp \
-    gui/sdlgamepadkeynavigation.cpp \
-    streaming/video/overlaymanager.cpp \
-    backend/systemproperties.cpp \
-    wm.cpp
+    gui/sdlgamepadkeynavigation.cpp

 HEADERS += \
    utils.h \
@@ -170,7 +132,6 @@ HEADERS += \
    backend/nvpairingmanager.h \
    backend/computermanager.h \
    backend/boxartmanager.h \
-    backend/richpresencemanager.h \
    cli/commandlineparser.h \
    cli/quitstream.h \
    cli/startstream.h \
@@ -186,9 +147,7 @@ HEADERS += \
    backend/autoupdatechecker.h \
    path.h \
    settings/mappingmanager.h \
-    gui/sdlgamepadkeynavigation.h \
-    streaming/video/overlaymanager.h \
-    backend/systemproperties.h
+    gui/sdlgamepadkeynavigation.h

 # Platform-specific renderers and decoders
 ffmpeg {
@@ -198,15 +157,13 @@ 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

+
    HEADERS += \
        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
 }
@@ -230,12 +187,6 @@ 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)

@@ -243,34 +194,16 @@ libvdpau {
    SOURCES += streaming/video/ffmpeg-renderers/vdpau.cpp
    HEADERS += streaming/video/ffmpeg-renderers/vdpau.h
 }
-mmal {
-    message(MMAL renderer selected)
+config_SLVideo {
+    message(SLVideo decoder/renderer selected)

-    DEFINES += HAVE_MMAL
-    SOURCES += streaming/video/ffmpeg-renderers/mmal.cpp
-    HEADERS += streaming/video/ffmpeg-renderers/mmal.h
+    DEFINES += HAVE_SLVIDEO
+    LIBS += -lSLVideo
+
+    SOURCES += streaming/video/sl.cpp
+    HEADERS += streaming/video/sl.h
 }
-libdrm {
-    message(DRM renderer selected)
-
-    DEFINES += HAVE_DRM
-    SOURCES += streaming/video/ffmpeg-renderers/drm.cpp
-    HEADERS += streaming/video/ffmpeg-renderers/drm.h
-}
-config_SL {
-    message(Steam Link build configuration selected)
-
-    DEFINES += STEAM_LINK HAVE_SLVIDEO HAVE_SLAUDIO
-    LIBS += -lSLVideo -lSLAudio
-
-    SOURCES += \
-        streaming/video/slvid.cpp \
-        streaming/audio/renderers/slaud.cpp
-    HEADERS += \
-        streaming/video/slvid.h \
-        streaming/audio/renderers/slaud.h
-}
-win32:!winrt {
+win32 {
    message(DXVA2 renderer selected)

    SOURCES += \
@@ -285,10 +218,12 @@ macx {
    message(VideoToolbox renderer selected)

    SOURCES += \
-        streaming/video/ffmpeg-renderers/vt.mm
+        streaming/video/ffmpeg-renderers/vt.mm \
+        streaming/video/ffmpeg-renderers/pacer/displaylinkvsyncsource.mm

    HEADERS += \
-        streaming/video/ffmpeg-renderers/vt.h
+        streaming/video/ffmpeg-renderers/vt.h \
+        streaming/video/ffmpeg-renderers/pacer/displaylinkvsyncsource.h
 }
 soundio {
    message(libsoundio audio renderer selected)
@@ -297,12 +232,6 @@ 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 \
@@ -328,14 +257,12 @@ else:unix: LIBS += -L$$OUT_PWD/../qmdnsengine/ -lqmdnsengine
 INCLUDEPATH += $$PWD/../qmdnsengine/qmdnsengine/src/include $$PWD/../qmdnsengine
 DEPENDPATH += $$PWD/../qmdnsengine/qmdnsengine/src/include $$PWD/../qmdnsengine

-soundio {
-    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../soundio/release/ -lsoundio
-    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../soundio/debug/ -lsoundio
-    else:unix: LIBS += -L$$OUT_PWD/../soundio/ -lsoundio
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../soundio/release/ -lsoundio
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../soundio/debug/ -lsoundio
+else:unix: LIBS += -L$$OUT_PWD/../soundio/ -lsoundio

-    INCLUDEPATH += $$PWD/../soundio/libsoundio
-    DEPENDPATH += $$PWD/../soundio/libsoundio
-}
+INCLUDEPATH += $$PWD/../soundio/libsoundio
+DEPENDPATH += $$PWD/../soundio/libsoundio

 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../h264bitstream/release/ -lh264bitstream
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../h264bitstream/debug/ -lh264bitstream
@@ -344,13 +271,11 @@ else:unix: LIBS += -L$$OUT_PWD/../h264bitstream/ -lh264bitstream
 INCLUDEPATH += $$PWD/../h264bitstream/h264bitstream
 DEPENDPATH += $$PWD/../h264bitstream/h264bitstream

-!winrt {
-    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AntiHooking/release/ -lAntiHooking
-    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AntiHooking/debug/ -lAntiHooking
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AntiHooking/release/ -lAntiHooking
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AntiHooking/debug/ -lAntiHooking

-    INCLUDEPATH += $$PWD/../AntiHooking
-    DEPENDPATH += $$PWD/../AntiHooking
-}
+INCLUDEPATH += $$PWD/../AntiHooking
+DEPENDPATH += $$PWD/../AntiHooking

 unix:!macx: {
    isEmpty(PREFIX) {
@@ -374,7 +299,10 @@ unix:!macx: {
    appstream.files = deploy/linux/com.moonlight_stream.Moonlight.appdata.xml
    appstream.path = $$PREFIX/$$DATADIR/metainfo/

-    INSTALLS += target desktop icons appstream
+    appdata.files = SDL_GameControllerDB/gamecontrollerdb.txt
+    appdata.path = "$$PREFIX/$$DATADIR/Moonlight Game Streaming Project/Moonlight/"
+
+    INSTALLS += target appdata desktop icons appstream
 }
 win32 {
    RC_ICONS = moonlight.ico
@@ -392,10 +320,10 @@ macx {

    QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist

-    APP_BUNDLE_RESOURCES.files = moonlight.icns
+    APP_BUNDLE_RESOURCES.files = moonlight.icns SDL_GameControllerDB/gamecontrollerdb.txt
    APP_BUNDLE_RESOURCES.path = Contents/Resources

-    APP_BUNDLE_FRAMEWORKS.files = $$files(../libs/mac/Frameworks/*.framework, true) $$files(../libs/mac/lib/*.dylib, true)
+    APP_BUNDLE_FRAMEWORKS.files = $$files(../libs/mac/Frameworks/*.framework, true)
    APP_BUNDLE_FRAMEWORKS.path = Contents/Frameworks

    QMAKE_BUNDLE_DATA += APP_BUNDLE_RESOURCES APP_BUNDLE_FRAMEWORKS
@@ -28,12 +28,7 @@ AutoUpdateChecker::AutoUpdateChecker(QObject *parent) :

 void AutoUpdateChecker::start()
 {
-#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, 14, 2) && !defined(QT_NO_BEARERMANAGEMENT)
-    // HACK: Set network accessibility to work around QTBUG-80947
-    m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);
-#endif
-
+#if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN) // Only run update checker on platforms without auto-update
    // We'll get a callback when this is finished
    QUrl url("https://moonlight-stream.org/updates/qt.json");
    m_Nam.get(QNetworkRequest(url));
@@ -48,17 +43,6 @@ 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());
@@ -104,7 +88,7 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
                }

                if (updateObj["arch"] == QSysInfo::buildCpuArchitecture() &&
-                        updateObj["platform"] == getPlatform()) {
+                        updateObj["platform"] == QSysInfo::productType()) {
                    qDebug() << "Found update manifest match for current platform";

                    QString latestVersion = updateObj["version"].toString();
@@ -153,7 +137,7 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
        }

        qWarning() << "No entry in update manifest found for current platform: "
-                   << QSysInfo::buildCpuArchitecture() << getPlatform();
+                   << QSysInfo::buildCpuArchitecture() << QSysInfo::productType();
    }
    else {
        qWarning() << "Update checking failed with error: " << reply->error();
@@ -20,8 +20,6 @@ private slots:
 private:
    void parseStringToVersionQuad(QString& string, QVector<int>& version);

-    QString getPlatform();
-
    QVector<int> m_CurrentVersionQuad;
    QNetworkAccessManager m_Nam;
 };
@@ -71,10 +71,10 @@ private:

 QUrl BoxArtManager::loadBoxArt(NvComputer* computer, NvApp& app)
 {
-    // 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());
+    // Try to open the cached file
+    QString cacheFilePath = getFilePathForBoxArt(computer, app.id);
+    if (QFile::exists(cacheFilePath)) {
+        return QUrl::fromLocalFile(cacheFilePath);
    }

    // If we get here, we need to fetch asynchronously.
@@ -89,9 +89,10 @@ QUrl BoxArtManager::loadBoxArt(NvComputer* computer, NvApp& app)

 void BoxArtManager::handleBoxArtLoadComplete(NvComputer* computer, NvApp app, QUrl image)
 {
-    if (!image.isEmpty()) {
-        emit boxArtLoadComplete(computer, app, image);
+    if (image.isEmpty()) {
+        image = QUrl("qrc:/res/no_app_image.png");
    }
+    emit boxArtLoadComplete(computer, app, image);
 }

 QUrl BoxArtManager::loadBoxArtFromNetwork(NvComputer* computer, int appId)
@@ -109,10 +110,6 @@ 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();
@@ -7,7 +7,6 @@

 #include <QThread>
 #include <QThreadPool>
-#include <QCoreApplication>

 #define SER_HOSTS "hosts"

@@ -32,7 +31,7 @@ private:

        QString serverInfo;
        try {
-            serverInfo = http.getServerInfo(NvHTTP::NvLogLevel::NVLL_NONE, true);
+            serverInfo = http.getServerInfo(NvHTTP::NvLogLevel::NONE);
        } catch (...) {
            return false;
        }
@@ -84,7 +83,7 @@ private:
            bool stateChanged = false;
            bool online = false;
            bool wasOnline = m_Computer->state == NvComputer::CS_ONLINE;
-            for (int i = 0; i < (wasOnline ? TRIES_BEFORE_OFFLINING : 1) && !online; i++) {
+            for (int i = 0; i < TRIES_BEFORE_OFFLINING && !online; i++) {
                for (auto& address : m_Computer->uniqueAddresses()) {
                    if (isInterruptionRequested()) {
                        return;
@@ -131,12 +130,8 @@ private:
                emit computerStateChanged(m_Computer);
            }

-            // Wait a bit to poll again, but do it in 100 ms chunks
-            // so we can be interrupted reasonably quickly.
-            // FIXME: QWaitCondition would be better.
-            for (int i = 0; i < 30 && !isInterruptionRequested(); i++) {
-                QThread::msleep(100);
-            }
+            // Wait a bit to poll again
+            QThread::sleep(3);
        }
    }

@@ -162,13 +157,6 @@ ComputerManager::ComputerManager(QObject *parent)
        m_KnownHosts[computer->uuid] = computer;
    }
    settings.endArray();
-
-    // To quit in a timely manner, we must block additional requests
-    // after we receive the aboutToQuit() signal. This is neccessary
-    // because NvHTTP uses aboutToQuit() to abort requests in progres
-    // while quitting, however this is a one time signal - additional
-    // requests would not be aborted and block termination.
-    connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(handleAboutToQuit()));
 }

 ComputerManager::~ComputerManager()
@@ -186,19 +174,38 @@ ComputerManager::~ComputerManager()
    delete m_MdnsBrowser;
    m_MdnsBrowser = nullptr;

-    // Interrupt polling
-    for (ComputerPollingEntry* entry : m_PollEntries) {
-        entry->interrupt();
+    {
+        QMutableMapIterator<QString, QThread*> i(m_PollThreads);
+
+        // Interrupt all polling threads
+        while (i.hasNext()) {
+            i.next();
+            i.value()->requestInterruption();
+        }
+
+        // Wait for all threads to terminate before destroying
+        // the NvComputer objects.
+        i.toFront();
+        while (i.hasNext()) {
+            i.next();
+
+            QThread* thread = i.value();
+            thread->wait();
+            delete thread;
+
+            i.remove();
+        }
    }

-    // Delete all polling entries (and associated threads)
-    for (ComputerPollingEntry* entry : m_PollEntries) {
-        delete entry;
-    }
+    {
+        QMutableMapIterator<QString, NvComputer*> i(m_KnownHosts);

-    // Destroy all NvComputer objects now that polling is halted
-    for (NvComputer* computer : m_KnownHosts) {
-        delete computer;
+        // Destroy all NvComputer objects
+        while (i.hasNext()) {
+            i.next();
+            delete i.value();
+            i.remove();
+        }
    }
 }

@@ -209,50 +216,13 @@ void ComputerManager::saveHosts()

    settings.remove(SER_HOSTS);
    settings.beginWriteArray(SER_HOSTS);
-    int i = 0;
-    for (const NvComputer* computer : m_KnownHosts) {
-        settings.setArrayIndex(i++);
-        computer->serialize(settings);
+    for (int i = 0; i < m_KnownHosts.count(); i++) {
+        settings.setArrayIndex(i);
+        m_KnownHosts.value(m_KnownHosts.keys()[i])->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);
@@ -270,9 +240,9 @@ void ComputerManager::startPolling()
                this, [this](const QMdnsEngine::Service& service) {
            qInfo() << "Discovered mDNS host:" << service.hostname();

-            MdnsPendingComputer* pendingComputer = new MdnsPendingComputer(&m_MdnsServer, service);
-            connect(pendingComputer, &MdnsPendingComputer::resolvedHost,
-                    this, &ComputerManager::handleMdnsServiceResolved);
+            MdnsPendingComputer* pendingComputer = new MdnsPendingComputer(&m_MdnsServer, &m_MdnsCache, service);
+            connect(pendingComputer, SIGNAL(resolvedv4(MdnsPendingComputer*,QHostAddress)),
+                    this, SLOT(handleMdnsServiceResolved(MdnsPendingComputer*,QHostAddress)));
            m_PendingResolution.append(pendingComputer);
        });
    }
@@ -295,58 +265,24 @@ void ComputerManager::startPollingComputer(NvComputer* computer)
        return;
    }

-    ComputerPollingEntry* pollingEntry;
-
-    if (!m_PollEntries.contains(computer->uuid)) {
-        pollingEntry = m_PollEntries[computer->uuid] = new ComputerPollingEntry();
-    }
-    else {
-        pollingEntry = m_PollEntries[computer->uuid];
+    if (m_PollThreads.contains(computer->uuid)) {
+        Q_ASSERT(m_PollThreads.value(computer->uuid)->isRunning());
+        return;
    }

-    if (!pollingEntry->isActive()) {
-        PcMonitorThread* thread = new PcMonitorThread(computer);
-        connect(thread, SIGNAL(computerStateChanged(NvComputer*)),
-                this, SLOT(handleComputerStateChanged(NvComputer*)));
-        pollingEntry->setActiveThread(thread);
-        thread->start();
-    }
+    PcMonitorThread* thread = new PcMonitorThread(computer);
+    connect(thread, SIGNAL(computerStateChanged(NvComputer*)),
+            this, SLOT(handleComputerStateChanged(NvComputer*)));
+    m_PollThreads[computer->uuid] = thread;
+    thread->start();
 }

 void ComputerManager::handleMdnsServiceResolved(MdnsPendingComputer* computer,
-                                                QVector<QHostAddress>& addresses)
+                                                const QHostAddress& address)
 {
-    QHostAddress v6Global = getBestGlobalAddressV6(addresses);
-    bool added = false;
+    qInfo() << "Resolved" << computer->hostname() << "to" << address.toString();

-    // 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;
-                }
-            }
-        }
-    }
+    addNewHost(address.toString(), true);

    m_PendingResolution.removeOne(computer);
    computer->deleteLater();
@@ -381,14 +317,14 @@ public:

    void run()
    {
-        ComputerPollingEntry* pollingEntry;
+        QThread* pollingThread;

        // Only do the minimum amount of work while holding the writer lock.
        // We must release it before calling saveHosts().
        {
            QWriteLocker lock(&m_ComputerManager->m_Lock);

-            pollingEntry = m_ComputerManager->m_PollEntries.take(m_Computer->uuid);
+            pollingThread = m_ComputerManager->m_PollThreads.take(m_Computer->uuid);

            m_ComputerManager->m_KnownHosts.remove(m_Computer->uuid);
        }
@@ -396,8 +332,18 @@ public:
        // Persist the new host list
        m_ComputerManager->saveHosts();

-        // Delete the polling entry first. This will stop all polling threads too.
-        delete pollingEntry;
+        // Delete the polling thread
+        if (pollingThread != nullptr) {
+            pollingThread->requestInterruption();
+
+            // We must wait here because we're going to delete computer
+            // and we can't do that out from underneath the poller.
+            pollingThread->wait();
+
+            // The thread is safe to delete now
+            Q_ASSERT(pollingThread->isFinished());
+            delete pollingThread;
+        }

        // Finally, delete the computer itself. This must be done
        // last because the polling thread might be using it.
@@ -416,17 +362,6 @@ void ComputerManager::deleteHost(NvComputer* computer)
    QThreadPool::globalInstance()->start(new DeferredHostDeletionTask(this, computer));
 }

-void ComputerManager::handleAboutToQuit()
-{
-    QWriteLocker lock(&m_Lock);
-
-    // Interrupt polling threads immediately, so they
-    // avoid making additional requests while quitting
-    for (ComputerPollingEntry* entry : m_PollEntries) {
-        entry->interrupt();
-    }
-}
-
 class PendingPairingTask : public QObject, public QRunnable
 {
    Q_OBJECT
@@ -466,7 +401,7 @@ private:
               break;
           }
        } catch (const GfeHttpResponseException& e) {
-            emit pairingCompleted(m_Computer, "GeForce Experience returned error: " + e.toQString());
+            emit pairingCompleted(m_Computer, e.toQString());
        } catch (const QtNetworkReplyException& e) {
            emit pairingCompleted(m_Computer, e.toQString());
        }
@@ -563,8 +498,20 @@ void ComputerManager::stopPollingAsync()
    m_MdnsBrowser = nullptr;

    // Interrupt all threads, but don't wait for them to terminate
-    for (ComputerPollingEntry* entry : m_PollEntries) {
-        entry->interrupt();
+    QMutableMapIterator<QString, QThread*> i(m_PollThreads);
+    while (i.hasNext()) {
+        i.next();
+
+        QThread* thread = i.value();
+
+        // Let this thread delete itself when it's finished
+        connect(thread, SIGNAL(finished()),
+                thread, SLOT(deleteLater()));
+
+        // The threads will delete themselves when they terminate,
+        // but we remove them from the polling threads map here.
+        i.value()->requestInterruption();
+        i.remove();
    }
 }

@@ -573,10 +520,9 @@ class PendingAddTask : public QObject, public QRunnable
    Q_OBJECT

 public:
-    PendingAddTask(ComputerManager* computerManager, QString address, QHostAddress mdnsIpv6Address, bool mdns)
+    PendingAddTask(ComputerManager* computerManager, QString address, bool mdns)
        : m_ComputerManager(computerManager),
          m_Address(address),
-          m_MdnsIpv6Address(mdnsIpv6Address),
          m_Mdns(mdns)
    {
        connect(this, &PendingAddTask::computerAddCompleted,
@@ -600,12 +546,12 @@ private:
            // around this issue, we will issue the request again after a few seconds if
            // we see a ServiceUnavailableError error.
            try {
-                serverInfo = http.getServerInfo(NvHTTP::NVLL_VERBOSE);
+                serverInfo = http.getServerInfo(NvHTTP::NvLogLevel::VERBOSE);
            } catch (const QtNetworkReplyException& e) {
                if (e.getError() == QNetworkReply::ServiceUnavailableError) {
                    qWarning() << "Retrying request in 5 seconds after ServiceUnavailableError";
                    QThread::sleep(5);
-                    serverInfo = http.getServerInfo(NvHTTP::NVLL_VERBOSE);
+                    serverInfo = http.getServerInfo(NvHTTP::NvLogLevel::VERBOSE);
                    qInfo() << "Retry successful";
                }
                else {
@@ -626,21 +572,16 @@ private:
    {
        NvHTTP http(m_Address, QSslCertificate());

-        qInfo() << "Processing new PC at" << m_Address << "from" << (m_Mdns ? "mDNS" : "user") << m_MdnsIpv6Address;
+        qInfo() << "Processing new PC at" << m_Address << "from" << (m_Mdns ? "mDNS" : "user");

        // 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(http.address(), serverInfo, QSslCertificate());
+        NvComputer* newComputer = new NvComputer(m_Address, serverInfo, QSslCertificate());

        // Check if we have a record of this host UUID to pull the pinned cert
        NvComputer* existingComputer;
@@ -660,34 +601,22 @@ private:
            }

            // Update the polled computer with the HTTPS information
-            NvComputer httpsComputer(http.address(), serverInfo, QSslCertificate());
+            NvComputer httpsComputer(m_Address, serverInfo, QSslCertificate());
            newComputer->update(httpsComputer);
        }

        // Update addresses depending on the context
        if (m_Mdns) {
-            // 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;
-            }
+            newComputer->localAddress = m_Address;

-            // 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;
-                }
+            // 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();
            }
-
-            if (!m_MdnsIpv6Address.isNull()) {
-                Q_ASSERT(m_MdnsIpv6Address.protocol() == QAbstractSocket::IPv6Protocol);
-                newComputer->ipv6Address = m_MdnsIpv6Address.toString();
+            else {
+                qWarning() << "STUN failed to get WAN address:" << err;
            }
        }
        else {
@@ -740,15 +669,14 @@ private:

    ComputerManager* m_ComputerManager;
    QString m_Address;
-    QHostAddress m_MdnsIpv6Address;
    bool m_Mdns;
 };

-void ComputerManager::addNewHost(QString address, bool mdns, QHostAddress mdnsIpv6Address)
+void ComputerManager::addNewHost(QString address, bool mdns)
 {
    // Punt to a worker thread to avoid stalling the
    // UI while waiting for serverinfo query to complete
-    PendingAddTask* addTask = new PendingAddTask(this, address, mdnsIpv6Address, mdns);
+    PendingAddTask* addTask = new PendingAddTask(this, address, mdns);
    QThreadPool::globalInstance()->start(addTask);
 }

@@ -13,7 +13,6 @@
 #include <QReadWriteLock>
 #include <QSettings>
 #include <QRunnable>
-#include <QTimer>

 class MdnsPendingComputer : public QObject
 {
@@ -21,18 +20,13 @@ class MdnsPendingComputer : public QObject

 public:
    explicit MdnsPendingComputer(QMdnsEngine::Server* server,
+                                 QMdnsEngine::Cache* cache,
                                 const QMdnsEngine::Service& service)
        : m_Hostname(service.hostname()),
-          m_Server(server),
-          m_Resolver(nullptr)
+          m_Resolver(server, m_Hostname, cache)
    {
-        // Start resolving
-        resolve();
-    }
-
-    virtual ~MdnsPendingComputer()
-    {
-        delete m_Resolver;
+        connect(&m_Resolver, SIGNAL(resolved(QHostAddress)),
+                this, SLOT(handleResolved(QHostAddress)));
    }

    QString hostname()
@@ -41,115 +35,20 @@ public:
    }

 private slots:
-    void handleResolvedTimeout()
+    void handleResolved(const QHostAddress& address)
    {
-        if (m_Addresses.isEmpty()) {
-            // Try again
-            qInfo() << "Resolving" << hostname() << "timed out. Retrying...";
-            resolve();
+        if (address.protocol() == QAbstractSocket::IPv4Protocol) {
+            m_Resolver.disconnect();
+            emit resolvedv4(this, address);
        }
-        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 resolvedHost(MdnsPendingComputer*,QVector<QHostAddress>&);
+    void resolvedv4(MdnsPendingComputer*, const 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::Server* m_Server;
-    QMdnsEngine::Resolver* m_Resolver;
-    QVector<QHostAddress> m_Addresses;
-};
-
-class ComputerPollingEntry
-{
-public:
-    ComputerPollingEntry()
-        : m_ActiveThread(nullptr)
-    {
-
-    }
-
-    virtual ~ComputerPollingEntry()
-    {
-        interrupt();
-
-        // interrupt() should have taken care of this
-        Q_ASSERT(m_ActiveThread == nullptr);
-
-        for (QThread* thread : m_InactiveList) {
-            thread->wait();
-            delete thread;
-        }
-    }
-
-    bool isActive()
-    {
-        cleanInactiveList();
-
-        return m_ActiveThread != nullptr;
-    }
-
-    void setActiveThread(QThread* thread)
-    {
-        cleanInactiveList();
-
-        Q_ASSERT(!isActive());
-        m_ActiveThread = thread;
-    }
-
-    void interrupt()
-    {
-        cleanInactiveList();
-
-        if (m_ActiveThread != nullptr) {
-            // Interrupt the active thread
-            m_ActiveThread->requestInterruption();
-
-            // Place it on the inactive list awaiting death
-            m_InactiveList.append(m_ActiveThread);
-
-            m_ActiveThread = nullptr;
-        }
-    }
-
-private:
-    void cleanInactiveList()
-    {
-        QMutableListIterator<QThread*> i(m_InactiveList);
-
-        // Reap any threads that have finished
-        while (i.hasNext()) {
-            i.next();
-
-            QThread* thread = i.value();
-            if (thread->isFinished()) {
-                delete thread;
-                i.remove();
-            }
-        }
-    }
-
-    QThread* m_ActiveThread;
-    QList<QThread*> m_InactiveList;
+    QMdnsEngine::Resolver m_Resolver;
 };

 class ComputerManager : public QObject
@@ -168,7 +67,7 @@ public:

    Q_INVOKABLE void stopPollingAsync();

-    Q_INVOKABLE void addNewHost(QString address, bool mdns, QHostAddress mdnsIpv6Address = QHostAddress());
+    Q_INVOKABLE void addNewHost(QString address, bool mdns);

    void pairHost(NvComputer* computer, QString pin);

@@ -189,23 +88,19 @@ signals:
    void quitAppCompleted(QVariant error);

 private slots:
-    void handleAboutToQuit();
-
    void handleComputerStateChanged(NvComputer* computer);

-    void handleMdnsServiceResolved(MdnsPendingComputer* computer, QVector<QHostAddress>& addresses);
+    void handleMdnsServiceResolved(MdnsPendingComputer* computer, const QHostAddress& address);

 private:
    void saveHosts();

-    QHostAddress getBestGlobalAddressV6(QVector<QHostAddress>& addresses);
-
    void startPollingComputer(NvComputer* computer);

    int m_PollingRef;
    QReadWriteLock m_Lock;
    QMap<QString, NvComputer*> m_KnownHosts;
-    QMap<QString, ComputerPollingEntry*> m_PollEntries;
+    QMap<QString, QThread*> m_PollThreads;
    QMdnsEngine::Server m_MdnsServer;
    QMdnsEngine::Browser* m_MdnsBrowser;
    QMdnsEngine::Cache m_MdnsCache;
@@ -39,18 +39,11 @@ void ComputerSeeker::onComputerUpdated(NvComputer *computer)
 bool ComputerSeeker::matchComputer(NvComputer *computer) const
 {
    QString value = m_ComputerName.toLower();
-
-    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;
+    return computer->name.toLower() == value ||
+           computer->localAddress.toLower() == value ||
+           computer->remoteAddress.toLower() == value ||
+           computer->manualAddress.toLower() == value ||
+           computer->uuid.toLower() == value;
 }

 bool ComputerSeeker::isOnline(NvComputer *computer) const
@@ -75,7 +75,7 @@ void IdentityManager::createCredentials(QSettings& settings)
                               -1, -1, 0);
    X509_set_issuer_name(cert, name);

-    X509_sign(cert, pk, EVP_sha256());
+    X509_sign(cert, pk, EVP_sha1());

    BIO* biokey = BIO_new(BIO_s_mem());
    THROW_BAD_ALLOC_IF_NULL(biokey);
@@ -3,7 +3,6 @@
 #include <QUdpSocket>
 #include <QHostInfo>
 #include <QNetworkInterface>
-#include <QNetworkProxy>

 #define SER_NAME "hostname"
 #define SER_UUID "uuid"
@@ -11,7 +10,6 @@
 #define SER_LOCALADDR "localaddress"
 #define SER_REMOTEADDR "remoteaddress"
 #define SER_MANUALADDR "manualaddress"
-#define SER_IPV6ADDR "ipv6address"
 #define SER_APPLIST "apps"
 #define SER_SRVCERT "srvcert"

@@ -26,7 +24,6 @@ NvComputer::NvComputer(QSettings& settings)
    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());

@@ -57,7 +54,7 @@ NvComputer::NvComputer(QSettings& settings)
    this->gpuModel = nullptr;
 }

-void NvComputer::serialize(QSettings& settings) const
+void NvComputer::serialize(QSettings& settings)
 {
    QReadLocker lock(&this->lock);

@@ -66,7 +63,6 @@ void NvComputer::serialize(QSettings& settings) const
    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());

@@ -133,12 +129,7 @@ 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;
@@ -165,7 +156,7 @@ bool NvComputer::wake()

    const quint16 WOL_PORTS[] = {
        7, 9, // Standard WOL ports
-        47998, 47999, 48000, 48002, 48010, // Ports opened by GFE
+        47998, 47999, 48000, // Ports opened by GFE
    };

    // Create the WoL payload
@@ -238,82 +229,7 @@ bool NvComputer::wake()
    return success;
 }

-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;
-    }
-}
-
-QVector<QString> NvComputer::uniqueAddresses() const
+QVector<QString> NvComputer::uniqueAddresses()
 {
    QVector<QString> uniqueAddressList;

@@ -321,7 +237,6 @@ QVector<QString> NvComputer::uniqueAddresses() const
    uniqueAddressList.append(activeAddress);
    uniqueAddressList.append(localAddress);
    uniqueAddressList.append(remoteAddress);
-    uniqueAddressList.append(ipv6Address);
    uniqueAddressList.append(manualAddress);

    // Prune duplicates (always giving precedence to the first)
@@ -381,7 +296,6 @@ bool NvComputer::update(NvComputer& that)
    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);
@@ -29,14 +29,11 @@ public:
    bool
    wake();

-    bool
-    isReachableOverVpn();
-
    QVector<QString>
-    uniqueAddresses() const;
+    uniqueAddresses();

    void
-    serialize(QSettings& settings) const;
+    serialize(QSettings& settings);

    enum PairState
    {
@@ -67,7 +64,6 @@ public:
    // Persisted traits
    QString localAddress;
    QString remoteAddress;
-    QString ipv6Address;
    QString manualAddress;
    QByteArray macAddress;
    QString name;
@@ -76,5 +72,5 @@ public:
    QVector<NvApp> appList;

    // Synchronization
-    mutable QReadWriteLock lock;
+    QReadWriteLock lock;
 };
@@ -12,27 +12,27 @@
 #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);
-
-    connect(&m_Nam, &QNetworkAccessManager::sslErrors, this, &NvHTTP::handleSslErrors);
 }

 void NvHTTP::setServerCert(QSslCertificate serverCert)
@@ -40,21 +40,6 @@ 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)
 {
@@ -93,7 +78,7 @@ NvHTTP::getCurrentGame(QString serverInfo)
 }

 QString
-NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
+NvHTTP::getServerInfo(NvLogLevel logLevel)
 {
    QString serverInfo;

@@ -107,7 +92,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
            serverInfo = openConnectionToString(m_BaseUrlHttps,
                                                "serverinfo",
                                                nullptr,
-                                                fastFail ? FAST_FAIL_TIMEOUT_MS : REQUEST_TIMEOUT_MS,
+                                                REQUEST_TIMEOUT_MS,
                                                logLevel);
            // Throws if the request failed
            verifyResponseStatus(serverInfo);
@@ -120,7 +105,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
                serverInfo = openConnectionToString(m_BaseUrlHttp,
                                                    "serverinfo",
                                                    nullptr,
-                                                    fastFail ? FAST_FAIL_TIMEOUT_MS : REQUEST_TIMEOUT_MS,
+                                                    REQUEST_TIMEOUT_MS,
                                                    logLevel);
                verifyResponseStatus(serverInfo);
            }
@@ -137,7 +122,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
        serverInfo = openConnectionToString(m_BaseUrlHttp,
                                            "serverinfo",
                                            nullptr,
-                                            fastFail ? FAST_FAIL_TIMEOUT_MS : REQUEST_TIMEOUT_MS,
+                                            REQUEST_TIMEOUT_MS,
                                            logLevel);
        verifyResponseStatus(serverInfo);
    }
@@ -145,6 +130,30 @@ NvHTTP::getServerInfo(NvLogLevel logLevel, bool fastFail)
    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,
@@ -171,7 +180,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="+QString::number(SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION(streamConfig->audioConfiguration))+
+                                   "&surroundAudioInfo="+getSurroundAudioInfoString(streamConfig->audioConfiguration)+
                                   "&remoteControllersBitmap="+QString::number(gamepadMask)+
                                   "&gcmap="+QString::number(gamepadMask),
                                   LAUNCH_TIMEOUT_MS);
@@ -193,7 +202,7 @@ NvHTTP::resumeApp(PSTREAM_CONFIGURATION streamConfig)
                                   "resume",
                                   "rikey="+QString(QByteArray(streamConfig->remoteInputAesKey, sizeof(streamConfig->remoteInputAesKey)).toHex())+
                                   "&rikeyid="+QString::number(riKeyId)+
-                                   "&surroundAudioInfo="+QString::number(SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION(streamConfig->audioConfiguration)),
+                                   "&surroundAudioInfo="+getSurroundAudioInfoString(streamConfig->audioConfiguration),
                                   RESUME_TIMEOUT_MS);

    // Throws if the request failed
@@ -214,7 +223,7 @@ NvHTTP::quitApp()

    // Newer GFE versions will just return success even if quitting fails
    // if we're not the original requestor.
-    if (getCurrentGame(getServerInfo(NvHTTP::NVLL_ERROR)) != 0) {
+    if (getCurrentGame(getServerInfo(NvHTTP::ERROR)) != 0) {
        // Generate a synthetic GfeResponseException letting the caller know
        // that they can't kill someone else's stream.
        throw GfeHttpResponseException(599, "");
@@ -230,16 +239,16 @@ NvHTTP::getDisplayModeList(QString serverInfo)
    while (!xmlReader.atEnd()) {
        while (xmlReader.readNextStartElement()) {
            QStringRef name = xmlReader.name();
-            if (name == "DisplayMode") {
+            if (xmlReader.name() == "DisplayMode") {
                modes.append(NvDisplayMode());
            }
-            else if (name == "Width") {
+            else if (xmlReader.name() == "Width") {
                modes.last().width = xmlReader.readElementText().toInt();
            }
-            else if (name == "Height") {
+            else if (xmlReader.name() == "Height") {
                modes.last().height = xmlReader.readElementText().toInt();
            }
-            else if (name == "RefreshRate") {
+            else if (xmlReader.name() == "RefreshRate") {
                modes.last().refreshRate = xmlReader.readElementText().toInt();
            }
        }
@@ -255,7 +264,7 @@ NvHTTP::getAppList()
                                            "applist",
                                            nullptr,
                                            REQUEST_TIMEOUT_MS,
-                                            NvLogLevel::NVLL_ERROR);
+                                            NvLogLevel::ERROR);
    verifyResponseStatus(appxml);

    QXmlStreamReader xmlReader(appxml);
@@ -263,7 +272,7 @@ NvHTTP::getAppList()
    while (!xmlReader.atEnd()) {
        while (xmlReader.readNextStartElement()) {
            QStringRef name = xmlReader.name();
-            if (name == "App") {
+            if (xmlReader.name() == "App") {
                // We must have a valid app before advancing to the next one
                if (!apps.isEmpty() && !apps.last().isInitialized()) {
                    qWarning() << "Invalid applist XML";
@@ -272,18 +281,15 @@ NvHTTP::getAppList()
                }
                apps.append(NvApp());
            }
-            else if (name == "AppTitle") {
+            else if (xmlReader.name() == "AppTitle") {
                apps.last().name = xmlReader.readElementText();
            }
-            else if (name == "ID") {
+            else if (xmlReader.name() == "ID") {
                apps.last().id = xmlReader.readElementText().toInt();
            }
-            else if (name == "IsHdrSupported") {
+            else if (xmlReader.name() == "IsHdrSupported") {
                apps.last().hdrSupported = xmlReader.readElementText() == "1";
            }
-            else if (name == "IsAppCollectorGame") {
-                apps.last().isAppCollectorGame = xmlReader.readElementText() == "1";
-            }
        }
    }

@@ -299,10 +305,7 @@ NvHTTP::verifyResponseStatus(QString xml)
    {
        if (xmlReader.name() == "root")
        {
-            // 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();
+            int statusCode = xmlReader.attributes().value("status_code").toInt();
            if (statusCode == 200)
            {
                // Successful
@@ -315,12 +318,6 @@ 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);
            }
        }
@@ -335,7 +332,7 @@ NvHTTP::getBoxArt(int appId)
                                          "appid="+QString::number(appId)+
                                          "&AssetType=2&AssetIdx=0",
                                          REQUEST_TIMEOUT_MS,
-                                          NvLogLevel::NVLL_VERBOSE);
+                                          NvLogLevel::VERBOSE);
    QImage image = QImageReader(reply).read();
    delete reply;

@@ -377,28 +374,6 @@ NvHTTP::getXmlString(QString xml,
    return nullptr;
 }

-void NvHTTP::handleSslErrors(QNetworkReply* reply, const QList<QSslError>& errors)
-{
-    bool ignoreErrors = true;
-
-    if (m_ServerCert.isNull()) {
-        // We should never make an HTTPS request without a cert
-        Q_ASSERT(!m_ServerCert.isNull());
-        return;
-    }
-
-    for (auto error : errors) {
-        if (m_ServerCert != error.certificate()) {
-            ignoreErrors = false;
-            break;
-        }
-    }
-
-    if (ignoreErrors) {
-        reply->ignoreSslErrors(errors);
-    }
-}
-
 QString
 NvHTTP::openConnectionToString(QUrl baseUrl,
                               QString command,
@@ -435,26 +410,37 @@ NvHTTP::openConnection(QUrl baseUrl,
                 QUuid::createUuid().toRfc4122().toHex() +
                 ((arguments != nullptr) ? ("&" + arguments) : ""));

-    QNetworkRequest request(url);
+    QNetworkRequest request = QNetworkRequest(url);

    // Add our client certificate
    request.setSslConfiguration(IdentityManager::get()->getSslConfig());

-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && QT_VERSION < QT_VERSION_CHECK(5, 14, 2) && !defined(QT_NO_BEARERMANAGEMENT)
-    // HACK: Set network accessibility to work around QTBUG-80947
-    m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);
-#endif
-
    QNetworkReply* reply = m_Nam.get(request);

+    // Assert that we always have a server cert for HTTPS, since
+    // the request will fail anyway if we do not.
+    Q_ASSERT(!m_ServerCert.isNull() || baseUrl == m_BaseUrlHttp);
+
+    if (!m_ServerCert.isNull()) {
+        // Pin the server certificate received during pairing
+        QList<QSslError> expectedSslErrors;
+        expectedSslErrors.append(QSslError(QSslError::HostNameMismatch, m_ServerCert));
+        expectedSslErrors.append(QSslError(QSslError::SelfSignedCertificate, m_ServerCert));
+
+        // The SecureTransport backend for Qt TLS on macOS throws CertificateUntrusted
+        // instead of SelfSignedCertificate, so we will need to allow that error too.
+        expectedSslErrors.append(QSslError(QSslError::CertificateUntrusted, m_ServerCert));
+
+        reply->ignoreSslErrors(expectedSslErrors);
+    }
+
    // Run the request with a timeout if requested
    QEventLoop loop;
-    connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
-    connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), &loop, SLOT(quit()));
+    QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
    if (timeoutMs) {
        QTimer::singleShot(timeoutMs, &loop, SLOT(quit()));
    }
-    if (logLevel >= NvLogLevel::NVLL_VERBOSE) {
+    if (logLevel >= NvLogLevel::VERBOSE) {
        qInfo() << "Executing request:" << url.toString();
    }
    loop.exec(QEventLoop::ExcludeUserInputEvents);
@@ -462,7 +448,7 @@ NvHTTP::openConnection(QUrl baseUrl,
    // Abort the request if it timed out
    if (!reply->isFinished())
    {
-        if (logLevel >= NvLogLevel::NVLL_ERROR) {
+        if (logLevel >= NvLogLevel::ERROR) {
            qWarning() << "Aborting timed out request for" << url.toString();
        }
        reply->abort();
@@ -475,7 +461,7 @@ NvHTTP::openConnection(QUrl baseUrl,
    // Handle error
    if (reply->error() != QNetworkReply::NoError)
    {
-        if (logLevel >= NvLogLevel::NVLL_ERROR) {
+        if (logLevel >= NvLogLevel::ERROR) {
            qWarning() << command << " request failed with error " << reply->error();
        }

@@ -24,7 +24,6 @@ public:
    int id;
    QString name;
    bool hdrSupported;
-    bool isAppCollectorGame;
 };

 Q_DECLARE_METATYPE(NvApp)
@@ -114,15 +113,13 @@ private:
    QString m_ErrorText;
 };

-class NvHTTP : public QObject
+class NvHTTP
 {
-    Q_OBJECT
-
 public:
    enum NvLogLevel {
-        NVLL_NONE,
-        NVLL_ERROR,
-        NVLL_VERBOSE
+        NONE,
+        ERROR,
+        VERBOSE
    };

    explicit NvHTTP(QString address, QSslCertificate serverCert);
@@ -132,7 +129,7 @@ public:
    getCurrentGame(QString serverInfo);

    QString
-    getServerInfo(NvLogLevel logLevel, bool fastFail = false);
+    getServerInfo(NvLogLevel logLevel);

    static
    void
@@ -153,14 +150,10 @@ public:
                           QString command,
                           QString arguments,
                           int timeoutMs,
-                           NvLogLevel logLevel = NvLogLevel::NVLL_VERBOSE);
+                           NvLogLevel logLevel = NvLogLevel::VERBOSE);

    void setServerCert(QSslCertificate serverCert);

-    void setAddress(QString address);
-
-    QString address();
-
    static
    QVector<int>
    parseQuad(QString quad);
@@ -191,9 +184,6 @@ public:
    QUrl m_BaseUrlHttp;
    QUrl m_BaseUrlHttps;
 private:
-    void
-    handleSslErrors(QNetworkReply* reply, const QList<QSslError>& errors);
-
    QNetworkReply*
    openConnection(QUrl baseUrl,
                   QString command,
@@ -256,9 +256,7 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
    challengeResponse.append(reinterpret_cast<char*>(asnSignature->data), asnSignature->length);
    challengeResponse.append(clientSecretData);

-    QByteArray paddedHash = QCryptographicHash::hash(challengeResponse, hashAlgo);
-    paddedHash.resize(32);
-    QByteArray encryptedChallengeResponseHash = encrypt(paddedHash, &encKey);
+    QByteArray encryptedChallengeResponseHash = encrypt(QCryptographicHash::hash(challengeResponse, hashAlgo), &encKey);
    QString respXml = m_Http.openConnectionToString(m_Http.m_BaseUrlHttp,
                                                    "pair",
                                                    "devicename=roth&updateState=1&serverchallengeresp=" +
@@ -1,67 +0,0 @@
-#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
@@ -1,26 +0,0 @@
-#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;
-};
-
@@ -1,136 +0,0 @@
-#include "systemproperties.h"
-#include "utils.h"
-
-#include <QGuiApplication>
-
-#include "streaming/session.h"
-#include "streaming/streamutils.h"
-
-SystemProperties::SystemProperties()
-{
-    hasWindowManager = WMUtils::isRunningWindowManager();
-    isRunningWayland = WMUtils::isRunningWayland();
-    isRunningXWayland = isRunningWayland && QGuiApplication::platformName() == "xcb";
-
-#ifdef Q_OS_WIN32
-    isWow64 = QSysInfo::currentCpuArchitecture() != QSysInfo::buildCpuArchitecture();
-#else
-    isWow64 = false;
-#endif
-
-#ifndef STEAM_LINK
-    // 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
-    // and cache the results to speed up future queries on this data.
-    querySdlVideoInfo();
-
-    Q_ASSERT(maximumStreamingFrameRate >= 60);
-    Q_ASSERT(!monitorDesktopResolutions.isEmpty());
-    Q_ASSERT(!monitorNativeResolutions.isEmpty());
-}
-
-QRect SystemProperties::getDesktopResolution(int displayIndex)
-{
-    // Returns default constructed QRect if out of bounds
-    return monitorDesktopResolutions.value(displayIndex);
-}
-
-QRect SystemProperties::getNativeResolution(int displayIndex)
-{
-    // Returns default constructed QRect if out of bounds
-    return monitorNativeResolutions.value(displayIndex);
-}
-
-void SystemProperties::querySdlVideoInfo()
-{
-    monitorDesktopResolutions.clear();
-    monitorNativeResolutions.clear();
-    hasHardwareAcceleration = false;
-
-    // Never let the maximum drop below 60 FPS
-    maximumStreamingFrameRate = 60;
-
-    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
-                     SDL_GetError());
-        return;
-    }
-
-    SDL_DisplayMode bestMode;
-    for (int displayIndex = 0; displayIndex < SDL_GetNumVideoDisplays(); displayIndex++) {
-        SDL_DisplayMode desktopMode;
-        int err;
-
-        err = SDL_GetDesktopDisplayMode(displayIndex, &desktopMode);
-        if (err == 0) {
-            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,
-                         "SDL_GetDesktopDisplayMode() failed: %s",
-                         SDL_GetError());
-        }
-
-        if (StreamUtils::getRealDesktopMode(displayIndex, &desktopMode)) {
-            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;
-            for (int i = 0; i < SDL_GetNumDisplayModes(displayIndex); i++) {
-                SDL_DisplayMode mode;
-                if (SDL_GetDisplayMode(displayIndex, i, &mode) == 0) {
-                    if (mode.w == desktopMode.w && mode.h == desktopMode.h) {
-                        if (mode.refresh_rate > bestMode.refresh_rate) {
-                            bestMode = mode;
-                        }
-                    }
-                }
-            }
-
-            maximumStreamingFrameRate = qMax(maximumStreamingFrameRate, bestMode.refresh_rate);
-        }
-    }
-
-    SDL_Window* 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;
-    }
-
-    Session::getDecoderInfo(testWindow, hasHardwareAcceleration, rendererAlwaysFullScreen, maximumResolution);
-
-    SDL_DestroyWindow(testWindow);
-
-    SDL_QuitSubSystem(SDL_INIT_VIDEO);
-}
@@ -1,48 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QRect>
-
-class SystemProperties : public QObject
-{
-    Q_OBJECT
-
-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_INVOKABLE QRect getDesktopResolution(int displayIndex);
-    Q_INVOKABLE QRect getNativeResolution(int displayIndex);
-
-signals:
-    void unmappedGamepadsChanged();
-
-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;
-};
-
@@ -59,7 +59,7 @@ public:

    void showMessage(QString message, MessageType type) const
    {
-    #if defined(Q_OS_WIN32)
+    #if defined(Q_OS_WIN)
        UINT flags = MB_OK | MB_TOPMOST | MB_SETFOREGROUND;
        flags |= (type == Info ? MB_ICONINFORMATION : MB_ICONERROR);
        QString title = "Moonlight";
@@ -172,31 +172,20 @@ 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 (posArgs.isEmpty()) {
+    if (action == "") {
        // This method will not return and terminates the process if --version
        // or --help is specified
        parser.handleHelpAndVersionOptions();
        parser.handleUnknownOptions();
        return NormalStartRequested;
-    }
-    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"));
+    } else if (action == "quit") {
+        return QuitRequested;
+    } else if (action == "stream") {
+        return StreamRequested;
+    } else {
+        parser.showError(QString("Invalid action: %1").arg(action));
    }
 }

@@ -252,7 +241,6 @@ 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},
@@ -292,12 +280,11 @@ 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("absolute-mouse", "enable direct mouse control (best for remote desktop rather than games)");
+    parser.addToggleOption("mouse-acceleration", "mouse acceleration");
    parser.addToggleOption("game-optimization", "game optimizations");
    parser.addToggleOption("audio-on-host", "audio on host PC");
    parser.addToggleOption("frame-pacing", "frame pacing");
@@ -358,14 +345,6 @@ 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"));
@@ -385,8 +364,8 @@ void StreamCommandLineParser::parse(const QStringList &args, StreamingPreference
    // Resolve --quit-after and --no-quit-after options
    preferences->quitAppAfter = parser.getToggleOptionValue("quit-after", preferences->quitAppAfter);

-    // Resolve --absolute-mouse and --no-absolute-mouse options
-    preferences->absoluteMouseMode = parser.getToggleOptionValue("absolute-mouse", preferences->absoluteMouseMode);
+    // Resolve --mouse-acceleration and --no-mouse-acceleration options
+    preferences->mouseAcceleration = parser.getToggleOptionValue("mouse-acceleration", preferences->mouseAcceleration);

    // Resolve --game-optimization and --no-game-optimization options
    preferences->gameOptimizations = parser.getToggleOptionValue("game-optimization", preferences->gameOptimizations);
@@ -12,12 +12,10 @@
 		<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, 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>Hardware accelerated video decoding with VAAPI and VDPAU support</li>
+			<li>5.1 surround sound audio support</li>
 			<li>HEVC support for better video compression efficiency</li>
-			<li>Gamepad support with force feedback for up to 4 players</li>
+			<li>Gamepad support with SDL mapping compatibility</li>
 		</ul>
 	</description>

@@ -35,165 +33,6 @@
 	</screenshots>

 	<releases>
-		<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>
-				<ul>
-					<li>Fixed broken video on GeForce Experience 3.19</li>
-				</ul>
-			</description>
-		</release>
-		<release version="1.0.0" date="2019-05-21">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Mouse mode for gamepads (Press and hold Start to toggle)</li>
-					<li>Improved gamepad UI navigation</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed duplicate non-working gamepads appearing on the host</li>
-					<li>Fixed excessive frame queue delay on macOS</li>
-					<li>Fixed excessive audio latency on Steam Link</li>
-					<li>Fixed hiding mouse cursor after streaming on Steam Link</li>
-					<li>Fixed incorrect receive time stats on 32-bit platforms</li>
-					<li>Added UDP ports 48002 and 48010 for Wake-on-LAN</li>
-					<li>Updated included gamepad mappings</li>
-				</ul>
-			</description>
-		</release>
-		<release version="0.10.1" date="2019-04-28">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Video performance optimizations</li>
-					<li>VAAPI support on Wayland</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed a crash when attempting to dismiss the connection terminated dialog</li>
-					<li>Fixed a crash when using the overlay on the software decoder</li>
-					<li>Fixed software decoder not displaying output in some cases</li>
-					<li>Fixed some minor UI issues on the PC grid</li>
-					<li>Improved visibility of toolbar highlights</li>
-				</ul>
-			</description>
-		</release>
-		<release version="0.10.0" date="2019-04-07">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Redesigned App Grid with larger game artwork and less blank space</li>
-					<li>Redesigned UI dialogs using Material Design</li>
-					<li>Added a connection warning overlay (which can be disabled in settings)</li>
-					<li>Streaming window no longer minimizes when it loses focus in full-screen mode</li>
-					<li>The Steam Link device is now a supported platform</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed several bugs that could cause UI hangs or lag</li>
-					<li>Fixed rumble support on gamepads with limited rumble motor control</li>
-					<li>Fixed increased memory usage if the software renderer gets delayed</li>
-					<li>Fixed crashes on certain desktop configurations when loading the UI</li>
-					<li>Fixed handling of pairing certificates with a bogus date</li>
-				</ul>
-			</description>
-		</release>
-		<release version="0.9.1" date="2019-02-17">
-			<description>
-				<p>New features:</p>
-				<ul>
-					<li>Added gamepad rumble support</li>
-					<li>Added a dedicated quit button to the running app tile</li>
-					<li>Reduced video latency on Windows and Linux</li>
-					<li>Added a performance overlay for software decoding</li>
-				</ul>
-				<p>Bugfixes:</p>
-				<ul>
-					<li>Fixed delayed first video frame with GFE 3.17</li>
-					<li>Fixed erroneously setting host resolution to 720p in certain configurations</li>
-					<li>The connection termination dialog is no longer displayed for intentional termination</li>
-					<li>Fixed some gamepads only functioning for UI navigation and not in game</li>
-					<li>Fixed audio latency increasing when switching audio devices</li>
-					<li>Fixed VDPAU scaling behavior on AMD cards</li>
-					<li>Fixed several bugs in gamepad navigation behavior</li>
-					<li>Work around a bug in QGnomePlatform that breaks dialog rendering on Linux</li>
-					<li>Updated included SDL gamepad mappings</li>
-					<li>Fixed hotkey behavior on non-latin keyboards</li>
-					<li>Fixed incorrect frame drop percentages in debug stats</li>
-				</ul>
-			</description>
-		</release>
 		<release version="0.8.1" date="2019-01-08">
 			<description>
 				<p>New features:</p>
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# The default HOME is not persistent, so override
-# it to a path on the onboard flash. Otherwise our
-# 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
-echo Launching $BIN
-exec nice -n -10 ./bin/$BIN > /tmp/moonlight.log
@@ -1,3 +0,0 @@
-name=Moonlight
-icon=moonlight.png
-run=moonlight.sh
@@ -1,21 +1,29 @@
 import QtQuick 2.9
+import QtQuick.Dialogs 1.2
 import QtQuick.Controls 2.2

 import AppModel 1.0
 import ComputerManager 1.0
 import SdlGamepadKeyNavigation 1.0

-CenteredGridView {
+GridView {
    property int computerIndex
    property AppModel appModel : createModel()
-    property bool activated

    id: appGrid
    focus: true
    activeFocusOnTab: true
-    topMargin: 20
-    bottomMargin: 5
-    cellWidth: 230; cellHeight: 297;
+    anchors.fill: parent
+    anchors.leftMargin: (parent.width % (cellWidth + anchors.rightMargin)) / 2
+    anchors.topMargin: 20
+    anchors.rightMargin: 5
+    anchors.bottomMargin: 5
+    cellWidth: 225; cellHeight: 385;
+
+    // The StackView will trigger a visibility change when
+    // we're pushed onto it, causing our onVisibleChanged
+    // routine to run, but only if we start as invisible
+    visible: false

    function computerLost()
    {
@@ -24,25 +32,23 @@ CenteredGridView {
    }

    Component.onCompleted: {
-        // Don't show any highlighted item until interacting with them.
-        // We do this here instead of onActivated to avoid losing the user's
-        // selection when backing out of a different page of the app.
+        // Don't show any highlighted item until interacting with them
        currentIndex = -1
    }

-    StackView.onActivated: {
-        appModel.computerLost.connect(computerLost)
-        activated = true
-
-        // Highlight the first item if a gamepad is connected
-        if (currentIndex == -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
-            currentIndex = 0
-        }
+    SdlGamepadKeyNavigation {
+        id: gamepadKeyNav
    }

-    StackView.onDeactivating: {
-        appModel.computerLost.disconnect(computerLost)
-        activated = false
+    onVisibleChanged: {
+        if (visible) {
+            appModel.computerLost.connect(computerLost)
+            gamepadKeyNav.enable()
+        }
+        else {
+            appModel.computerLost.disconnect(computerLost)
+            gamepadKeyNav.disable()
+        }
    }

    function createModel()
@@ -55,112 +61,50 @@ CenteredGridView {
    model: appModel

    delegate: NavigableItemDelegate {
-        width: 220; height: 287;
+        width: 200; height: 335;
        grid: appGrid

        Image {
-            property bool isPlaceholder: false
-
            id: appIcon
-            anchors.horizontalCenter: parent.horizontalCenter
-            y: 10
+            anchors.horizontalCenter: parent.horizontalCenter;
+            y: 20
            source: model.boxart
-
-            onSourceSizeChanged: {
-                if ((sourceSize.width == 130 && sourceSize.height == 180) || // GFE 2.0 placeholder image
-                    (sourceSize.width == 628 && sourceSize.height == 888) || // GFE 3.0 placeholder image
-                    (sourceSize.width == 200 && sourceSize.height == 266))   // Our no_app_image.png
-                {
-                    isPlaceholder = true
-                }
-                else
-                {
-                    isPlaceholder = false
-                }
-
-                width = 200
-                height = 267
+            sourceSize {
+                width: 150
+                height: 200
            }
+            width: sourceSize.width
+            height: sourceSize.height
+            fillMode: Image.Pad
+        }
+
+        Image {
+            id: runningIcon
+            anchors.centerIn: appIcon
+            visible: model.running
+            source: "qrc:/res/baseline-play_circle_filled_white-48px.svg"
+            sourceSize {
+                width: 75
+                height: 75
+            }
+        }
+
+        Label {
+            id: appNameText
+            text: model.name
+            width: parent.width
+            height: 125
+            anchors.top: appIcon.bottom
+            font.pointSize: 22
+            horizontalAlignment: Text.AlignHCenter
+            wrapMode: Text.Wrap
+            elide: Text.ElideRight

            // Display a tooltip with the full name if it's truncated
            ToolTip.text: model.name
            ToolTip.delay: 1000
            ToolTip.timeout: 5000
-            ToolTip.visible: (parent.hovered || parent.highlighted) && (!appNameText.visible || appNameText.truncated)
-        }
-
-        ToolButton {
-            id: resumeButton
-            anchors.horizontalCenterOffset: appIcon.isPlaceholder ? -47 : 0
-            anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : -60
-            anchors.centerIn: appIcon
-            visible: model.running
-            implicitWidth: 125
-            implicitHeight: 125
-
-            Image {
-                source: "qrc:/res/baseline-play_circle_filled_white-48px.svg"
-                anchors.centerIn: parent
-                sourceSize {
-                    width: 75
-                    height: 75
-                }
-            }
-
-            onClicked: {
-                launchOrResumeSelectedApp()
-            }
-
-            ToolTip.text: "Resume Game"
-            ToolTip.delay: 1000
-            ToolTip.timeout: 3000
-            ToolTip.visible: hovered
-        }
-
-        ToolButton {
-            id: quitButton
-            anchors.horizontalCenterOffset: appIcon.isPlaceholder ? 47 : 0
-            anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : 60
-            anchors.centerIn: appIcon
-            visible: model.running
-            implicitWidth: 125
-            implicitHeight: 125
-
-            Image {
-                source: "qrc:/res/baseline-cancel-24px.svg"
-                anchors.centerIn: parent
-                sourceSize {
-                    width: 75
-                    height: 75
-                }
-            }
-
-            onClicked: {
-                doQuitGame()
-            }
-
-            ToolTip.text: "Quit Game"
-            ToolTip.delay: 1000
-            ToolTip.timeout: 3000
-            ToolTip.visible: hovered
-        }
-
-        Label {
-            id: appNameText
-            visible: appIcon.isPlaceholder
-            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
-            font.pointSize: 22
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            wrapMode: Text.Wrap
-            elide: Text.ElideRight
+            ToolTip.visible: (parent.hovered || parent.highlighted) && truncated
        }

        function launchOrResumeSelectedApp()
@@ -181,64 +125,61 @@ CenteredGridView {
        }

        onClicked: {
-            // Only allow clicking on the box art for non-running games.
-            // For running games, buttons will appear to resume or quit which
-            // will handle starting the game and clicks on the box art will
-            // be ignored.
-            if (!model.running) {
-                launchOrResumeSelectedApp()
-            }
+            // Nothing is running or this app is running
+            launchOrResumeSelectedApp()
        }

-        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
-            // method will handle the launch.
-            if (model.running) {
-                // This will be keyboard/gamepad driven so use
-                // open() instead of popup()
-                appContextMenu.open()
+        MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.RightButton
+            onClicked: {
+                // popup() ensures the menu appears under the mouse cursor
+                if (appContextMenu.popup) {
+                    appContextMenu.popup()
+                }
+                else {
+                    // Qt 5.9 doesn't have popup()
+                    appContextMenu.open()
+                }
            }
        }

        Keys.onMenuPressed: {
-            if (model.running) {
-                // This will be keyboard/gamepad driven so use
-                // open() instead of popup()
-                appContextMenu.open()
-            }
+            // We must use open() here so the menu is positioned on
+            // the ItemDelegate and not where the mouse cursor is
+            appContextMenu.open()
        }

-        function doQuitGame() {
-            quitAppDialog.appName = appModel.getRunningAppName()
-            quitAppDialog.segueToStream = false
-            quitAppDialog.open()
-        }
-
-        NavigableMenu {
+        Menu {
            id: appContextMenu
            NavigableMenuItem {
-                parentMenu: appContextMenu
                text: model.running ? "Resume Game" : "Launch Game"
-                onTriggered: launchOrResumeSelectedApp()
+                onTriggered: {
+                    appContextMenu.close()
+                    launchOrResumeSelectedApp()
+                }
            }
            NavigableMenuItem {
-                parentMenu: appContextMenu
                text: "Quit Game"
-                onTriggered: doQuitGame()
+                onTriggered: {
+                    quitAppDialog.appName = appModel.getRunningAppName()
+                    quitAppDialog.segueToStream = false
+                    quitAppDialog.open()
+                }
                visible: model.running
            }
        }
    }

-    NavigableMessageDialog {
+    MessageDialog {
        id: quitAppDialog
+        modality:Qt.WindowModal
        property string appName : ""
        property bool segueToStream : false
        property string nextAppName: ""
        property int nextAppIndex: 0
        text:"Are you sure you want to quit " + appName +"? Any unsaved progress will be lost."
-        standardButtons: Dialog.Yes | Dialog.No
+        standardButtons: StandardButton.Yes | StandardButton.No

        function quitApp() {
            var component = Qt.createComponent("QuitSegue.qml")
@@ -260,21 +201,20 @@ CenteredGridView {
            appModel.quitRunningApp()
        }

+        onYes: quitApp()
+
+        // For keyboard/gamepad navigation
        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
+            top: appGrid.top
+            left: appGrid.right
+            bottom: appGrid.bottom
+
+            leftMargin: -10
        }
    }
 }
@@ -1,8 +1,6 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2

-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
@@ -30,13 +28,4 @@ ComboBox {
            textWidth = Math.max(popupMetrics.width, textWidth)
        }
    }
-
-    popup.onAboutToShow: {
-        // Switch to normal navigation for combo boxes
-        SdlGamepadKeyNavigation.setUiNavMode(false)
-    }
-
-    popup.onAboutToHide: {
-        SdlGamepadKeyNavigation.setUiNavMode(true)
-    }
 }
@@ -1,43 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-
-GridView {
-    // Detect Qt 5.11 or earlier using presence of synchronousDrag.
-    // Prior to 5.12, the leftMargin and rightMargin values did not work.
-    property bool hasBrokenMargins: this.synchronousDrag === undefined
-
-    property int minMargin: 10
-    property real availableWidth: (parent.width - 2 * minMargin)
-    property int itemsPerRow: availableWidth / cellWidth
-    property real horizontalMargin: itemsPerRow < count && availableWidth >= cellWidth ?
-                                        (availableWidth % cellWidth) / 2 : minMargin
-
-    function updateMargins() {
-        leftMargin = horizontalMargin
-        rightMargin = horizontalMargin
-
-        if (hasBrokenMargins) {
-            anchors.leftMargin = leftMargin
-            anchors.rightMargin = rightMargin
-        }
-    }
-
-    onHorizontalMarginChanged: {
-        updateMargins()
-    }
-
-    Component.onCompleted: {
-        if (hasBrokenMargins) {
-            // This will cause an anchor conflict with the parent StackView
-            // which breaks animation, but otherwise the grid will not be
-            // centered in the window.
-            anchors.fill = parent
-            anchors.topMargin = topMargin
-            anchors.bottomMargin = bottomMargin
-        }
-
-        updateMargins()
-    }
-
-    boundsBehavior: Flickable.OvershootBounds
-}
@@ -1,10 +1,13 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.2
+import QtQuick.Dialogs 1.2

 import ComputerManager 1.0
 import Session 1.0

 Item {
+    anchors.fill: parent
+
    function onSearchingComputer() {
        stageLabel.text = "Establishing connection to PC..."
    }
@@ -18,8 +21,13 @@ Item {
        errorDialog.open()
    }

-    StackView.onActivated: {
-        if (!launcher.isExecuted()) {
+    // The StackView will trigger a visibility change when
+    // we're pushed onto it, causing our onVisibleChanged
+    // routine to run, but only if we start as invisible
+    visible: false
+
+    onVisibleChanged: {
+        if (visible && !launcher.isExecuted()) {
            toolBar.visible = false
            launcher.searchingComputer.connect(onSearchingComputer)
            launcher.quittingApp.connect(onQuittingApp)
@@ -47,11 +55,16 @@ Item {
        }
    }

-    ErrorMessageDialog {
+    MessageDialog {
        id: errorDialog
+        modality:Qt.WindowModal
+        icon: StandardIcon.Critical
+        standardButtons: StandardButton.Ok

-        onClosed: {
-            Qt.quit()
+        onVisibleChanged: {
+            if (!visible) {
+                Qt.quit()
+            }
        }
    }
 }
@@ -1,9 +1,13 @@
+import QtQml 2.2
 import QtQuick 2.0
 import QtQuick.Controls 2.2
+import QtQuick.Dialogs 1.2

 import ComputerManager 1.0

 Item {
+    visible: false
+
    function onSearchingComputer() {
        stageLabel.text = "Establishing connection to PC..."
    }
@@ -32,8 +36,8 @@ Item {
        quitAppDialog.open()
    }

-    StackView.onActivated: {
-        if (!launcher.isExecuted()) {
+    onVisibleChanged: {
+        if (visible && !launcher.isExecuted()) {
            toolBar.visible = false
            launcher.searchingComputer.connect(onSearchingComputer)
            launcher.searchingApp.connect(onSearchingApp)
@@ -62,18 +66,26 @@ Item {
        }
    }

-    ErrorMessageDialog {
+    MessageDialog {
        id: errorDialog
-
-        onClosed: {
-            Qt.quit();
+        modality:Qt.WindowModal
+        icon: StandardIcon.Critical
+        standardButtons: StandardButton.Ok | StandardButton.Help
+        onHelp: {
+            Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting");
+        }
+        onVisibleChanged: {
+            if (!visible) {
+                Qt.quit();
+            }
        }
    }

-    NavigableMessageDialog {
+    MessageDialog {
        id: quitAppDialog
+        modality:Qt.WindowModal
        text:"Are you sure you want to quit " + appName +"? Any unsaved progress will be lost."
-        standardButtons: Dialog.Yes | Dialog.No
+        standardButtons: StandardButton.Yes | StandardButton.No
        property string appName : ""

        function quitApp() {
@@ -84,7 +96,29 @@ Item {
            launcher.quitRunningApp()
        }

+        onYes: quitApp()
+
+        // For keyboard/gamepad navigation
        onAccepted: quitApp()
-        onRejected: Qt.quit()
+
+        // Exit process if app quit is rejected (reacts also to closing of the
+        // dialog from title bar's close button).
+        // Note: this depends on undocumented behavior of visibleChanged()
+        // signal being emitted before yes() or accepted() has been emitted.
+        onVisibleChanged: {
+            if (!visible) {
+                quitTimer.start()
+            }
+        }
+        Component.onCompleted: {
+            yes.connect(quitTimer.stop)
+            accepted.connect(quitTimer.stop)
+        }
+    }
+
+    Timer {
+        id: quitTimer
+        interval: 100
+        onTriggered: Qt.quit()
    }
 }
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.2
-
-import SystemProperties 1.0
-
-NavigableMessageDialog {
-    standardButtons: Dialog.Ok | (SystemProperties.hasBrowser ? Dialog.Help : 0)
-}
@@ -1,17 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.2
-
-Dialog {
-    parent: overlay
-
-    x: Math.round((parent.width - width) / 2)
-    y: Math.round((parent.height - height) / 2)
-
-    onAboutToHide: {
-        // We must force focus back to the last item for platforms without
-        // support for more than one active window like Steam Link. If
-        // we don't, gamepad and keyboard navigation will break after a
-        // dialog appears.
-        stackView.forceActiveFocus()
-    }
-}
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.2
-
-Menu {
-    onOpened: {
-        itemAt(0).forceActiveFocus(Qt.TabFocusReason)
-    }
-}
@@ -2,27 +2,11 @@ import QtQuick 2.0
 import QtQuick.Controls 2.2

 MenuItem {
-    // Qt 5.10 has a menu property, but we need to support 5.9
-    // so we must make our own.
-    property Menu parentMenu
-
    // Ensure focus can't be given to an invisible item
    enabled: visible
    height: visible ? implicitHeight : 0
-    focusPolicy: visible ? Qt.TabFocus : Qt.NoFocus
-
-    onTriggered: {
-        // We must close the context menu first or
-        // it can steal focus from any dialogs that
-        // onTriggered may spawn.
-        parentMenu.close()
-    }

    Keys.onReturnPressed: {
        triggered()
    }
-
-    Keys.onEscapePressed: {
-        parentMenu.close()
-    }
 }
@@ -1,65 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.2
-
-NavigableDialog {
-    id: dialog
-
-    property alias text: dialogLabel.dialogText
-
-    property string helpText
-    property string helpUrl : "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting"
-    property string helpTextSeparator : " "
-
-    onOpened: {
-        // Force keyboard focus on the label so keyboard navigation works
-        dialogLabel.forceActiveFocus()
-    }
-
-    RowLayout {
-        spacing: 10
-
-        Image {
-            source: (standardButtons & Dialog.Yes) ?
-                        "qrc:/res/baseline-help_outline-24px.svg" :
-                        "qrc:/res/baseline-error_outline-24px.svg"
-            sourceSize {
-                // The icon should be square so use the height as the width too
-                width: 50
-                height: 50
-            }
-        }
-
-        Label {
-            property string dialogText
-
-            id: dialogLabel
-            text: dialogText + ((helpText && (standardButtons & Dialog.Help)) ? (helpTextSeparator + helpText) : "")
-            wrapMode: Text.Wrap
-            elide: Label.ElideRight
-
-            // Cap the width so the dialog doesn't grow horizontally forever. This
-            // will cause word wrap to kick in.
-            Layout.maximumWidth: 400
-            Layout.maximumHeight: 400
-
-            Keys.onReturnPressed: {
-                accept()
-            }
-
-            Keys.onEscapePressed: {
-                reject()
-            }
-        }
-    }
-
-    footer: DialogButtonBox {
-        id: dialogButtonBox
-        standardButtons: dialog.standardButtons
-
-        onHelpRequested: {
-            Qt.openUrlExternally(helpUrl)
-            close()
-        }
-    }
-}
@@ -2,27 +2,8 @@ import QtQuick 2.0
 import QtQuick.Controls 2.2

 ToolButton {
-    property string iconSource
-
    activeFocusOnTab: true

-    // FIXME: We're using an Image here rather than icon.source because
-    // icons don't work on Qt 5.9 LTS.
-    Image {
-        id: image
-        source: iconSource
-        anchors.centerIn: parent.background
-        sourceSize {
-            width: parent.background.width * 1.10
-            height: parent.background.height * 1.10
-        }
-    }
-
-    // This determines the size of the Material highlight. We increase it
-    // from the default because we use larger than normal icons for TV readability.
-    background.width: (parent.height - parent.anchors.bottomMargin - parent.anchors.topMargin) * 0.60
-    background.height: (parent.height - parent.anchors.bottomMargin - parent.anchors.topMargin) * 0.60
-
    Keys.onReturnPressed: {
        clicked()
    }
@@ -1,5 +1,8 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
+import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.3
+import QtQuick.Window 2.2

 import ComputerModel 1.0

@@ -7,41 +10,48 @@ import ComputerManager 1.0
 import StreamingPreferences 1.0
 import SdlGamepadKeyNavigation 1.0

-CenteredGridView {
+GridView {
    property ComputerModel computerModel : createModel()

    id: pcGrid
    focus: true
    activeFocusOnTab: true
-    topMargin: 20
-    bottomMargin: 5
-    cellWidth: 310; cellHeight: 330;
+    anchors.fill: parent
+    anchors.leftMargin: (parent.width % (cellWidth + anchors.rightMargin)) / 2
+    anchors.topMargin: 20
+    anchors.rightMargin: 5
+    anchors.bottomMargin: 5
+    cellWidth: 350; cellHeight: 350;
    objectName: "Computers"

-    Component.onCompleted: {
-        // Don't show any highlighted item until interacting with them.
-        // We do this here instead of onActivated to avoid losing the user's
-        // selection when backing out of a different page of the app.
-        currentIndex = -1
+    // The StackView will trigger a visibility change when
+    // we're pushed onto it, causing our onVisibleChanged
+    // routine to run, but only if we start as invisible
+    visible: false
+
+    StreamingPreferences {
+        id: prefs
    }

-    StackView.onActivated: {
-        // Setup signals on CM
-        ComputerManager.computerAddCompleted.connect(addComplete)
+    SdlGamepadKeyNavigation {
+        id: gamepadKeyNav
+    }

-        // This is a bit of a hack to do this here as opposed to main.qml, but
-        // we need it enabled before calling getConnectedGamepads() and PcView
-        // is never destroyed, so it should be okay.
-        SdlGamepadKeyNavigation.enable()
-
-        // Highlight the first item if a gamepad is connected
-        if (currentIndex == -1 && SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
-            currentIndex = 0
+    onVisibleChanged: {
+        if (visible) {
+            gamepadKeyNav.enable()
+        }
+        else {
+            gamepadKeyNav.disable()
        }
    }

-    StackView.onDeactivating: {
-        ComputerManager.computerAddCompleted.disconnect(addComplete)
+    Component.onCompleted: {
+        // Setup signals on CM
+        ComputerManager.computerAddCompleted.connect(addComplete)
+
+        // Don't show any highlighted item until interacting with them
+        currentIndex = -1
    }

    function pairingComplete(error)
@@ -52,7 +62,6 @@ CenteredGridView {
        // Display a failed dialog if we got an error
        if (error !== undefined) {
            errorDialog.text = error
-            errorDialog.helpText = ""
            errorDialog.open()
        }
    }
@@ -60,8 +69,7 @@ CenteredGridView {
    function addComplete(success)
    {
        if (!success) {
-            errorDialog.text = "Unable to connect to the specified PC."
-            errorDialog.helpText = "Click the Help button for possible solutions."
+            errorDialog.text = "Unable to connect to the specified PC. Click the Help button for possible solutions."
            errorDialog.open()
        }
    }
@@ -74,37 +82,18 @@ CenteredGridView {
        return model
    }

-    Row {
-        anchors.centerIn: parent
-        spacing: 5
-        visible: pcGrid.count === 0
-
-        BusyIndicator {
-            id: searchSpinner
-            visible: StreamingPreferences.enableMdns
-        }
-
-        Label {
-            height: searchSpinner.height
-            elide: Label.ElideRight
-            text: StreamingPreferences.enableMdns ? "Searching for PCs with NVIDIA GameStream enabled..."
-                                                  : "Automatic PC discovery is disabled. Add your PC manually."
-            font.pointSize: 20
-            verticalAlignment: Text.AlignVCenter
-            wrapMode: Text.Wrap
-        }
-    }
-
    model: computerModel

    delegate: NavigableItemDelegate {
-        width: 300; height: 320;
+        width: 300; height: 300;
        grid: pcGrid

        Image {
            id: pcIcon
            anchors.horizontalCenter: parent.horizontalCenter
-            source: "qrc:/res/desktop_windows-48px.svg"
+            source: {
+                model.addPc ? "qrc:/res/ic_add_to_queue_white_48px.svg" : "qrc:/res/ic_tv_white_48px.svg"
+            }
            sourceSize {
                width: 200
                height: 200
@@ -116,8 +105,8 @@ CenteredGridView {
            id: stateIcon
            anchors.horizontalCenter: pcIcon.horizontalCenter
            anchors.verticalCenter: pcIcon.verticalCenter
-            anchors.verticalCenterOffset: -15
-            visible: !model.statusUnknown && (!model.online || !model.paired)
+            anchors.verticalCenterOffset: -10
+            visible: !model.addPc && !model.statusUnknown && (!model.online || !model.paired)
            source: !model.online ? "qrc:/res/baseline-warning-24px.svg" : "qrc:/res/baseline-lock-24px.svg"
            sourceSize {
                width: 75
@@ -129,10 +118,10 @@ CenteredGridView {
            id: statusUnknownSpinner
            anchors.horizontalCenter: pcIcon.horizontalCenter
            anchors.verticalCenter: pcIcon.verticalCenter
-            anchors.verticalCenterOffset: -15
+            anchors.verticalCenterOffset: -10
            width: 75
            height: 75
-            visible: model.statusUnknown
+            visible: !model.addPc && model.statusUnknown
        }

        Label {
@@ -141,17 +130,19 @@ CenteredGridView {

            width: parent.width
            anchors.top: pcIcon.bottom
-            anchors.bottom: parent.bottom
            font.pointSize: 36
            horizontalAlignment: Text.AlignHCenter
            wrapMode: Text.Wrap
-            elide: Text.ElideRight
        }

-        NavigableMenu {
+        Menu {
            id: pcContextMenu
            NavigableMenuItem {
-                parentMenu: pcContextMenu
+                text: "Wake PC"
+                onTriggered: computerModel.wakeComputer(index)
+                visible: !model.addPc && !model.online && model.wakeable
+            }
+            NavigableMenuItem {
                text: "Delete PC"
                onTriggered: {
                    deletePcDialog.pcIndex = index
@@ -159,16 +150,13 @@ CenteredGridView {
                    deletePcDialog.open()
                }
            }
-            NavigableMenuItem {
-                parentMenu: pcContextMenu
-                text: "Wake PC"
-                onTriggered: computerModel.wakeComputer(index)
-                visible: !model.online && model.wakeable
-            }
        }

        onClicked: {
-            if (model.online) {
+            if (model.addPc) {
+                addPcDialog.open()
+            }
+            else if (model.online) {
                if (model.paired) {
                    // go to game view
                    var component = Qt.createComponent("AppView.qml")
@@ -188,8 +176,7 @@ CenteredGridView {
                    }
                    else {
                        // cannot pair while something is streaming or attempting to pair
-                        errorDialog.text = "You cannot pair while a previous session is still running on the host PC. Quit any running games or reboot the host PC, then try pairing again."
-                        errorDialog.helpText = ""
+                        errorDialog.text = "This PC is currently busy. Make sure to quit any running games and try again."
                        errorDialog.open()
                    }
                }
@@ -199,78 +186,117 @@ CenteredGridView {
            }
        }

-        onPressAndHold: {
-            // popup() ensures the menu appears under the mouse cursor
-            if (pcContextMenu.popup) {
-                pcContextMenu.popup()
-            }
-            else {
-                // Qt 5.9 doesn't have popup()
-                pcContextMenu.open()
-            }
-        }
-
        MouseArea {
            anchors.fill: parent
            acceptedButtons: Qt.RightButton;
            onClicked: {
-                parent.onPressAndHold()
+                if (!model.addPc) {
+                    // popup() ensures the menu appears under the mouse cursor
+                    if (pcContextMenu.popup) {
+                        pcContextMenu.popup()
+                    }
+                    else {
+                        // Qt 5.9 doesn't have popup()
+                        pcContextMenu.open()
+                    }
+                }
            }
        }

        Keys.onMenuPressed: {
-            // We must use open() here so the menu is positioned on
-            // the ItemDelegate and not where the mouse cursor is
-            pcContextMenu.open()
+            if (!model.addPc) {
+                // We must use open() here so the menu is positioned on
+                // the ItemDelegate and not where the mouse cursor is
+                pcContextMenu.open()
+            }
        }
    }

-    ErrorMessageDialog {
+    MessageDialog {
        id: errorDialog
-
-        // Using Setup-Guide here instead of Troubleshooting because it's likely that users
-        // will arrive here by forgetting to enable GameStream or not forwarding ports.
-        helpUrl: "https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide"
+        // don't allow edits to the rest of the window while open
+        modality:Qt.WindowModal
+        icon: StandardIcon.Critical
+        standardButtons: StandardButton.Ok | StandardButton.Help
+        onHelp: {
+            // Using Setup-Guide here instead of Troubleshooting because it's likely that users
+            // will arrive here by forgetting to enable GameStream or not forwarding ports.
+            Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide");
+        }
    }

-    NavigableMessageDialog {
+    MessageDialog {
        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
+        modality:Qt.WindowModal
        property string pin : "0000"
        text:"Please enter " + pin + " on your GameStream PC. This dialog will close when pairing is completed."
-        standardButtons: Dialog.Cancel
+        standardButtons: StandardButton.Cancel
        onRejected: {
            // FIXME: We should interrupt pairing here
        }
    }

-    NavigableMessageDialog {
+    MessageDialog {
        id: deletePcDialog
        // don't allow edits to the rest of the window while open
+        modality:Qt.WindowModal
        property int pcIndex : -1;
        text:"Are you sure you want to remove this PC?"
-        standardButtons: Dialog.Yes | Dialog.No
+        standardButtons: StandardButton.Yes | StandardButton.No

        function deletePc() {
            console.log("deleting PC pairing for PC at index: " + pcIndex)
            computerModel.deleteComputer(pcIndex);
        }

+        onYes: deletePc()
+
+        // For keyboard/gamepad activation
        onAccepted: deletePc()
    }

+    Dialog {
+        id: addPcDialog
+        property string label: "Enter the IP address of your GameStream PC"
+        property string hint: "192.168.1.100"
+        property alias editText : editTextItem
+
+        standardButtons: StandardButton.Ok | StandardButton.Cancel
+        onVisibleChanged: {
+            editTextItem.focus = true
+            editTextItem.selectAll()
+        }
+        onAccepted: {
+            ComputerManager.addNewHost(editText.text, false)
+        }
+
+        ColumnLayout {
+            Text {
+                id: addPcDialogLabel
+                text: addPcDialog.label
+            }
+            Rectangle {
+                implicitWidth: parent.parent.width
+                height: editTextItem.height
+
+                TextInput {
+                    id: editTextItem
+                    inputMethodHints: Qt.ImhPreferUppercase
+                    text: addPcDialog.hint
+                }
+            }
+        }
+    }
+
    ScrollBar.vertical: ScrollBar {
        parent: pcGrid.parent
        anchors {
-            top: parent.top
-            right: parent.right
-            bottom: parent.bottom
+            top: pcGrid.top
+            left: pcGrid.right
+            bottom: pcGrid.bottom
+
+            leftMargin: -10
        }
    }
 }
@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.2
+import QtQuick.Dialogs 1.2

 import ComputerManager 1.0
 import Session 1.0
@@ -11,6 +12,13 @@ Item {

    property string stageText : "Quitting " + appName + "..."

+    anchors.fill: parent
+
+    // The StackView will trigger a visibility change when
+    // we're pushed onto it, causing our onVisibleChanged
+    // routine to run, but only if we start as invisible
+    visible: false
+
    function quitAppCompleted(error)
    {
        // Display a failed dialog if we got an error
@@ -19,34 +27,28 @@ Item {
            errorDialog.open()
        }

+        // Exit this view
+        stackView.pop()
+
        // If we're supposed to launch another game after this, do so now
        if (error === undefined && nextSession !== null) {
            var component = Qt.createComponent("StreamSegue.qml")
            var segue = component.createObject(stackView, {"appName": nextAppName, "session": nextSession})
-            stackView.replace(segue)
+            stackView.push(segue)
+        }
+    }
+
+    onVisibleChanged: {
+        if (visible) {
+            // Connect the quit completion signal
+            ComputerManager.quitAppCompleted.connect(quitAppCompleted)
        }
        else {
-            // Exit this view
-            stackView.pop()
+            // Disconnect the signal
+            ComputerManager.quitAppCompleted.disconnect(quitAppCompleted)
        }
    }

-    StackView.onActivated: {
-        // Hide the toolbar before we start loading
-        toolBar.visible = false
-
-        // Connect the quit completion signal
-        ComputerManager.quitAppCompleted.connect(quitAppCompleted)
-    }
-
-    StackView.onDeactivating: {
-        // Show the toolbar again
-        toolBar.visible = true
-
-        // Disconnect the signal
-        ComputerManager.quitAppCompleted.disconnect(quitAppCompleted)
-    }
-
    Row {
        anchors.centerIn: parent
        spacing: 5
@@ -66,7 +68,10 @@ Item {
        }
    }

-    ErrorMessageDialog {
+    MessageDialog {
        id: errorDialog
+        modality:Qt.WindowModal
+        icon: StandardIcon.Critical
+        standardButtons: StandardButton.Ok
    }
 }
@@ -4,13 +4,11 @@ import QtQuick.Controls 2.2
 import StreamingPreferences 1.0
 import ComputerManager 1.0
 import SdlGamepadKeyNavigation 1.0
-import SystemProperties 1.0

 Flickable {
    id: settingsPage
    objectName: "Settings"
-
-    boundsBehavior: Flickable.OvershootBounds
+    anchors.fill: parent

    contentWidth: settingsColumn1.width > settingsColumn2.width ? settingsColumn1.width : settingsColumn2.width
    contentHeight: settingsColumn1.height > settingsColumn2.height ? settingsColumn1.height : settingsColumn2.height
@@ -26,22 +24,31 @@ Flickable {
        }
    }

-    StackView.onActivated: {
-        // This enables Tab and BackTab based navigation rather than arrow keys.
-        // It is required to shift focus between controls on the settings page.
-        SdlGamepadKeyNavigation.setUiNavMode(true)
+    StreamingPreferences {
+        id: prefs
+    }

-        // Highlight the first item if a gamepad is connected
-        if (SdlGamepadKeyNavigation.getConnectedGamepads() > 0) {
-            resolutionComboBox.forceActiveFocus(Qt.TabFocus)
+    // The StackView will trigger a visibility change when
+    // we're pushed onto it, causing our onVisibleChanged
+    // routine to run, but only if we start as invisible
+    visible: false
+
+    SdlGamepadKeyNavigation {
+        id: gamepadKeyNav
+    }
+
+    onVisibleChanged: {
+        if (visible) {
+            gamepadKeyNav.setSettingsMode(true)
+            gamepadKeyNav.enable()
+        }
+        else {
+            gamepadKeyNav.disable()
        }
    }

-    StackView.onDeactivating: {
-        SdlGamepadKeyNavigation.setUiNavMode(false)
-
-        // Save the prefs so the Session can observe the changes
-        StreamingPreferences.save()
+    Component.onDestruction: {
+        prefs.save()
    }

    Column {
@@ -90,11 +97,11 @@ Flickable {

                                    // Some platforms have different desktop resolutions
                                    // and native resolutions (like macOS with Retina displays)
-                                    if (displayResIndex === 0) {
-                                        screenRect = SystemProperties.getDesktopResolution(displayIndex)
+                                    if (displayResIndex == 0) {
+                                        screenRect = prefs.getDesktopResolution(displayIndex)
                                    }
                                    else {
-                                        screenRect = SystemProperties.getNativeResolution(displayIndex)
+                                        screenRect = prefs.getNativeResolution(displayIndex)
                                    }

                                    if (screenRect.width === 0) {
@@ -131,24 +138,10 @@ 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
-                            var saved_height = StreamingPreferences.height
+                            var saved_width = prefs.width
+                            var saved_height = prefs.height
                            currentIndex = 0
                            for (var i = 0; i < resolutionListModel.count; i++) {
                                var el_width = parseInt(resolutionListModel.get(i).video_width);
@@ -197,14 +190,12 @@ Flickable {
                            var selectedHeight = parseInt(resolutionListModel.get(currentIndex).video_height)

                            // Only modify the bitrate if the values actually changed
-                            if (StreamingPreferences.width !== selectedWidth || StreamingPreferences.height !== selectedHeight) {
-                                StreamingPreferences.width = selectedWidth
-                                StreamingPreferences.height = selectedHeight
+                            if (prefs.width !== selectedWidth || prefs.height !== selectedHeight) {
+                                prefs.width = selectedWidth
+                                prefs.height = selectedHeight

-                                StreamingPreferences.bitrateKbps = StreamingPreferences.getDefaultBitrate(StreamingPreferences.width,
-                                                                                                          StreamingPreferences.height,
-                                                                                                          StreamingPreferences.fps);
-                                slider.value = StreamingPreferences.bitrateKbps
+                                prefs.bitrateKbps = prefs.getDefaultBitrate(prefs.width, prefs.height, prefs.fps);
+                                slider.value = prefs.bitrateKbps
                            }
                        }
                    }
@@ -213,14 +204,15 @@ Flickable {
                        function createModel() {
                            var fpsListModel = Qt.createQmlObject('import QtQuick 2.0; ListModel {}', parent, '')

-                            var max_fps = SystemProperties.maximumStreamingFrameRate
+                            // Get the max supported FPS on this system
+                            var max_fps = prefs.getMaximumStreamingFrameRate();

                            // Default entries
                            fpsListModel.append({"text": "30 FPS", "video_fps": "30"})
                            fpsListModel.append({"text": "60 FPS", "video_fps": "60"})

                            // Add unsupported FPS values that come before the display max FPS
-                            if (StreamingPreferences.unsupportedFps) {
+                            if (prefs.unsupportedFps) {
                                if (max_fps > 90) {
                                    fpsListModel.append({"text": "90 FPS (Unsupported)", "video_fps": "90"})
                                }
@@ -233,7 +225,7 @@ Flickable {
                            // handle wonky displays that report just over 60 Hz.
                            if (max_fps > 64) {
                                // Mark any FPS value greater than 120 as unsupported
-                                if (StreamingPreferences.unsupportedFps && max_fps > 120) {
+                                if (prefs.unsupportedFps && max_fps > 120) {
                                    fpsListModel.append({"text": max_fps+" FPS (Unsupported)", "video_fps": ""+max_fps})
                                }
                                else if (max_fps > 120) {
@@ -245,7 +237,7 @@ Flickable {
                            }

                            // Add unsupported FPS values that come after the display max FPS
-                            if (StreamingPreferences.unsupportedFps) {
+                            if (prefs.unsupportedFps) {
                                if (max_fps < 90) {
                                    fpsListModel.append({"text": "90 FPS (Unsupported)", "video_fps": "90"})
                                }
@@ -260,7 +252,7 @@ Flickable {
                        function reinitialize() {
                            model = createModel()

-                            var saved_fps = StreamingPreferences.fps
+                            var saved_fps = prefs.fps
                            currentIndex = 0
                            for (var i = 0; i < model.count; i++) {
                                var el_fps = parseInt(model.get(i).video_fps);
@@ -287,13 +279,11 @@ Flickable {
                            var selectedFps = parseInt(model.get(currentIndex).video_fps)

                            // Only modify the bitrate if the values actually changed
-                            if (StreamingPreferences.fps !== selectedFps) {
-                                StreamingPreferences.fps = selectedFps
+                            if (prefs.fps !== selectedFps) {
+                                prefs.fps = selectedFps

-                                StreamingPreferences.bitrateKbps = StreamingPreferences.getDefaultBitrate(StreamingPreferences.width,
-                                                                                                          StreamingPreferences.height,
-                                                                                                          StreamingPreferences.fps);
-                                slider.value = StreamingPreferences.bitrateKbps
+                                prefs.bitrateKbps = prefs.getDefaultBitrate(prefs.width, prefs.height, prefs.fps);
+                                slider.value = prefs.bitrateKbps
                            }
                        }
                    }
@@ -318,7 +308,7 @@ Flickable {
                Slider {
                    id: slider

-                    value: StreamingPreferences.bitrateKbps
+                    value: prefs.bitrateKbps

                    stepSize: 500
                    from : 500
@@ -329,7 +319,7 @@ Flickable {

                    onValueChanged: {
                        bitrateTitle.text = "Video bitrate: " + (value / 1000.0) + " Mbps"
-                        StreamingPreferences.bitrateKbps = value
+                        prefs.bitrateKbps = value
                    }
                }

@@ -344,40 +334,25 @@ Flickable {
                AutoResizingComboBox {
                    // ignore setting the index at first, and actually set it when the component is loaded
                    Component.onCompleted: {
-                        // Set the recommended option based on the OS
+                        var savedWm = prefs.windowMode
+                        currentIndex = 0
                        for (var i = 0; i < windowModeListModel.count; i++) {
                             var thisWm = windowModeListModel.get(i).val;
-                             if (thisWm === StreamingPreferences.recommendedFullScreenMode) {
-                                 windowModeListModel.get(i).text += " (Recommended)"
-                                 windowModeListModel.move(i, 0, 1);
+                             if (savedWm === thisWm) {
+                                 currentIndex = i
                                 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"
+                            text: "Full-screen (Recommended)"
                            val: StreamingPreferences.WM_FULLSCREEN
                        }
                        ListElement {
@@ -390,7 +365,7 @@ Flickable {
                        }
                    }
                    onActivated: {
-                        StreamingPreferences.windowMode = windowModeListModel.get(currentIndex).val
+                        prefs.windowMode = windowModeListModel.get(currentIndex).val
                    }

                    ToolTip.delay: 1000
@@ -404,9 +379,9 @@ Flickable {
                    hoverEnabled: true
                    text: "V-Sync"
                    font.pointSize:  12
-                    checked: StreamingPreferences.enableVsync
+                    checked: prefs.enableVsync
                    onCheckedChanged: {
-                        StreamingPreferences.enableVsync = checked
+                        prefs.enableVsync = checked
                    }

                    ToolTip.delay: 1000
@@ -420,10 +395,10 @@ Flickable {
                    hoverEnabled: true
                    text: "Frame pacing"
                    font.pointSize:  12
-                    enabled: StreamingPreferences.enableVsync
-                    checked: StreamingPreferences.enableVsync && StreamingPreferences.framePacing
+                    enabled: prefs.enableVsync
+                    checked: prefs.enableVsync && prefs.framePacing
                    onCheckedChanged: {
-                        StreamingPreferences.framePacing = checked
+                        prefs.framePacing = checked
                    }
                    ToolTip.delay: 1000
                    ToolTip.timeout: 5000
@@ -456,7 +431,7 @@ Flickable {
                AutoResizingComboBox {
                    // ignore setting the index at first, and actually set it when the component is loaded
                    Component.onCompleted: {
-                        var saved_audio = StreamingPreferences.audioConfig
+                        var saved_audio = prefs.audioConfig
                        currentIndex = 0
                        for (var i = 0; i < audioListModel.count; i++) {
                            var el_audio = audioListModel.get(i).val;
@@ -480,14 +455,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 : {
-                        StreamingPreferences.audioConfig = audioListModel.get(currentIndex).val
+                        prefs.audioConfig = audioListModel.get(currentIndex).val
                    }
                }

@@ -509,38 +480,11 @@ Flickable {
                    id: startMaximizedCheck
                    text: "Maximize Moonlight window on startup"
                    font.pointSize: 12
-                    enabled: SystemProperties.hasWindowManager
-                    checked: !StreamingPreferences.startWindowed || !SystemProperties.hasWindowManager
+                    checked: !prefs.startWindowed
                    onCheckedChanged: {
-                        StreamingPreferences.startWindowed = !checked
+                        prefs.startWindowed = !checked
                    }
                }
-
-                CheckBox {
-                    id: connectionWarningsCheck
-                    text: "Show connection quality warnings"
-                    font.pointSize: 12
-                    checked: StreamingPreferences.connectionWarnings
-                    onCheckedChanged: {
-                        StreamingPreferences.connectionWarnings = checked
-                    }
-                }
-
-                CheckBox {
-                    visible: SystemProperties.hasDiscordIntegration
-                    id: discordPresenceCheck
-                    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."
-                }
            }
        }
    }
@@ -566,9 +510,9 @@ Flickable {
                    id: singleControllerCheck
                    text: "Force gamepad #1 always present"
                    font.pointSize:  12
-                    checked: !StreamingPreferences.multiController
+                    checked: !prefs.multiController
                    onCheckedChanged: {
-                        StreamingPreferences.multiController = !checked
+                        prefs.multiController = !checked
                    }

                    ToolTip.delay: 1000
@@ -579,37 +523,19 @@ Flickable {
                }

                CheckBox {
-                    id: absoluteMouseCheck
+                    id: rawInputCheck
                    hoverEnabled: true
-                    text: "Optimize mouse for remote desktop instead of games"
+                    text: "Raw mouse input"
                    font.pointSize:  12
-                    enabled: SystemProperties.hasWindowManager
-                    checked: StreamingPreferences.absoluteMouseMode && SystemProperties.hasWindowManager
+                    checked: !prefs.mouseAcceleration
                    onCheckedChanged: {
-                        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: gamepadMouseCheck
-                    hoverEnabled: true
-                    text: "Gamepad mouse mode support"
-                    font.pointSize:  12
-                    checked: StreamingPreferences.gamepadMouse
-                    onCheckedChanged: {
-                        StreamingPreferences.gamepadMouse = checked
+                        prefs.mouseAcceleration = !checked
                    }

                    ToolTip.delay: 1000
                    ToolTip.timeout: 3000
                    ToolTip.visible: hovered
-                    ToolTip.text: "When enabled, holding the Start button will toggle mouse mode"
+                    ToolTip.text: "When checked, mouse input is not accelerated or scaled by the OS before passing to Moonlight"
                }
            }
        }
@@ -629,9 +555,9 @@ Flickable {
                    id: optimizeGameSettingsCheck
                    text: "Optimize game settings"
                    font.pointSize:  12
-                    checked: StreamingPreferences.gameOptimizations
+                    checked: prefs.gameOptimizations
                    onCheckedChanged: {
-                        StreamingPreferences.gameOptimizations = checked
+                        prefs.gameOptimizations = checked
                    }
                }

@@ -639,9 +565,9 @@ Flickable {
                    id: audioPcCheck
                    text: "Play audio on host PC"
                    font.pointSize:  12
-                    checked: StreamingPreferences.playAudioOnHost
+                    checked: prefs.playAudioOnHost
                    onCheckedChanged: {
-                        StreamingPreferences.playAudioOnHost = checked
+                        prefs.playAudioOnHost = checked
                    }
                }
            }
@@ -669,7 +595,7 @@ Flickable {
                AutoResizingComboBox {
                    // ignore setting the index at first, and actually set it when the component is loaded
                    Component.onCompleted: {
-                        var saved_vds = StreamingPreferences.videoDecoderSelection
+                        var saved_vds = prefs.videoDecoderSelection
                        currentIndex = 0
                        for (var i = 0; i < decoderListModel.count; i++) {
                            var el_vds = decoderListModel.get(i).val;
@@ -700,7 +626,7 @@ Flickable {
                    }
                    // ::onActivated must be used, as it only listens for when the index is changed by a human
                    onActivated : {
-                        StreamingPreferences.videoDecoderSelection = decoderListModel.get(currentIndex).val
+                        prefs.videoDecoderSelection = decoderListModel.get(currentIndex).val
                    }
                }

@@ -715,7 +641,7 @@ Flickable {
                AutoResizingComboBox {
                    // ignore setting the index at first, and actually set it when the component is loaded
                    Component.onCompleted: {
-                        var saved_vcc = StreamingPreferences.videoCodecConfig
+                        var saved_vcc = prefs.videoCodecConfig
                        currentIndex = 0
                        for(var i = 0; i < codecListModel.count; i++) {
                            var el_vcc = codecListModel.get(i).val;
@@ -736,21 +662,24 @@ Flickable {
                            val: StreamingPreferences.VCC_AUTO
                        }
                        ListElement {
-                            text: "H.264"
+                            text: "Force H.264"
                            val: StreamingPreferences.VCC_FORCE_H264
                        }
                        ListElement {
-                            text: "HEVC (H.265)"
+                            text: "Force HEVC"
                            val: StreamingPreferences.VCC_FORCE_HEVC
                        }
-                        ListElement {
-                            text: "HEVC HDR (Experimental)"
+                        // 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"
                            val: StreamingPreferences.VCC_FORCE_HEVC_HDR
-                        }
+                        } */
                    }
                    // ::onActivated must be used, as it only listens for when the index is changed by a human
                    onActivated : {
-                        StreamingPreferences.videoCodecConfig = codecListModel.get(currentIndex).val
+                        prefs.videoCodecConfig = codecListModel.get(currentIndex).val
                    }
                }

@@ -758,17 +687,13 @@ Flickable {
                    id: unlockUnsupportedFps
                    text: "Unlock unsupported FPS options"
                    font.pointSize: 12
-                    checked: StreamingPreferences.unsupportedFps
+                    checked: prefs.unsupportedFps
                    onCheckedChanged: {
-                        // This is called on init, so only do the work if we've
-                        // actually changed the value.
-                        if (StreamingPreferences.unsupportedFps != checked) {
-                            StreamingPreferences.unsupportedFps = checked
+                        prefs.unsupportedFps = checked

-                            // The selectable FPS values depend on whether
-                            // this option is enabled or not
-                            fpsComboBox.reinitialize()
-                        }
+                        // The selectable FPS values depend on whether
+                        // this option is enabled or not
+                        fpsComboBox.reinitialize()
                    }
                }

@@ -776,22 +701,18 @@ Flickable {
                    id: enableMdns
                    text: "Automatically find PCs on the local network (Recommended)"
                    font.pointSize: 12
-                    checked: StreamingPreferences.enableMdns
+                    checked: prefs.enableMdns
                    onCheckedChanged: {
-                        // This is called on init, so only do the work if we've
-                        // actually changed the value.
-                        if (StreamingPreferences.enableMdns != checked) {
-                            StreamingPreferences.enableMdns = checked
+                        prefs.enableMdns = checked

-                            // We must save the updated preference to ensure
-                            // ComputerManager can observe the change internally.
-                            StreamingPreferences.save()
+                        // We must save the updated preference to ensure
+                        // ComputerManager can observe the change internally.
+                        prefs.save()

-                            // Restart polling so the mDNS change takes effect
-                            if (window.pollingActive) {
-                                ComputerManager.stopPollingAsync()
-                                ComputerManager.startPolling()
-                            }
+                        // Restart polling so the mDNS change takes effect
+                        if (window.pollingActive) {
+                            ComputerManager.stopPollingAsync()
+                            ComputerManager.startPolling()
                        }
                    }
                }
@@ -800,9 +721,9 @@ Flickable {
                    id: quitAppAfter
                    text: "Quit app after quitting session"
                    font.pointSize: 12
-                    checked: StreamingPreferences.quitAppAfter
+                    checked: prefs.quitAppAfter
                    onCheckedChanged: {
-                        StreamingPreferences.quitAppAfter = checked
+                        prefs.quitAppAfter = checked
                    }
                }
            }
@@ -1,7 +1,9 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.2
+import QtQuick.Dialogs 1.2
 import QtQuick.Window 2.2

+import ComputerManager 1.0
 import SdlGamepadKeyNavigation 1.0
 import Session 1.0

@@ -11,6 +13,13 @@ Item {
    property string stageText : "Starting " + appName + "..."
    property bool quitAfter : false

+    anchors.fill: parent
+
+    // The StackView will trigger a visibility change when
+    // we're pushed onto it, causing our onVisibleChanged
+    // routine to run, but only if we start as invisible
+    visible: false
+
    function stageStarting(stage)
    {
        // Update the spinner text
@@ -19,8 +28,8 @@ Item {

    function stageFailed(stage, errorCode)
    {
-        // Display the error dialog after Session::exec() returns
-        streamSegueErrorDialog.text = "Starting " + stage + " failed: Error " + errorCode
+        errorDialog.text = "Starting " + stage + " failed: Error " + errorCode
+        errorDialog.open()
    }

    function connectionStarted()
@@ -29,7 +38,6 @@ Item {
        // see them briefly when we pop off the StackView
        stageSpinner.visible = false
        stageLabel.visible = false
-        hintText.visible = false

        // Hide the window now that streaming has begun
        window.visible = false
@@ -38,7 +46,7 @@ Item {
    function displayLaunchError(text)
    {
        // Display the error dialog after Session::exec() returns
-        streamSegueErrorDialog.text = text
+        errorDialog.text = text
    }

    function displayLaunchWarning(text)
@@ -46,7 +54,7 @@ Item {
        // This toast appears for 3 seconds, just shorter than how long
        // Session will wait for it to be displayed. This gives it time
        // to transition to invisible before continuing.
-        var toast = Qt.createQmlObject('import QtQuick.Controls 2.2; ToolTip {}', parent, '')
+        var toast = Qt.createQmlObject('import QtQuick.Controls 2.3; ToolTip {}', parent, '')
        toast.text = text
        toast.timeout = 3000
        toast.visible = true
@@ -64,14 +72,10 @@ Item {

    function sessionFinished()
    {
-        // Enable GUI gamepad usage now
-        SdlGamepadKeyNavigation.enable()
-
        if (quitAfter) {
-            if (streamSegueErrorDialog.text) {
+            if (errorDialog.text) {
                // Quit when the error dialog is acknowledged
-                streamSegueErrorDialog.quitAfter = quitAfter
-                streamSegueErrorDialog.open()
+                errorDialog.open()
            }
            else {
                // Quit immediately
@@ -88,73 +92,48 @@ Item {
            // the Qt UI is visible again to prevent losing
            // focus on the dialog which would impact gamepad
            // users.
-            if (streamSegueErrorDialog.text) {
-                streamSegueErrorDialog.quitAfter = quitAfter
-                streamSegueErrorDialog.open()
+            if (errorDialog.text) {
+                errorDialog.open()
            }
        }
    }

-    StackView.onDeactivating: {
-        // Show the toolbar again when popped off the stack
-        toolBar.visible = true
-
-        // Enable GUI gamepad usage now
-        SdlGamepadKeyNavigation.enable()
+    // It's important that we don't call enable() here
+    // or it may interfere with the Session instance
+    // getting notified of initial connected gamepads.
+    SdlGamepadKeyNavigation {
+        id: gamepadKeyNav
    }

-    StackView.onActivated: {
-        // Hide the toolbar before we start loading
-        toolBar.visible = false
+    onVisibleChanged: {
+        if (visible) {
+            // Hide the toolbar before we start loading
+            toolBar.visible = false

-        // Hook up our signals
-        session.stageStarting.connect(stageStarting)
-        session.stageFailed.connect(stageFailed)
-        session.connectionStarted.connect(connectionStarted)
-        session.displayLaunchError.connect(displayLaunchError)
-        session.displayLaunchWarning.connect(displayLaunchWarning)
-        session.quitStarting.connect(quitStarting)
-        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
-        asynchronous: true
-
-        onLoaded: {
            // Set the hint text. We do this here rather than
            // in the hintText control itself to synchronize
            // with Session.exec() which requires no concurrent
            // gamepad usage.
-            hintText.text = SdlGamepadKeyNavigation.getConnectedGamepads() > 0 ?
+            hintText.text = gamepadKeyNav.getConnectedGamepads() > 0 ?
                      "Tip: Press Start+Select+L1+R1 to disconnect your session" :
                      "Tip: Press Ctrl+Alt+Shift+Q to disconnect your session"

-            // Stop GUI gamepad usage now
-            SdlGamepadKeyNavigation.disable()
+            // Hook up our signals
+            session.stageStarting.connect(stageStarting)
+            session.stageFailed.connect(stageFailed)
+            session.connectionStarted.connect(connectionStarted)
+            session.displayLaunchError.connect(displayLaunchError)
+            session.displayLaunchWarning.connect(displayLaunchWarning)
+            session.quitStarting.connect(quitStarting)
+            session.sessionFinished.connect(sessionFinished)

            // Run the streaming session to completion
            session.exec(Screen.virtualX, Screen.virtualY)
        }
-
-        sourceComponent: Item {}
+        else if (!quitAfter) {
+            // Show the toolbar again when we become hidden
+            toolBar.visible = true
+        }
    }

    Row {
@@ -163,7 +142,6 @@ Item {

        BusyIndicator {
            id: stageSpinner
-            running: false
        }

        Label {
@@ -187,4 +165,25 @@ Item {

        wrapMode: Text.Wrap
    }
+
+    MessageDialog {
+        id: errorDialog
+        modality:Qt.WindowModal
+        icon: StandardIcon.Critical
+        standardButtons: StandardButton.Ok | StandardButton.Help
+
+        onAccepted: {
+            if (quitAfter) {
+                Qt.quit()
+            }
+        }
+
+        onHelp: {
+            Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting");
+
+            if (quitAfter) {
+                Qt.quit()
+            }
+        }
+    }
 }
@@ -22,6 +22,18 @@ QVariant ComputerModel::data(const QModelIndex& index, int role) const
        return QVariant();
    }

+    if (index.row() == m_Computers.count()) {
+        // We insert a synthetic item at the end for the Add PC option
+        switch (role) {
+        case NameRole:
+            return "Add PC";
+        case AddPcRole:
+            return true;
+        default:
+            return QVariant();
+        }
+    }
+
    Q_ASSERT(index.row() < m_Computers.count());

    NvComputer* computer = m_Computers[index.row()];
@@ -38,6 +50,8 @@ QVariant ComputerModel::data(const QModelIndex& index, int role) const
        return computer->currentGameId != 0;
    case WakeableRole:
        return !computer->macAddress.isEmpty();
+    case AddPcRole:
+        return false;
    case StatusUnknownRole:
        return computer->state == NvComputer::CS_UNKNOWN;
    default:
@@ -53,7 +67,8 @@ int ComputerModel::rowCount(const QModelIndex& parent) const
        return 0;
    }

-    return m_Computers.count();
+    // Add PC placeholder counts as 1
+    return m_Computers.count() + 1;
 }

 QHash<int, QByteArray> ComputerModel::roleNames() const
@@ -64,6 +79,7 @@ QHash<int, QByteArray> ComputerModel::roleNames() const
    names[OnlineRole] = "online";
    names[PairedRole] = "paired";
    names[BusyRole] = "busy";
+    names[AddPcRole] = "addPc";
    names[WakeableRole] = "wakeable";
    names[StatusUnknownRole] = "statusUnknown";

@@ -14,7 +14,8 @@ class ComputerModel : public QAbstractListModel
        PairedRole,
        BusyRole,
        WakeableRole,
-        StatusUnknownRole
+        StatusUnknownRole,
+        AddPcRole
    };

 public:
@@ -1,13 +1,14 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
+import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.3
 import QtQuick.Window 2.2

+import QtQuick.Controls.Material 2.1
+
 import ComputerManager 1.0
 import AutoUpdateChecker 1.0
 import StreamingPreferences 1.0
-import SystemProperties 1.0
-import SdlGamepadKeyNavigation 1.0

 ApplicationWindow {
    property bool pollingActive: false
@@ -17,7 +18,14 @@ ApplicationWindow {
    width: 1280
    height: 600

-    visibility: (SystemProperties.hasWindowManager && StreamingPreferences.startWindowed) ? "Windowed" : "Maximized"
+    visibility: prefs.startWindowed ? "Windowed" : "Maximized"
+
+    Material.theme: Material.Dark
+    Material.accent: Material.Purple
+
+    StreamingPreferences {
+        id: prefs
+    }

    StackView {
        id: stackView
@@ -134,20 +142,19 @@ ApplicationWindow {
            // onAfterRendering call and potentially reenter this code.
            initialized = true;

-            if (SystemProperties.isWow64) {
+            if (prefs.isRunningWayland()) {
+                waylandDialog.open()
+            }
+            else if (prefs.isWow64()) {
                wow64Dialog.open()
            }
-            else if (!SystemProperties.hasHardwareAcceleration) {
-                if (SystemProperties.isRunningXWayland) {
-                    xWaylandDialog.open()
-                }
-                else {
-                    noHwDecoderDialog.open()
-                }
+            else if (!prefs.hasAnyHardwareAcceleration()) {
+                noHwDecoderDialog.open()
            }

-            if (SystemProperties.unmappedGamepads) {
-                unmappedGamepadDialog.unmappedGamepads = SystemProperties.unmappedGamepads
+            var unmappedGamepads = prefs.getUnmappedGamepads()
+            if (unmappedGamepads) {
+                unmappedGamepadDialog.unmappedGamepads = unmappedGamepads
                unmappedGamepadDialog.open()
            }
        }
@@ -171,21 +178,28 @@ ApplicationWindow {

    header: ToolBar {
        id: toolBar
-        height: 60
        anchors.topMargin: 5
        anchors.bottomMargin: 5

        RowLayout {
            spacing: 20
-            anchors.leftMargin: 10
-            anchors.rightMargin: 10
            anchors.fill: parent

            NavigableToolButton {
                // Only make the button visible if the user has navigated somewhere.
                visible: stackView.depth > 1

-                iconSource: "qrc:/res/arrow_left.svg"
+                // FIXME: We're using an Image here rather than icon.source because
+                // icons don't work on Qt 5.9 LTS.
+                Image {
+                    source: "qrc:/res/arrow_left.svg"
+                    anchors.centerIn: parent
+                    sourceSize {
+                        // The icon should be square so use the height as the width too
+                        width: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                        height: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                    }
+                }

                onClicked: stackView.pop()

@@ -204,52 +218,29 @@ ApplicationWindow {
                Layout.fillWidth: true
            }

-            NavigableToolButton {
-                id: addPcButton
-                visible: stackView.currentItem.objectName === "Computers"
-
-                iconSource:  "qrc:/res/ic_add_to_queue_white_48px.svg"
-
-                ToolTip.delay: 1000
-                ToolTip.timeout: 3000
-                ToolTip.visible: hovered
-                ToolTip.text: "Add PC manually" + (newPcShortcut.nativeText ? (" ("+newPcShortcut.nativeText+")") : "")
-
-                Shortcut {
-                    id: newPcShortcut
-                    sequence: StandardKey.New
-                    onActivated: addPcButton.clicked()
-                }
-
-                onClicked: {
-                    addPcDialog.open()
-                }
-
-                Keys.onDownPressed: {
-                    stackView.currentItem.forceActiveFocus(Qt.TabFocus)
-                }
-            }
-
            NavigableToolButton {
                property string browserUrl: ""

                id: updateButton

-                iconSource: "qrc:/res/update.svg"
+                Image {
+                    source: "qrc:/res/update.svg"
+                    anchors.centerIn: parent
+                    sourceSize {
+                        width: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                        height: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                    }
+                }

                ToolTip.delay: 1000
                ToolTip.timeout: 3000
-                ToolTip.visible: hovered || visible
+                ToolTip.visible: hovered

                // Invisible until we get a callback notifying us that
                // an update is available
                visible: false

-                onClicked: {
-                    if (SystemProperties.hasBrowser) {
-                        Qt.openUrlExternally(browserUrl);
-                    }
-                }
+                onClicked: Qt.openUrlExternally(browserUrl);

                function updateAvailable(version, url)
                {
@@ -270,9 +261,15 @@ ApplicationWindow {

            NavigableToolButton {
                id: helpButton
-                visible: SystemProperties.hasBrowser

-                iconSource: "qrc:/res/question_mark.svg"
+                Image {
+                    source: "qrc:/res/question_mark.svg"
+                    anchors.centerIn: parent
+                    sourceSize {
+                        width: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                        height: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                    }
+                }

                ToolTip.delay: 1000
                ToolTip.timeout: 3000
@@ -302,7 +299,14 @@ ApplicationWindow {
                ToolTip.visible: hovered
                ToolTip.text: "Gamepad Mapper"

-                iconSource: "qrc:/res/ic_videogame_asset_white_48px.svg"
+                Image {
+                    source: "qrc:/res/ic_videogame_asset_white_48px.svg"
+                    anchors.centerIn: parent
+                    sourceSize {
+                        width: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                        height: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                    }
+                }

                onClicked: navigateTo("qrc:/gui/GamepadMapper.qml", "Gamepad Mapping")

@@ -314,7 +318,14 @@ ApplicationWindow {
            NavigableToolButton {
                id: settingsButton

-                iconSource:  "qrc:/res/settings.svg"
+                Image {
+                    source: "qrc:/res/settings.svg"
+                    anchors.centerIn: parent
+                    sourceSize {
+                        width: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                        height: toolBar.height - toolBar.anchors.bottomMargin - toolBar.anchors.topMargin
+                    }
+                }

                onClicked: navigateTo("qrc:/gui/SettingsView.qml", "Settings")

@@ -336,108 +347,67 @@ ApplicationWindow {
        }
    }

-    ErrorMessageDialog {
+    MessageDialog {
        id: noHwDecoderDialog
+        modality:Qt.WindowModal
+        icon: StandardIcon.Warning
+        standardButtons: StandardButton.Ok | StandardButton.Help
        text: "No functioning hardware accelerated H.264 video decoder was detected by Moonlight. " +
-              "Your streaming performance may be severely degraded in this configuration."
-        helpText: "Click the Help button for more information on solving this problem."
-        helpUrl: "https://github.com/moonlight-stream/moonlight-docs/wiki/Fixing-Hardware-Decoding-Problems"
+              "Your streaming performance may be severely degraded in this configuration. " +
+              "Click the Help button for more information on solving this problem."
+        onHelp: {
+            Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-docs/wiki/Fixing-Hardware-Decoding-Problems");
+        }
    }

-    ErrorMessageDialog {
-        id: xWaylandDialog
-        text: "Hardware acceleration doesn't work on XWayland. Continuing on XWayland may result in poor streaming performance. " +
-              "Try running with QT_QPA_PLATFORM=wayland or switch to X11."
-        helpText: "Click the Help button for more information."
-        helpUrl: "https://github.com/moonlight-stream/moonlight-docs/wiki/Fixing-Hardware-Decoding-Problems"
+    MessageDialog {
+        id: waylandDialog
+        modality:Qt.WindowModal
+        icon: StandardIcon.Warning
+        standardButtons: StandardButton.Ok | StandardButton.Help
+        text: "Moonlight does not support hardware acceleration on Wayland. Continuing on Wayland may result in poor streaming performance. " +
+              "Please switch to an X session for optimal performance."
+        onHelp: {
+            Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-docs/wiki/Fixing-Hardware-Decoding-Problems");
+        }
    }

-    NavigableMessageDialog {
+    MessageDialog {
        id: wow64Dialog
-        standardButtons: Dialog.Ok | Dialog.Cancel
+        modality:Qt.WindowModal
+        icon: StandardIcon.Warning
+        standardButtons: StandardButton.Ok | StandardButton.Cancel
        text: "This PC is running a 64-bit version of Windows. Please download the x64 version of Moonlight for the best streaming performance."
        onAccepted: {
            Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-qt/releases");
        }
    }

-    ErrorMessageDialog {
+    MessageDialog {
        id: unmappedGamepadDialog
        property string unmappedGamepads : ""
-        text: "Moonlight detected gamepads without a mapping:\n" + unmappedGamepads
-        helpTextSeparator: "\n\n"
-        helpText: "Click the Help button for information on how to map your gamepads."
-        helpUrl: "https://github.com/moonlight-stream/moonlight-docs/wiki/Gamepad-Mapping"
+        modality:Qt.WindowModal
+        icon: StandardIcon.Warning
+        standardButtons: StandardButton.Ok | StandardButton.Help
+        text: "Moonlight detected gamepads without a proper mapping. " +
+              "The following gamepads will not function until this is resolved: " + unmappedGamepads + "\n\n" +
+              "Click the Help button for information on how to map your gamepads."
+        onHelp: {
+            Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-docs/wiki/Gamepad-Mapping");
+        }
    }

    // This dialog appears when quitting via keyboard or gamepad button
-    NavigableMessageDialog {
+    MessageDialog {
        id: quitConfirmationDialog
-        standardButtons: Dialog.Yes | Dialog.No
+        modality:Qt.WindowModal
+        icon: StandardIcon.Warning
+        standardButtons: StandardButton.Yes | StandardButton.No
        text: "Are you sure you want to quit?"
+
+        onYes: Qt.quit()
+
        // For keyboard/gamepad navigation
        onAccepted: Qt.quit()
    }
-
-    // HACK: This belongs in StreamSegue but keeping a dialog around after the parent
-    // dies can trigger bugs in Qt 5.12 that cause the app to crash. For now, we will
-    // host this dialog in a QML component that is never destroyed.
-    //
-    // To repro: Start a stream, cut the network connection to trigger the "Connection
-    // terminated" dialog, wait until the app grid times out back to the PC grid, then
-    // try to dismiss the dialog.
-    ErrorMessageDialog {
-        id: streamSegueErrorDialog
-
-        property bool quitAfter: false
-
-        onClosed: {
-            if (quitAfter) {
-                Qt.quit()
-            }
-
-            // StreamSegue assumes its dialog will be re-created each time we
-            // start streaming, so fake it by wiping out the text each time.
-            text = ""
-        }
-    }
-
-    NavigableDialog {
-        id: addPcDialog
-        property string label: "Enter the IP address of your GameStream PC:"
-
-        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) {
-                ComputerManager.addNewHost(editText.text, false)
-            }
-        }
-
-        ColumnLayout {
-            Label {
-                text: addPcDialog.label
-                font.bold: true
-            }
-
-            TextField {
-                id: editText
-                Layout.fillWidth: true
-                focus: true
-
-                Keys.onReturnPressed: {
-                    addPcDialog.accept()
-                }
-            }
-        }
-    }
 }
@@ -10,7 +10,7 @@

 SdlGamepadKeyNavigation::SdlGamepadKeyNavigation()
    : m_Enabled(false),
-      m_UiNavMode(false),
+      m_SettingsMode(false),
      m_LastAxisNavigationEventTime(0)
 {
    m_PollingTimer = new QTimer(this);
@@ -91,12 +91,6 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()

    while (SDL_PollEvent(&event)) {
        switch (event.type) {
-        case SDL_QUIT:
-            // SDL may send us a quit event since we initialize
-            // the video subsystem on startup. If we get one,
-            // forward it on for Qt to take care of.
-            QCoreApplication::instance()->quit();
-            break;
        case SDL_CONTROLLERBUTTONDOWN:
        case SDL_CONTROLLERBUTTONUP:
        {
@@ -106,7 +100,7 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()

            switch (event.cbutton.button) {
            case SDL_CONTROLLER_BUTTON_DPAD_UP:
-                if (m_UiNavMode) {
+                if (m_SettingsMode) {
                    // Back-tab
                    sendKey(type, Qt::Key_Tab, Qt::ShiftModifier);
                }
@@ -115,7 +109,7 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
                }
                break;
            case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
-                if (m_UiNavMode) {
+                if (m_SettingsMode) {
                    sendKey(type, Qt::Key_Tab);
                }
                else {
@@ -124,12 +118,24 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
                break;
            case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
                sendKey(type, Qt::Key_Left);
+                if (m_SettingsMode) {
+                    // Some settings controls respond to left/right (like the slider)
+                    // and others respond to up/down (like combo boxes). They seem to
+                    // be mutually exclusive though so let's just send both.
+                    sendKey(type, Qt::Key_Up);
+                }
                break;
            case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
                sendKey(type, Qt::Key_Right);
+                if (m_SettingsMode) {
+                    // Some settings controls respond to left/right (like the slider)
+                    // and others respond to up/down (like combo boxes). They seem to
+                    // be mutually exclusive though so let's just send both.
+                    sendKey(type, Qt::Key_Down);
+                }
                break;
            case SDL_CONTROLLER_BUTTON_A:
-                if (m_UiNavMode) {
+                if (m_SettingsMode) {
                    sendKey(type, Qt::Key_Space);
                }
                else {
@@ -171,7 +177,7 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
            // Do nothing
        }
        else if (leftY < -30000) {
-            if (m_UiNavMode) {
+            if (m_SettingsMode) {
                // Back-tab
                sendKey(QEvent::Type::KeyPress, Qt::Key_Tab, Qt::ShiftModifier);
                sendKey(QEvent::Type::KeyRelease, Qt::Key_Tab, Qt::ShiftModifier);
@@ -184,7 +190,7 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
            m_LastAxisNavigationEventTime = SDL_GetTicks();
        }
        else if (leftY > 30000) {
-            if (m_UiNavMode) {
+            if (m_SettingsMode) {
                sendKey(QEvent::Type::KeyPress, Qt::Key_Tab);
                sendKey(QEvent::Type::KeyRelease, Qt::Key_Tab);
            }
@@ -198,11 +204,27 @@ void SdlGamepadKeyNavigation::onPollingTimerFired()
        else if (leftX < -30000) {
            sendKey(QEvent::Type::KeyPress, Qt::Key_Left);
            sendKey(QEvent::Type::KeyRelease, Qt::Key_Left);
+            if (m_SettingsMode) {
+                // Some settings controls respond to left/right (like the slider)
+                // and others respond to up/down (like combo boxes). They seem to
+                // be mutually exclusive though so let's just send both.
+                sendKey(QEvent::Type::KeyPress, Qt::Key_Up);
+                sendKey(QEvent::Type::KeyRelease, Qt::Key_Up);
+            }
+
            m_LastAxisNavigationEventTime = SDL_GetTicks();
        }
        else if (leftX > 30000) {
            sendKey(QEvent::Type::KeyPress, Qt::Key_Right);
            sendKey(QEvent::Type::KeyRelease, Qt::Key_Right);
+            if (m_SettingsMode) {
+                // Some settings controls respond to left/right (like the slider)
+                // and others respond to up/down (like combo boxes). They seem to
+                // be mutually exclusive though so let's just send both.
+                sendKey(QEvent::Type::KeyPress, Qt::Key_Down);
+                sendKey(QEvent::Type::KeyRelease, Qt::Key_Down);
+            }
+
            m_LastAxisNavigationEventTime = SDL_GetTicks();
        }
    }
@@ -218,14 +240,19 @@ void SdlGamepadKeyNavigation::sendKey(QEvent::Type type, Qt::Key key, Qt::Keyboa
    }
 }

-void SdlGamepadKeyNavigation::setUiNavMode(bool uiNavMode)
+void SdlGamepadKeyNavigation::setSettingsMode(bool settingsMode)
 {
-    m_UiNavMode = uiNavMode;
+    m_SettingsMode = settingsMode;
 }

 int SdlGamepadKeyNavigation::getConnectedGamepads()
 {
-    Q_ASSERT(m_Enabled);
+    if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) failed: %s",
+                     SDL_GetError());
+        return 0;
+    }

    int count = 0;
    for (int i = 0; i < SDL_NumJoysticks(); i++) {
@@ -234,5 +261,6 @@ int SdlGamepadKeyNavigation::getConnectedGamepads()
        }
    }

+    SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
    return count;
 }
@@ -18,7 +18,7 @@ public:

    Q_INVOKABLE void disable();

-    Q_INVOKABLE void setUiNavMode(bool settingsMode);
+    Q_INVOKABLE void setSettingsMode(bool settingsMode);

    Q_INVOKABLE int getConnectedGamepads();

@@ -32,6 +32,6 @@ private:
    QTimer* m_PollingTimer;
    QList<SDL_GameController*> m_Gamepads;
    bool m_Enabled;
-    bool m_UiNavMode;
+    bool m_SettingsMode;
    Uint32 m_LastAxisNavigationEventTime;
 };
@@ -6,11 +6,6 @@
 #include <QMutex>
 #include <QtDebug>
 #include <QNetworkProxyFactory>
-#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
@@ -22,21 +17,17 @@
 #include "streaming/video/ffmpeg.h"
 #endif

-#if defined(Q_OS_WIN32)
+#ifdef 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"
-#include "backend/systemproperties.h"
 #include "streaming/session.h"
 #include "settings/streamingpreferences.h"
 #include "gui/sdlgamepadkeynavigation.h"
@@ -57,7 +48,7 @@
 #endif

 #ifdef USE_CUSTOM_LOGGER
-static QElapsedTimer s_LoggerTime;
+static QTime s_LoggerTime;
 static QTextStream s_LoggerStream(stdout);
 static QMutex s_LoggerLock;
 #ifdef LOG_TO_FILE
@@ -76,12 +67,7 @@ void logToLoggerStream(QString& message)
        return;
    }
    else if (s_LogLinesWritten == MAX_LOG_LINES) {
-        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_LoggerStream << "Log size limit reached!" << endl;
        s_LogLimitReached = true;
        return;
    }
@@ -150,6 +136,14 @@ void qtLogToDiskHandler(QtMsgType type, const QMessageLogContext&, const QString
        break;
    }

+    // HACK: Avoid printing this internal Qt warning which seems to print every time we
+    // start our event loop for the QNetworkReply. I have found this warning in many
+    // unrelated bug reports, but none actually tackle this warning itself. It seems to be
+    // new in Qt 5.12.
+    if (msg.startsWith("QNetworkReplyHttpImplPrivate::_q_startOperation was called more than once")) {
+        return;
+    }
+
    QTime logTime = QTime::fromMSecsSinceStartOfDay(s_LoggerTime.elapsed());
    QString txt = QString("%1 - Qt %2: %3\n").arg(logTime.toString()).arg(typeTxt).arg(msg);

@@ -237,8 +231,6 @@ LONG WINAPI UnhandledExceptionHandler(struct _EXCEPTION_POINTERS *ExceptionInfo)

 int main(int argc, char *argv[])
 {
-    SDL_SetMainReady();
-
    // Set the app version for the QCommandLineParser's showVersion() command
    QCoreApplication::setApplicationVersion(VERSION_STR);

@@ -288,48 +280,17 @@ int main(int argc, char *argv[])
    SetUnhandledExceptionFilter(UnhandledExceptionHandler);
 #endif

-#if defined(Q_OS_WIN32)
+#ifdef 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

-    // 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
-    }
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);

    // This avoids using the default keychain for SSL, which may cause
    // password prompts on macOS.
-    qputenv("QT_SSL_USE_TEMPORARY_KEYCHAIN", "1");
+    qputenv("QT_SSL_USE_TEMPORARY_KEYCHAIN", QByteArray("1"));

 #ifdef Q_OS_WIN32
    if (!qEnvironmentVariableIsSet("QT_OPENGL")) {
@@ -350,116 +311,15 @@ 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",
-                     SDL_GetError());
-        return -1;
-    }
-
-#ifdef STEAM_LINK
-    // Steam Link requires that we initialize video before creating our
-    // QGuiApplication in order to configure the framebuffer correctly.
-    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
-                     SDL_GetError());
-        return -1;
-    }
-#endif
-
-    // Use atexit() to ensure SDL_Quit() is called. This avoids
-    // racing with object destruction where SDL may be used.
-    atexit(SDL_Quit);
-
-    // Avoid the default behavior of changing the timer resolution to 1 ms.
-    // We don't want this all the time that Moonlight is open. We will set
-    // it manually when we start streaming.
-    SDL_SetHint(SDL_HINT_TIMER_RESOLUTION, "0");
-
-    // 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
-    // of caution.
-    SDL_SetHint(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, "0");
-#endif
-
    QGuiApplication app(argc, argv);

-    // After the QGuiApplication is created, the platform stuff will be initialized
-    // and we can set the SDL video driver to match Qt.
-    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.");
-        qputenv("SDL_VIDEODRIVER", "wayland");
-    }
-
-#ifdef STEAM_LINK
-    // Qt 5.9 from the Steam Link SDK is not able to load any fonts
-    // since the Steam Link doesn't include any of the ones it looks
-    // for. We know it has NotoSans so we will explicitly ask for that.
-    if (app.font().family().isEmpty()) {
-        qWarning() << "SL HACK: No default font - using NotoSans";
-
-        QFont fon("NotoSans");
-        app.setFont(fon);
-    }
-
-    // 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"));

    // Register our C++ types for QML
    qmlRegisterType<ComputerModel>("ComputerModel", 1, 0, "ComputerModel");
    qmlRegisterType<AppModel>("AppModel", 1, 0, "AppModel");
+    qmlRegisterType<StreamingPreferences>("StreamingPreferences", 1, 0, "StreamingPreferences");
+    qmlRegisterType<SdlGamepadKeyNavigation>("SdlGamepadKeyNavigation", 1, 0, "SdlGamepadKeyNavigation");
    qmlRegisterUncreatableType<Session>("Session", 1, 0, "Session", "Session cannot be created from QML");
    qmlRegisterSingletonType<ComputerManager>("ComputerManager", 1, 0,
                                              "ComputerManager",
@@ -471,48 +331,8 @@ int main(int argc, char *argv[])
                                                [](QQmlEngine*, QJSEngine*) -> QObject* {
                                                    return new AutoUpdateChecker();
                                                });
-    qmlRegisterSingletonType<SystemProperties>("SystemProperties", 1, 0,
-                                               "SystemProperties",
-                                               [](QQmlEngine*, QJSEngine*) -> QObject* {
-                                                   return new SystemProperties();
-                                               });
-    qmlRegisterSingletonType<SdlGamepadKeyNavigation>("SdlGamepadKeyNavigation", 1, 0,
-                                                      "SdlGamepadKeyNavigation",
-                                                      [](QQmlEngine*, QJSEngine*) -> QObject* {
-                                                          return new SdlGamepadKeyNavigation();
-                                                      });
-    qmlRegisterSingletonType<StreamingPreferences>("StreamingPreferences", 1, 0,
-                                                   "StreamingPreferences",
-                                                   [](QQmlEngine*, QJSEngine*) -> QObject* {
-                                                       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")) {
-        qputenv("QT_QUICK_CONTROLS_STYLE", "Material");
-    }
-#else
-    // Use universal dark on WinRT
-    if (!qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_STYLE")) {
-        qputenv("QT_QUICK_CONTROLS_STYLE", "Universal");
-    }
-#endif
-    if (!qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_MATERIAL_THEME")) {
-        qputenv("QT_QUICK_CONTROLS_MATERIAL_THEME", "Dark");
-    }
-    if (!qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_MATERIAL_ACCENT")) {
-        qputenv("QT_QUICK_CONTROLS_MATERIAL_ACCENT", "Purple");
-    }
-    if (!qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_MATERIAL_VARIANT")) {
-        qputenv("QT_QUICK_CONTROLS_MATERIAL_VARIANT", "Dense");
-    }
-    if (!qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_UNIVERSAL_THEME")) {
-        qputenv("QT_QUICK_CONTROLS_UNIVERSAL_THEME", "Dark");
-    }
+    QQuickStyle::setStyle("Material");

    QQmlApplicationEngine engine;
    QString initialView;
@@ -520,11 +340,11 @@ int main(int argc, char *argv[])
    GlobalCommandLineParser parser;
    switch (parser.parse(app.arguments())) {
    case GlobalCommandLineParser::NormalStartRequested:
-        initialView = "qrc:/gui/PcView.qml";
+        initialView = "PcView.qml";
        break;
    case GlobalCommandLineParser::StreamRequested:
        {
-            initialView = "qrc:/gui/CliStartStreamSegue.qml";
+            initialView = "CliStartStreamSegue.qml";
            StreamingPreferences* preferences = new StreamingPreferences(&app);
            StreamCommandLineParser streamParser;
            streamParser.parse(app.arguments(), preferences);
@@ -536,7 +356,7 @@ int main(int argc, char *argv[])
        }
    case GlobalCommandLineParser::QuitRequested:
        {
-            initialView = "qrc:/gui/CliQuitStreamSegue.qml";
+            initialView = "CliQuitStreamSegue.qml";
            QuitCommandLineParser quitParser;
            quitParser.parse(app.arguments());
            auto launcher = new CliQuitStream::Launcher(quitParser.getHost(), &app);
@@ -552,6 +372,22 @@ int main(int argc, char *argv[])
    if (engine.rootObjects().isEmpty())
        return -1;

+    SDL_SetMainReady();
+    if (SDL_Init(SDL_INIT_TIMER) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_Init() failed: %s",
+                     SDL_GetError());
+    }
+
+    // Use atexit() to ensure SDL_Quit() is called. This avoids
+    // racing with object destruction where SDL may be used.
+    atexit(SDL_Quit);
+
+    // Avoid the default behavior of changing the timer resolution to 1 ms.
+    // We don't want this all the time that Moonlight is open. We will set
+    // it manually when we start streaming.
+    SDL_SetHint(SDL_HINT_TIMER_RESOLUTION, "0");
+
    int err = app.exec();

    // Give worker tasks time to properly exit. Fixes PendingQuitTask
@@ -8,6 +8,7 @@

 QString Path::s_LogDir;
 QString Path::s_BoxArtCacheDir;
+const QString Path::k_GameControllerMappingFile("gamecontrollerdb.txt");

 QString Path::getLogDir()
 {
@@ -21,42 +22,40 @@ QString Path::getBoxArtCacheDir()
    return s_BoxArtCacheDir;
 }

-QByteArray Path::readDataFile(QString fileName)
-{
-    QFile dataFile(getDataFilePath(fileName));
-    dataFile.open(QIODevice::ReadOnly);
-    return dataFile.readAll();
-}
-
-QString Path::getDataFilePath(QString fileName)
+QString Path::getGamepadMappingFile()
 {
    QString candidatePath;

    // Check the current directory first
-    candidatePath = QDir(QDir::currentPath()).absoluteFilePath(fileName);
+    candidatePath = QDir(QDir::currentPath()).absoluteFilePath(k_GameControllerMappingFile);
    if (QFile::exists(candidatePath)) {
-        qInfo() << "Found" << fileName << "at" << candidatePath;
        return candidatePath;
    }

    // Now check the data directories (for Linux, in particular)
-    candidatePath = QStandardPaths::locate(QStandardPaths::DataLocation, fileName);
+    candidatePath = QStandardPaths::locate(QStandardPaths::DataLocation, k_GameControllerMappingFile);
    if (!candidatePath.isEmpty() && QFile::exists(candidatePath)) {
-        qInfo() << "Found" << fileName << "at" << candidatePath;
        return candidatePath;
    }

    // Now try the directory of our app installation (for Windows, if current dir doesn't find it)
-    candidatePath = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(fileName);
+    candidatePath = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(k_GameControllerMappingFile);
    if (QFile::exists(candidatePath)) {
-        qInfo() << "Found" << fileName << "at" << candidatePath;
        return candidatePath;
    }

-    // Return the QRC embedded copy
-    candidatePath = ":/data/" + fileName;
-    qInfo() << "Found" << fileName << "at" << candidatePath;
-    return QString(candidatePath);
+    // Now try the Resources folder in our app bundle for macOS
+    QDir dir = QDir(QCoreApplication::applicationDirPath());
+    dir.cdUp();
+    dir.cd("Resources");
+    dir.filePath(k_GameControllerMappingFile);
+    candidatePath = dir.absoluteFilePath(k_GameControllerMappingFile);
+    if (QFile::exists(candidatePath)) {
+        return candidatePath;
+    }
+
+    // Couldn't find it
+    return QString();
 }

 void Path::initialize(bool portable)
@@ -9,14 +9,12 @@ public:

    static QString getBoxArtCacheDir();

-    static QByteArray readDataFile(QString fileName);
-
-    // Only safe to use directly for Qt classes
-    static QString getDataFilePath(QString fileName);
+    static QString getGamepadMappingFile();

    static void initialize(bool portable);

 private:
    static QString s_LogDir;
    static QString s_BoxArtCacheDir;
+    static const QString k_GameControllerMappingFile;
 };
@@ -13,10 +13,5 @@
        <file>gui/CliQuitStreamSegue.qml</file>
        <file>gui/CliStartStreamSegue.qml</file>
        <file>gui/AutoResizingComboBox.qml</file>
-        <file>gui/NavigableMenu.qml</file>
-        <file>gui/ErrorMessageDialog.qml</file>
-        <file>gui/NavigableMessageDialog.qml</file>
-        <file>gui/NavigableDialog.qml</file>
-        <file>gui/CenteredGridView.qml</file>
    </qresource>
 </RCC>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#fff"><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#FFFFFF"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#FFFFFF"><path fill="none" d="M0 0h24v24H0z"/><path d="M11 18h2v-2h-2v2zm1-16C6.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 8zm0-14c-2.21 0-4 1.79-4 4h2c0-1.1.9-2 2-2s2 .9 2 2c0 2-3 1.75-3 5h2c0-2.25 3-2.5 3-5 0-2.21-1.79-4-4-4z"/></svg>
@@ -1,4 +0,0 @@
-<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>
@@ -0,0 +1,4 @@
+<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>
@@ -0,0 +1,9 @@
+<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>
@@ -0,0 +1,4 @@
+<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>
@@ -1,23 +1,18 @@
 <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/desktop_windows-48px.svg</file>
+        <file>res/ic_tv_white_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>
        <file>res/baseline-warning-24px.svg</file>
-        <file>res/baseline-cancel-24px.svg</file>
        <file>res/no_app_image.png</file>
        <file>res/settings.svg</file>
        <file>res/arrow_left.svg</file>
        <file>res/question_mark.svg</file>
        <file>res/moonlight.svg</file>
        <file>res/update.svg</file>
-        <file>res/baseline-help_outline-24px.svg</file>
-        <file>res/baseline-error_outline-24px.svg</file>
-    </qresource>
-    <qresource prefix="/data">
-        <file alias="gamecontrollerdb.txt">SDL_GameControllerDB/gamecontrollerdb.txt</file>
-        <file alias="ModeSeven.ttf">ModeSeven.ttf</file>
    </qresource>
 </RCC>
@@ -26,13 +26,7 @@ MappingManager::MappingManager()
    settings.endArray();

    // Finally load mappings from SDL_HINT_GAMECONTROLLERCONFIG
-    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
+    QStringList sdlMappings = QString::fromLocal8Bit(SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG)).split('\n', QString::SkipEmptyParts);
    for (QString sdlMapping : sdlMappings) {
        SdlGamepadMapping mapping(sdlMapping);
        addMapping(mapping);
@@ -60,10 +54,15 @@ void MappingManager::save()

 void MappingManager::applyMappings()
 {
-    QByteArray mappingData = Path::readDataFile("gamecontrollerdb.txt");
-    if (!mappingData.isEmpty()) {
-        int newMappings = SDL_GameControllerAddMappingsFromRW(
-                    SDL_RWFromConstMem(mappingData.constData(), mappingData.size()), 1);
+    QString mappingFile = Path::getGamepadMappingFile();
+    if (!mappingFile.isEmpty()) {
+        std::string mappingFileNative = QDir::toNativeSeparators(mappingFile).toStdString();
+
+        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                    "Loading gamepad mappings from: %s",
+                    mappingFileNative.c_str());
+
+        int newMappings = SDL_GameControllerAddMappingsFromFile(mappingFileNative.c_str());
        if (newMappings < 0) {
            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                         "Error loading gamepad mappings: %s",
@@ -76,8 +75,8 @@ void MappingManager::applyMappings()
        }
    }
    else {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Unable to load gamepad mapping file");
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                    "No gamepad mapping file found");
    }

    QList<SdlGamepadMapping> mappings = m_Mappings.values();
@@ -1,4 +1,6 @@
 #include "streamingpreferences.h"
+#include "streaming/session.h"
+#include "streaming/streamutils.h"

 #include <QSettings>

@@ -19,16 +21,9 @@
 #define SER_UNSUPPORTEDFPS "unsupportedfps"
 #define SER_MDNS "mdns"
 #define SER_QUITAPPAFTER "quitAppAfter"
-#define SER_ABSMOUSEMODE "mouseacceleration"
+#define SER_MOUSEACCELERATION "mouseacceleration"
 #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 CURRENT_DEFAULT_VER 1

 StreamingPreferences::StreamingPreferences(QObject *parent)
    : QObject(parent)
@@ -40,14 +35,6 @@ 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();
@@ -59,13 +46,9 @@ void StreamingPreferences::reload()
    unsupportedFps = settings.value(SER_UNSUPPORTEDFPS, false).toBool();
    enableMdns = settings.value(SER_MDNS, true).toBool();
    quitAppAfter = settings.value(SER_QUITAPPAFTER, false).toBool();
-    absoluteMouseMode = settings.value(SER_ABSMOUSEMODE, false).toBool();
-    startWindowed = settings.value(SER_STARTWINDOWED, true).toBool();
+    mouseAcceleration = settings.value(SER_MOUSEACCELERATION, false).toBool();
+    startWindowed = settings.value(SER_STARTWINDOWED, false).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();
-    packetSize = settings.value(SER_PACKETSIZE, 0).toInt();
    audioConfig = static_cast<AudioConfig>(settings.value(SER_AUDIOCFG,
                                                  static_cast<int>(AudioConfig::AC_STEREO)).toInt());
    videoCodecConfig = static_cast<VideoCodecConfig>(settings.value(SER_VIDEOCFG,
@@ -75,17 +58,7 @@ 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() ?
-                                                                             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
-    }
+                                                                             WindowMode::WM_FULLSCREEN : WindowMode::WM_WINDOWED)).toInt());
 }

 void StreamingPreferences::save()
@@ -103,18 +76,134 @@ void StreamingPreferences::save()
    settings.setValue(SER_UNSUPPORTEDFPS, unsupportedFps);
    settings.setValue(SER_MDNS, enableMdns);
    settings.setValue(SER_QUITAPPAFTER, quitAppAfter);
-    settings.setValue(SER_ABSMOUSEMODE, absoluteMouseMode);
+    settings.setValue(SER_MOUSEACCELERATION, mouseAcceleration);
    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_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);
+}
+
+bool StreamingPreferences::hasAnyHardwareAcceleration()
+{
+    // Always use VDS_AUTO to avoid spamming the user with warnings
+    // if they've forced software decoding.
+    return Session::isHardwareDecodeAvailable(VDS_AUTO,
+                                              VIDEO_FORMAT_H264,
+                                              1920, 1080, 60);
+}
+
+bool StreamingPreferences::isRunningWayland()
+{
+    return qgetenv("XDG_SESSION_TYPE") == QByteArray("wayland");
+}
+
+bool StreamingPreferences::isWow64()
+{
+#ifdef Q_OS_WIN32
+    return QSysInfo::currentCpuArchitecture() != QSysInfo::buildCpuArchitecture();
+#else
+    return false;
+#endif
+}
+
+QString StreamingPreferences::getUnmappedGamepads()
+{
+    return SdlInputHandler::getUnmappedGamepads();
+}
+
+int StreamingPreferences::getMaximumStreamingFrameRate()
+{
+    // Never let the maximum drop below 60 FPS
+    int maxFrameRate = 60;
+
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
+                     SDL_GetError());
+        return maxFrameRate;
+    }
+
+    SDL_DisplayMode mode, bestMode, desktopMode;
+    for (int displayIndex = 0; displayIndex < SDL_GetNumVideoDisplays(); displayIndex++) {
+        // Get the native desktop resolution
+        if (StreamUtils::getRealDesktopMode(displayIndex, &desktopMode)) {
+
+            // Start at desktop mode and work our way up
+            bestMode = desktopMode;
+            for (int i = 0; i < SDL_GetNumDisplayModes(displayIndex); i++) {
+                if (SDL_GetDisplayMode(displayIndex, i, &mode) == 0) {
+                    if (mode.w == desktopMode.w && mode.h == desktopMode.h) {
+                        if (mode.refresh_rate > bestMode.refresh_rate) {
+                            bestMode = mode;
+                        }
+                    }
+                }
+            }
+
+            maxFrameRate = qMax(maxFrameRate, bestMode.refresh_rate);
+        }
+    }
+
+    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+    return maxFrameRate;
+}
+
+QRect StreamingPreferences::getDesktopResolution(int displayIndex)
+{
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
+                     SDL_GetError());
+        return QRect();
+    }
+
+    if (displayIndex >= SDL_GetNumVideoDisplays()) {
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        return QRect();
+    }
+
+    SDL_DisplayMode mode;
+    int err = SDL_GetDesktopDisplayMode(displayIndex, &mode);
+    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+    if (err == 0) {
+        return QRect(0, 0, mode.w, mode.h);
+    }
+    else {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_GetDesktopDisplayMode() failed: %s",
+                     SDL_GetError());
+        return QRect();
+    }
+}
+
+QRect StreamingPreferences::getNativeResolution(int displayIndex)
+{
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
+                     SDL_GetError());
+        return QRect();
+    }
+
+    if (displayIndex >= SDL_GetNumVideoDisplays()) {
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        return QRect();
+    }
+
+    SDL_DisplayMode mode;
+    bool success = StreamUtils::getRealDesktopMode(displayIndex, &mode);
+    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+    if (success) {
+        return QRect(0, 0, mode.w, mode.h);
+    }
+    else {
+        return QRect();
+    }
 }

 int StreamingPreferences::getDefaultBitrate(int width, int height, int fps)
@@ -15,13 +15,26 @@ public:

    Q_INVOKABLE void save();

+    Q_INVOKABLE static bool hasAnyHardwareAcceleration();
+
+    Q_INVOKABLE static bool isRunningWayland();
+
+    Q_INVOKABLE static bool isWow64();
+
+    Q_INVOKABLE static int getMaximumStreamingFrameRate();
+
+    Q_INVOKABLE QRect getDesktopResolution(int displayIndex);
+
+    Q_INVOKABLE QRect getNativeResolution(int displayIndex);
+
+    Q_INVOKABLE QString getUnmappedGamepads();
+
    void reload();

    enum AudioConfig
    {
        AC_STEREO,
-        AC_51_SURROUND,
-        AC_71_SURROUND
+        AC_51_SURROUND
    };
    Q_ENUM(AudioConfig)

@@ -61,17 +74,13 @@ 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 absoluteMouseMode MEMBER absoluteMouseMode NOTIFY absoluteMouseModeChanged)
+    Q_PROPERTY(bool mouseAcceleration MEMBER mouseAcceleration NOTIFY mouseAccelerationChanged)
    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(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)

    // Directly accessible members for preferences
    int width;
@@ -85,18 +94,13 @@ public:
    bool unsupportedFps;
    bool enableMdns;
    bool quitAppAfter;
-    bool absoluteMouseMode;
+    bool mouseAcceleration;
    bool startWindowed;
    bool framePacing;
-    bool connectionWarnings;
-    bool richPresence;
-    bool gamepadMouse;
-    int packetSize;
    AudioConfig audioConfig;
    VideoCodecConfig videoCodecConfig;
    VideoDecoderSelection videoDecoderSelection;
    WindowMode windowMode;
-    WindowMode recommendedFullScreenMode;

 signals:
    void displayModeChanged();
@@ -108,15 +112,12 @@ signals:
    void unsupportedFpsChanged();
    void enableMdnsChanged();
    void quitAppAfterChanged();
-    void absoluteMouseModeChanged();
+    void mouseAccelerationChanged();
    void audioConfigChanged();
    void videoCodecConfigChanged();
    void videoDecoderSelectionChanged();
    void windowModeChanged();
    void startWindowedChanged();
    void framePacingChanged();
-    void connectionWarningsChanged();
-    void richPresenceChanged();
-    void gamepadMouseChanged();
 };

@@ -5,112 +5,55 @@
 #include "renderers/soundioaudiorenderer.h"
 #endif

-#ifdef HAVE_SLAUDIO
-#include "renderers/slaud.h"
-#endif
-
 #include "renderers/sdl.h"

 #include <Limelight.h>

-#define TRY_INIT_RENDERER(renderer, opusConfig)        \
-{                                                      \
-    IAudioRenderer* __renderer = new renderer();       \
-    if (__renderer->prepareForPlayback(opusConfig))    \
-        return __renderer;                             \
-    delete __renderer;                                 \
-}
-
-IAudioRenderer* Session::createAudioRenderer(const POPUS_MULTISTREAM_CONFIGURATION opusConfig)
+IAudioRenderer* Session::createAudioRenderer()
 {
-    // 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;
+    if (qgetenv("ML_AUDIO") == "SDL") {
+        return new SdlAudioRenderer();
    }

-    // -------------- 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
+    return new SoundIoAudioRenderer();
 #else
-    // Windows and macOS default to libsoundio and fall back to SDL
-#ifdef HAVE_SOUNDIO
-    TRY_INIT_RENDERER(SoundIoAudioRenderer, opusConfig)
+    return new SdlAudioRenderer();
 #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);
-
-    IAudioRenderer* audioRenderer = createAudioRenderer(&opusConfig);
-    if (audioRenderer == nullptr) {
-        return 0;
-    }
-
-    int caps = audioRenderer->getCapabilities();
-
-    delete audioRenderer;
-
-    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;

-    IAudioRenderer* audioRenderer = createAudioRenderer(&opusConfig);
+    audioRenderer = createAudioRenderer();
    if (audioRenderer == nullptr) {
        return false;
    }

+    // Build a fake OPUS_MULTISTREAM_CONFIGURATION to give
+    // the renderer the channel count and sample rate.
+    OPUS_MULTISTREAM_CONFIGURATION opusConfig = {};
+    opusConfig.sampleRate = 48000;
+
+    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;
+    }
+
+    bool ret = audioRenderer->prepareForPlayback(&opusConfig);
+
    delete audioRenderer;

-    return true;
+    return ret;
 }

 int Session::arInit(int /* audioConfiguration */,
@@ -121,34 +64,30 @@ 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(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,
+            opus_multistream_decoder_create(opusConfig->sampleRate,
+                                            opusConfig->channelCount,
+                                            opusConfig->streams,
+                                            opusConfig->coupledStreams,
+                                            opusConfig->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",
-                s_ActiveSession->m_AudioConfig.channelCount);
+                opusConfig->channelCount);

    return 0;
 }
@@ -166,11 +105,8 @@ void Session::arDecodeAndPlaySample(char* sampleData, int sampleLength)
 {
    int samplesDecoded;

-#ifndef STEAM_LINK
-    // Set this thread to high priority to reduce the chance of missing
-    // our sample delivery time. On Steam Link, this causes starvation
-    // of other threads due to severely restricted CPU time available,
-    // so we will skip it on that platform.
+    // Set this thread to high priority to reduce
+    // the chance of missing our sample delivery time
    if (s_ActiveSession->m_AudioSampleCount == 0) {
        if (SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH) < 0) {
            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
@@ -178,54 +114,29 @@ void Session::arDecodeAndPlaySample(char* sampleData, int sampleLength)
                        SDL_GetError());
        }
    }
-#endif
-
-    // See if we need to drop this sample
-    if (s_ActiveSession->m_DropAudioEndTime != 0) {
-        if (SDL_TICKS_PASSED(SDL_GetTicks(), s_ActiveSession->m_DropAudioEndTime)) {
-            // Avoid calling SDL_GetTicks() now
-            s_ActiveSession->m_DropAudioEndTime = 0;
-
-            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                        "Audio drop window has ended");
-        }
-        else {
-            // We're still in the drop window
-            return;
-        }
-    }

    s_ActiveSession->m_AudioSampleCount++;

    if (s_ActiveSession->m_AudioRenderer != nullptr) {
-        int desiredSize = sizeof(short) * s_ActiveSession->m_AudioConfig.samplesPerFrame * s_ActiveSession->m_AudioConfig.channelCount;
-        void* buffer = s_ActiveSession->m_AudioRenderer->getAudioBuffer(&desiredSize);
-        if (buffer == nullptr) {
-            return;
-        }
-
        samplesDecoded = opus_multistream_decode(s_ActiveSession->m_OpusDecoder,
                                                 (unsigned char*)sampleData,
                                                 sampleLength,
-                                                 (short*)buffer,
-                                                 desiredSize / sizeof(short) / s_ActiveSession->m_AudioConfig.channelCount,
+                                                 s_ActiveSession->m_OpusDecodeBuffer,
+                                                 SAMPLES_PER_FRAME,
                                                 0);
-
-        // Update desiredSize with the number of bytes actually populated by the decoding operation
        if (samplesDecoded > 0) {
-            SDL_assert(desiredSize >= (int)(sizeof(short) * samplesDecoded * s_ActiveSession->m_AudioConfig.channelCount));
-            desiredSize = sizeof(short) * samplesDecoded * s_ActiveSession->m_AudioConfig.channelCount;
-        }
-        else {
-            desiredSize = 0;
-        }
+            if (!s_ActiveSession->m_AudioRenderer->submitAudio(s_ActiveSession->m_OpusDecodeBuffer,
+                                                               static_cast<int>(
+                                                                   sizeof(short) *
+                                                                   samplesDecoded *
+                                                                   s_ActiveSession->m_AudioConfig.channelCount))) {

-        if (!s_ActiveSession->m_AudioRenderer->submitAudio(desiredSize)) {
-            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                        "Reinitializing audio renderer after failure");
+                SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                            "Reinitializing audio renderer after failure");

-            delete s_ActiveSession->m_AudioRenderer;
-            s_ActiveSession->m_AudioRenderer = nullptr;
+                delete s_ActiveSession->m_AudioRenderer;
+                s_ActiveSession->m_AudioRenderer = nullptr;
+            }
        }
    }

@@ -234,18 +145,10 @@ void Session::arDecodeAndPlaySample(char* sampleData, int sampleLength)
    // safe to reinitialize here because we can't be torn down while
    // the audio decoder/playback thread is still alive.
    if (s_ActiveSession->m_AudioRenderer == nullptr && (s_ActiveSession->m_AudioSampleCount % 200) == 0) {
-        // Since we're doing this inline and audio initialization takes time, we need
-        // to drop samples to account for the time we've spent blocking audio rendering
-        // so we return to real-time playback and don't accumulate latency.
-        Uint32 audioReinitStartTime = SDL_GetTicks();
-
-        s_ActiveSession->m_AudioRenderer = s_ActiveSession->createAudioRenderer(&s_ActiveSession->m_AudioConfig);
-
-        Uint32 audioReinitStopTime = SDL_GetTicks();
-
-        s_ActiveSession->m_DropAudioEndTime = audioReinitStopTime + (audioReinitStopTime - audioReinitStartTime);
-        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                    "Audio reinitialization took %d ms - starting drop window",
-                    audioReinitStopTime - audioReinitStartTime);
+        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;
+        }
    }
 }
@@ -2,6 +2,9 @@

 #include <Limelight.h>

+#define MAX_CHANNELS 6
+#define SAMPLES_PER_FRAME 240
+
 class IAudioRenderer
 {
 public:
@@ -9,20 +12,6 @@ public:

    virtual bool prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION* opusConfig) = 0;

-    virtual void* getAudioBuffer(int* size) = 0;
-
    // 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
-    }
+    virtual bool submitAudio(short* audioBuffer, int audioSize) = 0;
 };
@@ -12,14 +12,8 @@ public:

    virtual bool prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION* opusConfig);

-    virtual void* getAudioBuffer(int* size);
-
-    virtual bool submitAudio(int bytesWritten);
-
-    virtual int getCapabilities();
+    virtual bool submitAudio(short* audioBuffer, int audioSize);

 private:
    SDL_AudioDeviceID m_AudioDevice;
-    void* m_AudioBuffer;
-    int m_FrameSize;
 };
@@ -4,42 +4,11 @@
 #include <SDL.h>

 #include <QtGlobal>
-#include <QFile>
-#include <QTextStream>

 SdlAudioRenderer::SdlAudioRenderer()
-    : m_AudioDevice(0),
-      m_AudioBuffer(nullptr)
+    : m_AudioDevice(0)
 {
    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",
@@ -61,29 +30,21 @@ bool SdlAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION*
    // frames contain a non-power of 2 number of samples,
    // so the slop would require buffering another full frame.
    // Specifying non-Po2 seems to work for our supported platforms.
-    want.samples = opusConfig->samplesPerFrame;
-
-    m_FrameSize = opusConfig->samplesPerFrame * sizeof(short) * opusConfig->channelCount;
+    want.samples = SAMPLES_PER_FRAME;

    m_AudioDevice = SDL_OpenAudioDevice(NULL, 0, &want, &have, 0);
    if (m_AudioDevice == 0) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "Failed to open audio device: %s",
                     SDL_GetError());
-        return false;
-    }
-
-    m_AudioBuffer = malloc(m_FrameSize);
-    if (m_AudioBuffer == nullptr) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Failed to allocate audio buffer");
+        SDL_QuitSubSystem(SDL_INIT_AUDIO);
        return false;
    }

    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Desired audio buffer: %u samples (%u bytes)",
+                "Desired audio buffer: %u samples (%lu bytes)",
                want.samples,
-                want.samples * (Uint32)sizeof(short) * want.channels);
+                want.samples * sizeof(short) * want.channels);

    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                "Obtained audio buffer: %u samples (%u bytes)",
@@ -104,39 +65,13 @@ SdlAudioRenderer::~SdlAudioRenderer()
        SDL_CloseAudioDevice(m_AudioDevice);
    }

-    if (m_AudioBuffer != nullptr) {
-        free(m_AudioBuffer);
-    }
-
    SDL_QuitSubSystem(SDL_INIT_AUDIO);
    SDL_assert(!SDL_WasInit(SDL_INIT_AUDIO));
 }

-void* SdlAudioRenderer::getAudioBuffer(int*)
+bool SdlAudioRenderer::submitAudio(short* audioBuffer, int audioSize)
 {
-    return m_AudioBuffer;
-}
-
-bool SdlAudioRenderer::submitAudio(int bytesWritten)
-{
-    if (bytesWritten == 0) {
-        // Nothing to do
-        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) {
+    if (SDL_QueueAudio(m_AudioDevice, audioBuffer, audioSize) < 0) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "Failed to queue audio sample: %s",
                     SDL_GetError());
@@ -144,9 +79,3 @@ 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;
-}
@@ -1,145 +0,0 @@
-#include "slaud.h"
-
-#include <SDL.h>
-
-SLAudioRenderer::SLAudioRenderer()
-    : m_AudioContext(nullptr),
-      m_AudioStream(nullptr),
-      m_AudioBuffer(nullptr)
-{
-    SLAudio_SetLogFunction(SLAudioRenderer::slLogCallback, nullptr);
-}
-
-bool SLAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION* opusConfig)
-{
-    m_AudioContext = SLAudio_CreateContext();
-    if (m_AudioContext == nullptr) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SLAudio_CreateContext() failed");
-        return false;
-    }
-
-    // This number is pretty conservative (especially for surround), but
-    // it's hard to avoid since we get crushed by CPU limitations.
-    m_MaxQueuedAudioMs = 40 * opusConfig->channelCount / 2;
-
-    m_AudioBufferSize = opusConfig->samplesPerFrame * sizeof(short) * opusConfig->channelCount;
-    m_AudioStream = SLAudio_CreateStream(m_AudioContext,
-                                         opusConfig->sampleRate,
-                                         opusConfig->channelCount,
-                                         m_AudioBufferSize,
-                                         1);
-    if (m_AudioStream == nullptr) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SLAudio_CreateStream() failed");
-        return false;
-    }
-
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "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);
-
-    if (m_AudioBuffer == nullptr) {
-        m_AudioBuffer = SLAudio_BeginFrame(m_AudioStream);
-    }
-
-    return m_AudioBuffer;
-}
-
-SLAudioRenderer::~SLAudioRenderer()
-{
-    if (m_AudioBuffer != nullptr) {
-        memset(m_AudioBuffer, 0, m_AudioBufferSize);
-        SLAudio_SubmitFrame(m_AudioStream);
-    }
-
-    if (m_AudioStream != nullptr) {
-        SLAudio_FreeStream(m_AudioStream);
-    }
-
-    if (m_AudioContext != nullptr) {
-        SLAudio_FreeContext(m_AudioContext);
-    }
-}
-
-bool SLAudioRenderer::submitAudio(int bytesWritten)
-{
-    if (bytesWritten == 0) {
-        // This buffer will be reused next time
-        return true;
-    }
-
-    if (LiGetPendingAudioDuration() < m_MaxQueuedAudioMs) {
-        SLAudio_SubmitFrame(m_AudioStream);
-        m_AudioBuffer = nullptr;
-    }
-    else {
-        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                    "Too many queued audio frames: %d",
-                    LiGetPendingAudioFrames());
-    }
-
-    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;
-
-    switch (logLevel)
-    {
-    case k_ESLAudioLogError:
-        priority = SDL_LOG_PRIORITY_ERROR;
-        break;
-    case k_ESLAudioLogWarning:
-        priority = SDL_LOG_PRIORITY_WARN;
-        break;
-    case k_ESLAudioLogInfo:
-        priority = SDL_LOG_PRIORITY_INFO;
-        break;
-    default:
-    case k_ESLAudioLogDebug:
-        priority = SDL_LOG_PRIORITY_DEBUG;
-        break;
-    }
-
-    SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION,
-                   priority,
-                   "SLAudio: %s",
-                   message);
-}
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "renderer.h"
-#include <SLAudio.h>
-
-class SLAudioRenderer : public IAudioRenderer
-{
-public:
-    SLAudioRenderer();
-
-    virtual ~SLAudioRenderer();
-
-    virtual bool prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION* opusConfig);
-
-    virtual void* getAudioBuffer(int* size);
-
-    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);
-
-    CSLAudioContext* m_AudioContext;
-    CSLAudioStream* m_AudioStream;
-
-    void* m_AudioBuffer;
-    int m_AudioBufferSize;
-    int m_MaxQueuedAudioMs;
-};
@@ -4,13 +4,29 @@

 #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)
 {
@@ -72,17 +88,11 @@ 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:
-                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++;
-                }
+                score += 2;
                break;

            default:
@@ -162,11 +172,9 @@ 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 = m_AudioPacketDuration;
+    m_OutputStream->software_latency = k_MinSampleLengthSec;
    m_OutputStream->name = "Moonlight";
    m_OutputStream->userdata = this;
    m_OutputStream->error_callback = sioErrorCallback;
@@ -217,50 +225,42 @@ bool SoundIoAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATI

    m_EffectiveLayout = m_OutputStream->layout;
    for (int i = 0; i < m_EffectiveLayout.channel_count; i++) {
-        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;
-            }
+        // 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;
        }
-        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;
-            }
+        if (m_EffectiveLayout.channels[i] == SoundIoChannelIdSideRight) {
+            m_EffectiveLayout.channels[i] = SoundIoChannelIdBackRight;
        }
    }

    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 = (int)ceil(0.015 / m_AudioPacketDuration);
+        packetsToBuffer = 3;
    }
    else {
        // 30 ms buffer on CoreAudio to avoid glitching on macOS
-        packetsToBuffer = (int)ceil(0.030 / m_AudioPacketDuration);
+        packetsToBuffer = 6;
    }
-
-    // Always buffer at least 2 packets
-    packetsToBuffer = qMax(2, packetsToBuffer);
+#endif

    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Audio buffer size: %f seconds",
-                packetsToBuffer * m_AudioPacketDuration);
+                "Audio buffer size: %d packets",
+                packetsToBuffer);

    m_RingBuffer = soundio_ring_buffer_create(m_SoundIo,
                                              m_OutputStream->bytes_per_sample *
                                              m_OpusChannelCount *
-                                              opusConfig->samplesPerFrame *
+                                              SAMPLES_PER_FRAME *
                                              packetsToBuffer);
    if (m_RingBuffer == nullptr) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -284,8 +284,15 @@ bool SoundIoAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATI
    return true;
 }

-void* SoundIoAudioRenderer::getAudioBuffer(int* size)
+bool SoundIoAudioRenderer::submitAudio(short* audioBuffer, int audioSize)
 {
+    if (m_Errored) {
+        return false;
+    }
+
+    // Flush events to update with new device arrivals
+    soundio_flush_events(m_SoundIo);
+
    // We must always write a full frame of audio. If we don't,
    // the reader will get out of sync with the writer and our
    // channels will get all mixed up. To ensure this is always
@@ -293,36 +300,13 @@ void* SoundIoAudioRenderer::getAudioBuffer(int* size)
    // of our frame size.
    int bytesFree = soundio_ring_buffer_free_count(m_RingBuffer);
    int bytesPerFrame = m_OpusChannelCount * m_OutputStream->bytes_per_sample;
-    *size = qMin(*size, (bytesFree / bytesPerFrame) * bytesPerFrame);
-    return soundio_ring_buffer_write_ptr(m_RingBuffer);
-}
-
-bool SoundIoAudioRenderer::submitAudio(int bytesWritten)
-{
-    if (m_Errored) {
-        return false;
-    }
-
-    if (bytesWritten == 0) {
-        // Nothing to do
-        return true;
-    }
-
-    // Flush events to update with new device arrivals
-    soundio_flush_events(m_SoundIo);
-
-    // Advance the write pointer
-    soundio_ring_buffer_advance_write_ptr(m_RingBuffer, bytesWritten);
+    int bytesToWrite = qMin(audioSize, (bytesFree / bytesPerFrame) * bytesPerFrame);
+    memcpy(soundio_ring_buffer_write_ptr(m_RingBuffer), audioBuffer, bytesToWrite);
+    soundio_ring_buffer_advance_write_ptr(m_RingBuffer, bytesToWrite);

    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);
@@ -387,19 +371,15 @@ 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 * 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 = qMax(frameCountMin, (int)(stream->sample_rate * k_MinSampleLengthSec));
    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);
@@ -429,8 +409,9 @@ 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
-                // after we've applied our fixups to m_EffectiveLayout for 5.1 and 7.1.
+                // 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.
                int readPtrChannel = me->m_EffectiveLayout.channels[ch] - 1;

                if (frame >= framesLeft || readPtrChannel >= me->m_OpusChannelCount) {
@@ -13,11 +13,7 @@ public:

    virtual bool prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION* opusConfig);

-    virtual void* getAudioBuffer(int* size);
-
-    virtual bool submitAudio(int bytesWritten);
-
-    virtual int getCapabilities();
+    virtual bool submitAudio(short* audioBuffer, int audioSize);

 private:
    int scoreChannelLayout(const struct SoundIoChannelLayout* layout, const OPUS_MULTISTREAM_CONFIGURATION* opusConfig);
@@ -36,7 +32,9 @@ 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;
 };
@@ -10,15 +10,6 @@ struct GamepadState {
    SDL_JoystickID jsId;
    short index;

-#if !SDL_VERSION_ATLEAST(2, 0, 9)
-    SDL_Haptic* haptic;
-    int hapticMethod;
-    int hapticEffectId;
-#endif
-
-    SDL_TimerID mouseEmulationTimer;
-    uint32_t lastStartDownTime;
-
    short buttons;
    short lsX, lsY;
    short rsX, rsY;
@@ -28,13 +19,6 @@ struct GamepadState {
 #define MAX_GAMEPADS 4
 #define MAX_FINGERS 2

-#define GAMEPAD_HAPTIC_METHOD_NONE 0
-#define GAMEPAD_HAPTIC_METHOD_LEFTRIGHT 1
-#define GAMEPAD_HAPTIC_METHOD_SIMPLERUMBLE 2
-
-#define GAMEPAD_HAPTIC_SIMPLE_HIFREQ_MOTOR_WEIGHT 0.33
-#define GAMEPAD_HAPTIC_SIMPLE_LOWFREQ_MOTOR_WEIGHT 0.8
-
 class SdlInputHandler
 {
 public:
@@ -47,7 +31,7 @@ public:

    void handleMouseButtonEvent(SDL_MouseButtonEvent* event);

-    void handleMouseMotionEvent(SDL_Window* window, SDL_MouseMotionEvent* event);
+    void handleMouseMotionEvent(SDL_MouseMotionEvent* event);

    void handleMouseWheelEvent(SDL_MouseWheelEvent* event);

@@ -59,22 +43,12 @@ public:

    void handleJoystickArrivalEvent(SDL_JoyDeviceEvent* event);

-    void rumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor);
-
-    void handleTouchFingerEvent(SDL_Window* window, SDL_TouchFingerEvent* event);
+    void handleTouchFingerEvent(SDL_TouchFingerEvent* event);

    int getAttachedGamepadMask();

    void raiseAllKeys();

-    void notifyFocusGained(SDL_Window* window);
-
-    void notifyFocusLost(SDL_Window* window);
-
-    bool isCaptureActive();
-
-    void setCaptureActive(bool active);
-
    static
    QString getUnmappedGamepads();

@@ -85,30 +59,34 @@ private:
    void sendGamepadState(GamepadState* state);

    static
-    Uint32 longPressTimerCallback(Uint32 interval, void* param);
+    Uint32 releaseLeftButtonTimerCallback(Uint32 interval, void* param);
+
+    static
+    Uint32 releaseRightButtonTimerCallback(Uint32 interval, void* param);
+
+    static
+    Uint32 dragTimerCallback(Uint32 interval, void* param);

    static
    Uint32 mouseMoveTimerCallback(Uint32 interval, void* param);

-    static
-    Uint32 mouseEmulationTimerCallback(Uint32 interval, void* param);
-
    bool m_MultiController;
-    bool m_GamepadMouse;
    SDL_TimerID m_MouseMoveTimer;
    SDL_atomic_t m_MouseDeltaX;
    SDL_atomic_t m_MouseDeltaY;
    int m_GamepadMask;
    GamepadState m_GamepadState[MAX_GAMEPADS];
    QSet<short> m_KeysDown;
-    bool m_FakeCaptureActive;

-    SDL_TouchFingerEvent m_LastTouchDownEvent;
-    SDL_TouchFingerEvent m_LastTouchUpEvent;
-    SDL_TimerID m_LongPressTimer;
+    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;
-    bool m_AbsoluteMouseMode;

    static const int k_ButtonMap[];
 };
@@ -1,7 +1,6 @@
 #include "session.h"
 #include "settings/streamingpreferences.h"
 #include "streaming/streamutils.h"
-#include "backend/richpresencemanager.h"

 #include <Limelight.h>
 #include <SDL.h>
@@ -12,7 +11,7 @@
 #endif

 #ifdef HAVE_SLVIDEO
-#include "video/slvid.h"
+#include "video/sl.h"
 #endif

 #ifdef Q_OS_WIN32
@@ -30,8 +29,6 @@
 #include <QSvgRenderer>
 #include <QPainter>
 #include <QImage>
-#include <QGuiApplication>
-#include <QCursor>

 CONNECTION_LISTENER_CALLBACKS Session::k_ConnCallbacks = {
    Session::clStageStarting,
@@ -39,9 +36,18 @@ CONNECTION_LISTENER_CALLBACKS Session::k_ConnCallbacks = {
    Session::clStageFailed,
    nullptr,
    Session::clConnectionTerminated,
-    Session::clLogMessage,
-    Session::clRumble,
-    Session::clConnectionStatusUpdate
+    nullptr,
+    nullptr,
+    Session::clLogMessage
+};
+
+AUDIO_RENDERER_CALLBACKS Session::k_AudioCallbacks = {
+    Session::arInit,
+    nullptr,
+    nullptr,
+    Session::arCleanup,
+    Session::arDecodeAndPlaySample,
+    CAPABILITY_DIRECT_SUBMIT
 };

 Session* Session::s_ActiveSession;
@@ -56,7 +62,7 @@ void Session::clStageStarting(int stage)
    QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 }

-void Session::clStageFailed(int stage, int errorCode)
+void Session::clStageFailed(int stage, long 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
@@ -65,16 +71,13 @@ void Session::clStageFailed(int stage, int errorCode)
    QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 }

-void Session::clConnectionTerminated(int errorCode)
+void Session::clConnectionTerminated(long errorCode)
 {
-    // Display the termination dialog if this was not intended
-    if (errorCode != 0) {
-        s_ActiveSession->m_UnexpectedTermination = true;
-        emit s_ActiveSession->displayLaunchError("Connection terminated");
-    }
+    s_ActiveSession->m_UnexpectedTermination = true;
+    emit s_ActiveSession->displayLaunchError("Connection terminated");

    SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                 "Connection terminated: %d",
+                 "Connection terminated: %ld",
                 errorCode);

    // Push a quit event to the main loop
@@ -96,72 +99,19 @@ void Session::clLogMessage(const char* format, ...)
    va_end(ap);
 }

-void Session::clRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor)
-{
-    // The input handler can be closed during the stream if LiStopConnection() hasn't completed yet
-    // but the stream has been stopped by the user. In this case, just discard the rumble.
-    SDL_AtomicLock(&s_ActiveSession->m_InputHandlerLock);
-    if (s_ActiveSession->m_InputHandler != nullptr) {
-        s_ActiveSession->m_InputHandler->rumble(controllerNumber, lowFreqMotor, highFreqMotor);
-    }
-    SDL_AtomicUnlock(&s_ActiveSession->m_InputHandlerLock);
-}
-
-void Session::clConnectionStatusUpdate(int connectionStatus)
-{
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Connection status update: %d",
-                connectionStatus);
-
-    if (!s_ActiveSession->m_Preferences->connectionWarnings) {
-        return;
-    }
-
-    if (s_ActiveSession->m_MouseEmulationRefCount > 0) {
-        // Don't display the overlay if mouse emulation is already using it
-        return;
-    }
-
-    switch (connectionStatus)
-    {
-    case CONN_STATUS_POOR:
-        if (s_ActiveSession->m_StreamConfig.bitrate > 5000) {
-            strcpy(s_ActiveSession->m_OverlayManager.getOverlayText(Overlay::OverlayStatusUpdate), "Slow connection to PC\nReduce your bitrate");
-        }
-        else {
-            strcpy(s_ActiveSession->m_OverlayManager.getOverlayText(Overlay::OverlayStatusUpdate), "Poor connection to PC");
-        }
-        s_ActiveSession->m_OverlayManager.setOverlayTextUpdated(Overlay::OverlayStatusUpdate);
-        s_ActiveSession->m_OverlayManager.setOverlayState(Overlay::OverlayStatusUpdate, true);
-        break;
-    case CONN_STATUS_OKAY:
-        s_ActiveSession->m_OverlayManager.setOverlayState(Overlay::OverlayStatusUpdate, false);
-        break;
-    }
-}
+#define CALL_INITIALIZE(dec) (dec)->initialize(vds, window, videoFormat, width, height, frameRate, enableVsync, enableFramePacing)

 bool Session::chooseDecoder(StreamingPreferences::VideoDecoderSelection vds,
                            SDL_Window* window, int videoFormat, int width, int height,
-                            int frameRate, bool enableVsync, bool enableFramePacing, bool testOnly, IVideoDecoder*& chosenDecoder)
+                            int frameRate, bool enableVsync, bool enableFramePacing, IVideoDecoder*& chosenDecoder)
 {
-    DECODER_PARAMETERS params;
-
-    params.width = width;
-    params.height = height;
-    params.frameRate = frameRate;
-    params.videoFormat = videoFormat;
-    params.window = window;
-    params.enableVsync = enableVsync;
-    params.enableFramePacing = enableFramePacing;
-    params.vds = vds;
-
    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                "V-sync %s",
                enableVsync ? "enabled" : "disabled");

 #ifdef HAVE_SLVIDEO
-    chosenDecoder = new SLVideoDecoder(testOnly);
-    if (chosenDecoder->initialize(&params)) {
+    chosenDecoder = new SLVideoDecoder();
+    if (CALL_INITIALIZE(chosenDecoder)) {
        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                    "SLVideo video decoder chosen");
        return true;
@@ -175,8 +125,8 @@ bool Session::chooseDecoder(StreamingPreferences::VideoDecoderSelection vds,
 #endif

 #ifdef HAVE_FFMPEG
-    chosenDecoder = new FFmpegVideoDecoder(testOnly);
-    if (chosenDecoder->initialize(&params)) {
+    chosenDecoder = new FFmpegVideoDecoder();
+    if (CALL_INITIALIZE(chosenDecoder)) {
        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                    "FFmpeg-based video decoder chosen");
        return true;
@@ -250,32 +200,30 @@ 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,
+bool Session::isHardwareDecodeAvailable(StreamingPreferences::VideoDecoderSelection vds,
                                        int videoFormat, int width, int height, int frameRate)
 {
    IVideoDecoder* decoder;

-    if (!chooseDecoder(vds, window, videoFormat, width, height, frameRate, true, false, true, decoder)) {
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
+                     SDL_GetError());
+        return false;
+    }
+
+    SDL_Window* window = SDL_CreateWindow("", 0, 0, width, height, SDL_WINDOW_HIDDEN);
+    if (!window) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "Failed to create window for hardware decode test: %s",
+                     SDL_GetError());
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        return false;
+    }
+
+    if (!chooseDecoder(vds, window, videoFormat, width, height, frameRate, true, false, decoder)) {
+        SDL_DestroyWindow(window);
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
        return false;
    }

@@ -283,31 +231,53 @@ bool Session::isHardwareDecodeAvailable(SDL_Window* window,

    delete decoder;

+    // This must be called after the decoder is deleted, because
+    // the renderer may want to interact with the window
+    SDL_DestroyWindow(window);
+
+    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
    return ret;
 }

-bool Session::populateDecoderProperties(SDL_Window* window)
+int Session::getDecoderCapabilities(StreamingPreferences::VideoDecoderSelection vds,
+                                    int videoFormat, int width, int height, int frameRate)
 {
    IVideoDecoder* 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)) {
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
+                     SDL_GetError());
        return false;
    }

-    m_VideoCallbacks.capabilities = decoder->getDecoderCapabilities();
+    SDL_Window* window = SDL_CreateWindow("", 0, 0, width, height, SDL_WINDOW_HIDDEN);
+    if (!window) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "Failed to create window for hardware decode test: %s",
+                     SDL_GetError());
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        return false;
+    }

-    m_StreamConfig.colorSpace = decoder->getDecoderColorspace();
+    if (!chooseDecoder(vds, window, videoFormat, width, height, frameRate, true, false, decoder)) {
+        SDL_DestroyWindow(window);
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+        return false;
+    }
+
+    int caps = decoder->getDecoderCapabilities();

    delete decoder;

-    return true;
+    // This must be called after the decoder is deleted, because
+    // the renderer may want to interact with the window
+    SDL_DestroyWindow(window);
+
+    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+    return caps;
 }

 Session::Session(NvComputer* computer, NvApp& app, StreamingPreferences *preferences)
@@ -323,18 +293,12 @@ Session::Session(NvComputer* computer, NvApp& app, StreamingPreferences *prefere
      m_DisplayOriginY(0),
      m_PendingWindowedTransition(false),
      m_UnexpectedTermination(true), // Failure prior to streaming is unexpected
-      m_InputHandler(nullptr),
-      m_InputHandlerLock(0),
-      m_MouseEmulationRefCount(0),
      m_OpusDecoder(nullptr),
      m_AudioRenderer(nullptr),
-      m_AudioSampleCount(0),
-      m_DropAudioEndTime(0)
+      m_AudioSampleCount(0)
 {
 }

-// NB: This may not get destroyed for a long time! Don't put any vital cleanup here.
-// Use Session::exec() or DeferredSessionCleanupTask instead.
 Session::~Session()
 {
    // Acquire session semaphore to ensure all cleanup is done before the destructor returns
@@ -343,25 +307,8 @@ Session::~Session()
    s_ActiveSessionSemaphore.release();
 }

-bool Session::initialize()
+void Session::initialize()
 {
-    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
-                     SDL_GetError());
-        return false;
-    }
-
-    // Create a hidden window to use for decoder initialization tests
-    SDL_Window* 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;
    qInfo() << "Server GFE version:" << m_Computer->gfeVersion;

@@ -369,12 +316,21 @@ 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",
@@ -394,31 +350,18 @@ 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 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));
+                "Audio configuration: %d",
+                m_StreamConfig.audioConfiguration);

    switch (m_Preferences->videoCodecConfig)
    {
    case StreamingPreferences::VCC_AUTO:
        // TODO: Determine if HEVC is better depending on the decoder
        m_StreamConfig.supportsHevc =
-                isHardwareDecodeAvailable(testWindow,
-                                          m_Preferences->videoDecoderSelection,
+                isHardwareDecodeAvailable(m_Preferences->videoDecoderSelection,
                                          VIDEO_FORMAT_H265,
                                          m_StreamConfig.width,
                                          m_StreamConfig.height,
@@ -457,44 +400,14 @@ bool Session::initialize()

    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) {
-        SDL_QuitSubSystem(SDL_INIT_VIDEO);
-        return false;
-    }
-
-    return true;
 }

 void Session::emitLaunchWarning(QString text)
@@ -513,22 +426,12 @@ void Session::emitLaunchWarning(QString text)
    }
 }

-bool Session::validateLaunch(SDL_Window* testWindow)
+bool Session::validateLaunch()
 {
    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) {
-        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.");
-        }
+        emitLaunchWarning("Your settings selection to force software decoding may cause poor streaming performance.");
    }

    if (m_Preferences->unsupportedFps && m_StreamConfig.fps > 60) {
@@ -543,14 +446,12 @@ bool Session::validateLaunch(SDL_Window* testWindow)
        bool hevcForced = m_Preferences->videoCodecConfig == StreamingPreferences::VCC_FORCE_HEVC ||
                m_Preferences->videoCodecConfig == StreamingPreferences::VCC_FORCE_HEVC_HDR;

-        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 (!isHardwareDecodeAvailable(m_Preferences->videoDecoderSelection,
+                                       VIDEO_FORMAT_H265,
+                                       m_StreamConfig.width,
+                                       m_StreamConfig.height,
+                                       m_StreamConfig.fps) &&
+                m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_AUTO) {
            if (hevcForced) {
                emitLaunchWarning("Using software decoding due to your selection to force HEVC without GPU support. This may cause poor streaming performance.");
            }
@@ -586,8 +487,7 @@ bool Session::validateLaunch(SDL_Window* testWindow)
            emitLaunchWarning("Your host PC GPU doesn't support HDR streaming. "
                              "A GeForce GTX 1000-series (Pascal) or later GPU is required for HDR streaming.");
        }
-        else if (!isHardwareDecodeAvailable(testWindow,
-                                            m_Preferences->videoDecoderSelection,
+        else if (!isHardwareDecodeAvailable(m_Preferences->videoDecoderSelection,
                                            VIDEO_FORMAT_H265_MAIN10,
                                            m_StreamConfig.width,
                                            m_StreamConfig.height,
@@ -615,12 +515,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 surround sound doesn't work
-    if (!audioTestPassed && CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION(m_StreamConfig.audioConfiguration) > 2) {
+    // Gracefully degrade to stereo if 5.1 doesn't work
+    if (!audioTestPassed && m_StreamConfig.audioConfiguration == AUDIO_CONFIGURATION_51_SURROUND) {
        audioTestPassed = testAudio(AUDIO_CONFIGURATION_STEREO);
        if (audioTestPassed) {
            m_StreamConfig.audioConfiguration = AUDIO_CONFIGURATION_STEREO;
-            emitLaunchWarning("Your selected surround sound setting is not supported by the current audio device.");
+            emitLaunchWarning("5.1 surround sound is not supported by the current audio device.");
        }
    }

@@ -635,22 +535,8 @@ 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,
+            !isHardwareDecodeAvailable(m_Preferences->videoDecoderSelection,
                                       m_StreamConfig.supportsHevc ? VIDEO_FORMAT_H265 : VIDEO_FORMAT_H264,
                                       m_StreamConfig.width,
                                       m_StreamConfig.height,
@@ -666,6 +552,13 @@ bool Session::validateLaunch(SDL_Window* testWindow)
        return false;
    }

+    // Add the capability flags from the chosen decoder/renderer
+    m_VideoCallbacks.capabilities |= getDecoderCapabilities(m_Preferences->videoDecoderSelection,
+                                                            m_StreamConfig.supportsHevc ? VIDEO_FORMAT_H265 : VIDEO_FORMAT_H264,
+                                                            m_StreamConfig.width,
+                                                            m_StreamConfig.height,
+                                                            m_StreamConfig.fps);
+
    return true;
 }

@@ -867,18 +760,10 @@ void Session::toggleFullscreen()
    bool fullScreen = !(SDL_GetWindowFlags(m_Window) & m_FullScreenFlag);

    if (fullScreen) {
-        if (m_FullScreenFlag == SDL_WINDOW_FULLSCREEN) {
-            // Confine the cursor to the window
-            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);

@@ -887,22 +772,6 @@ void Session::toggleFullscreen()
    }
 }

-void Session::notifyMouseEmulationMode(bool enabled)
-{
-    m_MouseEmulationRefCount += enabled ? 1 : -1;
-    SDL_assert(m_MouseEmulationRefCount >= 0);
-
-    // We re-use the status update overlay for mouse mode notification
-    if (m_MouseEmulationRefCount > 0) {
-        strcpy(m_OverlayManager.getOverlayText(Overlay::OverlayStatusUpdate), "Gamepad mouse mode active\nLong press Start to deactivate");
-        m_OverlayManager.setOverlayTextUpdated(Overlay::OverlayStatusUpdate);
-        m_OverlayManager.setOverlayState(Overlay::OverlayStatusUpdate, true);
-    }
-    else {
-        m_OverlayManager.setOverlayState(Overlay::OverlayStatusUpdate, false);
-    }
-}
-
 void Session::exec(int displayOriginX, int displayOriginY)
 {
    m_DisplayOriginX = displayOriginX;
@@ -911,7 +780,11 @@ void Session::exec(int displayOriginX, int displayOriginY)
    // Complete initialization in this deferred context to avoid
    // calling expensive functions in the constructor (during the
    // process of loading the StreamSegue).
-    if (!initialize()) {
+    initialize();
+
+    // Check for validation errors/warnings and emit
+    // signals for them, if appropriate
+    if (!validateLaunch()) {
        emit sessionFinished();
        return;
    }
@@ -933,42 +806,15 @@ void Session::exec(int displayOriginX, int displayOriginY)

    // Initialize the gamepad code with our preferences
    StreamingPreferences prefs;
-    m_InputHandler = new SdlInputHandler(prefs, m_Computer,
-                                         m_StreamConfig.width,
-                                         m_StreamConfig.height);
+    SdlInputHandler inputHandler(prefs, m_Computer,
+                                 m_StreamConfig.width,
+                                 m_StreamConfig.height);

    // The UI should have ensured the old game was already quit
    // if we decide to stream a different game.
    Q_ASSERT(m_Computer->currentGameId == 0 ||
             m_Computer->currentGameId == m_App.id);

-    // SOPS will set all settings to 720p60 if it doesn't recognize
-    // the chosen resolution. Avoid that by disabling SOPS when it
-    // is not streaming a supported resolution.
-    bool enableGameOptimizations = false;
-    for (const NvDisplayMode &mode : m_Computer->displayModes) {
-        if (mode.width == m_StreamConfig.width &&
-                mode.height == m_StreamConfig.height) {
-            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                        "Found host supported resolution: %dx%d",
-                        mode.width, mode.height);
-            enableGameOptimizations = prefs.gameOptimizations;
-            break;
-        }
-    }
-
-    if (prefs.fps > 60) {
-        // Using SOPS with FPS values over 60 causes GFE to fall back
-        // to 720p60. On previous GFE versions, we could avoid this by
-        // forcing the FPS value to 60 when launching the stream, but
-        // now on GFE 3.20.3 that seems to trigger some sort of
-        // frame rate limiter that locks the game to 60 FPS.
-        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                    "Disabling SOPS for %d FPS stream",
-                    prefs.fps);
-        enableGameOptimizations = false;
-    }
-
    try {
        NvHTTP http(m_Computer->activeAddress, m_Computer->serverCert);
        if (m_Computer->currentGameId != 0) {
@@ -976,26 +822,30 @@ void Session::exec(int displayOriginX, int displayOriginY)
        }
        else {
            http.launchApp(m_App.id, &m_StreamConfig,
-                           enableGameOptimizations,
+                           prefs.gameOptimizations,
                           prefs.playAudioOnHost,
-                           m_InputHandler->getAttachedGamepadMask());
+                           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());
+        emit displayLaunchError(e.toQString());
        QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
        return;
    } 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;
    }

+    SDL_assert(!SDL_WasInit(SDL_INIT_VIDEO));
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_InitSubSystem(SDL_INIT_VIDEO) failed: %s",
+                     SDL_GetError());
+        emit displayLaunchError(QString::fromLocal8Bit(SDL_GetError()));
+        QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
+        return;
+    }
+
    QByteArray hostnameStr = m_Computer->activeAddress.toLatin1();
    QByteArray siAppVersion = m_Computer->appVersion.toLatin1();

@@ -1012,39 +862,13 @@ 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 : &m_AudioCallbacks,
+                                m_AudioDisabled ? nullptr : &k_AudioCallbacks,
                                NULL, 0, NULL, 0);
    if (err != 0) {
        // We already displayed an error dialog in the stage failure
        // listener.
-        delete m_InputHandler;
-        m_InputHandler = nullptr;
        SDL_QuitSubSystem(SDL_INIT_VIDEO);
        QThreadPool::globalInstance()->start(new DeferredSessionCleanupTask(this));
        return;
@@ -1057,13 +881,6 @@ void Session::exec(int displayOriginX, int displayOriginY)
    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,
@@ -1074,8 +891,6 @@ void Session::exec(int displayOriginX, int displayOriginY)
        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;
@@ -1118,11 +933,6 @@ void Session::exec(int displayOriginX, int displayOriginY)
        SDL_SetWindowResizable(m_Window, SDL_TRUE);
    }
    else {
-        if (m_FullScreenFlag == SDL_WINDOW_FULLSCREEN) {
-            // Confine the cursor to the window
-            SDL_SetWindowGrab(m_Window, SDL_TRUE);
-        }
-
        // Update the window display mode based on our current monitor
        updateOptimalWindowDisplayMode();

@@ -1130,35 +940,14 @@ void Session::exec(int displayOriginX, int displayOriginY)
        SDL_SetWindowFullscreen(m_Window, m_FullScreenFlag);
    }

-    bool needsFirstEnterCapture = false;
-
-    // Capture the mouse in relative mode by default on release builds only.
-    // This prevents the mouse from becoming trapped inside Moonlight when
-    // it's halted at a debug break.
-#ifdef QT_DEBUG
-    if (prefs.absoluteMouseMode)
-#endif
-    {
-        // HACK: For Wayland, we wait until we get the first SDL_WINDOWEVENT_ENTER
-        // event where it seems to work consistently on GNOME. This doesn't work for
-        // XWayland though.
-        if (strcmp(SDL_GetCurrentVideoDriver(), "wayland") != 0) {
-            // We know we aren't running on native Wayland now, but
-            // we still may be running on XWayland.
-            if (!WMUtils::isRunningWayland()) {
-                // Neither Wayland or XWayland: capture now
-                m_InputHandler->setCaptureActive(true);
-            }
-            else {
-                // XWayland: mouse capture doesn't work reliably, so let the user
-                // engage the mouse capture via clicking or using the hotkey.
-            }
-        }
-        else {
-            // Native Wayland: Capture on SDL_WINDOWEVENT_ENTER
-            needsFirstEnterCapture = true;
-        }
+#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);
    }
+#endif

    // Stop text input. SDL enables it by default
    // when we initialize the video subsystem, but this
@@ -1169,15 +958,18 @@ 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");

+    // Raise the priority of the main thread, since it handles
+    // time-sensitive video rendering
+    if (SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH) < 0) {
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                    "Unable to set main thread to high priority: %s",
+                    SDL_GetError());
+    }
+
    int currentDisplayIndex = SDL_GetWindowDisplayIndex(m_Window);

    // Now that we're about to stream, any SDL_QUIT event is expected
@@ -1185,9 +977,6 @@ 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(prefs, 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;
@@ -1197,14 +986,7 @@ void Session::exec(int displayOriginX, int displayOriginY)
        // blocks this thread too long for high polling rate mice and high
        // refresh rate displays.
        if (!SDL_PollEvent(&event)) {
-#ifndef STEAM_LINK
            SDL_Delay(1);
-#else
-            // Waking every 1 ms to process input is too much for the low performance
-            // ARM core in the Steam Link, so we will wait 10 ms instead.
-            SDL_Delay(10);
-#endif
-            presence.runCallbacks();
            continue;
        }
        switch (event.type) {
@@ -1212,24 +994,65 @@ void Session::exec(int displayOriginX, int displayOriginY)
            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                        "Quit event received");
            goto DispatchDeferredCleanup;
+        case SDL_USEREVENT: {
+            SDL_Event nextEvent;

-        case SDL_USEREVENT:
            SDL_assert(event.user.code == SDL_CODE_FRAME_READY);
-            m_VideoDecoder->renderFrameOnMainThread();
+
+            // Drop any earlier frames
+            while (SDL_PeepEvents(&nextEvent,
+                                  1,
+                                  SDL_GETEVENT,
+                                  SDL_USEREVENT,
+                                  SDL_USEREVENT) == 1) {
+                m_VideoDecoder->dropFrame(&event.user);
+                event = nextEvent;
+            }
+
+            // Render the last frame
+            m_VideoDecoder->renderFrame(&event.user);
            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) {
-                m_InputHandler->notifyFocusGained(m_Window);
-            }
-            else if (event.window.event == SDL_WINDOWEVENT_FOCUS_LOST) {
-                m_InputHandler->notifyFocusLost(m_Window);
+                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

-            // Capture the mouse on SDL_WINDOWEVENT_ENTER if needed
-            if (needsFirstEnterCapture && event.window.event == SDL_WINDOWEVENT_ENTER) {
-                m_InputHandler->setCaptureActive(true);
-                needsFirstEnterCapture = false;
+
+            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);
+                }
+
+                // 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.
+                inputHandler.raiseAllKeys();
            }

            // We want to recreate the decoder for resizes (full-screen toggles) and the initial shown event.
@@ -1302,7 +1125,6 @@ void Session::exec(int displayOriginX, int displayOriginY)
                                   m_ActiveVideoHeight, m_ActiveVideoFrameRate,
                                   enableVsync,
                                   enableVsync && m_Preferences->framePacing,
-                                   false,
                                   s_ActiveSession->m_VideoDecoder)) {
                    SDL_AtomicUnlock(&m_DecoderLock);
                    SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -1320,62 +1142,55 @@ void Session::exec(int displayOriginX, int displayOriginY)

        case SDL_KEYUP:
        case SDL_KEYDOWN:
-            m_InputHandler->handleKeyEvent(&event.key);
+            inputHandler.handleKeyEvent(&event.key);
            break;
        case SDL_MOUSEBUTTONDOWN:
        case SDL_MOUSEBUTTONUP:
-            m_InputHandler->handleMouseButtonEvent(&event.button);
+            inputHandler.handleMouseButtonEvent(&event.button);
            break;
        case SDL_MOUSEMOTION:
-            m_InputHandler->handleMouseMotionEvent(m_Window, &event.motion);
+            inputHandler.handleMouseMotionEvent(&event.motion);
            break;
        case SDL_MOUSEWHEEL:
-            m_InputHandler->handleMouseWheelEvent(&event.wheel);
+            inputHandler.handleMouseWheelEvent(&event.wheel);
            break;
        case SDL_CONTROLLERAXISMOTION:
-            m_InputHandler->handleControllerAxisEvent(&event.caxis);
+            inputHandler.handleControllerAxisEvent(&event.caxis);
            break;
        case SDL_CONTROLLERBUTTONDOWN:
        case SDL_CONTROLLERBUTTONUP:
-            m_InputHandler->handleControllerButtonEvent(&event.cbutton);
+            inputHandler.handleControllerButtonEvent(&event.cbutton);
            break;
        case SDL_CONTROLLERDEVICEADDED:
        case SDL_CONTROLLERDEVICEREMOVED:
-            m_InputHandler->handleControllerDeviceEvent(&event.cdevice);
+            inputHandler.handleControllerDeviceEvent(&event.cdevice);
            break;
        case SDL_JOYDEVICEADDED:
-            m_InputHandler->handleJoystickArrivalEvent(&event.jdevice);
+            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(m_Window, &event.tfinger);
+            inputHandler.handleTouchFingerEvent(&event.tfinger);
            break;
+#endif
        }
    }

 DispatchDeferredCleanup:
    // Uncapture the mouse and hide the window immediately,
    // so we can return to the Qt GUI ASAP.
-    m_InputHandler->setCaptureActive(false);
-    SDL_SetWindowGrab(m_Window, SDL_FALSE);
+    SDL_SetRelativeMouseMode(SDL_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();
-
-    // Destroy the input handler now. Any rumble callbacks that
-    // occur after this point will be discarded. This must be destroyed
-    // before allow the UI to continue execution or it could interfere
-    // with SDLGamepadKeyNavigation.
-    SDL_AtomicLock(&m_InputHandlerLock);
-    delete m_InputHandler;
-    m_InputHandler = nullptr;
-    SDL_AtomicUnlock(&m_InputHandlerLock);
+    inputHandler.raiseAllKeys();

    // Destroy the decoder, since this must be done on the main thread
    SDL_AtomicLock(&m_DecoderLock);
@@ -1390,8 +1205,8 @@ DispatchDeferredCleanup:
    if (iconSurface != nullptr) {
        SDL_FreeSurface(iconSurface);
    }
-
    SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    SDL_assert(!SDL_WasInit(SDL_INIT_VIDEO));

    // Cleanup can take a while, so dispatch it to a worker thread.
    // When it is complete, it will release our s_ActiveSessionSemaphore
@@ -4,11 +4,11 @@

 #include <Limelight.h>
 #include <opus_multistream.h>
+#include "backend/computermanager.h"
 #include "settings/streamingpreferences.h"
 #include "input.h"
 #include "video/decoder.h"
 #include "audio/renderers/renderer.h"
-#include "video/overlaymanager.h"

 class Session : public QObject
 {
@@ -25,23 +25,17 @@ public:
    Q_INVOKABLE void exec(int displayOriginX, int displayOriginY);

    static
-    void getDecoderInfo(SDL_Window* window,
-                       bool& isHardwareAccelerated, bool& isFullScreenOnly, QSize& maxResolution);
+    bool isHardwareDecodeAvailable(StreamingPreferences::VideoDecoderSelection vds,
+                                   int videoFormat, int width, int height, int frameRate);

-    static Session* get()
-    {
-        return s_ActiveSession;
-    }
-
-    Overlay::OverlayManager& getOverlayManager()
-    {
-        return m_OverlayManager;
-    }
+    static
+    int getDecoderCapabilities(StreamingPreferences::VideoDecoderSelection vds,
+                               int videoFormat, int width, int height, int frameRate);

 signals:
    void stageStarting(QString stage);

-    void stageFailed(QString stage, int errorCode);
+    void stageFailed(QString stage, long errorCode);

    void connectionStarted();

@@ -54,59 +48,45 @@ signals:
    void sessionFinished();

 private:
-    bool initialize();
+    void initialize();

-    bool validateLaunch(SDL_Window* testWindow);
+    bool validateLaunch();

    void emitLaunchWarning(QString text);

-    bool populateDecoderProperties(SDL_Window* window);
+    int getDecoderCapabilities();

-    IAudioRenderer* createAudioRenderer(const POPUS_MULTISTREAM_CONFIGURATION opusConfig);
+    IAudioRenderer* createAudioRenderer();
+
+    int detectAudioConfiguration();

    bool testAudio(int audioConfiguration);

-    int getAudioRendererCapabilities(int audioConfiguration);
-
    void getWindowDimensions(int& x, int& y,
                             int& width, int& height);

    void toggleFullscreen();

-    void notifyMouseEmulationMode(bool enabled);
-
    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,
                       int frameRate, bool enableVsync, bool enableFramePacing,
-                       bool testOnly,
                       IVideoDecoder*& chosenDecoder);

    static
    void clStageStarting(int stage);

    static
-    void clStageFailed(int stage, int errorCode);
+    void clStageFailed(int stage, long errorCode);

    static
-    void clConnectionTerminated(int errorCode);
+    void clConnectionTerminated(long errorCode);

    static
    void clLogMessage(const char* format, ...);

-    static
-    void clRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor);
-
-    static
-    void clConnectionStatusUpdate(int connectionStatus);
-
    static
    int arInit(int audioConfiguration,
               const POPUS_MULTISTREAM_CONFIGURATION opusConfig,
@@ -130,7 +110,6 @@ 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;
@@ -143,9 +122,6 @@ private:
    int m_DisplayOriginY;
    bool m_PendingWindowedTransition;
    bool m_UnexpectedTermination;
-    SdlInputHandler* m_InputHandler;
-    SDL_SpinLock m_InputHandlerLock;
-    int m_MouseEmulationRefCount;

    int m_ActiveVideoFormat;
    int m_ActiveVideoWidth;
@@ -153,13 +129,12 @@ private:
    int m_ActiveVideoFrameRate;

    OpusMSDecoder* m_OpusDecoder;
+    short m_OpusDecodeBuffer[MAX_CHANNELS * SAMPLES_PER_FRAME];
    IAudioRenderer* m_AudioRenderer;
    OPUS_MULTISTREAM_CONFIGURATION m_AudioConfig;
    int m_AudioSampleCount;
-    Uint32 m_DropAudioEndTime;
-
-    Overlay::OverlayManager m_OverlayManager;

+    static AUDIO_RENDERER_CALLBACKS k_AudioCallbacks;
    static CONNECTION_LISTENER_CALLBACKS k_ConnCallbacks;
    static Session* s_ActiveSession;
    static QSemaphore s_ActiveSessionSemaphore;
@@ -12,12 +12,14 @@ void StreamUtils::scaleSourceToDestinationSurface(SDL_Rect* src, SDL_Rect* dst)
    int dstW = dst->h * src->w / src->h;

    if (dstH > dst->h) {
-        dst->x += (dst->w - dstW) / 2;
+        dst->y = 0;
+        dst->x = (dst->w - dstW) / 2;
        dst->w = dstW;
        SDL_assert(dst->w * src->h / src->w <= dst->h);
    }
    else {
-        dst->y += (dst->h - dstH) / 2;
+        dst->x = 0;
+        dst->y = (dst->h - dstH) / 2;
        dst->h = dstH;
        SDL_assert(dst->h * src->w / src->h <= dst->w);
    }
@@ -12,41 +12,45 @@ typedef struct _VIDEO_STATS {
    uint32_t receivedFrames;
    uint32_t decodedFrames;
    uint32_t renderedFrames;
-    uint32_t totalFrames;
    uint32_t networkDroppedFrames;
    uint32_t pacerDroppedFrames;
    uint32_t totalReassemblyTime;
    uint32_t totalDecodeTime;
    uint32_t totalPacerTime;
    uint32_t totalRenderTime;
-    float totalFps;
    float receivedFps;
    float decodedFps;
    float renderedFps;
    uint32_t measurementStartTimestamp;
 } VIDEO_STATS, *PVIDEO_STATS;

-typedef struct _DECODER_PARAMETERS {
-    SDL_Window* window;
-    StreamingPreferences::VideoDecoderSelection vds;
-
-    int videoFormat;
-    int width;
-    int height;
-    int frameRate;
-    bool enableVsync;
-    bool enableFramePacing;
-} DECODER_PARAMETERS, *PDECODER_PARAMETERS;
-
 class IVideoDecoder {
 public:
    virtual ~IVideoDecoder() {}
-    virtual bool initialize(PDECODER_PARAMETERS params) = 0;
+    virtual bool initialize(StreamingPreferences::VideoDecoderSelection vds,
+                            SDL_Window* window,
+                            int videoFormat,
+                            int width,
+                            int height,
+                            int frameRate,
+                            bool enableVsync,
+                            bool enableFramePacing) = 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;
+    virtual void renderFrame(SDL_UserEvent* event) = 0;
+    virtual void dropFrame(SDL_UserEvent* event) = 0;
+
+    virtual void queueFrame(void* data1 = nullptr,
+                            void* data2 = nullptr)
+    {
+        SDL_Event event;
+
+        event.type = SDL_USEREVENT;
+        event.user.code = SDL_CODE_FRAME_READY;
+        event.user.data1 = data1;
+        event.user.data2 = data2;
+
+        SDL_PushEvent(&event);
+    }
 };
@@ -1,57 +0,0 @@
-#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;
-}
-
@@ -1,18 +0,0 @@
-#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;
-};
-
@@ -1,274 +0,0 @@
-#include "drm.h"
-
-extern "C" {
-    #include <libavutil/hwcontext_drm.h>
-}
-
-#include <libdrm/drm_fourcc.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "streaming/streamutils.h"
-#include "streaming/session.h"
-
-#include <Limelight.h>
-
-DrmRenderer::DrmRenderer()
-    : m_DrmFd(-1),
-      m_CrtcId(0),
-      m_PlaneId(0),
-      m_CurrentFbId(0)
-{
-}
-
-DrmRenderer::~DrmRenderer()
-{
-    if (m_CurrentFbId != 0) {
-        drmModeRmFB(m_DrmFd, m_CurrentFbId);
-    }
-
-    if (m_DrmFd != -1) {
-        close(m_DrmFd);
-    }
-}
-
-bool DrmRenderer::prepareDecoderContext(AVCodecContext*, AVDictionary**)
-{
-    /* Nothing to do */
-
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Using DRM renderer");
-
-    return true;
-}
-
-bool DrmRenderer::initialize(PDECODER_PARAMETERS)
-{
-    const char* device = SDL_getenv("DRM_DEV");
-    int i;
-
-    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 false;
-    }
-
-    drmModeRes* resources = drmModeGetResources(m_DrmFd);
-    if (resources == nullptr) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                 "drmModeGetResources() failed: %d",
-                 errno);
-        return false;
-    }
-
-    // Look for a connected connector and get the associated encoder
-    uint32_t encoderId = 0;
-    for (i = 0; i < resources->count_connectors && encoderId == 0; i++) {
-        drmModeConnector* connector = drmModeGetConnector(m_DrmFd, resources->connectors[i]);
-        if (connector != nullptr) {
-            if (connector->connection == DRM_MODE_CONNECTED && connector->count_modes > 0) {
-                encoderId = connector->encoder_id;
-            }
-
-            drmModeFreeConnector(connector);
-        }
-    }
-
-    if (encoderId == 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "No connected displays found!");
-        drmModeFreeResources(resources);
-        return false;
-    }
-
-    // Now find the CRTC from the encoder
-    m_CrtcId = 0;
-    for (i = 0; i < resources->count_encoders && m_CrtcId == 0; i++) {
-        drmModeEncoder* encoder = drmModeGetEncoder(m_DrmFd, resources->encoders[i]);
-        if (encoder != nullptr) {
-            if (encoder->encoder_id == encoderId) {
-                m_CrtcId = encoder->crtc_id;
-            }
-
-            drmModeFreeEncoder(encoder);
-        }
-    }
-
-    if (m_CrtcId == 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "DRM encoder not found!");
-        drmModeFreeResources(resources);
-        return false;
-    }
-
-    int crtcIndex = -1;
-    for (int i = 0; i < resources->count_crtcs; i++) {
-        if (resources->crtcs[i] == m_CrtcId) {
-            drmModeCrtc* crtc = drmModeGetCrtc(m_DrmFd, resources->crtcs[i]);
-            crtcIndex = i;
-            m_OutputRect.x = m_OutputRect.y = 0;
-            m_OutputRect.w = crtc->width;
-            m_OutputRect.h = crtc->height;
-            drmModeFreeCrtc(crtc);
-            break;
-        }
-    }
-
-    drmModeFreeResources(resources);
-
-    if (crtcIndex == -1) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Failed to get CRTC!");
-        return false;
-    }
-
-    drmSetClientCap(m_DrmFd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
-
-    drmModePlaneRes* planeRes = drmModeGetPlaneResources(m_DrmFd);
-    if (planeRes == nullptr) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "drmGetPlaneResources() failed: %d",
-                     errno);
-        return false;
-    }
-
-    // Find an NV12 overlay plane to render on
-    m_PlaneId = 0;
-    for (uint32_t i = 0; i < planeRes->count_planes && m_PlaneId == 0; i++) {
-        drmModePlane* plane = drmModeGetPlane(m_DrmFd, planeRes->planes[i]);
-        if (plane != nullptr) {
-            bool matchingFormat = false;
-            for (uint32_t j = 0; j < plane->count_formats; j++) {
-                if (plane->formats[j] == DRM_FORMAT_NV12) {
-                    matchingFormat = true;
-                    break;
-                }
-            }
-
-            if (matchingFormat == false) {
-                drmModeFreePlane(plane);
-                continue;
-            }
-
-            if ((plane->possible_crtcs & (1 << crtcIndex)) && plane->crtc_id == 0) {
-                drmModeObjectPropertiesPtr props = drmModeObjectGetProperties(m_DrmFd, planeRes->planes[i], DRM_MODE_OBJECT_PLANE);
-                if (props != nullptr) {
-                    for (uint32_t j = 0; j < props->count_props && m_PlaneId == 0; j++) {
-                        drmModePropertyPtr prop = drmModeGetProperty(m_DrmFd, props->props[j]);
-                        if (prop != nullptr) {
-                            if (!strcmp(prop->name, "type") && props->prop_values[j] == DRM_PLANE_TYPE_OVERLAY) {
-                                m_PlaneId = plane->plane_id;
-                            }
-
-                            drmModeFreeProperty(prop);
-                        }
-                    }
-
-                    drmModeFreeObjectProperties(props);
-                }
-            }
-
-            drmModeFreePlane(plane);
-        }
-    }
-
-    drmModeFreePlaneResources(planeRes);
-
-    return true;
-}
-
-enum AVPixelFormat DrmRenderer::getPreferredPixelFormat(int)
-{
-    // DRM PRIME buffers
-    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)
-{
-    AVDRMFrameDescriptor* drmFrame = (AVDRMFrameDescriptor*)frame->data[0];
-    int err;
-    uint32_t primeHandle;
-    uint32_t handles[4] = {};
-    uint32_t pitches[4] = {};
-    uint32_t offsets[4] = {};
-
-    SDL_Rect src, dst;
-
-    src.x = src.y = 0;
-    src.w = frame->width;
-    src.h = frame->height;
-    dst = m_OutputRect;
-
-    StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
-
-    // Convert the FD in the AVDRMFrameDescriptor to a PRIME handle
-    // that can be used in drmModeAddFB2()
-    SDL_assert(drmFrame->nb_objects == 1);
-    err = drmPrimeFDToHandle(m_DrmFd, drmFrame->objects[0].fd, &primeHandle);
-    if (err < 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "drmPrimeFDToHandle() failed: %d",
-                     errno);
-        return;
-    }
-
-    SDL_assert(drmFrame->nb_layers == 1);
-    SDL_assert(drmFrame->layers[0].nb_planes == 2);
-    for (int i = 0; i < drmFrame->layers[0].nb_planes; i++) {
-        handles[i] = primeHandle;
-        pitches[i] = drmFrame->layers[0].planes[i].pitch;
-        offsets[i] = drmFrame->layers[0].planes[i].offset;
-    }
-
-    // Remember the last FB object we created so we can free it
-    // when we are finished rendering this one (if successful).
-    uint32_t lastFbId = m_CurrentFbId;
-
-    // Create a frame buffer object from the PRIME buffer
-    err = drmModeAddFB2(m_DrmFd, frame->width, frame->height,
-                        drmFrame->layers[0].format,
-                        handles, pitches, offsets, &m_CurrentFbId, 0);
-    if (err < 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "drmModeAddFB2() failed: %d",
-                     errno);
-        m_CurrentFbId = lastFbId;
-        return;
-    }
-
-    // Update the overlay
-    err = drmModeSetPlane(m_DrmFd, m_PlaneId, m_CrtcId, m_CurrentFbId, 0,
-                          dst.x, dst.y,
-                          dst.w, dst.h,
-                          0, 0,
-                          frame->width << 16,
-                          frame->height << 16);
-    if (err < 0) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "drmModeSetPlane() failed: %d",
-                     errno);
-        drmModeRmFB(m_DrmFd, m_CurrentFbId);
-        m_CurrentFbId = lastFbId;
-        return;
-    }
-
-    // Free the previous FB object which has now been superseded
-    drmModeRmFB(m_DrmFd, lastFbId);
-}
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "renderer.h"
-
-#include <xf86drm.h>
-#include <xf86drmMode.h>
-
-class DrmRenderer : public IFFmpegRenderer {
-public:
-    DrmRenderer();
-    virtual ~DrmRenderer() override;
-    virtual bool initialize(PDECODER_PARAMETERS params) 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;
-    uint32_t m_CrtcId;
-    uint32_t m_PlaneId;
-    uint32_t m_CurrentFbId;
-    SDL_Rect m_OutputRect;
-};
-
@@ -2,7 +2,6 @@
 #include "dxva2.h"
 #include "../ffmpeg.h"
 #include <streaming/streamutils.h>
-#include <streaming/session.h>

 #include <SDL_syswm.h>

@@ -26,10 +25,7 @@ DXVA2Renderer::DXVA2Renderer() :
    m_RenderTarget(nullptr),
    m_ProcService(nullptr),
    m_Processor(nullptr),
-    m_FrameIndex(0),
-    m_DebugOverlayFont(nullptr),
-    m_StatusOverlayFont(nullptr),
-    m_BlockingPresent(false)
+    m_FrameIndex(0)
 {
    RtlZeroMemory(m_DecSurfaces, sizeof(m_DecSurfaces));
    RtlZeroMemory(&m_DXVAContext, sizeof(m_DXVAContext));
@@ -48,8 +44,6 @@ DXVA2Renderer::~DXVA2Renderer()
    SAFE_COM_RELEASE(m_RenderTarget);
    SAFE_COM_RELEASE(m_ProcService);
    SAFE_COM_RELEASE(m_Processor);
-    SAFE_COM_RELEASE(m_DebugOverlayFont);
-    SAFE_COM_RELEASE(m_StatusOverlayFont);

    for (int i = 0; i < ARRAYSIZE(m_DecSurfaces); i++) {
        SAFE_COM_RELEASE(m_DecSurfaces[i]);
@@ -80,7 +74,7 @@ AVBufferRef* DXVA2Renderer::ffPoolAlloc(void* opaque, int)
    return NULL;
 }

-bool DXVA2Renderer::prepareDecoderContext(AVCodecContext* context, AVDictionary**)
+bool DXVA2Renderer::prepareDecoderContext(AVCodecContext* context)
 {
    // m_DXVAContext.workaround and report_id already initialized elsewhere
    m_DXVAContext.decoder = m_Decoder;
@@ -107,7 +101,7 @@ bool DXVA2Renderer::prepareDecoderContext(AVCodecContext* context, AVDictionary*

 int DXVA2Renderer::ffGetBuffer2(AVCodecContext* context, AVFrame* frame, int)
 {
-    DXVA2Renderer* me = (DXVA2Renderer*)((FFmpegVideoDecoder*)context->opaque)->getBackendRenderer();
+    DXVA2Renderer* me = (DXVA2Renderer*)((FFmpegVideoDecoder*)context->opaque)->getRenderer();

    frame->buf[0] = av_buffer_pool_get(me->m_Pool);
    if (!frame->buf[0]) {
@@ -262,118 +256,66 @@ bool DXVA2Renderer::initializeRenderer()
    m_DisplayWidth = renderTargetDesc.Width;
    m_DisplayHeight = renderTargetDesc.Height;

-    if (!isDXVideoProcessorAPIBlacklisted()) {
-        hr = DXVA2CreateVideoService(m_Device, IID_IDirectXVideoProcessorService,
-                                     reinterpret_cast<void**>(&m_ProcService));
+    hr = DXVA2CreateVideoService(m_Device, IID_IDirectXVideoProcessorService,
+                                 reinterpret_cast<void**>(&m_ProcService));

-        if (FAILED(hr)) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "DXVA2CreateVideoService(IID_IDirectXVideoProcessorService) failed: %x",
-                         hr);
-            return false;
-        }
-
-        DXVA2_VideoProcessorCaps caps;
-        hr = m_ProcService->GetVideoProcessorCaps(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, &caps);
-        if (FAILED(hr)) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "GetVideoProcessorCaps() failed for DXVA2_VideoProcProgressiveDevice: %x",
-                         hr);
-            return false;
-        }
-
-        if (!(caps.DeviceCaps & DXVA2_VPDev_HardwareDevice)) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "DXVA2_VideoProcProgressiveDevice is not hardware: %x",
-                         caps.DeviceCaps);
-            return false;
-        }
-        else if (!(caps.VideoProcessorOperations & DXVA2_VideoProcess_YUV2RGB) &&
-                 !(caps.VideoProcessorOperations & DXVA2_VideoProcess_YUV2RGBExtended)) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "DXVA2_VideoProcProgressiveDevice can't convert YUV2RGB: %x",
-                         caps.VideoProcessorOperations);
-            return false;
-        }
-        else if (!(caps.VideoProcessorOperations & DXVA2_VideoProcess_StretchX) ||
-                 !(caps.VideoProcessorOperations & DXVA2_VideoProcess_StretchY)) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "DXVA2_VideoProcProgressiveDevice can't stretch video: %x",
-                         caps.VideoProcessorOperations);
-            return false;
-        }
-
-        if (caps.DeviceCaps & DXVA2_VPDev_EmulatedDXVA1) {
-            // DXVA2 over DXVA1 may have bad performance
-            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                        "DXVA2_VideoProcProgressiveDevice is DXVA1");
-        }
-
-        m_ProcService->GetProcAmpRange(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, DXVA2_ProcAmp_Brightness, &m_BrightnessRange);
-        m_ProcService->GetProcAmpRange(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, DXVA2_ProcAmp_Contrast, &m_ContrastRange);
-        m_ProcService->GetProcAmpRange(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, DXVA2_ProcAmp_Hue, &m_HueRange);
-        m_ProcService->GetProcAmpRange(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, DXVA2_ProcAmp_Saturation, &m_SaturationRange);
-
-        hr = m_ProcService->CreateVideoProcessor(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, 0, &m_Processor);
-        if (FAILED(hr)) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "CreateVideoProcessor() failed for DXVA2_VideoProcProgressiveDevice: %x",
-                         hr);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool DXVA2Renderer::isDXVideoProcessorAPIBlacklisted()
-{
-    IDirect3D9* d3d9;
-    HRESULT hr;
-    bool result = false;
-
-    if (qgetenv("DXVA2_DISABLE_VIDPROC_BLACKLIST") == "1") {
-        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                    "IDirectXVideoProcessor blacklist is disabled");
+    if (FAILED(hr)) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "DXVA2CreateVideoService(IID_IDirectXVideoProcessorService) failed: %x",
+                     hr);
        return false;
    }

-    hr = m_Device->GetDirect3D(&d3d9);
-    if (SUCCEEDED(hr)) {
-        D3DCAPS9 caps;
-
-        hr = m_Device->GetDeviceCaps(&caps);
-        if (SUCCEEDED(hr)) {
-            D3DADAPTER_IDENTIFIER9 id;
-
-            hr = d3d9->GetAdapterIdentifier(caps.AdapterOrdinal, 0, &id);
-            if (SUCCEEDED(hr) && id.VendorId == 0x8086) {
-                SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                            "Avoiding IDirectXVideoProcessor API on Intel GPU");
-
-                // On Intel GPUs, we can get unwanted video "enhancements" due to post-processing
-                // effects that the GPU driver forces on us. In many cases, this makes the video
-                // actually look worse. We can avoid these by using StretchRect() instead on these
-                // platforms.
-                result = true;
-            }
-            else {
-                result = false;
-            }
-        }
-        else {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "GetDeviceCaps() failed: %x", hr);
-        }
-
-        d3d9->Release();
-    }
-    else {
+    DXVA2_VideoProcessorCaps caps;
+    hr = m_ProcService->GetVideoProcessorCaps(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, &caps);
+    if (FAILED(hr)) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "GetDirect3D() failed: %x", hr);
+                     "GetVideoProcessorCaps() failed for DXVA2_VideoProcProgressiveDevice: %x",
+                     hr);
+        return false;
    }

-    return result;
+    if (!(caps.DeviceCaps & DXVA2_VPDev_HardwareDevice)) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "DXVA2_VideoProcProgressiveDevice is not hardware: %x",
+                     caps.DeviceCaps);
+        return false;
+    }
+    else if (!(caps.VideoProcessorOperations & DXVA2_VideoProcess_YUV2RGB) &&
+             !(caps.VideoProcessorOperations & DXVA2_VideoProcess_YUV2RGBExtended)) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "DXVA2_VideoProcProgressiveDevice can't convert YUV2RGB: %x",
+                     caps.VideoProcessorOperations);
+        return false;
+    }
+    else if (!(caps.VideoProcessorOperations & DXVA2_VideoProcess_StretchX) ||
+             !(caps.VideoProcessorOperations & DXVA2_VideoProcess_StretchY)) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "DXVA2_VideoProcProgressiveDevice can't stretch video: %x",
+                     caps.VideoProcessorOperations);
+        return false;
+    }
+
+    if (caps.DeviceCaps & DXVA2_VPDev_EmulatedDXVA1) {
+        // DXVA2 over DXVA1 may have bad performance
+        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                    "DXVA2_VideoProcProgressiveDevice is DXVA1");
+    }
+
+    m_ProcService->GetProcAmpRange(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, DXVA2_ProcAmp_Brightness, &m_BrightnessRange);
+    m_ProcService->GetProcAmpRange(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, DXVA2_ProcAmp_Contrast, &m_ContrastRange);
+    m_ProcService->GetProcAmpRange(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, DXVA2_ProcAmp_Hue, &m_HueRange);
+    m_ProcService->GetProcAmpRange(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, DXVA2_ProcAmp_Saturation, &m_SaturationRange);
+
+    hr = m_ProcService->CreateVideoProcessor(DXVA2_VideoProcProgressiveDevice, &m_Desc, renderTargetDesc.Format, 0, &m_Processor);
+    if (FAILED(hr)) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "CreateVideoProcessor() failed for DXVA2_VideoProcProgressiveDevice: %x",
+                     hr);
+        return false;
+    }
+
+    return true;
 }

 bool DXVA2Renderer::isDecoderBlacklisted()
@@ -382,11 +324,8 @@ bool DXVA2Renderer::isDecoderBlacklisted()
    HRESULT hr;
    bool result = false;

-    if (qgetenv("DXVA2_DISABLE_DECODER_BLACKLIST") == "1") {
-        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                    "DXVA2 decoder blacklist is disabled");
-        return false;
-    }
+    // TODO: Update for HEVC Main10
+    SDL_assert(m_VideoFormat != VIDEO_FORMAT_H265_MAIN10);

    hr = m_Device->GetDirect3D(&d3d9);
    if (SUCCEEDED(hr)) {
@@ -429,15 +368,6 @@ 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
@@ -546,34 +476,12 @@ 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;
-
-        if (m_VideoFormat == VIDEO_FORMAT_H265_MAIN10) {
-            d3dpp.BackBufferFormat = currentMode.Format = D3DFMT_A2R10G10B10;
-        }
-        else {
-            d3dpp.BackBufferFormat = currentMode.Format;
-        }
+        d3dpp.BackBufferFormat = currentMode.Format;
    }
    else {
        d3dpp.Windowed = true;
@@ -604,8 +512,6 @@ bool DXVA2Renderer::initializeDevice(SDL_Window* window, bool enableVsync)
            d3dpp.BackBufferCount = 1;
        }

-        m_BlockingPresent = false;
-
        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                    "Windowed mode with DWM running");
    }
@@ -615,7 +521,6 @@ bool DXVA2Renderer::initializeDevice(SDL_Window* window, bool enableVsync)
        d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
        d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
        d3dpp.BackBufferCount = 1;
-        m_BlockingPresent = true;

        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                    "V-Sync enabled");
@@ -626,7 +531,6 @@ bool DXVA2Renderer::initializeDevice(SDL_Window* window, bool enableVsync)
        d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
        d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
        d3dpp.BackBufferCount = 1;
-        m_BlockingPresent = false;

        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                    "V-Sync disabled in tearing mode");
@@ -677,23 +581,19 @@ bool DXVA2Renderer::initializeDevice(SDL_Window* window, bool enableVsync)
    return true;
 }

-bool DXVA2Renderer::initialize(PDECODER_PARAMETERS params)
+bool DXVA2Renderer::initialize(SDL_Window* window, int videoFormat, int width, int height, int, bool enableVsync)
 {
-    m_VideoFormat = params->videoFormat;
-    m_VideoWidth = params->width;
-    m_VideoHeight = params->height;
+    m_VideoFormat = videoFormat;
+    m_VideoWidth = width;
+    m_VideoHeight = height;

    RtlZeroMemory(&m_Desc, sizeof(m_Desc));

    int alignment;

-    // HEVC using DXVA requires 128 pixel alignment, however Intel GPUs decoding HEVC
-    // using StretchRect() to render draw a translucent green line at the top of
-    // the screen in full-screen mode at 720p/1080p unless we use 32 pixel alignment.
-    // This appears to work without issues on AMD and Nvidia GPUs too, so we will
-    // do it unconditionally for now.
+    // HEVC using DXVA requires 128B alignment
    if (m_VideoFormat & VIDEO_FORMAT_MASK_H265) {
-        alignment = 32;
+        alignment = 128;
    }
    else {
        alignment = 16;
@@ -708,15 +608,9 @@ 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)) {
+    if (!initializeDevice(window, enableVsync)) {
        return false;
    }

@@ -733,84 +627,29 @@ bool DXVA2Renderer::initialize(PDECODER_PARAMETERS params)
    // input focus. This glitches out the renderer and a bunch of other stuff.
    // Direct3D9Ex itself seems to have this minimize on focus loss behavior on its
    // own, so just disable SDL's handling of the focus loss event.
-    SDL_SetHintWithPriority(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0", SDL_HINT_OVERRIDE);
+    SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0");

    return true;
 }

-void DXVA2Renderer::notifyOverlayUpdated(Overlay::OverlayType type)
+bool DXVA2Renderer::needsTestFrame()
 {
-    HRESULT hr;
-
-    switch (type)
-    {
-    case Overlay::OverlayDebug:
-        if (m_DebugOverlayFont == nullptr) {
-            hr = D3DXCreateFontA(m_Device,
-                                 Session::get()->getOverlayManager().getOverlayFontSize(Overlay::OverlayDebug),
-                                 0,
-                                 FW_HEAVY,
-                                 1,
-                                 false,
-                                 ANSI_CHARSET,
-                                 OUT_DEFAULT_PRECIS,
-                                 DEFAULT_QUALITY,
-                                 DEFAULT_PITCH | FF_DONTCARE,
-                                 "",
-                                 &m_DebugOverlayFont);
-            if (FAILED(hr)) {
-                SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                             "D3DXCreateFontA() failed: %x",
-                             hr);
-                m_DebugOverlayFont = nullptr;
-            }
-        }
-        break;
-
-    case Overlay::OverlayStatusUpdate:
-        if (m_StatusOverlayFont == nullptr) {
-            hr = D3DXCreateFontA(m_Device,
-                                 Session::get()->getOverlayManager().getOverlayFontSize(Overlay::OverlayStatusUpdate),
-                                 0,
-                                 FW_HEAVY,
-                                 1,
-                                 false,
-                                 ANSI_CHARSET,
-                                 OUT_DEFAULT_PRECIS,
-                                 DEFAULT_QUALITY,
-                                 DEFAULT_PITCH | FF_DONTCARE,
-                                 "",
-                                 &m_StatusOverlayFont);
-            if (FAILED(hr)) {
-                SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                             "D3DXCreateFontA() failed: %x",
-                             hr);
-                m_StatusOverlayFont = nullptr;
-            }
-        }
-        break;
-
-    default:
-        SDL_assert(false);
-        break;
-    }
+    // We validate the DXVA2 profiles are supported
+    // in initialize() so no test frame is required
+    return false;
 }

-int DXVA2Renderer::getDecoderColorspace()
+int DXVA2Renderer::getDecoderCapabilities()
 {
-    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;
-    }
+    return 0;
 }

-void DXVA2Renderer::renderFrame(AVFrame *frame)
+IFFmpegRenderer::FramePacingConstraint DXVA2Renderer::getFramePacingConstraint()
+{
+    return PACING_ANY;
+}
+
+void DXVA2Renderer::renderFrameAtVsync(AVFrame *frame)
 {
    IDirect3DSurface9* surface = reinterpret_cast<IDirect3DSurface9*>(frame->data[3]);
    HRESULT hr;
@@ -946,10 +785,12 @@ void DXVA2Renderer::renderFrame(AVFrame *frame)

    bltParams.Alpha = DXVA2_Fixed32OpaqueAlpha();

-    hr = m_Device->Clear(0, nullptr, D3DCLEAR_TARGET, D3DCOLOR_ARGB(255, 0, 0, 0), 0.0f, 0);
+    m_Device->Clear(0, nullptr, D3DCLEAR_TARGET, D3DCOLOR_ARGB(255, 0, 0, 0), 0.0f, 0);
+
+    hr = m_Processor->VideoProcessBlt(m_RenderTarget, &bltParams, &sample, 1, nullptr);
    if (FAILED(hr)) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Clear() failed: %x",
+                     "VideoProcessBlt() failed: %x",
                     hr);
        SDL_Event event;
        event.type = SDL_RENDER_TARGETS_RESET;
@@ -957,85 +798,7 @@ void DXVA2Renderer::renderFrame(AVFrame *frame)
        return;
    }

-    hr = m_Device->BeginScene();
-    if (FAILED(hr)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "BeginScene() failed: %x",
-                     hr);
-        SDL_Event event;
-        event.type = SDL_RENDER_TARGETS_RESET;
-        SDL_PushEvent(&event);
-        return;
-    }
-
-    if (m_Processor) {
-        hr = m_Processor->VideoProcessBlt(m_RenderTarget, &bltParams, &sample, 1, nullptr);
-        if (FAILED(hr)) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "VideoProcessBlt() failed, falling back to StretchRect(): %x",
-                         hr);
-            m_Processor->Release();
-            m_Processor = nullptr;
-        }
-    }
-
-    if (!m_Processor) {
-        // This function doesn't trigger any of Intel's garbage video "enhancements"
-        hr = m_Device->StretchRect(surface, &sample.SrcRect, m_RenderTarget, &sample.DstRect, D3DTEXF_NONE);
-        if (FAILED(hr)) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "StretchRect() failed: %x",
-                         hr);
-            SDL_Event event;
-            event.type = SDL_RENDER_TARGETS_RESET;
-            SDL_PushEvent(&event);
-            return;
-        }
-    }
-
-    if (m_DebugOverlayFont != nullptr) {
-        if (Session::get()->getOverlayManager().isOverlayEnabled(Overlay::OverlayDebug)) {
-            SDL_Color color = Session::get()->getOverlayManager().getOverlayColor(Overlay::OverlayDebug);
-            m_DebugOverlayFont->DrawTextA(nullptr,
-                                          Session::get()->getOverlayManager().getOverlayText(Overlay::OverlayDebug),
-                                          -1,
-                                          &sample.DstRect,
-                                          DT_LEFT | DT_NOCLIP,
-                                          D3DCOLOR_ARGB(color.a, color.r, color.g, color.b));
-        }
-    }
-
-    if (m_StatusOverlayFont != nullptr) {
-        if (Session::get()->getOverlayManager().isOverlayEnabled(Overlay::OverlayStatusUpdate)) {
-            SDL_Color color = Session::get()->getOverlayManager().getOverlayColor(Overlay::OverlayStatusUpdate);
-            m_StatusOverlayFont->DrawTextA(nullptr,
-                                           Session::get()->getOverlayManager().getOverlayText(Overlay::OverlayStatusUpdate),
-                                           -1,
-                                           &sample.DstRect,
-                                           DT_RIGHT | DT_NOCLIP,
-                                           D3DCOLOR_ARGB(color.a, color.r, color.g, color.b));
-        }
-    }
-
-    hr = m_Device->EndScene();
-    if (FAILED(hr)) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "EndScene() failed: %x",
-                     hr);
-        SDL_Event event;
-        event.type = SDL_RENDER_TARGETS_RESET;
-        SDL_PushEvent(&event);
-        return;
-    }
-
-    do {
-        // Use D3DPRESENT_DONOTWAIT if present may block in order to avoid holding the giant
-        // lock around this D3D device for excessive lengths of time (blocking concurrent decoding tasks).
-        hr = m_Device->PresentEx(nullptr, nullptr, nullptr, nullptr, m_BlockingPresent ? D3DPRESENT_DONOTWAIT : 0);
-        if (hr == D3DERR_WASSTILLDRAWING) {
-            SDL_Delay(1);
-        }
-    } while (hr == D3DERR_WASSTILLDRAWING);
+    hr = m_Device->PresentEx(nullptr, nullptr, nullptr, nullptr, 0);
    if (FAILED(hr)) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "PresentEx() failed: %x",
@@ -4,7 +4,6 @@
 #include "pacer/pacer.h"

 #include <d3d9.h>
-#include <d3dx9.h>
 #include <dxva2api.h>

 extern "C" {
@@ -15,19 +14,24 @@ class DXVA2Renderer : public IFFmpegRenderer
 {
 public:
    DXVA2Renderer();
-    virtual ~DXVA2Renderer() 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 int getDecoderColorspace() override;
+    virtual ~DXVA2Renderer();
+    virtual bool initialize(SDL_Window* window,
+                            int videoFormat,
+                            int width,
+                            int height,
+                            int maxFps,
+                            bool enableVsync);
+    virtual bool prepareDecoderContext(AVCodecContext* context);
+    virtual void renderFrameAtVsync(AVFrame* frame);
+    virtual bool needsTestFrame();
+    virtual int getDecoderCapabilities();
+    virtual FramePacingConstraint getFramePacingConstraint();

 private:
    bool initializeDecoder();
    bool initializeRenderer();
    bool initializeDevice(SDL_Window* window, bool enableVsync);
    bool isDecoderBlacklisted();
-    bool isDXVideoProcessorAPIBlacklisted();

    static
    AVBufferRef* ffPoolAlloc(void* opaque, int size);
@@ -63,7 +67,4 @@ private:
    DXVA2_ValueRange m_SaturationRange;
    DXVA2_VideoDesc m_Desc;
    REFERENCE_TIME m_FrameIndex;
-    LPD3DXFONT m_DebugOverlayFont;
-    LPD3DXFONT m_StatusOverlayFont;
-    bool m_BlockingPresent;
 };
@@ -1,165 +0,0 @@
-#include "mmal.h"
-
-#include "streaming/streamutils.h"
-#include "streaming/session.h"
-
-#include <Limelight.h>
-
-MmalRenderer::MmalRenderer()
-    : m_Renderer(nullptr),
-      m_InputPort(nullptr)
-{
-}
-
-MmalRenderer::~MmalRenderer()
-{
-    if (m_InputPort != nullptr) {
-        mmal_port_disable(m_InputPort);
-    }
-
-    if (m_Renderer != nullptr) {
-        mmal_component_destroy(m_Renderer);
-    }
-}
-
-bool MmalRenderer::prepareDecoderContext(AVCodecContext* context, AVDictionary** options)
-{
-    // 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");
-
-    return true;
-}
-
-bool MmalRenderer::initialize(PDECODER_PARAMETERS params)
-{
-    MMAL_STATUS_T status;
-
-    status = mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_RENDERER, &m_Renderer);
-    if (status != MMAL_SUCCESS) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "mmal_component_create() failed: %x (%s)",
-                     status, mmal_status_to_string(status));
-        return false;
-    }
-
-    m_InputPort = m_Renderer->input[0];
-
-    m_InputPort->format->encoding = MMAL_ENCODING_OPAQUE;
-    m_InputPort->format->es->video.width = params->width;
-    m_InputPort->format->es->video.height = params->height;
-    m_InputPort->format->es->video.crop.x = 0;
-    m_InputPort->format->es->video.crop.y = 0;
-    m_InputPort->format->es->video.crop.width = params->width;
-    m_InputPort->format->es->video.crop.height = params->height;
-    status = mmal_port_format_commit(m_InputPort);
-    if (status != MMAL_SUCCESS) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "mmal_port_format_commit() failed: %x (%s)",
-                     status, mmal_status_to_string(status));
-        return false;
-    }
-
-    status = mmal_component_enable(m_Renderer);
-    if (status != MMAL_SUCCESS) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "mmal_component_enable() failed: %x (%s)",
-                     status, mmal_status_to_string(status));
-        return false;
-    }
-
-    {
-        MMAL_DISPLAYREGION_T dr;
-
-        dr.hdr.id = MMAL_PARAMETER_DISPLAYREGION;
-        dr.hdr.size = sizeof(MMAL_DISPLAYREGION_T);
-
-        dr.set = MMAL_DISPLAY_SET_LAYER;
-        dr.layer = 128;
-
-        dr.set |= MMAL_DISPLAY_SET_ALPHA;
-        dr.alpha = 255;
-
-        dr.set |= MMAL_DISPLAY_SET_FULLSCREEN;
-        dr.fullscreen = true;
-
-        {
-            SDL_Rect src, dst;
-            src.x = src.y = 0;
-            src.w = params->width;
-            src.h = params->height;
-            dst.x = dst.y = 0;
-            SDL_GetWindowSize(params->window, &dst.w, &dst.h);
-
-            StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
-
-            dr.set |= MMAL_DISPLAY_SET_DEST_RECT;
-            dr.dest_rect.x = dst.x;
-            dr.dest_rect.y = dst.y;
-            dr.dest_rect.width = dst.w;
-            dr.dest_rect.height = dst.h;
-        }
-    }
-
-    status = mmal_port_enable(m_InputPort, InputPortCallback);
-    if (status != MMAL_SUCCESS) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "mmal_port_enable() failed: %x (%s)",
-                     status, mmal_status_to_string(status));
-        return false;
-    }
-
-    return true;
-}
-
-void MmalRenderer::InputPortCallback(MMAL_PORT_T*, MMAL_BUFFER_HEADER_T* buffer)
-{
-    mmal_buffer_header_release(buffer);
-}
-
-enum AVPixelFormat MmalRenderer::getPreferredPixelFormat(int videoFormat)
-{
-    // Opaque MMAL buffers
-    SDL_assert(videoFormat == VIDEO_FORMAT_H264);
-    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,
-    // so we must test before allowing the decoder to be used.
-    return true;
-}
-
-void MmalRenderer::renderFrame(AVFrame* frame)
-{
-    MMAL_BUFFER_HEADER_T* buffer = (MMAL_BUFFER_HEADER_T*)frame->data[3];
-    MMAL_STATUS_T status;
-
-    status = mmal_port_send_buffer(m_InputPort, buffer);
-    if (status != MMAL_SUCCESS) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "mmal_port_send_buffer() failed: %x (%s)",
-                     status, mmal_status_to_string(status));
-    }
-    else {
-        // Prevent the buffer from being freed during av_frame_free()
-        // until rendering is complete. The reference is dropped in
-        // InputPortCallback().
-        mmal_buffer_header_acquire(buffer);
-    }
-}
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "renderer.h"
-
-#include <interface/mmal/mmal.h>
-#include <interface/mmal/util/mmal_util.h>
-#include <interface/mmal/util/mmal_util_params.h>
-#include <interface/mmal/util/mmal_default_components.h>
-
-class MmalRenderer : public IFFmpegRenderer {
-public:
-    MmalRenderer();
-    virtual ~MmalRenderer() override;
-    virtual bool initialize(PDECODER_PARAMETERS params) 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);
-
-    MMAL_COMPONENT_T* m_Renderer;
-    MMAL_PORT_T* m_InputPort;
-};
-
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "pacer.h"
+
+class DisplayLinkVsyncSourceFactory
+{
+public:
+    static
+    IVsyncSource* createVsyncSource(Pacer* pacer);
+};
+
@@ -0,0 +1,132 @@
+#include "displaylinkvsyncsource.h"
+
+#include <SDL_syswm.h>
+
+#include <CoreVideo/CoreVideo.h>
+
+#import <Cocoa/Cocoa.h>
+
+class DisplayLinkVsyncSource : public IVsyncSource
+{
+public:
+    DisplayLinkVsyncSource(Pacer* pacer)
+        : m_Pacer(pacer),
+          m_DisplayLink(nullptr)
+    {
+
+    }
+
+    virtual ~DisplayLinkVsyncSource() override
+    {
+        if (m_DisplayLink != nullptr) {
+            CVDisplayLinkStop(m_DisplayLink);
+            CVDisplayLinkRelease(m_DisplayLink);
+        }
+    }
+
+    static
+    CGDirectDisplayID
+    getDisplayID(NSScreen* screen)
+    {
+        NSNumber* screenNumber = [screen deviceDescription][@"NSScreenNumber"];
+        return [screenNumber unsignedIntValue];
+    }
+
+    static
+    CVReturn
+    displayLinkOutputCallback(
+        CVDisplayLinkRef displayLink,
+        const CVTimeStamp* /* now */,
+        const CVTimeStamp* /* vsyncTime */,
+        CVOptionFlags,
+        CVOptionFlags*,
+        void *displayLinkContext)
+    {
+        auto me = reinterpret_cast<DisplayLinkVsyncSource*>(displayLinkContext);
+
+        SDL_assert(displayLink == me->m_DisplayLink);
+
+        // In my testing on macOS 10.13, this callback is invoked about 24 ms
+        // prior to the specified v-sync time (now - vsyncTime). Since this is
+        // greater than the standard v-sync interval (16 ms = 60 FPS), we will
+        // draw using the current host time, rather than the actual v-sync target
+        // time. Because the CVDisplayLink is in sync with the actual v-sync
+        // interval, even if many ms prior, we can safely use the current host time
+        // and get a consistent callback for each v-sync. This reduces video latency
+        // by at least 1 frame vs. rendering with the actual vsyncTime.
+        me->m_Pacer->vsyncCallback(500 / me->m_DisplayFps);
+
+        return kCVReturnSuccess;
+    }
+
+    virtual bool initialize(SDL_Window* window, int displayFps) override
+    {
+        SDL_SysWMinfo info;
+
+        SDL_VERSION(&info.version);
+
+        if (!SDL_GetWindowWMInfo(window, &info)) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "SDL_GetWindowWMInfo() failed: %s",
+                         SDL_GetError());
+            return false;
+        }
+
+        SDL_assert(info.subsystem == SDL_SYSWM_COCOA);
+
+        m_DisplayFps = displayFps;
+
+        NSScreen* screen = [info.info.cocoa.window screen];
+        CVReturn status;
+        if (screen == nullptr) {
+            // Window not visible on any display, so use a
+            // CVDisplayLink that can work with all active displays.
+            // When we become visible, we'll recreate ourselves
+            // and associate with the new screen.
+            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
+                        "NSWindow is not visible on any display");
+            status = CVDisplayLinkCreateWithActiveCGDisplays(&m_DisplayLink);
+        }
+        else {
+            CGDirectDisplayID displayId;
+            displayId = getDisplayID(screen);
+            SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
+                        "NSWindow on display: %x",
+                        displayId);
+            status = CVDisplayLinkCreateWithCGDisplay(displayId, &m_DisplayLink);
+        }
+        if (status != kCVReturnSuccess) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "Failed to create CVDisplayLink: %d",
+                         status);
+            return false;
+        }
+
+        status = CVDisplayLinkSetOutputCallback(m_DisplayLink, displayLinkOutputCallback, this);
+        if (status != kCVReturnSuccess) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "CVDisplayLinkSetOutputCallback() failed: %d",
+                         status);
+            return false;
+        }
+
+        status = CVDisplayLinkStart(m_DisplayLink);
+        if (status != kCVReturnSuccess) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "CVDisplayLinkStart() failed: %d",
+                         status);
+            return false;
+        }
+
+        return true;
+    }
+
+private:
+    Pacer* m_Pacer;
+    CVDisplayLinkRef m_DisplayLink;
+    int m_DisplayFps;
+};
+
+IVsyncSource* DisplayLinkVsyncSourceFactory::createVsyncSource(Pacer* pacer) {
+    return new DisplayLinkVsyncSource(pacer);
+}
@@ -61,7 +61,7 @@ bool DxVsyncSource::initialize(SDL_Window* window, int displayFps)

    m_Window = info.info.win.window;

-    m_Thread = SDL_CreateThread(vsyncThread, "DXVsync", this);
+    m_Thread = SDL_CreateThread(vsyncThread, "DX Vsync Thread", this);
    if (m_Thread == nullptr) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "Unable to create DX V-sync thread: %s",
@@ -76,11 +76,7 @@ int DxVsyncSource::vsyncThread(void* context)
 {
    DxVsyncSource* me = reinterpret_cast<DxVsyncSource*>(context);

-#if SDL_VERSION_ATLEAST(2, 0, 9)
-    SDL_SetThreadPriority(SDL_THREAD_PRIORITY_TIME_CRITICAL);
-#else
    SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
-#endif

    D3DKMT_OPENADAPTERFROMHDC openAdapterParams = {};
    HMONITOR lastMonitor = nullptr;
@@ -18,7 +18,7 @@ NullThreadedVsyncSource::~NullThreadedVsyncSource()
 bool NullThreadedVsyncSource::initialize(SDL_Window*, int displayFps)
 {
    m_DisplayFps = displayFps;
-    m_Thread = SDL_CreateThread(vsyncThread, "NullVsync", this);
+    m_Thread = SDL_CreateThread(vsyncThread, "Null Vsync Thread", this);
    if (m_Thread == nullptr) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "Unable to create DX V-sync thread: %s",
@@ -33,11 +33,7 @@ int NullThreadedVsyncSource::vsyncThread(void* context)
 {
    NullThreadedVsyncSource* me = reinterpret_cast<NullThreadedVsyncSource*>(context);

-#if SDL_VERSION_ATLEAST(2, 0, 9)
-    SDL_SetThreadPriority(SDL_THREAD_PRIORITY_TIME_CRITICAL);
-#else
    SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
-#endif

    while (SDL_AtomicGet(&me->m_Stopping) == 0) {
        me->m_Pacer->vsyncCallback(1000 / me->m_DisplayFps);
@@ -3,16 +3,15 @@

 #include "nullthreadedvsyncsource.h"

+#ifdef Q_OS_DARWIN
+#include "displaylinkvsyncsource.h"
+#endif
+
 #ifdef Q_OS_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <VersionHelpers.h>
 #include "dxvsyncsource.h"
 #endif

-// Limit the number of queued frames to prevent excessive memory consumption
-// if the V-Sync source or renderer is blocked for a while.
-#define MAX_QUEUED_FRAMES 8
+#define FRAME_HISTORY_ENTRIES 8

 // We may be woken up slightly late so don't go all the way
 // up to the next V-sync since we may accidentally step into
@@ -22,8 +21,7 @@
 #define TIMER_SLACK_MS 3

 Pacer::Pacer(IFFmpegRenderer* renderer, PVIDEO_STATS videoStats) :
-    m_RenderThread(nullptr),
-    m_Stopping(false),
+    m_FrameQueueLock(0),
    m_VsyncSource(nullptr),
    m_VsyncRenderer(renderer),
    m_MaxVideoFps(0),
@@ -39,121 +37,10 @@ Pacer::~Pacer()
    delete m_VsyncSource;
    m_VsyncSource = nullptr;

-    // Stop the render thread
-    m_Stopping = true;
-    if (m_RenderThread != nullptr) {
-        m_RenderQueueNotEmpty.wakeAll();
-        SDL_WaitThread(m_RenderThread, nullptr);
-    }
-
-    // Delete any remaining unconsumed frames
-    while (!m_RenderQueue.isEmpty()) {
-        AVFrame* frame = m_RenderQueue.dequeue();
+    while (!m_FrameQueue.isEmpty()) {
+        AVFrame* frame = m_FrameQueue.dequeue();
        av_frame_free(&frame);
    }
-    while (!m_PacingQueue.isEmpty()) {
-        AVFrame* frame = m_PacingQueue.dequeue();
-        av_frame_free(&frame);
-    }
-}
-
-void Pacer::renderOnMainThread()
-{
-    // Ignore this call for renderers that work on a dedicated render thread
-    if (m_RenderThread != nullptr) {
-        return;
-    }
-
-    m_FrameQueueLock.lock();
-
-    if (!m_RenderQueue.isEmpty()) {
-        // Releases m_FrameQueueLock
-        renderLastFrameAndUnlock();
-    }
-    else {
-        m_FrameQueueLock.unlock();
-    }
-}
-
-int Pacer::renderThread(void* context)
-{
-    Pacer* me = reinterpret_cast<Pacer*>(context);
-
-    if (SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH) < 0) {
-        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                    "Unable to set render thread to high priority: %s",
-                    SDL_GetError());
-    }
-
-    while (!me->m_Stopping) {
-        // Acquire the frame queue lock to protect the queue and
-        // the not empty condition
-        me->m_FrameQueueLock.lock();
-
-        // Wait for a frame to be ready to render
-        while (!me->m_Stopping && me->m_RenderQueue.isEmpty()) {
-            me->m_RenderQueueNotEmpty.wait(&me->m_FrameQueueLock);
-        }
-
-        if (me->m_Stopping) {
-            // Exit this thread
-            me->m_FrameQueueLock.unlock();
-            break;
-        }
-
-        // Render the latest frame and discard the others
-        // NB: m_FrameQueueLock still held here!
-        me->renderLastFrameAndUnlock();
-    }
-
-    return 0;
-}
-
-void Pacer::enqueueFrameForRenderingAndUnlock(AVFrame *frame)
-{
-    dropFrameForEnqueue(m_RenderQueue);
-    m_RenderQueue.enqueue(frame);
-
-    m_FrameQueueLock.unlock();
-
-    if (m_RenderThread != nullptr) {
-        m_RenderQueueNotEmpty.wakeOne();
-    }
-    else {
-        SDL_Event event;
-
-        // For main thread rendering, we'll push an event to trigger a callback
-        event.type = SDL_USEREVENT;
-        event.user.code = SDL_CODE_FRAME_READY;
-        SDL_PushEvent(&event);
-    }
-}
-
-// Caller must hold m_FrameQueueLock
-void Pacer::renderLastFrameAndUnlock()
-{
-    // Dequeue the most recent frame for rendering and free the others.
-    AVFrame* lastFrame = nullptr;
-    while (!m_RenderQueue.isEmpty()) {
-        if (lastFrame != nullptr) {
-            // Don't hold the frame queue lock across av_frame_free(),
-            // since it could need to talk to the GPU driver. This is safe
-            // because we're guaranteed that the queue will not shrink during
-            // this time (and so dequeue() below will always get something).
-            m_FrameQueueLock.unlock();
-            av_frame_free(&lastFrame);
-            m_VideoStats->pacerDroppedFrames++;
-            m_FrameQueueLock.lock();
-        }
-
-        lastFrame = m_RenderQueue.dequeue();
-    }
-
-    // Release the frame queue lock before rendering
-    m_FrameQueueLock.unlock();
-
-    // Render and free the mot current frame
-    renderFrame(lastFrame);
 }

 // Called in an arbitrary thread by the IVsyncSource on V-sync
@@ -165,7 +52,9 @@ void Pacer::vsyncCallback(int timeUntilNextVsyncMillis)

    SDL_assert(timeUntilNextVsyncMillis >= TIMER_SLACK_MS);

-    m_FrameQueueLock.lock();
+    Uint32 vsyncCallbackStartTime = SDL_GetTicks();
+
+    SDL_AtomicLock(&m_FrameQueueLock);

    // If the queue length history entries are large, be strict
    // about dropping excess frames.
@@ -175,8 +64,8 @@ void Pacer::vsyncCallback(int timeUntilNextVsyncMillis)
    // frame history to drop frames only if consistently above the
    // one queued frame mark.
    if (m_MaxVideoFps >= m_DisplayFps) {
-        for (int queueHistoryEntry : m_PacingQueueHistory) {
-            if (queueHistoryEntry <= 1) {
+        for (int i = 0; i < m_FrameQueueHistory.count(); i++) {
+            if (m_FrameQueueHistory[i] <= 1) {
                // Be lenient as long as the queue length
                // resolves before the end of frame history
                frameDropTarget = 3;
@@ -184,36 +73,55 @@ void Pacer::vsyncCallback(int timeUntilNextVsyncMillis)
            }
        }

-        // Keep a rolling 500 ms window of pacing queue history
-        if (m_PacingQueueHistory.count() == m_DisplayFps / 2) {
-            m_PacingQueueHistory.dequeue();
+        if (m_FrameQueueHistory.count() == FRAME_HISTORY_ENTRIES) {
+            m_FrameQueueHistory.dequeue();
        }

-        m_PacingQueueHistory.enqueue(m_PacingQueue.count());
+        m_FrameQueueHistory.enqueue(m_FrameQueue.count());
    }

    // Catch up if we're several frames ahead
-    while (m_PacingQueue.count() > frameDropTarget) {
-        AVFrame* frame = m_PacingQueue.dequeue();
-
-        // Drop the lock while we call av_frame_free()
-        m_FrameQueueLock.unlock();
+    while (m_FrameQueue.count() > frameDropTarget) {
+        AVFrame* frame = m_FrameQueue.dequeue();
        m_VideoStats->pacerDroppedFrames++;
        av_frame_free(&frame);
-        m_FrameQueueLock.lock();
    }

-    if (m_PacingQueue.isEmpty()) {
-        // Wait for a frame to arrive or our V-sync timeout to expire
-        if (!m_PacingQueueNotEmpty.wait(&m_FrameQueueLock, timeUntilNextVsyncMillis - TIMER_SLACK_MS)) {
-            // Wait timed out - unlock and bail
-            m_FrameQueueLock.unlock();
-            return;
+    if (m_FrameQueue.isEmpty()) {
+        SDL_AtomicUnlock(&m_FrameQueueLock);
+
+        while (!SDL_TICKS_PASSED(SDL_GetTicks(),
+                                 vsyncCallbackStartTime + timeUntilNextVsyncMillis - TIMER_SLACK_MS)) {
+            SDL_Delay(1);
+
+            SDL_AtomicLock(&m_FrameQueueLock);
+            if (!m_FrameQueue.isEmpty()) {
+                // Don't release the lock
+                goto RenderNextFrame;
+            }
+            SDL_AtomicUnlock(&m_FrameQueueLock);
        }
+
+        // Nothing to render at this time
+        return;
    }

-    // Place the first frame on the render queue
-    enqueueFrameForRenderingAndUnlock(m_PacingQueue.dequeue());
+RenderNextFrame:
+    // Grab the first frame
+    AVFrame* frame = m_FrameQueue.dequeue();
+    SDL_AtomicUnlock(&m_FrameQueueLock);
+
+    // Count time spent in Pacer's queues
+    Uint32 beforeRender = SDL_GetTicks();
+    m_VideoStats->totalPacerTime += beforeRender - frame->pts;
+
+    // Render it
+    m_VsyncRenderer->renderFrameAtVsync(frame);
+    m_VideoStats->totalRenderTime += SDL_GetTicks() - beforeRender;
+    m_VideoStats->renderedFrames++;
+
+    // Free the frame
+    av_frame_free(&frame);
 }

 bool Pacer::initialize(SDL_Window* window, int maxVideoFps, bool enablePacing)
@@ -226,12 +134,10 @@ bool Pacer::initialize(SDL_Window* window, int maxVideoFps, bool enablePacing)
                    "Frame pacing active: target %d Hz with %d FPS stream",
                    m_DisplayFps, m_MaxVideoFps);

-    #if defined(Q_OS_WIN32)
-        // Don't use D3DKMTWaitForVerticalBlankEvent() on Windows 7, because
-        // it blocks during other concurrent DX operations (like actually rendering).
-        if (IsWindows8OrGreater()) {
-            m_VsyncSource = new DxVsyncSource(this);
-        }
+    #if defined(Q_OS_DARWIN)
+        m_VsyncSource = DisplayLinkVsyncSourceFactory::createVsyncSource(this);
+    #elif defined(Q_OS_WIN32)
+        m_VsyncSource = new DxVsyncSource(this);
    #else
        // Platforms without a VsyncSource will just render frames
        // immediately like they used to.
@@ -247,84 +153,32 @@ bool Pacer::initialize(SDL_Window* window, int maxVideoFps, bool enablePacing)
                    m_DisplayFps, m_MaxVideoFps);
    }

-    if (m_VsyncRenderer->isRenderThreadSupported()) {
-        m_RenderThread = SDL_CreateThread(Pacer::renderThread, "PacerRender", this);
-    }
-
    return true;
 }

-void Pacer::renderFrame(AVFrame* frame)
-{
-    // Count time spent in Pacer's queues
-    Uint32 beforeRender = SDL_GetTicks();
-    m_VideoStats->totalPacerTime += beforeRender - frame->pkt_dts;
-
-    // Render it
-    m_VsyncRenderer->renderFrame(frame);
-    Uint32 afterRender = SDL_GetTicks();
-
-    m_VideoStats->totalRenderTime += afterRender - beforeRender;
-    m_VideoStats->renderedFrames++;
-    av_frame_free(&frame);
-
-    // Drop frames if we have too many queued up for a while
-    m_FrameQueueLock.lock();
-
-    int frameDropTarget = 0;
-    for (int queueHistoryEntry : m_RenderQueueHistory) {
-        if (queueHistoryEntry == 0) {
-            // Be lenient as long as the queue length
-            // resolves before the end of frame history
-            frameDropTarget = 2;
-            break;
-        }
-    }
-
-    // Keep a rolling 500 ms window of render queue history
-    if (m_RenderQueueHistory.count() == m_MaxVideoFps / 2) {
-        m_RenderQueueHistory.dequeue();
-    }
-
-    m_RenderQueueHistory.enqueue(m_RenderQueue.count());
-
-    // Catch up if we're several frames ahead
-    while (m_RenderQueue.count() > frameDropTarget) {
-        AVFrame* frame = m_RenderQueue.dequeue();
-
-        // Drop the lock while we call av_frame_free()
-        m_FrameQueueLock.unlock();
-        m_VideoStats->pacerDroppedFrames++;
-        av_frame_free(&frame);
-        m_FrameQueueLock.lock();
-    }
-
-    m_FrameQueueLock.unlock();
-}
-
-void Pacer::dropFrameForEnqueue(QQueue<AVFrame*>& queue)
-{
-    SDL_assert(queue.size() <= MAX_QUEUED_FRAMES);
-    if (queue.size() == MAX_QUEUED_FRAMES) {
-        AVFrame* frame = queue.dequeue();
-        av_frame_free(&frame);
-    }
-}
-
 void Pacer::submitFrame(AVFrame* frame)
 {
    // Make sure initialize() has been called
    SDL_assert(m_MaxVideoFps != 0);

-    // Queue the frame and possibly wake up the render thread
-    m_FrameQueueLock.lock();
-    if (m_VsyncSource != nullptr) {
-        dropFrameForEnqueue(m_PacingQueue);
-        m_PacingQueue.enqueue(frame);
-        m_FrameQueueLock.unlock();
-        m_PacingQueueNotEmpty.wakeOne();
+    // Queue the frame until the V-sync callback if
+    // we have a V-sync source, otherwise deliver it
+    // immediately and hope for the best.
+    if (isUsingFrameQueue()) {
+        SDL_AtomicLock(&m_FrameQueueLock);
+        m_FrameQueue.enqueue(frame);
+        SDL_AtomicUnlock(&m_FrameQueueLock);
    }
    else {
-        enqueueFrameForRenderingAndUnlock(frame);
+        Uint32 beforeRender = SDL_GetTicks();
+        m_VsyncRenderer->renderFrameAtVsync(frame);
+        m_VideoStats->totalRenderTime += SDL_GetTicks() - beforeRender;
+        m_VideoStats->renderedFrames++;
+        av_frame_free(&frame);
    }
 }
+
+bool Pacer::isUsingFrameQueue()
+{
+    return m_VsyncSource != nullptr;
+}
@@ -4,8 +4,6 @@
 #include "../renderer.h"

 #include <QQueue>
-#include <QMutex>
-#include <QWaitCondition>

 class IVsyncSource {
 public:
@@ -26,28 +24,12 @@ public:

    void vsyncCallback(int timeUntilNextVsyncMillis);

-    void renderOnMainThread();
+    bool isUsingFrameQueue();

 private:
-    static int renderThread(void* context);
-
-    void enqueueFrameForRenderingAndUnlock(AVFrame* frame);
-
-    void renderLastFrameAndUnlock();
-
-    void renderFrame(AVFrame* frame);
-
-    void dropFrameForEnqueue(QQueue<AVFrame*>& queue);
-
-    QQueue<AVFrame*> m_RenderQueue;
-    QQueue<AVFrame*> m_PacingQueue;
-    QQueue<int> m_PacingQueueHistory;
-    QQueue<int> m_RenderQueueHistory;
-    QMutex m_FrameQueueLock;
-    QWaitCondition m_RenderQueueNotEmpty;
-    QWaitCondition m_PacingQueueNotEmpty;
-    SDL_Thread* m_RenderThread;
-    bool m_Stopping;
+    QQueue<AVFrame*> m_FrameQueue;
+    QQueue<int> m_FrameQueueHistory;
+    SDL_SpinLock m_FrameQueueLock;

    IVsyncSource* m_VsyncSource;
    IFFmpegRenderer* m_VsyncRenderer;
@@ -2,70 +2,49 @@

 #include <SDL.h>

-#include "streaming/video/decoder.h"
-#include "streaming/video/overlaymanager.h"
-
 extern "C" {
 #include <libavcodec/avcodec.h>
 }

-#define RENDERER_ATTRIBUTE_FULLSCREEN_ONLY 0x01
-#define RENDERER_ATTRIBUTE_1080P_MAX 0x02
-
-class IFFmpegRenderer : public Overlay::IOverlayRenderer {
+class IFFmpegRenderer {
 public:
-    virtual bool initialize(PDECODER_PARAMETERS params) = 0;
-    virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) = 0;
-    virtual void renderFrame(AVFrame* frame) = 0;
+    enum FramePacingConstraint {
+        PACING_FORCE_OFF,
+        PACING_FORCE_ON,
+        PACING_ANY
+    };

-    virtual bool needsTestFrame() {
-        // No test frame required by default
-        return false;
-    }
-
-    virtual int getDecoderCapabilities() {
-        // No special capabilities by default
-        return 0;
-    }
-
-    virtual int getRendererAttributes() {
-        // No special attributes by default
-        return 0;
-    }
-
-    virtual int getDecoderColorspace() {
-        // Rec 601 is default
-        return COLORSPACE_REC_601;
-    }
-
-    virtual bool isRenderThreadSupported() {
-        // Render thread is supported by default
-        return true;
-    }
-
-    virtual bool isDirectRenderingSupported() {
-        // The renderer can render directly to the display
-        return true;
-    }
-
-    virtual enum AVPixelFormat getPreferredPixelFormat(int videoFormat) {
-        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
-    }
+    virtual ~IFFmpegRenderer() {}
+    virtual bool initialize(SDL_Window* window,
+                            int videoFormat,
+                            int width,
+                            int height,
+                            int maxFps,
+                            bool enableVsync) = 0;
+    virtual bool prepareDecoderContext(AVCodecContext* context) = 0;
+    virtual void renderFrameAtVsync(AVFrame* frame) = 0;
+    virtual bool needsTestFrame() = 0;
+    virtual int getDecoderCapabilities() = 0;
+    virtual FramePacingConstraint getFramePacingConstraint() = 0;
+};
+
+class SdlRenderer : public IFFmpegRenderer {
+public:
+    SdlRenderer();
+    virtual ~SdlRenderer();
+    virtual bool initialize(SDL_Window* window,
+                            int videoFormat,
+                            int width,
+                            int height,
+                            int maxFps,
+                            bool enableVsync);
+    virtual bool prepareDecoderContext(AVCodecContext* context);
+    virtual void renderFrameAtVsync(AVFrame* frame);
+    virtual bool needsTestFrame();
+    virtual int getDecoderCapabilities();
+    virtual FramePacingConstraint getFramePacingConstraint();
+
+private:
+    SDL_Renderer* m_Renderer;
+    SDL_Texture* m_Texture;
 };
@@ -1,55 +1,16 @@
-#include "sdlvid.h"
-
-#include "streaming/session.h"
-#include "streaming/streamutils.h"
-#include "path.h"
-
-#include <QDir>
+#include "renderer.h"

 #include <Limelight.h>

 SdlRenderer::SdlRenderer()
    : m_Renderer(nullptr),
-      m_Texture(nullptr),
-      m_SwPixelFormat(AV_PIX_FMT_NONE),
-      m_FontData(Path::readDataFile("ModeSeven.ttf"))
+      m_Texture(nullptr)
 {
-    SDL_assert(TTF_WasInit() == 0);
-    if (TTF_Init() != 0) {
-        SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                    "TTF_Init() failed: %s",
-                    TTF_GetError());
-        return;
-    }

-    SDL_zero(m_OverlayFonts);
-    SDL_zero(m_OverlaySurfaces);
-    SDL_zero(m_OverlayTextures);
 }

 SdlRenderer::~SdlRenderer()
 {
-    for (int i = 0; i < Overlay::OverlayMax; i++) {
-        if (m_OverlayFonts[i] != nullptr) {
-            TTF_CloseFont(m_OverlayFonts[i]);
-        }
-    }
-
-    TTF_Quit();
-    SDL_assert(TTF_WasInit() == 0);
-
-    for (int i = 0; i < Overlay::OverlayMax; i++) {
-        if (m_OverlayTextures[i] != nullptr) {
-            SDL_DestroyTexture(m_OverlayTextures[i]);
-        }
-    }
-
-    for (int i = 0; i < Overlay::OverlayMax; i++) {
-        if (m_OverlaySurfaces[i] != nullptr) {
-            SDL_FreeSurface(m_OverlaySurfaces[i]);
-        }
-    }
-
    if (m_Texture != nullptr) {
        SDL_DestroyTexture(m_Texture);
    }
@@ -59,117 +20,53 @@ SdlRenderer::~SdlRenderer()
    }
 }

-bool SdlRenderer::prepareDecoderContext(AVCodecContext*, AVDictionary**)
+bool SdlRenderer::prepareDecoderContext(AVCodecContext*)
 {
    /* Nothing to do */

    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Using SDL renderer");
+                "Using SDL software renderer");

    return true;
 }

-void SdlRenderer::notifyOverlayUpdated(Overlay::OverlayType type)
+bool SdlRenderer::needsTestFrame()
 {
-    // Construct the required font to render the overlay
-    if (m_OverlayFonts[type] == nullptr) {
-        if (m_FontData.isEmpty()) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "SDL overlay font failed to load");
-            return;
-        }
-
-        // m_FontData must stay around until the font is closed
-        m_OverlayFonts[type] = TTF_OpenFontRW(SDL_RWFromConstMem(m_FontData.constData(), m_FontData.size()),
-                                              1,
-                                              Session::get()->getOverlayManager().getOverlayFontSize(type));
-        if (m_OverlayFonts[type] == nullptr) {
-            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                        "TTF_OpenFont() failed: %s",
-                        TTF_GetError());
-
-            // Can't proceed without a font
-            return;
-        }
-    }
-
-    SDL_Surface* oldSurface = (SDL_Surface*)SDL_AtomicGetPtr((void**)&m_OverlaySurfaces[type]);
-
-    // Free the old surface
-    if (oldSurface != nullptr && SDL_AtomicCASPtr((void**)&m_OverlaySurfaces[type], oldSurface, nullptr)) {
-        SDL_FreeSurface(oldSurface);
-    }
-
-    if (Session::get()->getOverlayManager().isOverlayEnabled(type)) {
-        // The _Wrapped variant is required for line breaks to work
-        SDL_Surface* surface = TTF_RenderText_Blended_Wrapped(m_OverlayFonts[type],
-                                                              Session::get()->getOverlayManager().getOverlayText(type),
-                                                              Session::get()->getOverlayManager().getOverlayColor(type),
-                                                              1000);
-        SDL_AtomicSetPtr((void**)&m_OverlaySurfaces[type], surface);
-    }
+    // This renderer should always work
+    return false;
 }

-bool SdlRenderer::isRenderThreadSupported()
+int SdlRenderer::getDecoderCapabilities()
 {
-    SDL_RendererInfo info;
-    SDL_GetRendererInfo(m_Renderer, &info);
-
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "SDL renderer backend: %s",
-                info.name);
-
-    if (info.name != QString("direct3d")) {
-        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                    "SDL renderer backend requires main thread rendering");
-        return false;
-    }
-
-    return true;
+    // The FFmpeg CPU decoder can handle reference frame invalidation,
+    // but only for H.264.
+    return CAPABILITY_REFERENCE_FRAME_INVALIDATION_AVC;
 }

-bool SdlRenderer::isPixelFormatSupported(int, AVPixelFormat pixelFormat)
+IFFmpegRenderer::FramePacingConstraint SdlRenderer::getFramePacingConstraint()
 {
-    // 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;
-    }
+    return PACING_ANY;
 }

-bool SdlRenderer::initialize(PDECODER_PARAMETERS params)
+bool SdlRenderer::initialize(SDL_Window* window,
+                             int,
+                             int width,
+                             int height,
+                             int,
+                             bool enableVsync)
 {
    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) {
+    if ((SDL_GetWindowFlags(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
        // configuration but doesn't seem feasible to detect here.
-        if (params->enableVsync) {
+        if (enableVsync) {
            rendererFlags |= SDL_RENDERER_PRESENTVSYNC;
        }
    }

-#ifdef Q_OS_WIN32
-    // We render on a different thread than the main thread which is handling window
-    // messages. Without D3DCREATE_MULTITHREADED, this can cause a deadlock by blocking
-    // on a window message being processed while the main thread is blocked waiting for
-    // the render thread to finish.
-    SDL_SetHintWithPriority(SDL_HINT_RENDER_DIRECT3D_THREADSAFE, "1", SDL_HINT_OVERRIDE);
-#endif
-
-    m_Renderer = SDL_CreateRenderer(params->window, -1, rendererFlags);
+    m_Renderer = SDL_CreateRenderer(window, -1, rendererFlags);
    if (!m_Renderer) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "SDL_CreateRenderer() failed: %s",
@@ -177,212 +74,41 @@ bool SdlRenderer::initialize(PDECODER_PARAMETERS params)
        return false;
    }

-    // Calculate the video region size, scaling to fill the window 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_GetWindowSize(params->window, &dst.w, &dst.h);
-    StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
-
-    // Ensure the viewport is set to the desired video region
-    SDL_RenderSetViewport(m_Renderer, &dst);
+    // 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, width, height);

    // Draw a black frame until the video stream starts rendering
    SDL_SetRenderDrawColor(m_Renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
    SDL_RenderClear(m_Renderer);
    SDL_RenderPresent(m_Renderer);

-#ifdef Q_OS_WIN32
-    // For some reason, using Direct3D9Ex breaks this with multi-monitor setups.
-    // When focus is lost, the window is minimized then immediately restored without
-    // input focus. This glitches out the renderer and a bunch of other stuff.
-    // Direct3D9Ex itself seems to have this minimize on focus loss behavior on its
-    // own, so just disable SDL's handling of the focus loss event.
-    SDL_SetHintWithPriority(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0", SDL_HINT_OVERRIDE);
-#endif
+    m_Texture = SDL_CreateTexture(m_Renderer,
+                                  SDL_PIXELFORMAT_YV12,
+                                  SDL_TEXTUREACCESS_STREAMING,
+                                  width,
+                                  height);
+    if (!m_Texture) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                     "SDL_CreateRenderer() failed: %s",
+                     SDL_GetError());
+        return false;
+    }

    return true;
 }

-void SdlRenderer::renderOverlay(Overlay::OverlayType type)
+void SdlRenderer::renderFrameAtVsync(AVFrame* frame)
 {
-    if (Session::get()->getOverlayManager().isOverlayEnabled(type)) {
-        // If a new surface has been created for updated overlay data, convert it into a texture.
-        // NB: We have to do this conversion at render-time because we can only interact
-        // with the renderer on a single thread.
-        SDL_Surface* surface = (SDL_Surface*)SDL_AtomicGetPtr((void**)&m_OverlaySurfaces[type]);
-        if (surface != nullptr && SDL_AtomicCASPtr((void**)&m_OverlaySurfaces[type], surface, nullptr)) {
-            if (m_OverlayTextures[type] != nullptr) {
-                SDL_DestroyTexture(m_OverlayTextures[type]);
-            }
-
-            if (type == Overlay::OverlayStatusUpdate) {
-                // Bottom Left
-                int unused;
-                SDL_RenderGetLogicalSize(m_Renderer, &unused, &m_OverlayRects[type].y);
-                m_OverlayRects[type].x = 0;
-                m_OverlayRects[type].y -= surface->h;
-            }
-            else if (type == Overlay::OverlayDebug) {
-                // Top left
-                m_OverlayRects[type].x = 0;
-                m_OverlayRects[type].y = 0;
-            }
-
-            m_OverlayRects[type].w = surface->w;
-            m_OverlayRects[type].h = surface->h;
-
-            m_OverlayTextures[type] = SDL_CreateTextureFromSurface(m_Renderer, surface);
-            SDL_FreeSurface(surface);
-        }
-
-        // If we have an overlay texture, render it too
-        if (m_OverlayTextures[type] != nullptr) {
-            SDL_RenderCopy(m_Renderer, m_OverlayTextures[type], nullptr, &m_OverlayRects[type]);
-        }
-    }
-}
-
-void SdlRenderer::renderFrame(AVFrame* frame)
-{
-    int err;
-    AVFrame* swFrame = nullptr;
-
-    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;
-        }
-
-        swFrame->width = frame->width;
-        swFrame->height = frame->height;
-        swFrame->format = m_SwPixelFormat;
-
-        err = av_hwframe_transfer_data(swFrame, frame, 0);
-        if (err != 0) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "av_hwframe_transfer_data() failed: %d",
-                         err);
-            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:
-            sdlFormat = SDL_PIXELFORMAT_YV12;
-            break;
-        case AV_PIX_FMT_NV12:
-            sdlFormat = SDL_PIXELFORMAT_NV12;
-            break;
-        case AV_PIX_FMT_NV21:
-            sdlFormat = SDL_PIXELFORMAT_NV21;
-            break;
-        default:
-            SDL_assert(false);
-            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,
-                                      frame->width,
-                                      frame->height);
-        if (!m_Texture) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "SDL_CreateTexture() failed: %s",
-                         SDL_GetError());
-            goto Exit;
-        }
-    }
-
-    if (frame->format == AV_PIX_FMT_YUV420P) {
-        SDL_UpdateYUVTexture(m_Texture, nullptr,
-                             frame->data[0],
-                             frame->linesize[0],
-                             frame->data[1],
-                             frame->linesize[1],
-                             frame->data[2],
-                             frame->linesize[2]);
-    }
-    else {
-        char* pixels;
-        int pitch;
-
-        err = SDL_LockTexture(m_Texture, nullptr, (void**)&pixels, &pitch);
-        if (err < 0) {
-            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                         "SDL_LockTexture() failed: %s",
-                         SDL_GetError());
-            goto Exit;
-        }
-
-        memcpy(pixels,
-               frame->data[0],
-               frame->linesize[0] * frame->height);
-        memcpy(pixels + (frame->linesize[0] * frame->height),
-               frame->data[1],
-               frame->linesize[1] * frame->height / 2);
-
-        SDL_UnlockTexture(m_Texture);
-    }
+    SDL_UpdateYUVTexture(m_Texture, nullptr,
+                         frame->data[0],
+                         frame->linesize[0],
+                         frame->data[1],
+                         frame->linesize[1],
+                         frame->data[2],
+                         frame->linesize[2]);

    SDL_RenderClear(m_Renderer);
-
-    // Draw the video content itself
    SDL_RenderCopy(m_Renderer, m_Texture, nullptr, nullptr);
-
-    // Draw the overlays
-    for (int i = 0; i < Overlay::OverlayMax; i++) {
-        renderOverlay((Overlay::OverlayType)i);
-    }
-
    SDL_RenderPresent(m_Renderer);
-
-Exit:
-    if (swFrame != nullptr) {
-        av_frame_free(&swFrame);
-    }
 }
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "renderer.h"
-
-#include <SDL_ttf.h>
-
-class SdlRenderer : public IFFmpegRenderer {
-public:
-    SdlRenderer();
-    virtual ~SdlRenderer() 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 isRenderThreadSupported() override;
-    virtual bool isPixelFormatSupported(int videoFormat, enum AVPixelFormat pixelFormat) override;
-
-private:
-    void renderOverlay(Overlay::OverlayType type);
-
-    SDL_Renderer* m_Renderer;
-    SDL_Texture* m_Texture;
-    int m_SwPixelFormat;
-    QByteArray m_FontData;
-    TTF_Font* m_OverlayFonts[Overlay::OverlayMax];
-    SDL_Surface* m_OverlaySurfaces[Overlay::OverlayMax];
-    SDL_Texture* m_OverlayTextures[Overlay::OverlayMax];
-    SDL_Rect m_OverlayRects[Overlay::OverlayMax];
-};
-
@@ -1,18 +1,12 @@
 #include <QString>

 #include "vaapi.h"
-#include "utils.h"
 #include <streaming/streamutils.h>

 #include <SDL_syswm.h>

-#include <unistd.h>
-#include <fcntl.h>
-
 VAAPIRenderer::VAAPIRenderer()
-    : m_HwContext(nullptr),
-      m_DrmFd(-1),
-      m_BlacklistedForDirectRendering(false)
+    : m_HwContext(nullptr)
 {

 }
@@ -32,50 +26,18 @@ VAAPIRenderer::~VAAPIRenderer()
            vaTerminate(display);
        }
    }
-
-    if (m_DrmFd != -1) {
-        close(m_DrmFd);
-    }
 }

 bool
-VAAPIRenderer::validateDriver(VADisplay display)
-{
-    const char* vendorString = vaQueryVendorString(display);
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Validating VAAPI driver: %s",
-                vendorString ? vendorString : "<unknown>");
-
-    if (isDirectRenderingSupported()) {
-        int entrypointCount;
-        VAEntrypoint entrypoints[vaMaxNumEntrypoints(display)];
-        VAStatus status = vaQueryConfigEntrypoints(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,
-                                "VAEntrypointVideoProc is supported");
-                    return true;
-                }
-            }
-        }
-
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "VAAPI driver doesn't support VAEntrypointVideoProc!");
-        return false;
-    }
-    else {
-        // Indirect rendering can use any driver
-        return true;
-    }
-}
-
-VADisplay
-VAAPIRenderer::openDisplay(SDL_Window* window)
+VAAPIRenderer::initialize(SDL_Window* window, int, int width, int height, int, bool)
 {
+    int err;
    SDL_SysWMinfo info;
-    VADisplay display;
+
+    m_VideoWidth = width;
+    m_VideoHeight = height;
+
+    SDL_GetWindowSize(window, &m_DisplayWidth, &m_DisplayHeight);

    SDL_VERSION(&info.version);

@@ -83,94 +45,9 @@ VAAPIRenderer::openDisplay(SDL_Window* window)
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "SDL_GetWindowWMInfo() failed: %s",
                     SDL_GetError());
-        return nullptr;
+        return false;
    }

-    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;
-
-    m_VideoWidth = params->width;
-    m_VideoHeight = params->height;
-
-    SDL_GetWindowSize(params->window, &m_DisplayWidth, &m_DisplayHeight);
-
    m_HwContext = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);
    if (!m_HwContext) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -181,113 +58,48 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
    AVHWDeviceContext* deviceContext = (AVHWDeviceContext*)m_HwContext->data;
    AVVAAPIDeviceContext* vaDeviceContext = (AVVAAPIDeviceContext*)deviceContext->hwctx;

-    vaDeviceContext->display = openDisplay(params->window);
-    if (vaDeviceContext->display == nullptr) {
-        // openDisplay() logs the error
+    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
+        m_WaylandSurface = info.info.wl.surface;
+        m_WaylandDisplay = info.info.wl.display;
+        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);
        return false;
    }

    int major, minor;
    VAStatus status;
-    bool setPathVar = false;
-
-    for (;;) {
-        status = vaInitialize(vaDeviceContext->display, &major, &minor);
-        if (status == VA_STATUS_SUCCESS && !validateDriver(vaDeviceContext->display)) {
-            vaTerminate(vaDeviceContext->display);
-            vaDeviceContext->display = openDisplay(params->window);
-            status = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
-        }
-        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 && !validateDriver(vaDeviceContext->display)) {
-                    vaTerminate(vaDeviceContext->display);
-                    vaDeviceContext->display = openDisplay(params->window);
-                    status = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
-                }
-            }
-
-            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 && !validateDriver(vaDeviceContext->display)) {
-                    vaTerminate(vaDeviceContext->display);
-                    vaDeviceContext->display = openDisplay(params->window);
-                    status = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
-                }
-            }
-
-            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 && !validateDriver(vaDeviceContext->display)) {
-                    vaTerminate(vaDeviceContext->display);
-                    vaDeviceContext->display = openDisplay(params->window);
-                    status = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
-                }
-            }
-
-            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;
-        }
-    }
-
+    status = vaInitialize(vaDeviceContext->display, &major, &minor);
    if (status != VA_STATUS_SUCCESS) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "Failed to initialize VAAPI: %d",
@@ -300,17 +112,16 @@ 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>");

-    // AMD's Gallium VAAPI driver has a nasty memory leak that causes memory
-    // 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 or XWayland.
-    if (qgetenv("FORCE_VAAPI") != "1" && !WMUtils::isRunningWayland()) {
+    // AMD's Gallium VAAPI driver has a nasty memory leak
+    // that causes memory 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 (vendorString && qgetenv("FORCE_VAAPI") != "1") {
+        QString vendorStr(vendorString);
        if (vendorStr.contains("AMD", Qt::CaseInsensitive) ||
                vendorStr.contains("Radeon", Qt::CaseInsensitive)) {
            // Fail and let VDPAU pick this up
@@ -320,12 +131,6 @@ 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) {
@@ -347,13 +152,13 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
 }

 bool
-VAAPIRenderer::prepareDecoderContext(AVCodecContext* context, AVDictionary**)
+VAAPIRenderer::prepareDecoderContext(AVCodecContext* context)
 {
    context->hw_device_ctx = av_buffer_ref(m_HwContext);

    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                "Using VAAPI accelerated renderer on %s",
-                SDL_GetCurrentVideoDriver());
+                m_WindowSystem == SDL_SYSWM_X11 ? "X11" : "Wayland");

    return true;
 }
@@ -366,23 +171,19 @@ VAAPIRenderer::needsTestFrame()
    return true;
 }

-bool
-VAAPIRenderer::isDirectRenderingSupported()
+int
+VAAPIRenderer::getDecoderCapabilities()
 {
-    // Many Wayland renderers don't support YUV surfaces, so use
-    // another frontend renderer to draw our frames.
-    return m_WindowSystem == SDL_SYSWM_X11 && !m_BlacklistedForDirectRendering;
+    return 0;
 }

-int VAAPIRenderer::getDecoderColorspace()
+IFFmpegRenderer::FramePacingConstraint VAAPIRenderer::getFramePacingConstraint()
 {
-    // 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;
+    return PACING_ANY;
 }

 void
-VAAPIRenderer::renderFrame(AVFrame* frame)
+VAAPIRenderer::renderFrameAtVsync(AVFrame* frame)
 {
    VASurfaceID surface = (VASurfaceID)(uintptr_t)frame->data[3];
    AVHWDeviceContext* deviceContext = (AVHWDeviceContext*)m_HwContext->data;
@@ -400,27 +201,6 @@ 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,
@@ -428,14 +208,31 @@ VAAPIRenderer::renderFrame(AVFrame* frame)
                     m_VideoWidth, m_VideoHeight,
                     dst.x, dst.y,
                     dst.w, dst.h,
-                     NULL, 0, flags);
+                     NULL, 0, 0);
 #endif
    }
    else if (m_WindowSystem == SDL_SYSWM_WAYLAND) {
-        // We don't support direct rendering on Wayland, so we should
-        // never get called there. Many common Wayland compositors don't
-        // support YUV surfaces, so direct rendering would fail.
-        SDL_assert(false);
+#ifdef HAVE_LIBVA_WAYLAND
+        struct wl_buffer* buffer;
+        VAStatus status;
+
+        status = vaGetSurfaceBufferWl(vaDeviceContext->display,
+                                      surface,
+                                      VA_FRAME_PICTURE,
+                                      &buffer);
+        if (status == VA_STATUS_SUCCESS) {
+            wl_surface_attach(m_WaylandSurface, buffer, 0, 0);
+            wl_surface_damage(m_WaylandSurface, dst.x, dst.y, dst.w, dst.h);
+
+            wl_display_flush(m_WaylandDisplay);
+            wl_surface_commit(m_WaylandSurface);
+        }
+        else {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
+                         "vaGetSurfaceBufferWl failed(): %d",
+                         status);
+        }
+#endif
    }
    else {
        // We don't accept anything else in initialize().
@@ -22,9 +22,6 @@ 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>
 }

@@ -32,27 +29,32 @@ class VAAPIRenderer : public IFFmpegRenderer
 {
 public:
    VAAPIRenderer();
-    virtual ~VAAPIRenderer() override;
-    virtual bool initialize(PDECODER_PARAMETERS params) 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;
+    virtual ~VAAPIRenderer();
+    virtual bool initialize(SDL_Window* window,
+                            int videoFormat,
+                            int width,
+                            int height,
+                            int maxFps,
+                            bool enableVsync);
+    virtual bool prepareDecoderContext(AVCodecContext* context);
+    virtual void renderFrameAtVsync(AVFrame* frame);
+    virtual bool needsTestFrame();
+    virtual int getDecoderCapabilities();
+    virtual FramePacingConstraint getFramePacingConstraint();

 private:
-    bool validateDriver(VADisplay display);
-    VADisplay openDisplay(SDL_Window* window);
-
    int m_WindowSystem;
    AVBufferRef* m_HwContext;
-    int m_DrmFd;
-    bool m_BlacklistedForDirectRendering;

 #ifdef HAVE_LIBVA_X11
    Window m_XWindow;
 #endif

+#ifdef HAVE_LIBVA_WAYLAND
+    struct wl_surface* m_WaylandSurface;
+    struct wl_display* m_WaylandDisplay;
+#endif
+
    int m_VideoWidth;
    int m_VideoHeight;
    int m_DisplayWidth;
@@ -12,16 +12,11 @@
 #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_OutputFormats8Bit[] = {
+const VdpRGBAFormat VDPAURenderer::k_OutputFormats[] = {
    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,59 +54,18 @@ VDPAURenderer::~VDPAURenderer()
    }
 }

-bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
+bool VDPAURenderer::initialize(SDL_Window* window, int, int width, int height, int, bool)
 {
    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;
+    m_VideoWidth = width;
+    m_VideoHeight = height;

    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",
@@ -139,11 +93,11 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
    GET_PROC_ADDRESS(VDP_FUNC_ID_VIDEO_SURFACE_GET_PARAMETERS, &m_VdpVideoSurfaceGetParameters);
    GET_PROC_ADDRESS(VDP_FUNC_ID_GET_INFORMATION_STRING, &m_VdpGetInformationString);

-    SDL_GetWindowSize(params->window, (int*)&m_DisplayWidth, (int*)&m_DisplayHeight);
+    SDL_GetWindowSize(window, (int*)&m_DisplayWidth, (int*)&m_DisplayHeight);

    SDL_VERSION(&info.version);

-    if (!SDL_GetWindowWMInfo(params->window, &info)) {
+    if (!SDL_GetWindowWMInfo(window, &info)) {
        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                     "SDL_GetWindowWMInfo() failed: %s",
                     SDL_GetError());
@@ -189,11 +143,7 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
    for (int i = 0; i < OUTPUT_SURFACE_FORMAT_COUNT; i++) {
        VdpBool supported;
        uint32_t maxWidth, maxHeight;
-        VdpRGBAFormat candidateFormat =
-                params->videoFormat == VIDEO_FORMAT_H265_MAIN10 ?
-                    k_OutputFormats10Bit[i] : k_OutputFormats8Bit[i];
-
-        status = m_VdpOutputSurfaceQueryCapabilities(m_Device, candidateFormat,
+        status = m_VdpOutputSurfaceQueryCapabilities(m_Device, k_OutputFormats[i],
                                                     &supported, &maxWidth, &maxHeight);
        if (status != VDP_STATUS_OK) {
            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -204,7 +154,7 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)

        if (supported) {
            if (m_DisplayWidth <= maxWidth && m_DisplayHeight <= maxHeight) {
-                m_OutputSurfaceFormat = candidateFormat;
+                m_OutputSurfaceFormat = k_OutputFormats[i];
                foundFormat = true;
                break;
            }
@@ -266,7 +216,7 @@ bool VDPAURenderer::initialize(PDECODER_PARAMETERS params)
    return true;
 }

-bool VDPAURenderer::prepareDecoderContext(AVCodecContext* context, AVDictionary**)
+bool VDPAURenderer::prepareDecoderContext(AVCodecContext* context)
 {
    context->hw_device_ctx = av_buffer_ref(m_HwContext);

@@ -291,16 +241,17 @@ bool VDPAURenderer::needsTestFrame()
    return true;
 }

-int VDPAURenderer::getDecoderColorspace()
+int VDPAURenderer::getDecoderCapabilities()
 {
-    // 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;
+    return 0;
 }

-void VDPAURenderer::renderFrame(AVFrame* frame)
+IFFmpegRenderer::FramePacingConstraint VDPAURenderer::getFramePacingConstraint()
+{
+    return PACING_ANY;
+}
+
+void VDPAURenderer::renderFrameAtVsync(AVFrame* frame)
 {
    VdpStatus status;
    VdpVideoSurface videoSurface = (VdpVideoSurface)(uintptr_t)frame->data[3];
@@ -384,8 +335,8 @@ void VDPAURenderer::renderFrame(AVFrame* frame)
                                   0, nullptr,
                                   &sourceRect,
                                   chosenSurface,
-                                   nullptr,
                                   &outputRect,
+                                   nullptr,
                                   0,
                                   nullptr);
    if (status != VDP_STATUS_OK) {
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#fff"><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"/><path d="M0 0h24v24H0z" fill="none"/></svg>`