5.2.0

Pipewire: auto change default_output/default_input connected nodes when the default devices are changed in system audio settings
Audio device capture: make default output/input switch recording source the default output/input is changed in the audio server
2026-04-02 01:36:06 +09:00 · 2025-02-27 15:55:18 +01:00 · 2025-02-27 01:43:16 +01:00 · 2025-02-26 18:08:00 +01:00 · 2025-02-24 22:27:00 +01:00 · 2025-02-24 21:40:20 +01:00
52 changed files with 5849 additions and 1566 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@ gsr-kms-server
 *.mov
 *.webm
 *.ts
+*.jpg
+*.jpeg
+*.png
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@ similar to shadowplay on windows. This is the fastest screen recording tool for
 This screen recorder can be used for recording your desktop offline, for live streaming and for nvidia shadowplay-like instant replay,
 where only the last few minutes are saved.

+This software can also take screenshots.
+
+This is a cli-only tool, if you want an UI for this check out [GPU Screen Recorder GTK](https://git.dec05eba.com/gpu-screen-recorder-gtk/) or if you prefer a ShadowPlay-like UI then check out [GPU Screen Recorder UI](https://git.dec05eba.com/gpu-screen-recorder-ui/).
+
 Supported video codecs:
 * H264 (default)
 * HEVC (Optionally with HDR)
@@ -18,42 +22,54 @@ Supported audio codecs:
 * Opus (default)
 * AAC

-## Note
-This software works on X11 and Wayland on AMD, Intel and NVIDIA.
+Supported image formats:
+* JPEG
+* PNG
+
+This software works on X11 and Wayland on AMD, Intel and NVIDIA. Replay data is stored in RAM, not disk.
 ### TEMPORARY ISSUES
-1) screen-direct capture has been temporary disabled as it causes issues with stuttering. This might be a nvfbc bug.
-2) Videos are in variable framerate format. Use MPV to play such videos, otherwise you might experience stuttering in the video if you are using a buggy video player. You can try saving the video into a .mkv file instead as some software may have better support for .mkv files (such as kdenlive). You can use the "-fm cfr" option to to use constant framerate mode.
-3) FLAC audio codec is disabled at the moment because of temporary issues.
+1) Videos are in variable framerate format. Use MPV to play such videos, otherwise you might experience stuttering in the video if you are using a buggy video player. You can try saving the video into a .mkv file instead as some software may have better support for .mkv files (such as kdenlive). You can use the "-fm cfr" option to to use constant framerate mode.
+2) FLAC audio codec is disabled at the moment because of temporary issues.
 ### AMD/Intel/Wayland root permission
-When recording a window or when using the `-w portal` option under AMD/Intel no special user permission is required,
-however when recording a monitor (or when using wayland) the program needs root permission (to access KMS).\
+When recording a window or when using the `-w portal` option no special user permission is required,
+however when recording a monitor the program needs root permission (to access KMS).\
 This is safe in GPU Screen Recorder as the part that needs root access has been moved to its own small program that only does one thing.\
-For you as a user this only means that if you installed GPU Screen Recorder as a flatpak then a prompt asking for root password will show up when you start recording.
+For you as a user this only means that if you installed GPU Screen Recorder as a flatpak then a prompt asking for root password will show up once when you start recording.
 # Performance
 On a system with a i5 4690k CPU and a GTX 1080 GPU:\
 When recording Legend of Zelda Breath of the Wild at 4k, fps drops from 30 to 7 when using OBS Studio + nvenc, however when using this screen recorder the fps remains at 30.\
 When recording GTA V at 4k on highest settings, fps drops from 60 to 23 when using obs-nvfbc + nvenc, however when using this screen recorder the fps only drops to 58.\
 GPU Screen Recorder also produces much smoother videos than OBS when GPU utilization is close to 100%, see comparison here: [https://www.youtube.com/watch?v=zfj4sNVLLLg](https://www.youtube.com/watch?v=zfj4sNVLLLg).\
 GPU Screen Recorder has much better performance than OBS Studio even with version 30.2 that does "zero-copy" recording and encoding, see: [https://www.youtube.com/watch?v=jdroRjibsDw](https://www.youtube.com/watch?v=jdroRjibsDw).\
-It is recommended to save the video to a SSD because of the large file size, which a slow HDD might not be fast enough to handle. Using variable framerate mode (-fm vfr) which is the default is also recommended as this reduces encoding load. Ultra quality is also overkill most of the time, very high (the default) or lower quality is usually enough.
+It is recommended to save the video to a SSD because of the large file size, which a slow HDD might not be fast enough to handle. Using variable framerate mode (-fm vfr) which is the default is also recommended as this reduces encoding load. Ultra quality is also overkill most of the time, very high (the default) or lower quality is usually enough.\
+Note that recording on AMD can have some performance issues on Wayland in the recording itself when recording without desktop portal unless your mesa version is 25.0.0 or greater.
 ## Note about optimal performance on NVIDIA
 NVIDIA driver has a "feature" (read: bug) where it will downclock memory transfer rate when a program uses cuda (or nvenc, which uses cuda), such as GPU Screen Recorder. To work around this bug, GPU Screen Recorder can overclock your GPU memory transfer rate to it's normal optimal level.\
 To enable overclocking for optimal performance use the `-oc` option when running GPU Screen Recorder. You also need to have "Coolbits" NVIDIA X setting set to "12" to enable overclocking. You can automatically add this option if you run `sudo nvidia-xconfig --cool-bits=12` and then reboot your computer.\
 Note that this only works when Xorg server is running as root, and using this option will only give you a performance boost if the game you are recording is bottlenecked by your GPU.\
 Note! use at your own risk!
 # VRR/G-SYNC
-This should work fine on AMD/Intel X11 or Wayland. On Nvidia X11 G-SYNC only works with the -w screen-direct-force option, but because of bugs in the Nvidia driver this option is not always recommended.
+This should work fine on AMD/Intel X11 or Wayland. On Nvidia X11 G-SYNC only works with the -w screen-direct option, but because of bugs in the Nvidia driver this option is not always recommended.
 For example it can cause your computer to freeze when recording certain games.

 # Installation
-If you are running an Arch Linux based distro, then you can find gpu screen recorder on aur under the name gpu-screen-recorder-git (`yay -S gpu-screen-recorder-git`).\
+If you are running an Arch Linux based distro then you can find gpu screen recorder on aur under the name gpu-screen-recorder (`yay -S gpu-screen-recorder`).\
 If you are running another distro then you can run `sudo ./install.sh`, but you need to manually install the dependencies, as described below.\
 You can also install gpu screen recorder ([the gtk gui version](https://git.dec05eba.com/gpu-screen-recorder-gtk/)) from [flathub](https://flathub.org/apps/details/com.dec05eba.gpu_screen_recorder), which is the easiest method
 to install GPU Screen Recorder on non-arch based distros.\
-The only official ways to install GPU Screen Recorder is either from source, AUR or flathub. If you install GPU Screen Recorder from somewhere else and have an issue then try installing it
-from one of the official sources before reporting it as an issue.
 If you install GPU Screen Recorder flatpak, which is the gtk gui version then you can still run GPU Screen Recorder command line by using the flatpak command option, for example `flatpak run --command=gpu-screen-recorder com.dec05eba.gpu_screen_recorder -w screen -f 60 -o video.mp4`. Note that if you want to record your monitor on AMD/Intel then you need to install the flatpak system-wide (like so: `flatpak install flathub --system com.dec05eba.gpu_screen_recorder`).

+## Unofficial install methods
+The only official ways to install GPU Screen Recorder is either from source, AUR or flathub. Other sources may be out of date and missing features or may not work correctly.\
+If you install GPU Screen Recorder from somewhere else and have an issue then try installing it from one of the official sources before reporting it as an issue.\
+If you still prefer to install GPU Screen Recorder with a package manager instead of from source or as a flatpak then you may be able to find a package for your distro.\
+Here are some known unofficial packages:
+* Debian/Ubuntu: [Pacstall](https://pacstall.dev/packages/gpu-screen-recorder)
+* Nix: [NixOS wiki](https://wiki.nixos.org/wiki/Gpu-screen-recorder)
+* openSUSE: [openSUSE software repository](https://software.opensuse.org/package/gpu-screen-recorder)
+* Fedora: [Copr](https://copr.fedorainfracloud.org/coprs/brycensranch/gpu-screen-recorder-git/)
+* OpenMandriva: [gpu-screen-recorder](https://github.com/OpenMandrivaAssociation/gpu-screen-recorder/tree/master)
+
 # Dependencies
 GPU Screen Recorder uses meson build system so you need to install `meson` to build GPU Screen Recorder.

@@ -94,11 +110,18 @@ When compiling GPU Screen Recorder with portal support (`-Dportal=true`, which i
 * libpipewire (and libspa which is usually part of libpipewire)

 # How to use
-Run `gpu-screen-recorder --help` to see all options and also examples.
+Run `gpu-screen-recorder --help` to see all options and also examples.\
+There is also a gui for the gpu screen recorder called [GPU Screen Recorder GTK](https://git.dec05eba.com/gpu-screen-recorder-gtk/).\
+There is also a new alternative UI for GPU Screen Recorder in the style of ShadowPlay called [GPU Screen Recorder UI](https://git.dec05eba.com/gpu-screen-recorder-ui/).
 ## Recording
 Here is an example of how to record your monitor and the default audio output: `gpu-screen-recorder -w screen -f 60 -a default_output -o ~/Videos/test_video.mp4`.
 Yyou can stop and save the recording with `Ctrl+C` or by running `killall -SIGINT gpu-screen-recorder`.
-You can see a list of monitor names to record if you use an invalid monitor name, for example: `gpu-screen-recorder -w invalid -f 60 -o video.mp4`.
+You can see a list of capture options to record if you run `gpu-screen-recorder --list-capture-options`. This will list possible capture options and monitor names, for example:\
+```
+  window
+  DP-1|1920x1080
+```
+in this case you could record a window or a monitor with the name `DP-1`.
 ## Streaming
 Streaming works the same as recording, but the `-o` argument should be path to the live streaming service you want to use (including your live streaming key). Take a look at `scripts/twitch-stream.sh` to see an example of how to stream to twitch.
 ## Replay mode
@@ -112,15 +135,6 @@ The replay buffer is stored in ram (as encoded video), so don't use a too large
 To save a video in replay mode, you need to send signal SIGUSR1 to gpu screen recorder. You can do this by running `killall -SIGUSR1 gpu-screen-recorder`.\
 To stop recording send SIGINT to gpu screen recorder. You can do this by running `killall -SIGINT gpu-screen-recorder` or pressing `Ctrl-C` in the terminal that runs gpu screen recorder. When recording a regular non-replay video this will also save the video.\
 To pause/unpause recording send SIGUSR2 to gpu screen recorder. You can do this by running `killall -SIGUSR2 gpu-screen-recorder`. This is only applicable and useful when recording (not streaming nor replay).\
-## Finding audio device name
-You can find the default output audio device (headset, speakers (in other words, desktop audio)) with the command `pactl get-default-sink`. Add `monitor` to the end of that to use that as an audio input in gpu screen recorder.\
-You can find the default input audio device (microphone) with the command `pactl get-default-source`. This input should not have `monitor` added to the end when used in gpu screen recorder.\
-Example of recording both desktop audio and microphone: `gpu-screen-recorder -w screen -f 60 -a "$(pactl get-default-sink).monitor" -a "$(pactl get-default-source)" -o ~/Videos/test_video.mp4`.\
-A name (that is visible to pipewire) can be given to an audio input device by prefixing the audio input with `<name>/`, for example `dummy/$(pactl get-default-sink).monitor`.\
-Note that if you use multiple audio inputs then they are each recorded into separate audio tracks in the video file. If you want to merge multiple audio inputs into one audio track then separate the audio inputs by "|" in one -a argument,
-for example `-a "$(pactl get-default-sink).monitor|$(pactl get-default-source)"`.
-
-There is also a gui for the gpu screen recorder called [gpu-screen-recorder-gtk](https://git.dec05eba.com/gpu-screen-recorder-gtk/).
 ## Simple way to run replay without gui
 Run the script `scripts/start-replay.sh` to start replay and then `scripts/save-replay.sh` to save a replay and `scripts/stop-replay.sh` to stop the replay. The videos are saved to `$HOME/Videos`.
 You can use these scripts to start replay at system startup if you add `scripts/start-replay.sh` to startup (this can be done differently depending on your desktop environment / window manager) and then go into
@@ -137,12 +151,8 @@ You have to reboot your computer after installing GPU Screen Recorder for the fi
 # Examples
 Look at the [scripts](https://git.dec05eba.com/gpu-screen-recorder/tree/scripts) directory for script examples. For example if you want to automatically save a recording/replay into a folder with the same name as the game you are recording.

-# Reporting bugs
-Issues are reported on this Github page: [https://github.com/dec05eba/gpu-screen-recorder-issues/issues](https://github.com/dec05eba/gpu-screen-recorder-issues/issues).
-# Contributing patches
-See [https://git.dec05eba.com/?p=about](https://git.dec05eba.com/?p=about) for contribution steps.
-# Donations
-See [https://git.dec05eba.com/?p=about](https://git.dec05eba.com/?p=about) for donation options.
+# Reporting bugs, contributing patches, questions or donation
+See [https://git.dec05eba.com/?p=about](https://git.dec05eba.com/?p=about).

 # Demo
 [![Click here to watch a demo video on youtube](https://img.youtube.com/vi/n5tm0g01n6A/0.jpg)](https://www.youtube.com/watch?v=n5tm0g01n6A)
@@ -171,3 +181,6 @@ You have to either record in hdr mode (-k `hevc_hdr` or -k `av1_hdr` option) to
 You can record with desktop portal option (`-w portal`) instead which ignores night light, if you are ok with recording without HDR.
 ## Kdenlive says that the video is not usable for editing because it has variable frame rate
 To fix this you can either record the video in .mkv format or constant frame rate (-fm cfr).
+## Colors look incorrect when recording HDR (with hevc_hdr/av1_hdr) or using an ICC profile
+KDE Plasma version 6.2 broke HDR and ICC profiles for screen recorders. This was changed in KDE plasma version 6.3 and recording HDR works now, as long as you set HDR brightness to 100% (which means setting "Maximum SDR Brightness" in KDE plasma display settings to 203) and set color accuracy to "Prefer color accuracy". If you want to convert HDR to SDR then record with desktop portal option (`-w portal`) instead.
+I don't know how well recording HDR works in wayland compositors other than KDE plasma.
--- a/83
+++ b/83
@@ -2,7 +2,6 @@ Check for reparent.
 Quickly changing workspace and back while recording under i3 breaks the screen recorder. i3 probably unmaps windows in other workspaces.
 See https://trac.ffmpeg.org/wiki/EncodingForStreamingSites for optimizing streaming.
 Look at VK_EXT_external_memory_dma_buf.
-Allow setting a different output resolution than the input resolution.
 Use mov+faststart.
 Allow recording all monitors/selected monitor without nvfbc by recording the compositor proxy window and only recording the part that matches the monitor(s).
 Allow recording a region by recording the compositor proxy window / nvfbc window and copying part of it.
@@ -10,7 +9,6 @@ Support amf and qsv.
 Disable flipping on nvidia? this might fix some stuttering issues on some setups. See NvCtrlGetAttribute/NvCtrlSetAttributeAndGetStatus NV_CTRL_SYNC_TO_VBLANK https://github.com/NVIDIA/nvidia-settings/blob/d5f022976368cbceb2f20b838ddb0bf992f0cfb9/src/gtk%2B-2.x/ctkopengl.c.
 Replays seem to have some issues with audio/video. Why?
 Cleanup unused gl/egl functions, macro, etc.
-Add option to disable overlapping of replays (the old behavior kinda. Remove the whole replay buffer data after saving when doing this).
 Set audio track name to audio device name (if not merge of multiple audio devices).
 Add support for webcam, but only really for amd/intel because amd/intel can get drm fd access to webcam, nvidia cant. This allows us to create an opengl texture directly from the webcam fd for optimal performance.
 Reverse engineer nvapi so we can disable "force p2 state" on linux too (nvapi profile api with the settings id 0x50166c5e).
@@ -69,13 +67,9 @@ Exit if X11/Wayland killed (if drm plane dead or something?)

 Use SRC_W and SRC_H for screen plane instead of crtc_w and crtc_h.

-Make it possible to select which /dev/dri/card* to use, but that requires opengl to also use the same card. Not sure if that is possible for amd, intel and nvidia without using vulkan instead.
-
 Test if p2 state can be worked around by using pure nvenc api and overwriting cuInit/cuCtxCreate* to not do anything. Cuda might be loaded when using nvenc but it might not be used, with certain record options? (such as h264 p5).
    nvenc uses cuda when using b frames and rgb->yuv conversion, so convert the image ourselves instead.-

-Mesa doesn't support global headers (AV_CODEC_FLAG_GLOBAL_HEADER) with h264... which also breaks mkv since mkv requires global header. Right now gpu screen recorder will forcefully set video codec to hevc when h264 is requested for mkv files.
-
 Drop frames if live streaming cant keep up with target fps, or dynamically change resolution/quality.

 Support low power option.
@@ -103,12 +97,10 @@ Investigate if there is a way to do gpu->gpu copy directly without touching syst

 Go back to using pure vaapi without opengl for video encoding? rotation (transpose) can be done if its done after (rgb to yuv) color conversion.

-Implement scaling and use lanczos resampling for better quality. Lanczos resampling can also be used for YUV chroma for better color quality on small text.
+Use lanczos resampling for better scaling quality. Lanczos resampling can also be used for YUV chroma for better color quality on small text.

 Flac is disabled because the frame sizes are too large which causes big audio/video desync.

-Add 10-bit capture option. This is good because it reduces banding and quality in very dark areas while reducing the file size compared to doing the same thing with 8-bits.
-
 Enable b-frames.

 Support vfr matching games exact fps all the time. On x11 use damage tracking, on wayland? maybe there is drm plane damage tracking. But that may not be accurate as the compositor may update it every monitor hz anyways. On wayland maybe only support it for desktop portal + pipewire capture.
@@ -178,4 +170,75 @@ Support ROI (AV_FRAME_DATA_REGIONS_OF_INTEREST).

 Default to hevc if capture size is larger than 4096 in width or height.

-Set low latency mode on vulkan encoding.
+Set low latency mode on vulkan encoding.
+
+Support recording/replay/livestreaming at the same time by allowing commands to be run on an existing gpu screen recorder instance.
+
+Test if `xrandr --output DP-1 --scale 1.5` captures correct size on nvidia.
+
+Fix cursor position and scale when scaling x11 display.
+
+Support surround audio in application audio recording. Right now only stereo and mono sound is supported.
+
+Support application audio recording without pulseaudio combined sink.
+
+Support transposing (rotating) with vaapi. This isn't supported on many devices with rgb buffer, but its supported with nv12 buffer (on intel at least).
+
+Cleanup pipewire_audio.c (proper error handling and memory cleanup of proxies).
+
+Hide application audio module-null-sink by using sink_properties=media.class="Audio/Sink/Internal".
+
+Improve software encoding performance.
+
+Add option to record audio from the recorded window only.
+
+Add option to automatically select best video codec available. Add -k best, -k best_10bit and -k best_hdr.
+
+Use wayland color management protocol when it's available: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/14.
+
+Use different exit codes for different errors. Use one for invalid -w option, another one for invalid -a option for audio devices, etc. This is to make UI error reporting better.
+    Document these exit codes in an exit code .md file, or finally create a manpage where this can be documented.
+
+Ffmpeg fixed black bars in videos on amd when using hevc and when recording at some resolutions, such as 1080p:
+    https://github.com/FFmpeg/FFmpeg/commit/bcfbf2bac8f9eeeedc407b40596f5c7aaa0d5b47
+    https://github.com/FFmpeg/FFmpeg/commit/d0facac679faf45d3356dff2e2cb382580d7a521
+    Disable gpu screen recorder black bar handling when using hevc on amd when the libavcodec version is the one that comes after those commits.
+    Also consider the mesa version, to see if the gpu supports this.
+    The version is libavcodec >= 61.28.100
+
+Use opengl compute shader instead of graphics shader. This might allow for better performance when games are using 100% of graphics unit which might fix issue with 100% gpu usage causing gpu screen recorder to run slow when not using vaapi to convert rgb to nv12(?).
+
+Always disable prime run/dri prime and list all monitors to record from from all cards.
+    Do this instead of adding an option to choose which gpu to use.
+    On X11 the primary gpu will always have the framebuffer for all monitors combined.
+        Use randr to list all monitors and always record and encode with the primary gpu.
+    On Wayland each gpu will have its own list of monitors with framebuffers.
+        Iterate through all cards with drm and list all monitors with associated framebuffers and when choosing a monitor to record
+        automatically use the associated gpu card.
+
+Allow flv av1 if recent ffmpeg version and streaming to youtube (and twitch?) and for custom services.
+Use explicit sync in pipewire video code: https://docs.pipewire.org/page_dma_buf.html.
+
+Support vaapi rotation. Support for it is added in mesa here: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32919.
+
+Replay (and recording?) fails to save properly sometimes (especially for long videos). This is noticable with mp4 files since they get corrupt and become unplayable.
+    The entire video does seem to get saved (it's a large video file) and it seems to have the correct headers but it's not playable.
+
+Make it possible to save a shorter replay clip remotely. Maybe implement ipc first, to then also allow starting recording/stream while a replay is running.
+
+Add an option to pass http headers when streaming. Some streaming services require streaming keys to be passed in a http header instead of in the url as a parameter.
+
+When adding vulkan video support add VK_VIDEO_ENCODE_TUNING_MODE_LOW_LATENCY_KHR.
+
+Implement screenshot without invoking opengl (which is slow to start on some systems).
+
+Automatically use desktop portal on wayland when hdr is enabled (or night light) by checking if kms hdr metadata exists, if hdr video codec is not used.
+    Or maybe do this in the ui?
+
+Detect if cached portal session token is no longer valid (this can happen if the user switches to another wayland compositor).
+
+Support reconnecting (and setting things up again) if the audio server is restarted (for both device recording and app recording).
+
+Find out how nvidia-smi fixes nvenc not working on opensuse and do that ourselves instead of relying on nvidia-smi that is not always installed.
+
+Pulseaudio code: add "running" variable to loops to allow stopping the running code when quitting.
--- a/external/stb_image_write.h
+++ b/external/stb_image_write.h
--- a/extra/gpu-screen-recorder.env
+++ b/extra/gpu-screen-recorder.env
@@ -1,6 +1,5 @@
 WINDOW=screen
 CONTAINER=mp4
-QUALITY=very_high
 CODEC=h264
 AUDIO_CODEC=opus
 AUDIO_DEVICE=default_output
--- a/extra/gpu-screen-recorder.service
+++ b/extra/gpu-screen-recorder.service
@@ -5,22 +5,23 @@ Description=GPU Screen Recorder Service
 EnvironmentFile=-%h/.config/gpu-screen-recorder.env
 Environment=WINDOW=screen
 Environment=CONTAINER=mp4
-Environment=QUALITY=very_high
-Environment=BITRATE_MODE=qp
+Environment=QUALITY=50000
+Environment=BITRATE_MODE=cbr
 Environment=CODEC=auto
 Environment=AUDIO_CODEC=opus
 Environment=AUDIO_DEVICE=default_output
 Environment=SECONDARY_AUDIO_DEVICE=
 Environment=FRAMERATE=60
-Environment=REPLAYDURATION=30
+Environment=REPLAYDURATION=60
 Environment=OUTPUTDIR=%h/Videos
 Environment=MAKEFOLDERS=no
 Environment=COLOR_RANGE=limited
 Environment=KEYINT=2
 Environment=ENCODER=gpu
 Environment=RESTORE_PORTAL_SESSION=yes
+Environment=OUTPUT_RESOLUTION=0x0
 Environment=ADDITIONAL_ARGS=
-ExecStart=gpu-screen-recorder -v no -w "${WINDOW}" -c "${CONTAINER}" -q "${QUALITY}" -k "${CODEC}" -ac "${AUDIO_CODEC}" -a "${AUDIO_DEVICE}" -a "${SECONDARY_AUDIO_DEVICE}" -f "${FRAMERATE}" -r "${REPLAYDURATION}" -o "${OUTPUTDIR}" -df "${MAKEFOLDERS}" $ADDITIONAL_ARGS -cr "${COLOR_RANGE}" -keyint "${KEYINT}" -restore-portal-session "${RESTORE_PORTAL_SESSION}" -encoder "${ENCODER}" -bm "${BITRATE_MODE}"
+ExecStart=gpu-screen-recorder -v no -w "${WINDOW}" -s "${OUTPUT_RESOLUTION}" -c "${CONTAINER}" -q "${QUALITY}" -k "${CODEC}" -ac "${AUDIO_CODEC}" -a "${AUDIO_DEVICE}" -a "${SECONDARY_AUDIO_DEVICE}" -f "${FRAMERATE}" -r "${REPLAYDURATION}" -o "${OUTPUTDIR}" -df "${MAKEFOLDERS}" $ADDITIONAL_ARGS -cr "${COLOR_RANGE}" -keyint "${KEYINT}" -restore-portal-session "${RESTORE_PORTAL_SESSION}" -encoder "${ENCODER}" -bm "${BITRATE_MODE}"
 KillSignal=SIGINT
 Restart=on-failure
 RestartSec=5s
--- a/include/capture/capture.h
+++ b/include/capture/capture.h
@@ -9,37 +9,43 @@
 typedef struct AVCodecContext AVCodecContext;
 typedef struct AVStream AVStream;
 typedef struct AVFrame AVFrame;
-typedef struct gsr_capture gsr_capture;
 typedef struct AVMasteringDisplayMetadata AVMasteringDisplayMetadata;
 typedef struct AVContentLightMetadata AVContentLightMetadata;
+typedef struct gsr_capture gsr_capture;
+
+typedef struct {
+    int width;
+    int height;
+    int fps;
+    AVCodecContext *video_codec_context; /* can be NULL */
+    AVFrame *frame; /* can be NULL, but will never be NULL if |video_codec_context| is set */
+} gsr_capture_metadata;

 struct gsr_capture {
    /* These methods should not be called manually. Call gsr_capture_* instead */
-    int (*start)(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame);
+    int (*start)(gsr_capture *cap, gsr_capture_metadata *capture_metadata);
    void (*on_event)(gsr_capture *cap, gsr_egl *egl); /* can be NULL */
    void (*tick)(gsr_capture *cap); /* can be NULL. If there is an event then |on_event| is called before this */
    bool (*should_stop)(gsr_capture *cap, bool *err); /* can be NULL. If NULL, return false */
-    int (*capture)(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion);
-    gsr_source_color (*get_source_color)(gsr_capture *cap);
+    int (*capture)(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion);
    bool (*uses_external_image)(gsr_capture *cap); /* can be NULL. If NULL, return false */
    bool (*set_hdr_metadata)(gsr_capture *cap, AVMasteringDisplayMetadata *mastering_display_metadata, AVContentLightMetadata *light_metadata); /* can be NULL. If NULL, return false */
    uint64_t (*get_window_id)(gsr_capture *cap); /* can be NULL. Returns 0 if unknown */
    bool (*is_damaged)(gsr_capture *cap); /* can be NULL */
    void (*clear_damage)(gsr_capture *cap); /* can be NULL */
-    void (*destroy)(gsr_capture *cap, AVCodecContext *video_codec_context);
+    void (*destroy)(gsr_capture *cap);

    void *priv; /* can be NULL */
    bool started;
 };

-int gsr_capture_start(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame);
+int gsr_capture_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata);
 void gsr_capture_on_event(gsr_capture *cap, gsr_egl *egl);
 void gsr_capture_tick(gsr_capture *cap);
 bool gsr_capture_should_stop(gsr_capture *cap, bool *err);
-int gsr_capture_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion);
-gsr_source_color gsr_capture_get_source_color(gsr_capture *cap);
+int gsr_capture_capture(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion);
 bool gsr_capture_uses_external_image(gsr_capture *cap);
 bool gsr_capture_set_hdr_metadata(gsr_capture *cap, AVMasteringDisplayMetadata *mastering_display_metadata, AVContentLightMetadata *light_metadata);
-void gsr_capture_destroy(gsr_capture *cap, AVCodecContext *video_codec_context);
+void gsr_capture_destroy(gsr_capture *cap);

 #endif /* GSR_CAPTURE_CAPTURE_H */
--- a/include/capture/kms.h
+++ b/include/capture/kms.h
@@ -11,6 +11,7 @@ typedef struct {
    bool hdr;
    bool record_cursor;
    int fps;
+    vec2i output_resolution;
 } gsr_capture_kms_params;

 gsr_capture* gsr_capture_kms_create(const gsr_capture_kms_params *params);
--- a/include/capture/nvfbc.h
+++ b/include/capture/nvfbc.h
@@ -14,7 +14,7 @@ typedef struct {
    gsr_color_depth color_depth;
    gsr_color_range color_range;
    bool record_cursor;
-    bool use_software_video_encoder;
+    vec2i output_resolution;
 } gsr_capture_nvfbc_params;

 gsr_capture* gsr_capture_nvfbc_create(const gsr_capture_nvfbc_params *params);
--- a/include/capture/portal.h
+++ b/include/capture/portal.h
@@ -11,6 +11,7 @@ typedef struct {
    bool restore_portal_session;
    /* If this is set to NULL then this defaults to $XDG_CONFIG_HOME/gpu-screen-recorder/restore_token ($XDG_CONFIG_HOME defaults to $HOME/.config) */
    const char *portal_session_token_filepath;
+    vec2i output_resolution;
 } gsr_capture_portal_params;

 gsr_capture* gsr_capture_portal_create(const gsr_capture_portal_params *params);
--- a/include/capture/xcomposite.h
+++ b/include/capture/xcomposite.h
@@ -8,10 +8,10 @@ typedef struct {
    gsr_egl *egl;
    unsigned long window;
    bool follow_focused; /* If this is set then |window| is ignored */
-    vec2i region_size; /* This is currently only used with |follow_focused| */
    gsr_color_range color_range;
    bool record_cursor;
    gsr_color_depth color_depth;
+    vec2i output_resolution;
 } gsr_capture_xcomposite_params;

 gsr_capture* gsr_capture_xcomposite_create(const gsr_capture_xcomposite_params *params);
--- a/include/color_conversion.h
+++ b/include/color_conversion.h
@@ -22,7 +22,8 @@ typedef enum {

 typedef enum {
    GSR_DESTINATION_COLOR_NV12, /* YUV420, BT709, 8-bit */
-    GSR_DESTINATION_COLOR_P010  /* YUV420, BT2020, 10-bit */
+    GSR_DESTINATION_COLOR_P010, /* YUV420, BT2020, 10-bit */
+    GSR_DESTINATION_COLOR_RGB8
 } gsr_destination_color;

 typedef struct {
@@ -33,7 +34,6 @@ typedef struct {
 typedef struct {
    gsr_egl *egl;

-    gsr_source_color source_color;
    gsr_destination_color destination_color;

    unsigned int destination_textures[2];
@@ -57,7 +57,7 @@ typedef struct {
 int gsr_color_conversion_init(gsr_color_conversion *self, const gsr_color_conversion_params *params);
 void gsr_color_conversion_deinit(gsr_color_conversion *self);

-void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_id, vec2i source_pos, vec2i source_size, vec2i texture_pos, vec2i texture_size, float rotation, bool external_texture);
+void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_id, vec2i source_pos, vec2i source_size, vec2i texture_pos, vec2i texture_size, float rotation, bool external_texture, gsr_source_color source_color);
 void gsr_color_conversion_clear(gsr_color_conversion *self);

 #endif /* GSR_COLOR_CONVERSION_H */
--- a/include/damage.h
+++ b/include/damage.h
@@ -17,6 +17,7 @@ typedef enum {

 typedef struct {
    gsr_egl *egl;
+    Display *display;
    bool track_cursor;
    gsr_damage_track_type track_type;

--- a/include/defs.h
+++ b/include/defs.h
@@ -13,6 +13,11 @@ typedef struct {
    gsr_gpu_vendor vendor;
    int gpu_version; /* 0 if unknown */
    bool is_steam_deck;
+
+    /* Only currently set for Mesa. 0 if unknown format */
+    int driver_major;
+    int driver_minor;
+    int driver_patch;
 } gsr_gpu_info;

 typedef enum {
--- a/include/egl.h
+++ b/include/egl.h
@@ -10,6 +10,8 @@
 #include "vec2.h"
 #include "defs.h"

+typedef struct gsr_window gsr_window;
+
 #ifdef _WIN64
 typedef signed   long long int khronos_intptr_t;
 typedef unsigned long long int khronos_uintptr_t;
@@ -102,11 +104,13 @@ typedef void(*__GLXextFuncPtr)(void);
 #define GL_RG                                   0x8227
 #define GL_RGB                                  0x1907
 #define GL_RGBA                                 0x1908
+#define GL_RGB8                                 0x8051
 #define GL_RGBA8                                0x8058
 #define GL_R8                                   0x8229
 #define GL_RG8                                  0x822B
 #define GL_R16                                  0x822A
 #define GL_RG16                                 0x822C
+#define GL_RGB16                                0x8054
 #define GL_UNSIGNED_BYTE                        0x1401
 #define GL_COLOR_BUFFER_BIT                     0x00004000
 #define GL_TEXTURE_WRAP_S                       0x2802
@@ -131,6 +135,7 @@ typedef void(*__GLXextFuncPtr)(void);

 #define GL_VENDOR                               0x1F00
 #define GL_RENDERER                             0x1F01
+#define GL_VERSION                              0x1F02

 #define GL_COMPILE_STATUS                       0x8B81
 #define GL_INFO_LOG_LENGTH                      0x8B84
@@ -151,54 +156,11 @@ typedef int (*FUNC_eglQueryDisplayAttribEXT)(EGLDisplay dpy, int32_t attribute,
 typedef const char* (*FUNC_eglQueryDeviceStringEXT)(void *device, int32_t name);
 typedef int (*FUNC_eglQueryDmaBufModifiersEXT)(EGLDisplay dpy, int32_t format, int32_t max_modifiers, uint64_t *modifiers, int *external_only, int32_t *num_modifiers);

-#define GSR_MAX_OUTPUTS 32
-
-typedef struct {
-    char *name;
-    vec2i pos;
-    vec2i size;
-    uint32_t connector_id;
-    gsr_monitor_rotation rotation;
-    uint32_t monitor_identifier; /* crtc id */
-} gsr_x11_output;
-
-typedef struct {
-    Display *dpy;
-    Window window;
-    gsr_x11_output outputs[GSR_MAX_OUTPUTS];
-    int num_outputs;
-    XEvent xev;
-} gsr_x11;
-
-typedef struct {
-    uint32_t wl_name;
-    void *output;
-    vec2i pos;
-    vec2i size;
-    int32_t transform;
-    char *name;
-} gsr_wayland_output;
-
-typedef struct {
-    void *dpy;
-    void *window;
-    void *registry;
-    void *surface;
-    void *compositor;
-    gsr_wayland_output outputs[GSR_MAX_OUTPUTS];
-    int num_outputs;
-} gsr_wayland;
-
 typedef enum {
    GSR_GL_CONTEXT_TYPE_EGL,
    GSR_GL_CONTEXT_TYPE_GLX
 } gsr_gl_context_type;

-typedef enum {
-    GSR_DISPLAY_SERVER_X11,
-    GSR_DISPLAY_SERVER_WAYLAND
-} gsr_display_server;
-
 typedef struct gsr_egl gsr_egl;
 struct gsr_egl {
    void *egl_library;
@@ -206,6 +168,7 @@ struct gsr_egl {
    void *gl_library;

    gsr_gl_context_type context_type;
+    gsr_window *window;

    EGLDisplay egl_display;
    EGLSurface egl_surface;
@@ -217,8 +180,6 @@ struct gsr_egl {

    gsr_gpu_info gpu_info;

-    gsr_x11 x11;
-    gsr_wayland wayland;
    char card_path[128];

    int32_t (*eglGetError)(void);
@@ -318,15 +279,10 @@ struct gsr_egl {
    unsigned char (*glUnmapBuffer)(unsigned int target);
 };

-bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_capture);
+bool gsr_egl_load(gsr_egl *self, gsr_window *window, bool is_monitor_capture, bool enable_debug);
 void gsr_egl_unload(gsr_egl *self);

-/* Returns true if an event is available */
-bool gsr_egl_process_event(gsr_egl *self);
 /* Does opengl swap with egl or glx, depending on which one is active */
 void gsr_egl_swap_buffers(gsr_egl *self);

-gsr_display_server gsr_egl_get_display_server(const gsr_egl *self);
-XEvent* gsr_egl_get_event_data(gsr_egl *self);
-
 #endif /* GSR_EGL_H */
--- a/include/image_writer.h
+++ b/include/image_writer.h
@@ -0,0 +1,31 @@
+#ifndef GSR_IMAGE_WRITER_H
+#define GSR_IMAGE_WRITER_H
+
+#include <stdbool.h>
+
+typedef struct gsr_egl gsr_egl;
+
+typedef enum {
+    GSR_IMAGE_FORMAT_JPEG,
+    GSR_IMAGE_FORMAT_PNG
+} gsr_image_format;
+
+typedef enum {
+    GSR_IMAGE_WRITER_SOURCE_OPENGL
+} gsr_image_writer_source;
+
+typedef struct {
+    gsr_image_writer_source source;
+    gsr_egl *egl;
+    int width;
+    int height;
+    unsigned int texture;
+} gsr_image_writer;
+
+bool gsr_image_writer_init(gsr_image_writer *self, gsr_image_writer_source source, gsr_egl *egl, int width, int height);
+void gsr_image_writer_deinit(gsr_image_writer *self);
+
+/* Quality is between 1 and 100 where 100 is the max quality. Quality doesn't apply to lossless formats */
+bool gsr_image_writer_write_to_file(gsr_image_writer *self, const char *filepath, gsr_image_format image_format, int quality);
+
+#endif /* GSR_IMAGE_WRITER_H */
--- a/include/pipewire_audio.h
+++ b/include/pipewire_audio.h
@@ -0,0 +1,156 @@
+#ifndef GSR_PIPEWIRE_AUDIO_H
+#define GSR_PIPEWIRE_AUDIO_H
+
+#include <pipewire/thread-loop.h>
+#include <pipewire/context.h>
+#include <pipewire/core.h>
+#include <spa/utils/hook.h>
+
+#include <stdbool.h>
+
+#define GSR_PIPEWIRE_AUDIO_MAX_STREAM_NODES 128
+#define GSR_PIPEWIRE_AUDIO_MAX_PORTS 256
+#define GSR_PIPEWIRE_AUDIO_MAX_LINKS 256
+#define GSR_PIPEWIRE_AUDIO_MAX_REQUESTED_LINKS 32
+#define GSR_PIPEWIRE_AUDIO_MAX_VIRTUAL_SINKS 32
+
+typedef enum {
+    GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT, /* Application audio */
+    GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_INPUT,  /* Audio recording input */
+    GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE /* Audio output or input device or combined (virtual) sink */
+} gsr_pipewire_audio_node_type;
+
+typedef struct {
+    uint32_t id;
+    char *name;
+    gsr_pipewire_audio_node_type type;
+} gsr_pipewire_audio_node;
+
+typedef enum {
+    GSR_PIPEWIRE_AUDIO_PORT_DIRECTION_INPUT,
+    GSR_PIPEWIRE_AUDIO_PORT_DIRECTION_OUTPUT
+} gsr_pipewire_audio_port_direction;
+
+typedef struct {
+    uint32_t id;
+    uint32_t node_id;
+    gsr_pipewire_audio_port_direction direction;
+    char *name;
+} gsr_pipewire_audio_port;
+
+typedef struct {
+    uint32_t id;
+    uint32_t output_node_id;
+    uint32_t input_node_id;
+} gsr_pipewire_audio_link;
+
+typedef enum {
+    GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_STREAM, /* Application */
+    GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_SINK    /* Combined (virtual) sink */
+} gsr_pipewire_audio_link_input_type;
+
+typedef enum {
+    GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_STANDARD,
+    GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT,
+    GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_INPUT
+} gsr_pipewire_audio_requested_type;
+
+typedef struct {
+    char *name;
+    gsr_pipewire_audio_requested_type type;
+} gsr_pipewire_audio_requested_output;
+
+typedef struct {
+    gsr_pipewire_audio_requested_output *outputs;
+    int num_outputs;
+    char *input_name;
+    bool inverted;
+    gsr_pipewire_audio_node_type output_type;
+    gsr_pipewire_audio_link_input_type input_type;
+} gsr_pipewire_audio_requested_link;
+
+typedef struct {
+    struct pw_thread_loop *thread_loop;
+    struct pw_context *context;
+    struct pw_core *core;
+    struct spa_hook core_listener;
+    struct pw_registry *registry;
+    struct spa_hook registry_listener;
+    int server_version_sync;
+
+    struct pw_proxy *metadata_proxy;
+    struct spa_hook metadata_listener;
+    char default_output_device_name[128];
+    char default_input_device_name[128];
+
+    gsr_pipewire_audio_node stream_nodes[GSR_PIPEWIRE_AUDIO_MAX_STREAM_NODES];
+    int num_stream_nodes;
+
+    gsr_pipewire_audio_port ports[GSR_PIPEWIRE_AUDIO_MAX_PORTS];
+    int num_ports;
+
+    gsr_pipewire_audio_link links[GSR_PIPEWIRE_AUDIO_MAX_LINKS];
+    int num_links;
+
+    gsr_pipewire_audio_requested_link requested_links[GSR_PIPEWIRE_AUDIO_MAX_REQUESTED_LINKS];
+    int num_requested_links;
+
+    struct pw_proxy *virtual_sink_proxies[GSR_PIPEWIRE_AUDIO_MAX_VIRTUAL_SINKS];
+    int num_virtual_sink_proxies;
+} gsr_pipewire_audio;
+
+bool gsr_pipewire_audio_init(gsr_pipewire_audio *self);
+void gsr_pipewire_audio_deinit(gsr_pipewire_audio *self);
+
+bool gsr_pipewire_audio_create_virtual_sink(gsr_pipewire_audio *self, const char *name);
+
+/*
+    This function links audio source outputs from applications that match the name |app_names| to the input
+    that matches the name |stream_name_input|.
+    If an application or a new application starts outputting audio after this function is called and the app name matches
+    then it will automatically link the audio sources.
+    |app_names| and |stream_name_input| are case-insensitive matches.
+*/
+bool gsr_pipewire_audio_add_link_from_apps_to_stream(gsr_pipewire_audio *self, const char **app_names, int num_app_names, const char *stream_name_input);
+/*
+    This function links audio source outputs from all applications except the ones that match the name |app_names| to the input
+    that matches the name |stream_name_input|.
+    If an application or a new application starts outputting audio after this function is called and the app name doesn't match
+    then it will automatically link the audio sources.
+    |app_names| and |stream_name_input| are case-insensitive matches.
+*/
+bool gsr_pipewire_audio_add_link_from_apps_to_stream_inverted(gsr_pipewire_audio *self, const char **app_names, int num_app_names, const char *stream_name_input);
+
+/*
+    This function links audio source outputs from applications that match the name |app_names| to the input
+    that matches the name |sink_name_input|.
+    If an application or a new application starts outputting audio after this function is called and the app name matches
+    then it will automatically link the audio sources.
+    |app_names| and |sink_name_input| are case-insensitive matches.
+*/
+bool gsr_pipewire_audio_add_link_from_apps_to_sink(gsr_pipewire_audio *self, const char **app_names, int num_app_names, const char *sink_name_input);
+/*
+    This function links audio source outputs from all applications except the ones that match the name |app_names| to the input
+    that matches the name |sink_name_input|.
+    If an application or a new application starts outputting audio after this function is called and the app name doesn't match
+    then it will automatically link the audio sources.
+    |app_names| and |sink_name_input| are case-insensitive matches.
+*/
+bool gsr_pipewire_audio_add_link_from_apps_to_sink_inverted(gsr_pipewire_audio *self, const char **app_names, int num_app_names, const char *sink_name_input);
+
+/*
+    This function links audio source outputs from devices that match the name |source_names| to the input
+    that matches the name |sink_name_input|.
+    If a device or a new device starts outputting audio after this function is called and the device name matches
+    then it will automatically link the audio sources.
+    |source_names| and |sink_name_input| are case-insensitive matches.
+    |source_names| can include "default_output" or "default_input" to use the default output/input
+    and it will automatically switch when the default output/input is changed in system audio settings.
+*/
+bool gsr_pipewire_audio_add_link_from_sources_to_sink(gsr_pipewire_audio *self, const char **source_names, int num_source_names, const char *sink_name_input);
+
+/* Return true to continue */
+typedef bool (*gsr_pipewire_audio_app_query_callback)(const char *app_name, void *userdata);
+void gsr_pipewire_audio_for_each_app(gsr_pipewire_audio *self, gsr_pipewire_audio_app_query_callback callback, void *userdata);
+
+#endif /* GSR_PIPEWIRE_AUDIO_H */
--- a/include/pipewire_video.h
+++ b/include/pipewire_video.h
@@ -1,5 +1,5 @@
-#ifndef GSR_PIPEWIRE_H
-#define GSR_PIPEWIRE_H
+#ifndef GSR_PIPEWIRE_VIDEO_H
+#define GSR_PIPEWIRE_VIDEO_H

 #include <stdbool.h>
 #include <stdint.h>
@@ -8,9 +8,9 @@
 #include <spa/utils/hook.h>
 #include <spa/param/video/format.h>

-#define GSR_PIPEWIRE_MAX_MODIFIERS 1024
-#define GSR_PIPEWIRE_NUM_VIDEO_FORMATS 6
-#define GSR_PIPEWIRE_DMABUF_MAX_PLANES 4
+#define GSR_PIPEWIRE_VIDEO_MAX_MODIFIERS 1024
+#define GSR_PIPEWIRE_VIDEO_MAX_VIDEO_FORMATS 12
+#define GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES 4

 typedef struct gsr_egl gsr_egl;

@@ -18,23 +18,23 @@ typedef struct {
    int major;
    int minor;
    int micro;
-} gsr_pipewire_data_version;
+} gsr_pipewire_video_data_version;

 typedef struct {
    uint32_t fps_num;
    uint32_t fps_den;
-} gsr_pipewire_video_info;
+} gsr_pipewire_video_video_info;

 typedef struct {
    int fd;
    uint32_t offset;
    int32_t stride;
-} gsr_pipewire_dmabuf_data;
+} gsr_pipewire_video_dmabuf_data;

 typedef struct {
    int x, y;
    int width, height;
-} gsr_pipewire_region;
+} gsr_pipewire_video_region;

 typedef struct {
    enum spa_video_format format;
@@ -82,31 +82,31 @@ typedef struct {
        uint32_t width, height;
    } crop;

-    gsr_video_format supported_video_formats[GSR_PIPEWIRE_NUM_VIDEO_FORMATS];
+    gsr_video_format supported_video_formats[GSR_PIPEWIRE_VIDEO_MAX_VIDEO_FORMATS];

-    gsr_pipewire_data_version server_version;
-    gsr_pipewire_video_info video_info;
-    gsr_pipewire_dmabuf_data dmabuf_data[GSR_PIPEWIRE_DMABUF_MAX_PLANES];
+    gsr_pipewire_video_data_version server_version;
+    gsr_pipewire_video_video_info video_info;
+    gsr_pipewire_video_dmabuf_data dmabuf_data[GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES];
    size_t dmabuf_num_planes;

    bool no_modifiers_fallback;
    bool external_texture_fallback;

-    uint64_t modifiers[GSR_PIPEWIRE_MAX_MODIFIERS];
+    uint64_t modifiers[GSR_PIPEWIRE_VIDEO_MAX_MODIFIERS];
    size_t num_modifiers;
-} gsr_pipewire;
+} gsr_pipewire_video;

 /*
    |capture_cursor| only applies to when capturing a window or region.
    In other cases |pipewire_node|'s setup will determine if the cursor is included.
    Note that the cursor is not guaranteed to be shown even if set to true, it depends on the wayland compositor.
 */
-bool gsr_pipewire_init(gsr_pipewire *self, int pipewire_fd, uint32_t pipewire_node, int fps, bool capture_cursor, gsr_egl *egl);
-void gsr_pipewire_deinit(gsr_pipewire *self);
+bool gsr_pipewire_video_init(gsr_pipewire_video *self, int pipewire_fd, uint32_t pipewire_node, int fps, bool capture_cursor, gsr_egl *egl);
+void gsr_pipewire_video_deinit(gsr_pipewire_video *self);

-/* |dmabuf_data| should be at least GSR_PIPEWIRE_DMABUF_MAX_PLANES in size */
-bool gsr_pipewire_map_texture(gsr_pipewire *self, gsr_texture_map texture_map, gsr_pipewire_region *region, gsr_pipewire_region *cursor_region, gsr_pipewire_dmabuf_data *dmabuf_data, int *num_dmabuf_data, uint32_t *fourcc, uint64_t *modifiers, bool *using_external_image);
-bool gsr_pipewire_is_damaged(gsr_pipewire *self);
-void gsr_pipewire_clear_damage(gsr_pipewire *self);
+/* |dmabuf_data| should be at least GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES in size */
+bool gsr_pipewire_video_map_texture(gsr_pipewire_video *self, gsr_texture_map texture_map, gsr_pipewire_video_region *region, gsr_pipewire_video_region *cursor_region, gsr_pipewire_video_dmabuf_data *dmabuf_data, int *num_dmabuf_data, uint32_t *fourcc, uint64_t *modifiers, bool *using_external_image);
+bool gsr_pipewire_video_is_damaged(gsr_pipewire_video *self);
+void gsr_pipewire_video_clear_damage(gsr_pipewire_video *self);

-#endif /* GSR_PIPEWIRE_H */
+#endif /* GSR_PIPEWIRE_VIDEO_H */
--- a/include/sound.hpp
+++ b/include/sound.hpp
@@ -26,7 +26,7 @@ typedef struct {
    unsigned int frames;
 } SoundDevice;

-struct AudioInput {
+struct AudioDevice {
    std::string name;
    std::string description;
 };
@@ -34,10 +34,22 @@ struct AudioInput {
 struct AudioDevices {
    std::string default_output;
    std::string default_input;
-    std::vector<AudioInput> audio_inputs;
+    std::vector<AudioDevice> audio_inputs;
+};
+
+enum class AudioInputType {
+    DEVICE,
+    APPLICATION
+};
+
+struct AudioInput {
+    std::string name;
+    AudioInputType type = AudioInputType::DEVICE;
+    bool inverted = false;
 };

 struct MergedAudioInputs {
+    std::string track_name;
    std::vector<AudioInput> audio_inputs;
 };

@@ -48,9 +60,10 @@ typedef enum {
 } AudioFormat;

 /*
-    Get a sound device by name, returning the device into the @device parameter.
-    The device should be closed with @sound_device_close after it has been used
-    to clean up internal resources.
+    Get a sound device by name, returning the device into the |device| parameter.
+    |device_name| can be a device name or "default_output" or "default_input".
+    If the device name is "default_output" or "default_input" then it will automatically switch which
+    device is records from when the default output/input is changed in the system audio settings.
    Returns 0 on success, or a negative value on failure.
 */
 int sound_device_get_by_name(SoundDevice *device, const char *device_name, const char *description, unsigned int num_channels, unsigned int period_frame_size, AudioFormat audio_format);
@@ -64,5 +77,6 @@ void sound_device_close(SoundDevice *device);
 int sound_device_read_next_chunk(SoundDevice *device, void **buffer, double timeout_sec, double *latency_seconds);

 AudioDevices get_pulseaudio_inputs();
+bool pulseaudio_server_is_pipewire();

 #endif /* GPU_SCREEN_RECORDER_H */
--- a/include/utils.h
+++ b/include/utils.h
@@ -7,6 +7,8 @@
 #include <stdbool.h>
 #include <stdint.h>

+#define CONNECTOR_TYPE_COUNTS 32
+
 typedef struct AVCodecContext AVCodecContext;
 typedef struct AVFrame AVFrame;

@@ -27,17 +29,31 @@ typedef struct {
    bool found_monitor;
 } get_monitor_by_name_userdata;

+typedef struct {
+    int type;
+    int count;
+    int count_active;
+} drm_connector_type_count;
+
 double clock_get_monotonic_seconds(void);
+bool generate_random_characters(char *buffer, int buffer_size, const char *alphabet, size_t alphabet_size);
+bool generate_random_characters_standard_alphabet(char *buffer, int buffer_size);

 typedef void (*active_monitor_callback)(const gsr_monitor *monitor, void *userdata);
 void for_each_active_monitor_output_x11_not_cached(Display *display, active_monitor_callback callback, void *userdata);
-void for_each_active_monitor_output_x11(const gsr_egl *egl, active_monitor_callback callback, void *userdata);
-void for_each_active_monitor_output(const gsr_egl *egl, gsr_connection_type connection_type, active_monitor_callback callback, void *userdata);
+void for_each_active_monitor_output(const gsr_window *window, const char *card_path, gsr_connection_type connection_type, active_monitor_callback callback, void *userdata);
 bool get_monitor_by_name(const gsr_egl *egl, gsr_connection_type connection_type, const char *name, gsr_monitor *monitor);
-gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_egl *egl, const gsr_monitor *monitor);
+gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_window *window, const gsr_monitor *monitor);
+
+int get_connector_type_by_name(const char *name);
+drm_connector_type_count* drm_connector_types_get_index(drm_connector_type_count *type_counts, int *num_type_counts, int connector_type);
+uint32_t monitor_identifier_from_type_and_count(int monitor_type_index, int monitor_type_count);

 bool gl_get_gpu_info(gsr_egl *egl, gsr_gpu_info *info);
+bool version_greater_than(int major, int minor, int patch, int other_major, int other_minor, int other_patch);
+bool gl_driver_version_greater_than(const gsr_gpu_info *gpu_info, int major, int minor, int patch);

+bool try_card_has_valid_plane(const char *card_path);
 /* |output| should be at least 128 bytes in size */
 bool gsr_get_valid_card_path(gsr_egl *egl, char *output, bool is_monitor_capture);
 /* |render_path| should be at least 128 bytes in size */
@@ -51,4 +67,6 @@ bool video_codec_context_is_vaapi(AVCodecContext *video_codec_context);
 bool vaapi_copy_drm_planes_to_video_surface(AVCodecContext *video_codec_context, AVFrame *video_frame, vec2i source_pos, vec2i source_size, vec2i dest_pos, vec2i dest_size, uint32_t format, vec2i size, const int *fds, const uint32_t *offsets, const uint32_t *pitches, const uint64_t *modifiers, int num_planes);
 bool vaapi_copy_egl_image_to_video_surface(gsr_egl *egl, EGLImage image, vec2i source_pos, vec2i source_size, vec2i dest_pos, vec2i dest_size, AVCodecContext *video_codec_context, AVFrame *video_frame);

+vec2i scale_keep_aspect_ratio(vec2i from, vec2i to);
+
 #endif /* GSR_UTILS_H */
--- a/include/vec2.h
+++ b/include/vec2.h
@@ -9,4 +9,8 @@ typedef struct {
    float x, y;
 } vec2f;

+typedef struct {
+    double x, y;
+} vec2d;
+
 #endif /* VEC2_H */
--- a/include/window/window.h
+++ b/include/window/window.h
@@ -0,0 +1,37 @@
+#ifndef GSR_WINDOW_H
+#define GSR_WINDOW_H
+
+#include "../utils.h"
+#include <stdbool.h>
+
+typedef union _XEvent XEvent;
+typedef struct gsr_window gsr_window;
+
+typedef enum {
+    GSR_DISPLAY_SERVER_X11,
+    GSR_DISPLAY_SERVER_WAYLAND
+} gsr_display_server;
+
+struct gsr_window {
+    void (*destroy)(gsr_window *self);
+    /* Returns true if an event is available */
+    bool (*process_event)(gsr_window *self);
+    XEvent* (*get_event_data)(gsr_window *self); /* can be NULL */
+    gsr_display_server (*get_display_server)(void);
+    void* (*get_display)(gsr_window *self);
+    void* (*get_window)(gsr_window *self);
+    void (*for_each_active_monitor_output_cached)(const gsr_window *self, active_monitor_callback callback, void *userdata);
+    void *priv;
+};
+
+void gsr_window_destroy(gsr_window *self);
+
+/* Returns true if an event is available */
+bool gsr_window_process_event(gsr_window *self);
+XEvent* gsr_window_get_event_data(gsr_window *self);
+gsr_display_server gsr_window_get_display_server(const gsr_window *self);
+void* gsr_window_get_display(gsr_window *self);
+void* gsr_window_get_window(gsr_window *self);
+void gsr_window_for_each_active_monitor_output_cached(const gsr_window *self, active_monitor_callback callback, void *userdata);
+
+#endif /* GSR_WINDOW_H */
--- a/include/window/window_wayland.h
+++ b/include/window/window_wayland.h
@@ -0,0 +1,8 @@
+#ifndef GSR_WINDOW_WAYLAND_H
+#define GSR_WINDOW_WAYLAND_H
+
+#include "window.h"
+
+gsr_window* gsr_window_wayland_create(void);
+
+#endif /* GSR_WINDOW_WAYLAND_H */
--- a/include/window/window_x11.h
+++ b/include/window/window_x11.h
@@ -0,0 +1,10 @@
+#ifndef GSR_WINDOW_X11_H
+#define GSR_WINDOW_X11_H
+
+#include "window.h"
+
+typedef struct _XDisplay Display;
+
+gsr_window* gsr_window_x11_create(Display *display);
+
+#endif /* GSR_WINDOW_X11_H */
--- a/kms/client/kms_client.c
+++ b/kms/client/kms_client.c
@@ -1,4 +1,5 @@
 #include "kms_client.h"
+#include "../../include/utils.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -10,9 +11,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/capability.h>
-#include <sys/random.h>

 #define GSR_SOCKET_PAIR_LOCAL  0
 #define GSR_SOCKET_PAIR_REMOTE 1
@@ -20,21 +21,6 @@
 static void cleanup_socket(gsr_kms_client *self, bool kill_server);
 static int gsr_kms_client_replace_connection(gsr_kms_client *self);

-static bool generate_random_characters(char *buffer, int buffer_size, const char *alphabet, size_t alphabet_size) {
-    /* TODO: Use other functions on other platforms than linux */
-    if(getrandom(buffer, buffer_size, 0) < buffer_size) {
-        fprintf(stderr, "Failed to get random bytes, error: %s\n", strerror(errno));
-        return false;
-    }
-
-    for(int i = 0; i < buffer_size; ++i) {
-        unsigned char c = *(unsigned char*)&buffer[i];
-        buffer[i] = alphabet[c % alphabet_size];
-    }
-
-    return true;
-}
-
 static void close_fds(gsr_kms_response *response) {
    for(int i = 0; i < response->num_items; ++i) {
        for(int j = 0; j < response->items[i].num_dma_bufs; ++j) {
@@ -139,7 +125,7 @@ static bool create_socket_path(char *output_path, size_t output_path_size) {

    char random_characters[11];
    random_characters[10] = '\0';
-    if(!generate_random_characters(random_characters, 10, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 62))
+    if(!generate_random_characters_standard_alphabet(random_characters, 10))
        return false;

    snprintf(output_path, output_path_size, "%s/.gsr-kms-socket-%s", home, random_characters);
@@ -333,17 +319,14 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) {
    }

    fprintf(stderr, "gsr info: gsr_kms_client_init: waiting for server to connect\n");
+    struct pollfd poll_fd = {
+        .fd = self->initial_socket_fd,
+        .events = POLLIN,
+        .revents = 0
+    };
    for(;;) {
-        struct timeval tv;
-        fd_set rfds;
-        FD_ZERO(&rfds);
-        FD_SET(self->initial_socket_fd, &rfds);
-
-        tv.tv_sec = 0;
-        tv.tv_usec = 100 * 1000; // 100 ms
-
-        int select_res = select(1 + self->initial_socket_fd, &rfds, NULL, NULL, &tv);
-        if(select_res > 0) {
+        int poll_res = poll(&poll_fd, 1, 100);
+        if(poll_res > 0 && (poll_fd.revents & POLLIN)) {
            socklen_t sock_len = 0;
            self->initial_client_fd = accept(self->initial_socket_fd, (struct sockaddr*)&remote_addr, &sock_len);
            if(self->initial_client_fd == -1) {
--- a/kms/server/kms_server.c
+++ b/kms/server/kms_server.c
@@ -19,6 +19,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <drm_mode.h>
+#include <drm_fourcc.h>

 #define MAX_CONNECTORS 32

@@ -362,7 +363,7 @@ static int kms_get_fb(gsr_drm *drm, gsr_kms_response *response, connector_to_crt
        response->items[item_index].width = drmfb->width;
        response->items[item_index].height = drmfb->height;
        response->items[item_index].pixel_format = drmfb->pixel_format;
-        response->items[item_index].modifier = drmfb->modifier;
+        response->items[item_index].modifier = drmfb->flags & DRM_MODE_FB_MODIFIERS ? drmfb->modifier : DRM_FORMAT_MOD_INVALID;
        response->items[item_index].connector_id = crtc_pair ? crtc_pair->connector_id : 0;
        response->items[item_index].is_cursor = property_mask & PLANE_PROPERTY_IS_CURSOR;
        if(property_mask & PLANE_PROPERTY_IS_CURSOR) {
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('gpu-screen-recorder', ['c', 'cpp'], version : '4.2.4', default_options : ['warning_level=2'])
+project('gpu-screen-recorder', ['c', 'cpp'], version : '5.2.0', default_options : ['warning_level=2'])

 add_project_arguments('-Wshadow', language : ['c', 'cpp'])
 if get_option('buildtype') == 'debug'
@@ -21,6 +21,9 @@ src = [
    'src/codec_query/nvenc.c',
    'src/codec_query/vaapi.c',
    'src/codec_query/vulkan.c',
+    'src/window/window.c',
+    'src/window/window_x11.c',
+    'src/window/window_wayland.c',
    'src/egl.c',
    'src/cuda.c',
    'src/xnvctrl.c',
@@ -32,6 +35,7 @@ src = [
    'src/library_loader.c',
    'src/cursor.c',
    'src/damage.c',
+    'src/image_writer.c',
    'src/sound.cpp',
    'src/main.cpp',
 ]
@@ -57,20 +61,32 @@ dep = [
    dependency('wayland-client'),
 ]

+uses_pipewire = false
+
 if get_option('portal') == true
    src += [
        'src/capture/portal.c',
        'src/dbus.c',
-        'src/pipewire.c',
+        'src/pipewire_video.c',
    ]
+    dep += dependency('dbus-1')
+    add_project_arguments('-DGSR_PORTAL', language : ['c', 'cpp'])
+    uses_pipewire = true
+endif

+if get_option('app_audio') == true
+    src += [
+        'src/pipewire_audio.c',
+    ]
+    add_project_arguments('-DGSR_APP_AUDIO', language : ['c', 'cpp'])
+    uses_pipewire = true
+endif
+
+if uses_pipewire == true
    dep += [
-        dependency('dbus-1'),
        dependency('libpipewire-0.3'),
        dependency('libspa-0.2'),
    ]
-
-    add_project_arguments('-DGSR_PORTAL', language : ['c', 'cpp'])
 endif

 add_project_arguments('-DGSR_VERSION="' + meson.project_version() + '"', language: ['c', 'cpp'])
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,5 @@
 option('systemd', type : 'boolean', value : true, description : 'Install systemd service file')
-option('capabilities', type : 'boolean', value : true, description : 'Set binary admin capability to remove password prompt when recording monitor (without desktop portal option) on amd/intel or nvidia wayland')
+option('capabilities', type : 'boolean', value : true, description : 'Set binary admin capability on gsr-kms-server binary to remove password prompt when recording monitor (without desktop portal option) on amd/intel or nvidia wayland')
 option('nvidia_suspend_fix', type : 'boolean', value : true, description : 'Install nvidia modprobe config file to tell nvidia driver to preserve video memory on suspend. This is a workaround for an nvidia driver bug that breaks cuda (and gpu screen recorder) on suspend')
-option('portal', type : 'boolean', value : true, description : 'If GPU Screen Recorder should be built with support for xdg desktop portal ScreenCast capture (wayland only)')
+option('portal', type : 'boolean', value : true, description : 'Build with support for xdg desktop portal ScreenCast capture (wayland only) (-w portal option)')
+option('app_audio', type : 'boolean', value : true, description : 'Build with support for recording a single audio source (-aa option). Requires pipewire')
--- a/project.conf
+++ b/project.conf
@@ -1,7 +1,7 @@
 [package]
 name = "gpu-screen-recorder"
 type = "executable"
-version = "4.2.4"
+version = "5.2.0"
 platforms = ["posix"]

 [config]
@@ -10,6 +10,7 @@ ignore_dirs = ["kms/server", "build", "debug-build"]

 [define]
 GSR_PORTAL = "1"
+GSR_APP_AUDIO = "1"

 [dependencies]
 libavcodec = ">=58"
--- a/scripts/record-application-name.sh
+++ b/scripts/record-application-name.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

 window=$(xdotool selectwindow)
-window_name=$(xdotool getwindowclassname "$window" || xdotool getwindowname "$window" || echo "Game")
+window_name=$(xdotool getwindowname "$window" || xdotool getwindowclassname "$window" || echo "Game")
 window_name="$(echo "$window_name" | tr '/\\' '_')"
 gpu-screen-recorder -w "$window" -f 60 -a default_output -o "$HOME/Videos/recording/$window_name/$(date +"Video_%Y-%m-%d_%H-%M-%S.mp4")"
--- a/scripts/record-save-application-name.sh
+++ b/scripts/record-save-application-name.sh
@@ -4,7 +4,7 @@
 # gpu-screen-recorder -w screen -f 60 -a default_output -r 60 -sc scripts/record-save-application-name.sh -c mp4 -o "$HOME/Videos"

 window=$(xdotool getwindowfocus)
-window_name=$(xdotool getwindowclassname "$window" || xdotool getwindowname "$window" || echo "Game")
+window_name=$(xdotool getwindowname "$window" || xdotool getwindowclassname "$window" || echo "Game")
 window_name="$(echo "$window_name" | tr '/\\' '_')"

 video_dir="$HOME/Videos/Replays/$window_name"
--- a/scripts/replay-application-name.sh
+++ b/scripts/replay-application-name.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

 window=$(xdotool selectwindow)
-window_name=$(xdotool getwindowclassname "$window" || xdotool getwindowname "$window" || echo "Game")
+window_name=$(xdotool getwindowname "$window" || xdotool getwindowclassname "$window" || echo "Game")
 window_name="$(echo "$window_name" | tr '/\\' '_')"
 gpu-screen-recorder -w "$window" -f 60 -c mkv -a default_output -r 60 -o "$HOME/Videos/Replays/$window_name"
--- a/src/capture/capture.c
+++ b/src/capture/capture.c
@@ -1,9 +1,9 @@
 #include "../../include/capture/capture.h"
 #include <assert.h>

-int gsr_capture_start(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame) {
+int gsr_capture_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata) {
    assert(!cap->started);
-    int res = cap->start(cap, video_codec_context, frame);
+    int res = cap->start(cap, capture_metadata);
    if(res == 0)
        cap->started = true;

@@ -29,13 +29,9 @@ bool gsr_capture_should_stop(gsr_capture *cap, bool *err) {
        return false;
 }

-int gsr_capture_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion) {
+int gsr_capture_capture(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion) {
    assert(cap->started);
-    return cap->capture(cap, frame, color_conversion);
-}
-
-gsr_source_color gsr_capture_get_source_color(gsr_capture *cap) {
-    return cap->get_source_color(cap);
+    return cap->capture(cap, capture_metadata, color_conversion);
 }

 bool gsr_capture_uses_external_image(gsr_capture *cap) {
@@ -52,6 +48,6 @@ bool gsr_capture_set_hdr_metadata(gsr_capture *cap, AVMasteringDisplayMetadata *
        return false;
 }

-void gsr_capture_destroy(gsr_capture *cap, AVCodecContext *video_codec_context) {
-    cap->destroy(cap, video_codec_context);
+void gsr_capture_destroy(gsr_capture *cap) {
+    cap->destroy(cap);
 }
--- a/src/capture/kms.c
+++ b/src/capture/kms.c
@@ -2,6 +2,7 @@
 #include "../../include/utils.h"
 #include "../../include/color_conversion.h"
 #include "../../include/cursor.h"
+#include "../../include/window/window.h"
 #include "../../kms/client/kms_client.h"

 #include <stdlib.h>
@@ -17,6 +18,8 @@
 #include <libavutil/mastering_display_metadata.h>
 #include <libavformat/avformat.h>

+#define FIND_CRTC_BY_NAME_TIMEOUT_SECONDS 2.0
+
 #define HDMI_STATIC_METADATA_TYPE1 0
 #define HDMI_EOTF_SMPTE_ST2084 2

@@ -52,9 +55,9 @@ typedef struct {
    bool is_x11;
    gsr_cursor x11_cursor;

-    AVCodecContext *video_codec_context;
    bool performance_error_shown;
    bool fast_path_failed;
+    bool mesa_supports_compute_only_vaapi_copy;

    //int drm_fd;
    //uint64_t prev_sequence;
@@ -62,6 +65,8 @@ typedef struct {

    vec2i prev_target_pos;
    vec2i prev_plane_size;
+
+    double last_time_monitor_check;
 } gsr_capture_kms;

 static void gsr_capture_kms_cleanup_kms_fds(gsr_capture_kms *self) {
@@ -171,7 +176,7 @@ static vec2i rotate_capture_size_if_rotated(gsr_capture_kms *self, vec2i capture
    return capture_size;
 }

-static int gsr_capture_kms_start(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame) {
+static int gsr_capture_kms_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata) {
    gsr_capture_kms *self = cap->priv;

    gsr_capture_kms_create_input_texture_ids(self);
@@ -183,17 +188,19 @@ static int gsr_capture_kms_start(gsr_capture *cap, AVCodecContext *video_codec_c
    if(kms_init_res != 0)
        return kms_init_res;

-    self->is_x11 = gsr_egl_get_display_server(self->params.egl) == GSR_DISPLAY_SERVER_X11;
+    self->is_x11 = gsr_window_get_display_server(self->params.egl->window) == GSR_DISPLAY_SERVER_X11;
    const gsr_connection_type connection_type = self->is_x11 ? GSR_CONNECTION_X11 : GSR_CONNECTION_DRM;
-    if(self->is_x11)
-        gsr_cursor_init(&self->x11_cursor, self->params.egl, self->params.egl->x11.dpy);
+    if(self->is_x11) {
+        Display *display = gsr_window_get_display(self->params.egl->window);
+        gsr_cursor_init(&self->x11_cursor, self->params.egl, display);
+    }

    MonitorCallbackUserdata monitor_callback_userdata = {
        &self->monitor_id,
        self->params.display_to_capture, strlen(self->params.display_to_capture),
        0,
    };
-    for_each_active_monitor_output(self->params.egl, connection_type, monitor_callback, &monitor_callback_userdata);
+    for_each_active_monitor_output(self->params.egl->window, self->params.egl->card_path, connection_type, monitor_callback, &monitor_callback_userdata);

    if(!get_monitor_by_name(self->params.egl, connection_type, self->params.display_to_capture, &monitor)) {
        fprintf(stderr, "gsr error: gsr_capture_kms_start: failed to find monitor by name \"%s\"\n", self->params.display_to_capture);
@@ -202,7 +209,7 @@ static int gsr_capture_kms_start(gsr_capture *cap, AVCodecContext *video_codec_c
    }

    monitor.name = self->params.display_to_capture;
-    self->monitor_rotation = drm_monitor_get_display_server_rotation(self->params.egl, &monitor);
+    self->monitor_rotation = drm_monitor_get_display_server_rotation(self->params.egl->window, &monitor);

    self->capture_pos = monitor.pos;
    /* Monitor size is already rotated on x11 when the monitor is rotated, no need to apply it ourselves */
@@ -211,16 +218,28 @@ static int gsr_capture_kms_start(gsr_capture *cap, AVCodecContext *video_codec_c
    else
        self->capture_size = rotate_capture_size_if_rotated(self, monitor.size);

-    /* Disable vsync */
-    self->params.egl->eglSwapInterval(self->params.egl->egl_display, 0);
+    if(self->params.output_resolution.x == 0 && self->params.output_resolution.y == 0) {
+        self->params.output_resolution = self->capture_size;
+        capture_metadata->width = FFALIGN(self->capture_size.x, 2);
+        capture_metadata->height = FFALIGN(self->capture_size.y, 2);
+    } else {
+        self->params.output_resolution = scale_keep_aspect_ratio(self->capture_size, self->params.output_resolution);
+        capture_metadata->width = FFALIGN(self->params.output_resolution.x, 2);
+        capture_metadata->height = FFALIGN(self->params.output_resolution.y, 2);
+    }

-    video_codec_context->width = FFALIGN(self->capture_size.x, 2);
-    video_codec_context->height = FFALIGN(self->capture_size.y, 2);
+    self->fast_path_failed = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 0, 9);
+    if(self->fast_path_failed)
+        fprintf(stderr, "gsr warning: gsr_capture_kms_start: your amd driver (mesa) version is known to be buggy (<= version 24.0.9), falling back to opengl copy\n");

-    frame->width = video_codec_context->width;
-    frame->height = video_codec_context->height;
+    //if(self->params.hdr) {
+    //    self->fast_path_failed = true;
+    //    fprintf(stderr, "gsr warning: gsr_capture_kms_start: recording with hdr requires shader color conversion which might be slow. If this is an issue record with -w portal instead (which converts HDR to SDR)\n");
+    //}

-    self->video_codec_context = video_codec_context;
+    self->mesa_supports_compute_only_vaapi_copy = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 3, 6);
+
+    self->last_time_monitor_check = clock_get_monotonic_seconds();
    return 0;
 }

@@ -229,7 +248,7 @@ static void gsr_capture_kms_on_event(gsr_capture *cap, gsr_egl *egl) {
    if(!self->is_x11)
        return;

-    XEvent *xev = gsr_egl_get_event_data(egl);
+    XEvent *xev = gsr_window_get_event_data(egl->window);
    gsr_cursor_on_event(&self->x11_cursor, xev);
 }

@@ -414,7 +433,7 @@ static gsr_kms_response_item* find_monitor_drm(gsr_capture_kms *self, bool *capt
    }

    // Will never happen on wayland unless the target monitor has been disconnected
-    if(!drm_fd) {
+    if(!drm_fd && self->is_x11) {
        drm_fd = find_largest_drm(&self->kms_response);
        *capture_is_combined_plane = true;
    }
@@ -429,7 +448,12 @@ static gsr_kms_response_item* find_cursor_drm_if_on_monitor(gsr_capture_kms *sel
    return cursor_drm_fd;
 }

-static void render_drm_cursor(gsr_capture_kms *self, gsr_color_conversion *color_conversion, const gsr_kms_response_item *cursor_drm_fd, vec2i target_pos, float texture_rotation) {
+static void render_drm_cursor(gsr_capture_kms *self, gsr_color_conversion *color_conversion, const gsr_kms_response_item *cursor_drm_fd, vec2i target_pos, float texture_rotation, vec2i output_size) {
+    const vec2d scale = {
+        self->capture_size.x == 0 ? 0 : (double)output_size.x / (double)self->capture_size.x,
+        self->capture_size.y == 0 ? 0 : (double)output_size.y / (double)self->capture_size.y
+    };
+
    const bool cursor_texture_id_is_external = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA;
    const vec2i cursor_size = {cursor_drm_fd->width, cursor_drm_fd->height};

@@ -458,6 +482,9 @@ static void render_drm_cursor(gsr_capture_kms *self, gsr_color_conversion *color
            break;
    }

+    cursor_pos.x *= scale.x;
+    cursor_pos.y *= scale.y;
+
    cursor_pos.x += target_pos.x;
    cursor_pos.y += target_pos.y;

@@ -487,34 +514,40 @@ static void render_drm_cursor(gsr_capture_kms *self, gsr_color_conversion *color
        self->params.egl->eglDestroyImage(self->params.egl->egl_display, cursor_image);

    self->params.egl->glEnable(GL_SCISSOR_TEST);
-    self->params.egl->glScissor(target_pos.x, target_pos.y, self->capture_size.x, self->capture_size.y);
+    self->params.egl->glScissor(target_pos.x, target_pos.y, output_size.x, output_size.y);

    gsr_color_conversion_draw(color_conversion, self->cursor_texture_id,
-        cursor_pos, cursor_size,
+        cursor_pos, (vec2i){cursor_size.x * scale.x, cursor_size.y * scale.y},
        (vec2i){0, 0}, cursor_size,
-        texture_rotation, cursor_texture_id_is_external);
+        texture_rotation, cursor_texture_id_is_external, GSR_SOURCE_COLOR_RGB);

    self->params.egl->glDisable(GL_SCISSOR_TEST);
 }

-static void render_x11_cursor(gsr_capture_kms *self, gsr_color_conversion *color_conversion, vec2i capture_pos, vec2i target_pos) {
+static void render_x11_cursor(gsr_capture_kms *self, gsr_color_conversion *color_conversion, vec2i capture_pos, vec2i target_pos, vec2i output_size) {
    if(!self->x11_cursor.visible)
        return;

-    gsr_cursor_tick(&self->x11_cursor, DefaultRootWindow(self->params.egl->x11.dpy));
+    const vec2d scale = {
+        self->capture_size.x == 0 ? 0 : (double)output_size.x / (double)self->capture_size.x,
+        self->capture_size.y == 0 ? 0 : (double)output_size.y / (double)self->capture_size.y
+    };
+
+    Display *display = gsr_window_get_display(self->params.egl->window);
+    gsr_cursor_tick(&self->x11_cursor, DefaultRootWindow(display));

    const vec2i cursor_pos = {
-        target_pos.x + self->x11_cursor.position.x - self->x11_cursor.hotspot.x - capture_pos.x,
-        target_pos.y + self->x11_cursor.position.y - self->x11_cursor.hotspot.y - capture_pos.y
+        target_pos.x + (self->x11_cursor.position.x - self->x11_cursor.hotspot.x - capture_pos.x) * scale.x,
+        target_pos.y + (self->x11_cursor.position.y - self->x11_cursor.hotspot.y - capture_pos.y) * scale.y
    };

    self->params.egl->glEnable(GL_SCISSOR_TEST);
-    self->params.egl->glScissor(target_pos.x, target_pos.y, self->capture_size.x, self->capture_size.y);
+    self->params.egl->glScissor(target_pos.x, target_pos.y, output_size.x, output_size.y);

    gsr_color_conversion_draw(color_conversion, self->x11_cursor.texture_id,
-        cursor_pos, self->x11_cursor.size,
+        cursor_pos, (vec2i){self->x11_cursor.size.x * scale.x, self->x11_cursor.size.y * scale.y},
        (vec2i){0, 0}, self->x11_cursor.size,
-        0.0f, false);
+        0.0f, false, GSR_SOURCE_COLOR_RGB);

    self->params.egl->glDisable(GL_SCISSOR_TEST);
 }
@@ -527,7 +560,56 @@ static void gsr_capture_kms_update_capture_size_change(gsr_capture_kms *self, gs
    }
 }

-static int gsr_capture_kms_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion) {
+static void gsr_capture_kms_update_connector_ids(gsr_capture_kms *self) {
+    const double now = clock_get_monotonic_seconds();
+    if(now - self->last_time_monitor_check < FIND_CRTC_BY_NAME_TIMEOUT_SECONDS)
+        return;
+
+    self->last_time_monitor_check = now;
+    /* TODO: Assume for now that there is only 1 framebuffer for all monitors and it doesn't change */
+    if(self->is_x11)
+        return;
+
+    self->monitor_id.num_connector_ids = 0;
+    const gsr_connection_type connection_type = self->is_x11 ? GSR_CONNECTION_X11 : GSR_CONNECTION_DRM;
+    // MonitorCallbackUserdata monitor_callback_userdata = {
+    //     &self->monitor_id,
+    //     self->params.display_to_capture, strlen(self->params.display_to_capture),
+    //     0,
+    // };
+    // for_each_active_monitor_output(self->params.egl->window, self->params.egl->card_path, connection_type, monitor_callback, &monitor_callback_userdata);
+
+    gsr_monitor monitor;
+    if(!get_monitor_by_name(self->params.egl, connection_type, self->params.display_to_capture, &monitor)) {
+        fprintf(stderr, "gsr error: gsr_capture_kms_update_connector_ids: failed to find monitor by name \"%s\"\n", self->params.display_to_capture);
+        return;
+    }
+
+    self->monitor_id.num_connector_ids = 1;
+    self->monitor_id.connector_ids[0] = monitor.connector_id;
+
+    monitor.name = self->params.display_to_capture;
+    self->monitor_rotation = drm_monitor_get_display_server_rotation(self->params.egl->window, &monitor);
+
+    self->capture_pos = monitor.pos;
+    /* Monitor size is already rotated on x11 when the monitor is rotated, no need to apply it ourselves */
+    if(self->is_x11)
+        self->capture_size = monitor.size;
+    else
+        self->capture_size = rotate_capture_size_if_rotated(self, monitor.size);
+}
+
+static void gsr_capture_kms_fail_fast_path_if_not_fast(gsr_capture_kms *self, uint32_t pixel_format) {
+    const uint8_t pixel_format_color_depth_1 = (pixel_format >> 16) & 0xFF;
+    if(!self->fast_path_failed && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !self->mesa_supports_compute_only_vaapi_copy && (pixel_format_color_depth_1 == '3' || pixel_format_color_depth_1 == '4')) {
+        self->fast_path_failed = true;
+        fprintf(stderr, "gsr warning: gsr_capture_kms_capture: the monitor you are recording is in 10/12-bit color format and your mesa version is <= 24.3.6, composition will be used."
+            " If you experience performance problems in the video then record on a single window on X11 or use portal capture option instead or disable 10/12-bit color option in your desktop environment settings,"
+            " or try to record the monitor on X11 instead (if you aren't already doing that) or update your mesa version.\n");
+    }
+}
+
+static int gsr_capture_kms_capture(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion) {
    gsr_capture_kms *self = cap->priv;

    gsr_capture_kms_cleanup_kms_fds(self);
@@ -546,6 +628,8 @@ static int gsr_capture_kms_capture(gsr_capture *cap, AVFrame *frame, gsr_color_c
        return -1;
    }

+    gsr_capture_kms_update_connector_ids(self);
+
    bool capture_is_combined_plane = false;
    const gsr_kms_response_item *drm_fd = find_monitor_drm(self, &capture_is_combined_plane);
    if(!drm_fd) {
@@ -556,15 +640,23 @@ static int gsr_capture_kms_capture(gsr_capture *cap, AVFrame *frame, gsr_color_c
    if(drm_fd->has_hdr_metadata && self->params.hdr && hdr_metadata_is_supported_format(&drm_fd->hdr_metadata))
        gsr_kms_set_hdr_metadata(self, drm_fd);

-    if(!self->performance_error_shown && self->monitor_rotation != GSR_MONITOR_ROT_0 && video_codec_context_is_vaapi(self->video_codec_context) && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD) {
+    if(!self->performance_error_shown && self->monitor_rotation != GSR_MONITOR_ROT_0 && video_codec_context_is_vaapi(capture_metadata->video_codec_context) && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD) {
        self->performance_error_shown = true;
-        fprintf(stderr,"gsr warning: gsr_capture_kms_capture: the monitor you are recording is rotated, composition will have to be used."
-            " If you are experience performance problems in the video then record a single window on X11 or use portal capture option instead\n");
+        self->fast_path_failed = true;
+        fprintf(stderr, "gsr warning: gsr_capture_kms_capture: the monitor you are recording is rotated, composition will have to be used."
+            " If you experience performance problems in the video then record a single window on X11 or use portal capture option instead\n");
    }

-    const float texture_rotation = monitor_rotation_to_radians(self->monitor_rotation);
-    const vec2i target_pos = { max_int(0, frame->width / 2 - self->capture_size.x / 2), max_int(0, frame->height / 2 - self->capture_size.y / 2) };
+    gsr_capture_kms_fail_fast_path_if_not_fast(self, drm_fd->pixel_format);
+
    self->capture_size = rotate_capture_size_if_rotated(self, (vec2i){ drm_fd->src_w, drm_fd->src_h });
+
+    const bool is_scaled = self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0;
+    vec2i output_size = is_scaled ? self->params.output_resolution : self->capture_size;
+    output_size = scale_keep_aspect_ratio(self->capture_size, output_size);
+
+    const float texture_rotation = monitor_rotation_to_radians(self->monitor_rotation);
+    const vec2i target_pos = { max_int(0, capture_metadata->width / 2 - output_size.x / 2), max_int(0, capture_metadata->height / 2 - output_size.y / 2) };
    gsr_capture_kms_update_capture_size_change(self, color_conversion, target_pos, drm_fd);

    vec2i capture_pos = self->capture_pos;
@@ -575,7 +667,7 @@ static int gsr_capture_kms_capture(gsr_capture *cap, AVFrame *frame, gsr_color_c
    self->params.egl->glFinish();

    /* Fast opengl free path */
-    if(!self->fast_path_failed && self->monitor_rotation == GSR_MONITOR_ROT_0 && video_codec_context_is_vaapi(self->video_codec_context) && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD) {
+    if(!self->fast_path_failed && self->monitor_rotation == GSR_MONITOR_ROT_0 && video_codec_context_is_vaapi(capture_metadata->video_codec_context) && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD) {
        int fds[4];
        uint32_t offsets[4];
        uint32_t pitches[4];
@@ -586,7 +678,7 @@ static int gsr_capture_kms_capture(gsr_capture *cap, AVFrame *frame, gsr_color_c
            pitches[i] = drm_fd->dma_buf[i].pitch;
            modifiers[i] = drm_fd->modifier;
        }
-        if(!vaapi_copy_drm_planes_to_video_surface(self->video_codec_context, frame, (vec2i){capture_pos.x, capture_pos.y}, self->capture_size, target_pos, self->capture_size, drm_fd->pixel_format, (vec2i){drm_fd->width, drm_fd->height}, fds, offsets, pitches, modifiers, drm_fd->num_dma_bufs)) {
+        if(!vaapi_copy_drm_planes_to_video_surface(capture_metadata->video_codec_context, capture_metadata->frame, (vec2i){capture_pos.x, capture_pos.y}, self->capture_size, target_pos, output_size, drm_fd->pixel_format, (vec2i){drm_fd->width, drm_fd->height}, fds, offsets, pitches, modifiers, drm_fd->num_dma_bufs)) {
            fprintf(stderr, "gsr error: gsr_capture_kms_capture: vaapi_copy_drm_planes_to_video_surface failed, falling back to opengl copy. Please report this as an issue at https://github.com/dec05eba/gpu-screen-recorder-issues\n");
            self->fast_path_failed = true;
        }
@@ -602,20 +694,22 @@ static int gsr_capture_kms_capture(gsr_capture *cap, AVFrame *frame, gsr_color_c
        }

        gsr_color_conversion_draw(color_conversion, self->external_texture_fallback ? self->external_input_texture_id : self->input_texture_id,
-            target_pos, self->capture_size,
+            target_pos, output_size,
            capture_pos, self->capture_size,
-            texture_rotation, self->external_texture_fallback);
+            texture_rotation, self->external_texture_fallback, GSR_SOURCE_COLOR_RGB);
    }

    if(self->params.record_cursor) {
        gsr_kms_response_item *cursor_drm_fd = find_cursor_drm_if_on_monitor(self, drm_fd->connector_id, capture_is_combined_plane);
        // The cursor is handled by x11 on x11 instead of using the cursor drm plane because on prime systems with a dedicated nvidia gpu
        // the cursor plane is not available when the cursor is on the monitor controlled by the nvidia device.
+        // TODO: This doesn't work properly with software cursor on x11 since it will draw the x11 cursor on top of the cursor already in the framebuffer.
+        // Detect if software cursor is used on x11 somehow.
        if(self->is_x11) {
            const vec2i cursor_monitor_offset = self->capture_pos;
-            render_x11_cursor(self, color_conversion, cursor_monitor_offset, target_pos);
+            render_x11_cursor(self, color_conversion, cursor_monitor_offset, target_pos, output_size);
        } else if(cursor_drm_fd) {
-            render_drm_cursor(self, color_conversion, cursor_drm_fd, target_pos, texture_rotation);
+            render_drm_cursor(self, color_conversion, cursor_drm_fd, target_pos, texture_rotation, output_size);
        }
    }

@@ -634,11 +728,6 @@ static bool gsr_capture_kms_should_stop(gsr_capture *cap, bool *err) {
    return false;
 }

-static gsr_source_color gsr_capture_kms_get_source_color(gsr_capture *cap) {
-    (void)cap;
-    return GSR_SOURCE_COLOR_RGB;
-}
-
 static bool gsr_capture_kms_uses_external_image(gsr_capture *cap) {
    (void)cap;
    return true;
@@ -664,8 +753,8 @@ static bool gsr_capture_kms_set_hdr_metadata(gsr_capture *cap, AVMasteringDispla
    mastering_display_metadata->min_luminance = av_make_q(self->hdr_metadata.hdmi_metadata_type1.min_display_mastering_luminance, 10000);
    mastering_display_metadata->max_luminance = av_make_q(self->hdr_metadata.hdmi_metadata_type1.max_display_mastering_luminance, 1);

-    mastering_display_metadata->has_primaries = mastering_display_metadata->display_primaries[0][0].num > 0;
-    mastering_display_metadata->has_luminance = mastering_display_metadata->max_luminance.num > 0;
+    mastering_display_metadata->has_primaries = true;
+    mastering_display_metadata->has_luminance = true;

    return true;
 }
@@ -680,8 +769,7 @@ static bool gsr_capture_kms_set_hdr_metadata(gsr_capture *cap, AVMasteringDispla
 //     self->damaged = false;
 // }

-static void gsr_capture_kms_destroy(gsr_capture *cap, AVCodecContext *video_codec_context) {
-    (void)video_codec_context;
+static void gsr_capture_kms_destroy(gsr_capture *cap) {
    gsr_capture_kms *self = cap->priv;
    if(cap->priv) {
        gsr_capture_kms_stop(self);
@@ -725,7 +813,6 @@ gsr_capture* gsr_capture_kms_create(const gsr_capture_kms_params *params) {
        //.tick = gsr_capture_kms_tick,
        .should_stop = gsr_capture_kms_should_stop,
        .capture = gsr_capture_kms_capture,
-        .get_source_color = gsr_capture_kms_get_source_color,
        .uses_external_image = gsr_capture_kms_uses_external_image,
        .set_hdr_metadata = gsr_capture_kms_set_hdr_metadata,
        //.is_damaged = gsr_capture_kms_is_damaged,
--- a/src/capture/nvfbc.c
+++ b/src/capture/nvfbc.c
@@ -3,12 +3,14 @@
 #include "../../include/egl.h"
 #include "../../include/utils.h"
 #include "../../include/color_conversion.h"
+#include "../../include/window/window.h"

 #include <dlfcn.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
+#include <assert.h>

 #include <X11/Xlib.h>
 #include <libavcodec/avcodec.h>
@@ -131,28 +133,6 @@ static bool gsr_capture_nvfbc_load_library(gsr_capture *cap) {
    return true;
 }

-/* TODO: check for glx swap control extension string (GLX_EXT_swap_control, etc) */
-static void set_vertical_sync_enabled(gsr_egl *egl, int enabled) {
-    int result = 0;
-
-    if(egl->glXSwapIntervalEXT) {
-        egl->glXSwapIntervalEXT(egl->x11.dpy, egl->x11.window, enabled ? 1 : 0);
-    } else if(egl->glXSwapIntervalMESA) {
-        result = egl->glXSwapIntervalMESA(enabled ? 1 : 0);
-    } else if(egl->glXSwapIntervalSGI) {
-        result = egl->glXSwapIntervalSGI(enabled ? 1 : 0);
-    } else {
-        static int warned = 0;
-        if (!warned) {
-            warned = 1;
-            fprintf(stderr, "gsr warning: setting vertical sync not supported\n");
-        }
-    }
-
-    if(result != 0)
-        fprintf(stderr, "gsr warning: setting vertical sync failed\n");
-}
-
 static void gsr_capture_nvfbc_destroy_session(gsr_capture_nvfbc *self) {
    if(self->fbc_handle_created && self->capture_session_created) {
        NVFBC_DESTROY_CAPTURE_SESSION_PARAMS destroy_capture_params;
@@ -219,8 +199,11 @@ static int gsr_capture_nvfbc_setup_handle(gsr_capture_nvfbc *self) {
        goto error_cleanup;
    }

-    self->tracking_width = XWidthOfScreen(DefaultScreenOfDisplay(self->params.egl->x11.dpy));
-    self->tracking_height = XHeightOfScreen(DefaultScreenOfDisplay(self->params.egl->x11.dpy));
+    assert(gsr_window_get_display_server(self->params.egl->window) == GSR_DISPLAY_SERVER_X11);
+    Display *display = gsr_window_get_display(self->params.egl->window);
+
+    self->tracking_width = XWidthOfScreen(DefaultScreenOfDisplay(display));
+    self->tracking_height = XHeightOfScreen(DefaultScreenOfDisplay(display));
    self->tracking_type = strcmp(self->params.display_to_capture, "screen") == 0 ? NVFBC_TRACKING_SCREEN : NVFBC_TRACKING_OUTPUT;
    if(self->tracking_type == NVFBC_TRACKING_OUTPUT) {
        if(!status_params.bXRandRAvailable) {
@@ -240,6 +223,11 @@ static int gsr_capture_nvfbc_setup_handle(gsr_capture_nvfbc *self) {
        }
    }

+    if(!self->capture_region) {
+        self->width = self->tracking_width;
+        self->height = self->tracking_height;
+    }
+
    return 0;

    error_cleanup:
@@ -298,7 +286,7 @@ static void gsr_capture_nvfbc_stop(gsr_capture_nvfbc *self) {
    }
 }

-static int gsr_capture_nvfbc_start(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame) {
+static int gsr_capture_nvfbc_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata) {
    gsr_capture_nvfbc *self = cap->priv;

    if(!gsr_capture_nvfbc_load_library(cap))
@@ -344,18 +332,20 @@ static int gsr_capture_nvfbc_start(gsr_capture *cap, AVCodecContext *video_codec
    }

    if(self->capture_region) {
-        video_codec_context->width = FFALIGN(self->width, 2);
-        video_codec_context->height = FFALIGN(self->height, 2);
+        capture_metadata->width = FFALIGN(self->width, 2);
+        capture_metadata->height = FFALIGN(self->height, 2);
    } else {
-        video_codec_context->width = FFALIGN(self->tracking_width, 2);
-        video_codec_context->height = FFALIGN(self->tracking_height, 2);
+        capture_metadata->width = FFALIGN(self->tracking_width, 2);
+        capture_metadata->height = FFALIGN(self->tracking_height, 2);
    }

-    frame->width = video_codec_context->width;
-    frame->height = video_codec_context->height;
-
-    /* Disable vsync */
-    set_vertical_sync_enabled(self->params.egl, 0);
+    if(self->params.output_resolution.x == 0 && self->params.output_resolution.y == 0) {
+        self->params.output_resolution = (vec2i){capture_metadata->width, capture_metadata->height};
+    } else {
+        self->params.output_resolution = scale_keep_aspect_ratio((vec2i){capture_metadata->width, capture_metadata->height}, self->params.output_resolution);
+        capture_metadata->width = FFALIGN(self->params.output_resolution.x, 2);
+        capture_metadata->height = FFALIGN(self->params.output_resolution.y, 2);
+    }

    return 0;

@@ -364,7 +354,7 @@ static int gsr_capture_nvfbc_start(gsr_capture *cap, AVCodecContext *video_codec
    return -1;
 }

-static int gsr_capture_nvfbc_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion) {
+static int gsr_capture_nvfbc_capture(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion) {
    gsr_capture_nvfbc *self = cap->priv;

    const double nvfbc_recreate_retry_time_seconds = 1.0;
@@ -390,6 +380,13 @@ static int gsr_capture_nvfbc_capture(gsr_capture *cap, AVFrame *frame, gsr_color
        }
    }

+    const vec2i frame_size = (vec2i){self->width, self->height};
+    const bool is_scaled = self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0;
+    vec2i output_size = is_scaled ? self->params.output_resolution : frame_size;
+    output_size = scale_keep_aspect_ratio(frame_size, output_size);
+
+    const vec2i target_pos = { max_int(0, capture_metadata->width / 2 - output_size.x / 2), max_int(0, capture_metadata->height / 2 - output_size.y / 2) };
+
    NVFBC_FRAME_GRAB_INFO frame_info;
    memset(&frame_info, 0, sizeof(frame_info));

@@ -412,9 +409,9 @@ static int gsr_capture_nvfbc_capture(gsr_capture *cap, AVFrame *frame, gsr_color
    self->params.egl->glFinish();

    gsr_color_conversion_draw(color_conversion, self->setup_params.dwTextures[grab_params.dwTextureIndex],
-        (vec2i){0, 0}, (vec2i){frame->width, frame->height},
-        (vec2i){0, 0}, (vec2i){frame->width, frame->height},
-        0.0f, false);
+        target_pos, (vec2i){output_size.x, output_size.y},
+        (vec2i){0, 0}, frame_size,
+        0.0f, false, GSR_SOURCE_COLOR_BGR);

    self->params.egl->glFlush();
    self->params.egl->glFinish();
@@ -422,13 +419,7 @@ static int gsr_capture_nvfbc_capture(gsr_capture *cap, AVFrame *frame, gsr_color
    return 0;
 }

-static gsr_source_color gsr_capture_nvfbc_get_source_color(gsr_capture *cap) {
-    (void)cap;
-    return GSR_SOURCE_COLOR_BGR;
-}
-
-static void gsr_capture_nvfbc_destroy(gsr_capture *cap, AVCodecContext *video_codec_context) {
-    (void)video_codec_context;
+static void gsr_capture_nvfbc_destroy(gsr_capture *cap) {
    gsr_capture_nvfbc *self = cap->priv;
    gsr_capture_nvfbc_stop(self);
    free(cap->priv);
@@ -472,7 +463,6 @@ gsr_capture* gsr_capture_nvfbc_create(const gsr_capture_nvfbc_params *params) {
        .tick = NULL,
        .should_stop = NULL,
        .capture = gsr_capture_nvfbc_capture,
-        .get_source_color = gsr_capture_nvfbc_get_source_color,
        .uses_external_image = NULL,
        .destroy = gsr_capture_nvfbc_destroy,
        .priv = cap_nvfbc
--- a/src/capture/portal.c
+++ b/src/capture/portal.c
@@ -3,7 +3,7 @@
 #include "../../include/egl.h"
 #include "../../include/utils.h"
 #include "../../include/dbus.h"
-#include "../../include/pipewire.h"
+#include "../../include/pipewire_video.h"

 #include <stdlib.h>
 #include <stdio.h>
@@ -20,13 +20,13 @@ typedef struct {
    gsr_dbus dbus;
    char *session_handle;

-    gsr_pipewire pipewire;
+    gsr_pipewire_video pipewire;
    vec2i capture_size;
-    gsr_pipewire_dmabuf_data dmabuf_data[GSR_PIPEWIRE_DMABUF_MAX_PLANES];
+    gsr_pipewire_video_dmabuf_data dmabuf_data[GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES];
    int num_dmabuf_data;

-    AVCodecContext *video_codec_context;
    bool fast_path_failed;
+    bool mesa_supports_compute_only_vaapi_copy;
 } gsr_capture_portal;

 static void gsr_capture_portal_cleanup_plane_fds(gsr_capture_portal *self) {
@@ -57,7 +57,7 @@ static void gsr_capture_portal_stop(gsr_capture_portal *self) {

    gsr_capture_portal_cleanup_plane_fds(self);

-    gsr_pipewire_deinit(&self->pipewire);
+    gsr_pipewire_video_deinit(&self->pipewire);

    if(self->session_handle) {
        free(self->session_handle);
@@ -233,8 +233,8 @@ static int gsr_capture_portal_setup_dbus(gsr_capture_portal *self, int *pipewire
 }

 static bool gsr_capture_portal_get_frame_dimensions(gsr_capture_portal *self) {
-    gsr_pipewire_region region = {0, 0, 0, 0};
-    gsr_pipewire_region cursor_region = {0, 0, 0, 0};
+    gsr_pipewire_video_region region = {0, 0, 0, 0};
+    gsr_pipewire_video_region cursor_region = {0, 0, 0, 0};
    fprintf(stderr, "gsr info: gsr_capture_portal_start: waiting for pipewire negotiation\n");

    const double start_time = clock_get_monotonic_seconds();
@@ -242,7 +242,7 @@ static bool gsr_capture_portal_get_frame_dimensions(gsr_capture_portal *self) {
        bool uses_external_image = false;
        uint32_t fourcc = 0;
        uint64_t modifiers = 0;
-        if(gsr_pipewire_map_texture(&self->pipewire, self->texture_map, &region, &cursor_region, self->dmabuf_data, &self->num_dmabuf_data, &fourcc, &modifiers, &uses_external_image)) {
+        if(gsr_pipewire_video_map_texture(&self->pipewire, self->texture_map, &region, &cursor_region, self->dmabuf_data, &self->num_dmabuf_data, &fourcc, &modifiers, &uses_external_image)) {
            gsr_capture_portal_cleanup_plane_fds(self);
            self->capture_size.x = region.width;
            self->capture_size.y = region.height;
@@ -256,7 +256,7 @@ static bool gsr_capture_portal_get_frame_dimensions(gsr_capture_portal *self) {
    return false;
 }

-static int gsr_capture_portal_start(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame) {
+static int gsr_capture_portal_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata) {
    gsr_capture_portal *self = cap->priv;

    gsr_capture_portal_create_input_textures(self);
@@ -285,7 +285,7 @@ static int gsr_capture_portal_start(gsr_capture *cap, AVCodecContext *video_code
    fprintf(stderr, "gsr info: gsr_capture_portal_start: setting up pipewire\n");
    /* TODO: support hdr when pipewire supports it */
    /* gsr_pipewire closes the pipewire fd, even on failure */
-    if(!gsr_pipewire_init(&self->pipewire, pipewire_fd, pipewire_node, video_codec_context->framerate.num, self->params.record_cursor, self->params.egl)) {
+    if(!gsr_pipewire_video_init(&self->pipewire, pipewire_fd, pipewire_node, capture_metadata->fps, self->params.record_cursor, self->params.egl)) {
        fprintf(stderr, "gsr error: gsr_capture_portal_start: failed to setup pipewire with fd: %d, node: %" PRIu32 "\n", pipewire_fd, pipewire_node);
        gsr_capture_portal_stop(self);
        return -1;
@@ -297,16 +297,22 @@ static int gsr_capture_portal_start(gsr_capture *cap, AVCodecContext *video_code
        return -1;
    }

-    /* Disable vsync */
-    self->params.egl->eglSwapInterval(self->params.egl->egl_display, 0);
+    if(self->params.output_resolution.x == 0 && self->params.output_resolution.y == 0) {
+        self->params.output_resolution = self->capture_size;
+        capture_metadata->width = FFALIGN(self->capture_size.x, 2);
+        capture_metadata->height = FFALIGN(self->capture_size.y, 2);
+    } else {
+        self->params.output_resolution = scale_keep_aspect_ratio(self->capture_size, self->params.output_resolution);
+        capture_metadata->width = FFALIGN(self->params.output_resolution.x, 2);
+        capture_metadata->height = FFALIGN(self->params.output_resolution.y, 2);
+    }

-    video_codec_context->width = FFALIGN(self->capture_size.x, 2);
-    video_codec_context->height = FFALIGN(self->capture_size.y, 2);
+    self->fast_path_failed = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 0, 9);
+    if(self->fast_path_failed)
+        fprintf(stderr, "gsr warning: gsr_capture_kms_start: your amd driver (mesa) version is known to be buggy (<= version 24.0.9), falling back to opengl copy\n");

-    frame->width = video_codec_context->width;
-    frame->height = video_codec_context->height;
+    self->mesa_supports_compute_only_vaapi_copy = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 3, 6);

-    self->video_codec_context = video_codec_context;
    return 0;
 }

@@ -314,18 +320,27 @@ static int max_int(int a, int b) {
    return a > b ? a : b;
 }

-static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion) {
-    (void)frame;
+static void gsr_capture_portal_fail_fast_path_if_not_fast(gsr_capture_portal *self, uint32_t pixel_format) {
+    const uint8_t pixel_format_color_depth_1 = (pixel_format >> 16) & 0xFF;
+    if(!self->fast_path_failed && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !self->mesa_supports_compute_only_vaapi_copy && (pixel_format_color_depth_1 == '3' || pixel_format_color_depth_1 == '4')) {
+        self->fast_path_failed = true;
+        fprintf(stderr, "gsr warning: gsr_capture_kms_capture: the monitor you are recording is in 10/12-bit color format and your mesa version is <= 24.3.6, composition will be used."
+            " If you experience performance problems in the video then record on a single window on X11 instead or disable 10/12-bit color option in your desktop environment settings,"
+            " or try to record the monitor on X11 instead (if you aren't already doing that) or update your mesa version.\n");
+    }
+}
+
+static int gsr_capture_portal_capture(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion) {
    (void)color_conversion;
    gsr_capture_portal *self = cap->priv;

    /* TODO: Handle formats other than RGB(a) */
-    gsr_pipewire_region region = {0, 0, 0, 0};
-    gsr_pipewire_region cursor_region = {0, 0, 0, 0};
+    gsr_pipewire_video_region region = {0, 0, 0, 0};
+    gsr_pipewire_video_region cursor_region = {0, 0, 0, 0};
    uint32_t pipewire_fourcc = 0;
    uint64_t pipewire_modifiers = 0;
    bool using_external_image = false;
-    if(gsr_pipewire_map_texture(&self->pipewire, self->texture_map, &region, &cursor_region, self->dmabuf_data, &self->num_dmabuf_data, &pipewire_fourcc, &pipewire_modifiers, &using_external_image)) {
+    if(gsr_pipewire_video_map_texture(&self->pipewire, self->texture_map, &region, &cursor_region, self->dmabuf_data, &self->num_dmabuf_data, &pipewire_fourcc, &pipewire_modifiers, &using_external_image)) {
        if(region.width != self->capture_size.x || region.height != self->capture_size.y) {
            self->capture_size.x = region.width;
            self->capture_size.y = region.height;
@@ -334,8 +349,14 @@ static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_colo
    } else {
        return 0;
    }
+
+    gsr_capture_portal_fail_fast_path_if_not_fast(self, pipewire_fourcc);
+
+    const bool is_scaled = self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0;
+    vec2i output_size = is_scaled ? self->params.output_resolution : self->capture_size;
+    output_size = scale_keep_aspect_ratio(self->capture_size, output_size);
    
-    const vec2i target_pos = { max_int(0, frame->width / 2 - self->capture_size.x / 2), max_int(0, frame->height / 2 - self->capture_size.y / 2) };
+    const vec2i target_pos = { max_int(0, capture_metadata->width / 2 - output_size.x / 2), max_int(0, capture_metadata->height / 2 - output_size.y / 2) };

    self->params.egl->glFlush();
    self->params.egl->glFinish();
@@ -343,7 +364,7 @@ static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_colo
    // TODO: Handle region crop

    /* Fast opengl free path */
-    if(!self->fast_path_failed && video_codec_context_is_vaapi(self->video_codec_context) && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD) {
+    if(!self->fast_path_failed && video_codec_context_is_vaapi(capture_metadata->video_codec_context) && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD) {
        int fds[4];
        uint32_t offsets[4];
        uint32_t pitches[4];
@@ -354,7 +375,7 @@ static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_colo
            pitches[i] = self->dmabuf_data[i].stride;
            modifiers[i] = pipewire_modifiers;
        }
-        if(!vaapi_copy_drm_planes_to_video_surface(self->video_codec_context, frame, (vec2i){region.x, region.y}, self->capture_size, target_pos, self->capture_size, pipewire_fourcc, self->capture_size, fds, offsets, pitches, modifiers, self->num_dmabuf_data)) {
+        if(!vaapi_copy_drm_planes_to_video_surface(capture_metadata->video_codec_context, capture_metadata->frame, (vec2i){region.x, region.y}, self->capture_size, target_pos, output_size, pipewire_fourcc, self->capture_size, fds, offsets, pitches, modifiers, self->num_dmabuf_data)) {
            fprintf(stderr, "gsr error: gsr_capture_portal_capture: vaapi_copy_drm_planes_to_video_surface failed, falling back to opengl copy. Please report this as an issue at https://github.com/dec05eba/gpu-screen-recorder-issues\n");
            self->fast_path_failed = true;
        }
@@ -364,23 +385,28 @@ static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_colo

    if(self->fast_path_failed) {
        gsr_color_conversion_draw(color_conversion, using_external_image ? self->texture_map.external_texture_id : self->texture_map.texture_id,
-            target_pos, self->capture_size,
+            target_pos, output_size,
            (vec2i){region.x, region.y}, self->capture_size,
-            0.0f, using_external_image);
+            0.0f, using_external_image, GSR_SOURCE_COLOR_RGB);
    }

-    if(self->params.record_cursor) {
+    if(self->params.record_cursor && self->texture_map.cursor_texture_id > 0 && cursor_region.width > 0) {
+        const vec2d scale = {
+            self->capture_size.x == 0 ? 0 : (double)output_size.x / (double)self->capture_size.x,
+            self->capture_size.y == 0 ? 0 : (double)output_size.y / (double)self->capture_size.y
+        };
+
        const vec2i cursor_pos = {
-            target_pos.x + cursor_region.x,
-            target_pos.y + cursor_region.y
+            target_pos.x + (cursor_region.x * scale.x),
+            target_pos.y + (cursor_region.y * scale.y)
        };

        self->params.egl->glEnable(GL_SCISSOR_TEST);
-        self->params.egl->glScissor(target_pos.x, target_pos.y, self->capture_size.x, self->capture_size.y);
+        self->params.egl->glScissor(target_pos.x, target_pos.y, output_size.x, output_size.y);
        gsr_color_conversion_draw(color_conversion, self->texture_map.cursor_texture_id,
-            (vec2i){cursor_pos.x, cursor_pos.y}, (vec2i){cursor_region.width, cursor_region.height},
+            (vec2i){cursor_pos.x, cursor_pos.y}, (vec2i){cursor_region.width * scale.x, cursor_region.height * scale.y},
            (vec2i){0, 0}, (vec2i){cursor_region.width, cursor_region.height},
-            0.0f, false);
+            0.0f, false, GSR_SOURCE_COLOR_RGB);
        self->params.egl->glDisable(GL_SCISSOR_TEST);
    }

@@ -392,11 +418,6 @@ static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_colo
    return 0;
 }

-static gsr_source_color gsr_capture_portal_get_source_color(gsr_capture *cap) {
-    (void)cap;
-    return GSR_SOURCE_COLOR_RGB;
-}
-
 static bool gsr_capture_portal_uses_external_image(gsr_capture *cap) {
    (void)cap;
    return true;
@@ -404,16 +425,15 @@ static bool gsr_capture_portal_uses_external_image(gsr_capture *cap) {

 static bool gsr_capture_portal_is_damaged(gsr_capture *cap) {
    gsr_capture_portal *self = cap->priv;
-    return gsr_pipewire_is_damaged(&self->pipewire);
+    return gsr_pipewire_video_is_damaged(&self->pipewire);
 }

 static void gsr_capture_portal_clear_damage(gsr_capture *cap) {
    gsr_capture_portal *self = cap->priv;
-    gsr_pipewire_clear_damage(&self->pipewire);
+    gsr_pipewire_video_clear_damage(&self->pipewire);
 }

-static void gsr_capture_portal_destroy(gsr_capture *cap, AVCodecContext *video_codec_context) {
-    (void)video_codec_context;
+static void gsr_capture_portal_destroy(gsr_capture *cap) {
    gsr_capture_portal *self = cap->priv;
    if(cap->priv) {
        gsr_capture_portal_stop(self);
@@ -446,7 +466,6 @@ gsr_capture* gsr_capture_portal_create(const gsr_capture_portal_params *params)
        .tick = NULL,
        .should_stop = NULL,
        .capture = gsr_capture_portal_capture,
-        .get_source_color = gsr_capture_portal_get_source_color,
        .uses_external_image = gsr_capture_portal_uses_external_image,
        .is_damaged = gsr_capture_portal_is_damaged,
        .clear_damage = gsr_capture_portal_clear_damage,
--- a/src/capture/xcomposite.c
+++ b/src/capture/xcomposite.c
@@ -3,6 +3,7 @@
 #include "../../include/utils.h"
 #include "../../include/cursor.h"
 #include "../../include/color_conversion.h"
+#include "../../include/window/window.h"

 #include <stdlib.h>
 #include <stdio.h>
@@ -16,6 +17,7 @@

 typedef struct {
    gsr_capture_xcomposite_params params;
+    Display *display;

    bool should_stop;
    bool stop_is_error;
@@ -29,7 +31,6 @@ typedef struct {
    double window_resize_timer;
    
    WindowTexture window_texture;
-    AVCodecContext *video_codec_context;

    Atom net_active_window_atom;

@@ -62,16 +63,16 @@ static Window get_focused_window(Display *display, Atom net_active_window_atom)
    return None;
 }

-static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_codec_context, AVFrame *frame) {
+static int gsr_capture_xcomposite_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata) {
    gsr_capture_xcomposite *self = cap->priv;

    if(self->params.follow_focused) {
-        self->net_active_window_atom = XInternAtom(self->params.egl->x11.dpy, "_NET_ACTIVE_WINDOW", False);
+        self->net_active_window_atom = XInternAtom(self->display, "_NET_ACTIVE_WINDOW", False);
        if(!self->net_active_window_atom) {
            fprintf(stderr, "gsr error: gsr_capture_xcomposite_start failed: failed to get _NET_ACTIVE_WINDOW atom\n");
            return -1;
        }
-        self->window = get_focused_window(self->params.egl->x11.dpy, self->net_active_window_atom);
+        self->window = get_focused_window(self->display, self->net_active_window_atom);
    } else {
        self->window = self->params.window;
    }
@@ -79,7 +80,7 @@ static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_
    /* TODO: Do these in tick, and allow error if follow_focused */

    XWindowAttributes attr;
-    if(!XGetWindowAttributes(self->params.egl->x11.dpy, self->window, &attr) && !self->params.follow_focused) {
+    if(!XGetWindowAttributes(self->display, self->window, &attr) && !self->params.follow_focused) {
        fprintf(stderr, "gsr error: gsr_capture_xcomposite_start failed: invalid window id: %lu\n", self->window);
        return -1;
    }
@@ -88,19 +89,17 @@ static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_
    self->window_size.y = max_int(attr.height, 0);

    if(self->params.follow_focused)
-        XSelectInput(self->params.egl->x11.dpy, DefaultRootWindow(self->params.egl->x11.dpy), PropertyChangeMask);
+        XSelectInput(self->display, DefaultRootWindow(self->display), PropertyChangeMask);

    // TODO: Get select and add these on top of it and then restore at the end. Also do the same in other xcomposite
-    XSelectInput(self->params.egl->x11.dpy, self->window, StructureNotifyMask | ExposureMask);
+    XSelectInput(self->display, self->window, StructureNotifyMask | ExposureMask);

-    /* Disable vsync */
-    self->params.egl->eglSwapInterval(self->params.egl->egl_display, 0);
-    if(window_texture_init(&self->window_texture, self->params.egl->x11.dpy, self->window, self->params.egl) != 0 && !self->params.follow_focused) {
-        fprintf(stderr, "gsr error: gsr_capture_xcomposite_start: failed to get window texture for window %ld\n", self->window);
+    if(window_texture_init(&self->window_texture, self->display, self->window, self->params.egl) != 0 && !self->params.follow_focused) {
+        fprintf(stderr, "gsr error: gsr_capture_xcomposite_start: failed to get window texture for window %ld\n", (long)self->window);
        return -1;
    }

-    if(gsr_cursor_init(&self->cursor, self->params.egl, self->params.egl->x11.dpy) != 0) {
+    if(gsr_cursor_init(&self->cursor, self->params.egl, self->display) != 0) {
        gsr_capture_xcomposite_stop(self);
        return -1;
    }
@@ -113,18 +112,19 @@ static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_
    self->params.egl->glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &self->texture_size.y);
    self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);

-    vec2i video_size = self->texture_size;
+    if(self->params.output_resolution.x == 0 && self->params.output_resolution.y == 0) {
+        self->params.output_resolution = self->texture_size;
+        capture_metadata->width = FFALIGN(self->texture_size.x, 2);
+        capture_metadata->height = FFALIGN(self->texture_size.y, 2);
+    } else {
+        capture_metadata->width = FFALIGN(self->params.output_resolution.x, 2);
+        capture_metadata->height = FFALIGN(self->params.output_resolution.y, 2);
+    }

-    if(self->params.region_size.x > 0 && self->params.region_size.y > 0)
-        video_size = self->params.region_size;
+    self->fast_path_failed = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 0, 9);
+    if(self->fast_path_failed)
+        fprintf(stderr, "gsr warning: gsr_capture_kms_start: your amd driver (mesa) version is known to be buggy (<= version 24.0.9), falling back to opengl copy\n");

-    video_codec_context->width = FFALIGN(video_size.x, 2);
-    video_codec_context->height = FFALIGN(video_size.y, 2);
-
-    frame->width = video_codec_context->width;
-    frame->height = video_codec_context->height;
-
-    self->video_codec_context = video_codec_context;
    self->window_resize_timer = clock_get_monotonic_seconds();
    return 0;
 }
@@ -138,24 +138,24 @@ static void gsr_capture_xcomposite_tick(gsr_capture *cap) {

    if(self->init_new_window) {
        self->init_new_window = false;
-        Window focused_window = get_focused_window(self->params.egl->x11.dpy, self->net_active_window_atom);
+        Window focused_window = get_focused_window(self->display, self->net_active_window_atom);
        if(focused_window != self->window || !self->follow_focused_initialized) {
            self->follow_focused_initialized = true;
-            XSelectInput(self->params.egl->x11.dpy, self->window, 0);
+            XSelectInput(self->display, self->window, 0);
            self->window = focused_window;
-            XSelectInput(self->params.egl->x11.dpy, self->window, StructureNotifyMask | ExposureMask);
+            XSelectInput(self->display, self->window, StructureNotifyMask | ExposureMask);

            XWindowAttributes attr;
            attr.width = 0;
            attr.height = 0;
-            if(!XGetWindowAttributes(self->params.egl->x11.dpy, self->window, &attr))
+            if(!XGetWindowAttributes(self->display, self->window, &attr))
                fprintf(stderr, "gsr error: gsr_capture_xcomposite_tick failed: invalid window id: %lu\n", self->window);

            self->window_size.x = max_int(attr.width, 0);
            self->window_size.y = max_int(attr.height, 0);

            window_texture_deinit(&self->window_texture);
-            window_texture_init(&self->window_texture, self->params.egl->x11.dpy, self->window, self->params.egl); // TODO: Do not do the below window_texture_on_resize after this
+            window_texture_init(&self->window_texture, self->display, self->window, self->params.egl); // TODO: Do not do the below window_texture_on_resize after this

            self->texture_size.x = 0;
            self->texture_size.y = 0;
@@ -195,7 +195,7 @@ static void gsr_capture_xcomposite_tick(gsr_capture *cap) {

 static void gsr_capture_xcomposite_on_event(gsr_capture *cap, gsr_egl *egl) {
    gsr_capture_xcomposite *self = cap->priv;
-    XEvent *xev = gsr_egl_get_event_data(egl);
+    XEvent *xev = gsr_window_get_event_data(egl->window);
    switch(xev->type) {
        case DestroyNotify: {
            /* Window died (when not following focused window), so we stop recording */
@@ -248,23 +248,26 @@ static bool gsr_capture_xcomposite_should_stop(gsr_capture *cap, bool *err) {
    return false;
 }

-static int gsr_capture_xcomposite_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion) {
+static int gsr_capture_xcomposite_capture(gsr_capture *cap, gsr_capture_metadata *capture_metdata, gsr_color_conversion *color_conversion) {
    gsr_capture_xcomposite *self = cap->priv;
-    (void)frame;

    if(self->clear_background) {
        self->clear_background = false;
        gsr_color_conversion_clear(color_conversion);
    }

-    const vec2i target_pos = { max_int(0, frame->width / 2 - self->texture_size.x / 2), max_int(0, frame->height / 2 - self->texture_size.y / 2) };
+    const bool is_scaled = self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0;
+    vec2i output_size = is_scaled ? self->params.output_resolution : self->texture_size;
+    output_size = scale_keep_aspect_ratio(self->texture_size, output_size);
+
+    const vec2i target_pos = { max_int(0, capture_metdata->width / 2 - output_size.x / 2), max_int(0, capture_metdata->height / 2 - output_size.y / 2) };

    self->params.egl->glFlush();
    self->params.egl->glFinish();

    /* Fast opengl free path */
-    if(!self->fast_path_failed && video_codec_context_is_vaapi(self->video_codec_context) && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD) {
-        if(!vaapi_copy_egl_image_to_video_surface(self->params.egl, self->window_texture.image, (vec2i){0, 0}, self->texture_size, target_pos, self->texture_size, self->video_codec_context, frame)) {
+    if(!self->fast_path_failed && video_codec_context_is_vaapi(capture_metdata->video_codec_context) && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD) {
+        if(!vaapi_copy_egl_image_to_video_surface(self->params.egl, self->window_texture.image, (vec2i){0, 0}, self->texture_size, target_pos, output_size, capture_metdata->video_codec_context, capture_metdata->frame)) {
            fprintf(stderr, "gsr error: gsr_capture_xcomposite_capture: vaapi_copy_egl_image_to_video_surface failed, falling back to opengl copy. Please report this as an issue at https://github.com/dec05eba/gpu-screen-recorder-issues\n");
            self->fast_path_failed = true;
        }
@@ -274,26 +277,31 @@ static int gsr_capture_xcomposite_capture(gsr_capture *cap, AVFrame *frame, gsr_

    if(self->fast_path_failed) {
        gsr_color_conversion_draw(color_conversion, window_texture_get_opengl_texture_id(&self->window_texture),
-            target_pos, self->texture_size,
+            target_pos, output_size,
            (vec2i){0, 0}, self->texture_size,
-            0.0f, false);
+            0.0f, false, GSR_SOURCE_COLOR_RGB);
    }

    if(self->params.record_cursor && self->cursor.visible) {
+        const vec2d scale = {
+            self->texture_size.x == 0 ? 0 : (double)output_size.x / (double)self->texture_size.x,
+            self->texture_size.y == 0 ? 0 : (double)output_size.y / (double)self->texture_size.y
+        };
+
        gsr_cursor_tick(&self->cursor, self->window);

        const vec2i cursor_pos = {
-            target_pos.x + self->cursor.position.x - self->cursor.hotspot.x,
-            target_pos.y + self->cursor.position.y - self->cursor.hotspot.y
+            target_pos.x + (self->cursor.position.x - self->cursor.hotspot.x) * scale.x,
+            target_pos.y + (self->cursor.position.y - self->cursor.hotspot.y) * scale.y
        };

        self->params.egl->glEnable(GL_SCISSOR_TEST);
-        self->params.egl->glScissor(target_pos.x, target_pos.y, self->texture_size.x, self->texture_size.y);
+        self->params.egl->glScissor(target_pos.x, target_pos.y, output_size.x, output_size.y);

        gsr_color_conversion_draw(color_conversion, self->cursor.texture_id,
-            cursor_pos, self->cursor.size,
+            cursor_pos, (vec2i){self->cursor.size.x * scale.x, self->cursor.size.y * scale.y},
            (vec2i){0, 0}, self->cursor.size,
-            0.0f, false);
+            0.0f, false, GSR_SOURCE_COLOR_RGB);

        self->params.egl->glDisable(GL_SCISSOR_TEST);
    }
@@ -304,18 +312,12 @@ static int gsr_capture_xcomposite_capture(gsr_capture *cap, AVFrame *frame, gsr_
    return 0;
 }

-static gsr_source_color gsr_capture_xcomposite_get_source_color(gsr_capture *cap) {
-    (void)cap;
-    return GSR_SOURCE_COLOR_RGB;
-}
-
 static uint64_t gsr_capture_xcomposite_get_window_id(gsr_capture *cap) {
    gsr_capture_xcomposite *self = cap->priv;
    return self->window;
 }

-static void gsr_capture_xcomposite_destroy(gsr_capture *cap, AVCodecContext *video_codec_context) {
-    (void)video_codec_context;
+static void gsr_capture_xcomposite_destroy(gsr_capture *cap) {
    if(cap->priv) {
        gsr_capture_xcomposite_stop(cap->priv);
        free(cap->priv);
@@ -341,6 +343,7 @@ gsr_capture* gsr_capture_xcomposite_create(const gsr_capture_xcomposite_params *
    }

    cap_xcomp->params = *params;
+    cap_xcomp->display = gsr_window_get_display(params->egl->window);
    
    *cap = (gsr_capture) {
        .start = gsr_capture_xcomposite_start,
@@ -348,7 +351,6 @@ gsr_capture* gsr_capture_xcomposite_create(const gsr_capture_xcomposite_params *
        .tick = gsr_capture_xcomposite_tick,
        .should_stop = gsr_capture_xcomposite_should_stop,
        .capture = gsr_capture_xcomposite_capture,
-        .get_source_color = gsr_capture_xcomposite_get_source_color,
        .uses_external_image = NULL,
        .get_window_id = gsr_capture_xcomposite_get_window_id,
        .destroy = gsr_capture_xcomposite_destroy,
--- a/src/color_conversion.c
+++ b/src/color_conversion.c
@@ -9,6 +9,7 @@

 #define MAX_SHADERS 4
 #define MAX_FRAMEBUFFERS 2
+#define EXTERNAL_TEXTURE_SHADER_OFFSET 2

 static float abs_f(float v) {
    return v >= 0.0f ? v : -v;
@@ -28,26 +29,26 @@ static float abs_f(float v) {
 #define RGB_TO_P010_FULL "const mat4 RGBtoYUV = mat4(0.262700, -0.139630,  0.500000, 0.000000,\n" \
                         "                           0.678000, -0.360370, -0.459786, 0.000000,\n" \
                         "                           0.059300,  0.500000, -0.040214, 0.000000,\n" \
-                         "                           0.000000,  0.500000,  0.500000, 1.000000);"
+                         "                           0.000000,  0.500000,  0.500000, 1.000000);\n"

 /* ITU-R BT2020, limited (full multiplied by (235-16)/255, adding 16/255 to luma) */
 #define RGB_TO_P010_LIMITED "const mat4 RGBtoYUV = mat4(0.225613, -0.119918,  0.429412, 0.000000,\n" \
                            "                           0.582282, -0.309494, -0.394875, 0.000000,\n" \
                            "                           0.050928,  0.429412, -0.034537, 0.000000,\n" \
-                            "                           0.062745,  0.500000,  0.500000, 1.000000);"
+                            "                           0.062745,  0.500000,  0.500000, 1.000000);\n"

 /* ITU-R BT709, full, custom values: 0.2110 0.7110 0.0710 */
 /* https://www.itu.int/dms_pubrec/itu-r/rec/bt/R-REC-BT.709-6-201506-I!!PDF-E.pdf */
 #define RGB_TO_NV12_FULL "const mat4 RGBtoYUV = mat4(0.211000, -0.113563,  0.500000, 0.000000,\n" \
                         "                           0.711000, -0.382670, -0.450570, 0.000000,\n" \
                         "                           0.071000,  0.500000, -0.044994, 0.000000,\n" \
-                         "                           0.000000,  0.500000,  0.500000, 1.000000);"
+                         "                           0.000000,  0.500000,  0.500000, 1.000000);\n"

 /* ITU-R BT709, limited, custom values: 0.2100 0.7100 0.0700 (full multiplied by (235-16)/255, adding 16/255 to luma) */
 #define RGB_TO_NV12_LIMITED "const mat4 RGBtoYUV = mat4(0.180353, -0.096964,  0.429412, 0.000000,\n" \
                            "                           0.609765, -0.327830, -0.385927, 0.000000,\n" \
                            "                           0.060118,  0.429412, -0.038049, 0.000000,\n" \
-                            "                           0.062745,  0.500000,  0.500000, 1.000000);"
+                            "                           0.062745,  0.500000,  0.500000, 1.000000);\n"

 static const char* color_format_range_get_transform_matrix(gsr_destination_color color_format, gsr_color_range color_range) {
    switch(color_format) {
@@ -69,6 +70,8 @@ static const char* color_format_range_get_transform_matrix(gsr_destination_color
            }
            break;
        }
+        case GSR_DESTINATION_COLOR_RGB8:
+            return "";
        default:
            return NULL;
    }
@@ -93,6 +96,12 @@ static int load_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_uniforms *u
        "  gl_Position = vec4(offset.x, offset.y, 0.0, 0.0) + vec4(pos.x, pos.y, 0.0, 1.0);    \n"
        "}                                                 \n");

+    const char *main_code =
+        main_code =
+            "  vec4 pixel = texture(tex1, texcoords_out);                                    \n"
+            "  FragColor.x = (RGBtoYUV * vec4(pixel.rgb, 1.0)).x;                            \n"
+            "  FragColor.w = pixel.a;                                                        \n";
+
    char fragment_shader[2048];
    if(external_texture) {
        snprintf(fragment_shader, sizeof(fragment_shader),
@@ -106,10 +115,8 @@ static int load_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_uniforms *u
            "%s"
            "void main()                                                                     \n"
            "{                                                                               \n"
-            "  vec4 pixel = texture(tex1, texcoords_out);                                    \n"
-            "  FragColor.x = (RGBtoYUV * vec4(pixel.rgb, 1.0)).x;                            \n"
-            "  FragColor.w = pixel.a;                                                        \n"
-            "}                                                                               \n", color_transform_matrix);
+            "%s"
+            "}                                                                               \n", color_transform_matrix, main_code);
    } else {
        snprintf(fragment_shader, sizeof(fragment_shader),
            "#version 300 es                                                                 \n"
@@ -120,10 +127,8 @@ static int load_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_uniforms *u
            "%s"
            "void main()                                                                     \n"
            "{                                                                               \n"
-            "  vec4 pixel = texture(tex1, texcoords_out);                                    \n"
-            "  FragColor.x = (RGBtoYUV * vec4(pixel.rgb, 1.0)).x;                            \n"
-            "  FragColor.w = pixel.a;                                                        \n"
-            "}                                                                               \n", color_transform_matrix);
+            "%s"
+            "}                                                                               \n", color_transform_matrix, main_code);
    }

    if(gsr_shader_init(shader, egl, vertex_shader, fragment_shader) != 0)
@@ -145,7 +150,7 @@ static unsigned int load_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_u
        "in vec2 pos;                                    \n"
        "in vec2 texcoords;                              \n"
        "out vec2 texcoords_out;                         \n"
-        "uniform vec2 offset;                              \n"
+        "uniform vec2 offset;                            \n"
        "uniform float rotation;                         \n"
        ROTATE_Z
        "void main()                                     \n"
@@ -154,6 +159,12 @@ static unsigned int load_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_u
        "  gl_Position = (vec4(offset.x, offset.y, 0.0, 0.0) + vec4(pos.x, pos.y, 0.0, 1.0)) * vec4(0.5, 0.5, 1.0, 1.0) - vec4(0.5, 0.5, 0.0, 0.0);   \n"
        "}                                               \n");

+    const char *main_code =
+        main_code =
+            "  vec4 pixel = texture(tex1, texcoords_out);                                          \n"
+            "  FragColor.xy = (RGBtoYUV * vec4(pixel.rgb, 1.0)).yz;                                \n"
+            "  FragColor.w = pixel.a;                                                              \n";
+
    char fragment_shader[2048];
    if(external_texture) {
        snprintf(fragment_shader, sizeof(fragment_shader),
@@ -167,10 +178,8 @@ static unsigned int load_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_u
            "%s"
            "void main()                                                                           \n"
            "{                                                                                     \n"
-            "  vec4 pixel = texture(tex1, texcoords_out);                                          \n"
-            "  FragColor.xy = (RGBtoYUV * vec4(pixel.rgb, 1.0)).yz;                                \n"
-            "  FragColor.w = pixel.a;                                                              \n"
-            "}                                                                                     \n", color_transform_matrix);
+            "%s"
+            "}                                                                                     \n", color_transform_matrix, main_code);
    } else {
        snprintf(fragment_shader, sizeof(fragment_shader),
            "#version 300 es                                                                       \n"
@@ -181,10 +190,66 @@ static unsigned int load_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_u
            "%s"
            "void main()                                                                           \n"
            "{                                                                                     \n"
+            "%s"
+            "}                                                                                     \n", color_transform_matrix, main_code);
+    }
+
+    if(gsr_shader_init(shader, egl, vertex_shader, fragment_shader) != 0)
+        return -1;
+
+    gsr_shader_bind_attribute_location(shader, "pos", 0);
+    gsr_shader_bind_attribute_location(shader, "texcoords", 1);
+    uniforms->offset = egl->glGetUniformLocation(shader->program_id, "offset");
+    uniforms->rotation = egl->glGetUniformLocation(shader->program_id, "rotation");
+    return 0;
+}
+
+static unsigned int load_shader_rgb(gsr_shader *shader, gsr_egl *egl, gsr_color_uniforms *uniforms, bool external_texture) {
+    char vertex_shader[2048];
+    snprintf(vertex_shader, sizeof(vertex_shader),
+        "#version 300 es                                   \n"
+        "in vec2 pos;                                      \n"
+        "in vec2 texcoords;                                \n"
+        "out vec2 texcoords_out;                           \n"
+        "uniform vec2 offset;                              \n"
+        "uniform float rotation;                           \n"
+        ROTATE_Z
+        "void main()                                       \n"
+        "{                                                 \n"
+        "  texcoords_out = (vec4(texcoords.x - 0.5, texcoords.y - 0.5, 0.0, 0.0) * rotate_z(rotation)).xy + vec2(0.5, 0.5);  \n"
+        "  gl_Position = vec4(offset.x, offset.y, 0.0, 0.0) + vec4(pos.x, pos.y, 0.0, 1.0);    \n"
+        "}                                                 \n");
+
+    const char *main_code =
+        main_code =
            "  vec4 pixel = texture(tex1, texcoords_out);                                          \n"
-            "  FragColor.xy = (RGBtoYUV * vec4(pixel.rgb, 1.0)).yz;                                \n"
-            "  FragColor.w = pixel.a;                                                              \n"
-            "}                                                                                     \n", color_transform_matrix);
+            "  FragColor = pixel;                                                                  \n";
+
+    char fragment_shader[2048];
+    if(external_texture) {
+        snprintf(fragment_shader, sizeof(fragment_shader),
+            "#version 300 es                                                                       \n"
+            "#extension GL_OES_EGL_image_external : enable                                         \n"
+            "#extension GL_OES_EGL_image_external_essl3 : require                                  \n"
+            "precision mediump float;                                                              \n"
+            "in vec2 texcoords_out;                                                                \n"
+            "uniform samplerExternalOES tex1;                                                      \n"
+            "out vec4 FragColor;                                                                   \n"
+            "void main()                                                                           \n"
+            "{                                                                                     \n"
+            "%s"
+            "}                                                                                     \n", main_code);
+    } else {
+        snprintf(fragment_shader, sizeof(fragment_shader),
+            "#version 300 es                                                                       \n"
+            "precision mediump float;                                                              \n"
+            "in vec2 texcoords_out;                                                                \n"
+            "uniform sampler2D tex1;                                                               \n"
+            "out vec4 FragColor;                                                                   \n"
+            "void main()                                                                           \n"
+            "{                                                                                     \n"
+            "%s"
+            "}                                                                                     \n", main_code);
    }

    if(gsr_shader_init(shader, egl, vertex_shader, fragment_shader) != 0)
@@ -272,18 +337,37 @@ int gsr_color_conversion_init(gsr_color_conversion *self, const gsr_color_conver
            }

            if(self->params.load_external_image_shader) {
-                if(load_shader_y(&self->shaders[2], self->params.egl, &self->uniforms[2], params->destination_color, params->color_range, true) != 0) {
+                if(load_shader_y(&self->shaders[EXTERNAL_TEXTURE_SHADER_OFFSET], self->params.egl, &self->uniforms[EXTERNAL_TEXTURE_SHADER_OFFSET], params->destination_color, params->color_range, true) != 0) {
                    fprintf(stderr, "gsr error: gsr_color_conversion_init: failed to load Y shader\n");
                    goto err;
                }

-                if(load_shader_uv(&self->shaders[3], self->params.egl, &self->uniforms[3], params->destination_color, params->color_range, true) != 0) {
+                if(load_shader_uv(&self->shaders[EXTERNAL_TEXTURE_SHADER_OFFSET + 1], self->params.egl, &self->uniforms[EXTERNAL_TEXTURE_SHADER_OFFSET + 1], params->destination_color, params->color_range, true) != 0) {
                    fprintf(stderr, "gsr error: gsr_color_conversion_init: failed to load UV shader\n");
                    goto err;
                }
            }
            break;
        }
+        case GSR_DESTINATION_COLOR_RGB8: {
+            if(self->params.num_destination_textures != 1) {
+                fprintf(stderr, "gsr error: gsr_color_conversion_init: expected 1 destination textures for destination color RGB8, got %d destination texture(s)\n", self->params.num_destination_textures);
+                return -1;
+            }
+
+            if(load_shader_rgb(&self->shaders[0], self->params.egl, &self->uniforms[0], false) != 0) {
+                fprintf(stderr, "gsr error: gsr_color_conversion_init: failed to load Y shader\n");
+                goto err;
+            }
+
+            if(self->params.load_external_image_shader) {
+                if(load_shader_rgb(&self->shaders[EXTERNAL_TEXTURE_SHADER_OFFSET], self->params.egl, &self->uniforms[EXTERNAL_TEXTURE_SHADER_OFFSET], true) != 0) {
+                    fprintf(stderr, "gsr error: gsr_color_conversion_init: failed to load Y shader\n");
+                    goto err;
+                }
+            }
+            break;
+        }
    }

    if(load_framebuffers(self) != 0)
@@ -325,22 +409,22 @@ void gsr_color_conversion_deinit(gsr_color_conversion *self) {
    self->params.egl = NULL;
 }

-static void gsr_color_conversion_swizzle_texture_source(gsr_color_conversion *self) {
-    if(self->params.source_color == GSR_SOURCE_COLOR_BGR) {
+static void gsr_color_conversion_swizzle_texture_source(gsr_color_conversion *self, gsr_source_color source_color) {
+    if(source_color == GSR_SOURCE_COLOR_BGR) {
        const int swizzle_mask[] = { GL_BLUE, GL_GREEN, GL_RED, 1 };
        self->params.egl->glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzle_mask);
    }
 }

-static void gsr_color_conversion_swizzle_reset(gsr_color_conversion *self) {
-    if(self->params.source_color == GSR_SOURCE_COLOR_BGR) {
+static void gsr_color_conversion_swizzle_reset(gsr_color_conversion *self, gsr_source_color source_color) {
+    if(source_color == GSR_SOURCE_COLOR_BGR) {
        const int swizzle_mask[] = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA };
        self->params.egl->glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzle_mask);
    }
 }

 /* |source_pos| is in pixel coordinates and |source_size|  */
-void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_id, vec2i source_pos, vec2i source_size, vec2i texture_pos, vec2i texture_size, float rotation, bool external_texture) {
+void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_id, vec2i source_pos, vec2i source_size, vec2i texture_pos, vec2i texture_size, float rotation, bool external_texture, gsr_source_color source_color) {
    // TODO: Remove this crap
    rotation = M_PI*2.0f - rotation;

@@ -402,7 +486,7 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
        -1.0f + 0.0f + size_norm.x, -1.0f + 0.0f + size_norm.y, texture_pos_norm.x + texture_size_norm.x, texture_pos_norm.y + texture_size_norm.y
    };

-    gsr_color_conversion_swizzle_texture_source(self);
+    gsr_color_conversion_swizzle_texture_source(self, source_color);

    self->params.egl->glBindVertexArray(self->vertex_array_object_id);
    self->params.egl->glViewport(0, 0, dest_texture_size.x, dest_texture_size.y);
@@ -415,7 +499,7 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
        self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, self->framebuffers[0]);
        //cap_xcomp->params.egl->glClear(GL_COLOR_BUFFER_BIT); // TODO: Do this in a separate clear_ function. We want to do that when using multiple drm to create the final image (multiple monitors for example)

-        const int shader_index = external_texture ? 2 : 0;
+        const int shader_index = external_texture ? EXTERNAL_TEXTURE_SHADER_OFFSET : 0;
        gsr_shader_use(&self->shaders[shader_index]);
        self->params.egl->glUniform1f(self->uniforms[shader_index].rotation, rotation);
        self->params.egl->glUniform2f(self->uniforms[shader_index].offset, pos_norm.x, pos_norm.y);
@@ -426,7 +510,7 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
        self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, self->framebuffers[1]);
        //cap_xcomp->params.egl->glClear(GL_COLOR_BUFFER_BIT);

-        const int shader_index = external_texture ? 3 : 1;
+        const int shader_index = external_texture ? EXTERNAL_TEXTURE_SHADER_OFFSET + 1 : 1;
        gsr_shader_use(&self->shaders[shader_index]);
        self->params.egl->glUniform1f(self->uniforms[shader_index].rotation, rotation);
        self->params.egl->glUniform2f(self->uniforms[shader_index].offset, pos_norm.x, pos_norm.y);
@@ -438,7 +522,7 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
    self->params.egl->glBindTexture(texture_target, 0);
    self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, 0);

-    gsr_color_conversion_swizzle_reset(self);
+    gsr_color_conversion_swizzle_reset(self, source_color);
 }

 void gsr_color_conversion_clear(gsr_color_conversion *self) {
@@ -454,6 +538,13 @@ void gsr_color_conversion_clear(gsr_color_conversion *self) {
            color2[3] = 1.0f;
            break;
        }
+        case GSR_DESTINATION_COLOR_RGB8: {
+            color2[0] = 0.0f;
+            color2[1] = 0.0f;
+            color2[2] = 0.0f;
+            color2[3] = 1.0f;
+            break;
+        }
    }

    self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, self->framebuffers[0]);
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -43,10 +43,12 @@ static bool gsr_cursor_set_from_x11_cursor_image(gsr_cursor *self, XFixesCursorI
                *visible = true;
            }

-            *out++ = (unsigned)*in++ * 255/alpha;
-            *out++ = (unsigned)*in++ * 255/alpha;
-            *out++ = (unsigned)*in++ * 255/alpha;
-            *out++ = *in++;
+            out[0] = (float)in[2] * 255.0/(float)alpha;
+            out[1] = (float)in[1] * 255.0/(float)alpha;
+            out[2] = (float)in[0] * 255.0/(float)alpha;
+            out[3] = in[3];
+            out += 4;
+            in += 4;
        }
    }

--- a/src/damage.c
+++ b/src/damage.c
@@ -1,5 +1,6 @@
 #include "../include/damage.h"
 #include "../include/utils.h"
+#include "../include/window/window.h"

 #include <stdio.h>
 #include <string.h>
@@ -30,33 +31,34 @@ bool gsr_damage_init(gsr_damage *self, gsr_egl *egl, bool track_cursor) {
    self->egl = egl;
    self->track_cursor = track_cursor;

-    if(gsr_egl_get_display_server(egl) != GSR_DISPLAY_SERVER_X11) {
+    if(gsr_window_get_display_server(egl->window) != GSR_DISPLAY_SERVER_X11) {
        fprintf(stderr, "gsr warning: gsr_damage_init: damage tracking is not supported on wayland\n");
        return false;
    }
+    self->display = gsr_window_get_display(egl->window);

-    if(!XDamageQueryExtension(self->egl->x11.dpy, &self->damage_event, &self->damage_error)) {
+    if(!XDamageQueryExtension(self->display, &self->damage_event, &self->damage_error)) {
        fprintf(stderr, "gsr warning: gsr_damage_init: XDamage is not supported by your X11 server\n");
        gsr_damage_deinit(self);
        return false;
    }

-    if(!XRRQueryExtension(self->egl->x11.dpy, &self->randr_event, &self->randr_error)) {
+    if(!XRRQueryExtension(self->display, &self->randr_event, &self->randr_error)) {
        fprintf(stderr, "gsr warning: gsr_damage_init: XRandr is not supported by your X11 server\n");
        gsr_damage_deinit(self);
        return false;
    }

-    if(!xrandr_is_supported(self->egl->x11.dpy)) {
+    if(!xrandr_is_supported(self->display)) {
        fprintf(stderr, "gsr warning: gsr_damage_init: your X11 randr version is too old\n");
        gsr_damage_deinit(self);
        return false;
    }

    if(self->track_cursor)
-        self->track_cursor = gsr_cursor_init(&self->cursor, self->egl, self->egl->x11.dpy) == 0;
+        self->track_cursor = gsr_cursor_init(&self->cursor, self->egl, self->display) == 0;

-    XRRSelectInput(self->egl->x11.dpy, DefaultRootWindow(self->egl->x11.dpy), RRScreenChangeNotifyMask | RRCrtcChangeNotifyMask | RROutputChangeNotifyMask);
+    XRRSelectInput(self->display, DefaultRootWindow(self->display), RRScreenChangeNotifyMask | RRCrtcChangeNotifyMask | RROutputChangeNotifyMask);

    self->damaged = true;
    return true;
@@ -64,7 +66,7 @@ bool gsr_damage_init(gsr_damage *self, gsr_egl *egl, bool track_cursor) {

 void gsr_damage_deinit(gsr_damage *self) {
    if(self->damage) {
-        XDamageDestroy(self->egl->x11.dpy, self->damage);
+        XDamageDestroy(self->display, self->damage);
        self->damage = None;
    }

@@ -85,22 +87,22 @@ bool gsr_damage_set_target_window(gsr_damage *self, uint64_t window) {
        return true;

    if(self->damage) {
-        XDamageDestroy(self->egl->x11.dpy, self->damage);
+        XDamageDestroy(self->display, self->damage);
        self->damage = None;
    }

    if(self->window)
-        XSelectInput(self->egl->x11.dpy, self->window, 0);
+        XSelectInput(self->display, self->window, 0);

    self->window = window;
-    XSelectInput(self->egl->x11.dpy, self->window, StructureNotifyMask | ExposureMask);
+    XSelectInput(self->display, self->window, StructureNotifyMask | ExposureMask);

    XWindowAttributes win_attr;
    win_attr.x = 0;
    win_attr.y = 0;
    win_attr.width = 0;
    win_attr.height = 0;
-    if(!XGetWindowAttributes(self->egl->x11.dpy, self->window, &win_attr))
+    if(!XGetWindowAttributes(self->display, self->window, &win_attr))
        fprintf(stderr, "gsr warning: gsr_damage_set_target_window failed: failed to get window attributes: %ld\n", (long)self->window);

    //self->window_pos.x = win_attr.x;
@@ -109,9 +111,9 @@ bool gsr_damage_set_target_window(gsr_damage *self, uint64_t window) {
    self->window_size.x = win_attr.width;
    self->window_size.y = win_attr.height;

-    self->damage = XDamageCreate(self->egl->x11.dpy, window, XDamageReportNonEmpty);
+    self->damage = XDamageCreate(self->display, window, XDamageReportNonEmpty);
    if(self->damage) {
-        XDamageSubtract(self->egl->x11.dpy, self->damage, None, None);
+        XDamageSubtract(self->display, self->damage, None, None);
        self->damaged = true;
        self->track_type = GSR_DAMAGE_TRACK_WINDOW;
        return true;
@@ -130,23 +132,23 @@ bool gsr_damage_set_target_monitor(gsr_damage *self, const char *monitor_name) {
        return true;

    if(self->damage) {
-        XDamageDestroy(self->egl->x11.dpy, self->damage);
+        XDamageDestroy(self->display, self->damage);
        self->damage = None;
    }

    memset(&self->monitor, 0, sizeof(self->monitor));
-    if(strcmp(monitor_name, "screen") != 0 && strcmp(monitor_name, "screen-direct") != 0 && strcmp(monitor_name, "screen-direct-force") != 0) {
+    if(strcmp(monitor_name, "screen-direct") != 0 && strcmp(monitor_name, "screen-direct-force") != 0) {
        if(!get_monitor_by_name(self->egl, GSR_CONNECTION_X11, monitor_name, &self->monitor))
            fprintf(stderr, "gsr warning: gsr_damage_set_target_monitor: failed to find monitor: %s\n", monitor_name);
    }

    if(self->window)
-        XSelectInput(self->egl->x11.dpy, self->window, 0);
+        XSelectInput(self->display, self->window, 0);

-    self->window = DefaultRootWindow(self->egl->x11.dpy);
-    self->damage = XDamageCreate(self->egl->x11.dpy, self->window, XDamageReportNonEmpty);
+    self->window = DefaultRootWindow(self->display);
+    self->damage = XDamageCreate(self->display, self->window, XDamageReportNonEmpty);
    if(self->damage) {
-        XDamageSubtract(self->egl->x11.dpy, self->damage, None, None);
+        XDamageSubtract(self->display, self->damage, None, None);
        self->damaged = true;
        snprintf(self->monitor_name, sizeof(self->monitor_name), "%s", monitor_name);
        self->track_type = GSR_DAMAGE_TRACK_MONITOR;
@@ -184,13 +186,14 @@ static void gsr_damage_on_output_change(gsr_damage *self, XEvent *xev) {
    if(!rr_output_change_event->output || self->monitor.monitor_identifier == 0)
        return;

-    XRRScreenResources *screen_res = XRRGetScreenResources(self->egl->x11.dpy, DefaultRootWindow(self->egl->x11.dpy));
+    XRRScreenResources *screen_res = XRRGetScreenResources(self->display, DefaultRootWindow(self->display));
    if(!screen_res)
        return;

-    XRROutputInfo *out_info = XRRGetOutputInfo(self->egl->x11.dpy, screen_res, rr_output_change_event->output);
+    // TODO: What about scaled output? look at for_each_active_monitor_output_x11_not_cached
+    XRROutputInfo *out_info = XRRGetOutputInfo(self->display, screen_res, rr_output_change_event->output);
    if(out_info && out_info->crtc && out_info->crtc == self->monitor.monitor_identifier) {
-        XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(self->egl->x11.dpy, screen_res, out_info->crtc);
+        XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(self->display, screen_res, out_info->crtc);
        if(crtc_info && (crtc_info->x != self->monitor.pos.x || crtc_info->y != self->monitor.pos.y ||
            (int)crtc_info->width != self->monitor.size.x || (int)crtc_info->height != self->monitor.size.y))
        {
@@ -225,15 +228,15 @@ static void gsr_damage_on_randr_event(gsr_damage *self, XEvent *xev) {

 static void gsr_damage_on_damage_event(gsr_damage *self, XEvent *xev) {
    const XDamageNotifyEvent *de = (XDamageNotifyEvent*)xev;
-    XserverRegion region = XFixesCreateRegion(self->egl->x11.dpy, NULL, 0);
+    XserverRegion region = XFixesCreateRegion(self->display, NULL, 0);
    /* Subtract all the damage, repairing the window */
-    XDamageSubtract(self->egl->x11.dpy, de->damage, None, region);
+    XDamageSubtract(self->display, de->damage, None, region);

    if(self->track_type == GSR_DAMAGE_TRACK_WINDOW || (self->track_type == GSR_DAMAGE_TRACK_MONITOR && self->monitor.connector_id == 0)) {
        self->damaged = true;
    } else {
        int num_rectangles = 0;
-        XRectangle *rectangles = XFixesFetchRegion(self->egl->x11.dpy, region, &num_rectangles);
+        XRectangle *rectangles = XFixesFetchRegion(self->display, region, &num_rectangles);
        if(rectangles) {
            const gsr_rectangle monitor_region = { self->monitor.pos, self->monitor.size };
            for(int i = 0; i < num_rectangles; ++i) {
@@ -246,8 +249,8 @@ static void gsr_damage_on_damage_event(gsr_damage *self, XEvent *xev) {
        }
    }

-    XFixesDestroyRegion(self->egl->x11.dpy, region);
-    XFlush(self->egl->x11.dpy);
+    XFixesDestroyRegion(self->display, region);
+    XFlush(self->display);
 }

 static void gsr_damage_on_tick_cursor(gsr_damage *self) {
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -1,11 +1,11 @@
 #include "../include/dbus.h"
+#include "../include/utils.h"

 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <assert.h>
-#include <sys/random.h>

 /* TODO: Make non-blocking when GPU Screen Recorder is turned into a library */
 /* TODO: Make sure responses matches the requests */
@@ -37,27 +37,12 @@ static const char* dict_value_type_to_string(dict_value_type type) {
    return "(unknown)";
 }

-static bool generate_random_characters(char *buffer, int buffer_size, const char *alphabet, size_t alphabet_size) {
-    /* TODO: Use other functions on other platforms than linux */
-    if(getrandom(buffer, buffer_size, 0) < buffer_size) {
-        fprintf(stderr, "gsr error: generate_random_characters: failed to get random bytes, error: %s\n", strerror(errno));
-        return false;
-    }
-
-    for(int i = 0; i < buffer_size; ++i) {
-        unsigned char c = *(unsigned char*)&buffer[i];
-        buffer[i] = alphabet[c % alphabet_size];
-    }
-
-    return true;
-}
-
 bool gsr_dbus_init(gsr_dbus *self, const char *screencast_restore_token) {
    memset(self, 0, sizeof(*self));
    dbus_error_init(&self->err);

    self->random_str[DBUS_RANDOM_STR_SIZE] = '\0';
-    if(!generate_random_characters(self->random_str, DBUS_RANDOM_STR_SIZE, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 62)) {
+    if(!generate_random_characters_standard_alphabet(self->random_str, DBUS_RANDOM_STR_SIZE)) {
        fprintf(stderr, "gsr error: gsr_dbus_init: failed to generate random string\n");
        return false;
    }
--- a/src/egl.c
+++ b/src/egl.c
@@ -1,4 +1,5 @@
 #include "../include/egl.h"
+#include "../include/window/window.h"
 #include "../include/library_loader.h"
 #include "../include/utils.h"

@@ -10,118 +11,28 @@
 #include <unistd.h>
 #include <sys/capability.h>

-#include <wayland-client.h>
-#include <wayland-egl.h>
-
 // TODO: rename gsr_egl to something else since this includes both egl and glx and in the future maybe vulkan too

-// TODO: Move this shit to a separate wayland file, and have a separate file for x11.
+#define GLX_DRAWABLE_TYPE                  0x8010
+#define GLX_RENDER_TYPE                    0x8011
+#define GLX_RGBA_BIT                       0x00000001
+#define GLX_WINDOW_BIT                     0x00000001
+#define GLX_PIXMAP_BIT                     0x00000002
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
+#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
+#define GLX_DOUBLEBUFFER                   5
+#define GLX_RED_SIZE                       8
+#define GLX_GREEN_SIZE                     9
+#define GLX_BLUE_SIZE                      10
+#define GLX_ALPHA_SIZE                     11
+#define GLX_DEPTH_SIZE                     12
+#define GLX_RGBA_TYPE                      0x8014

-static void output_handle_geometry(void *data, struct wl_output *wl_output,
-        int32_t x, int32_t y, int32_t phys_width, int32_t phys_height,
-        int32_t subpixel, const char *make, const char *model,
-        int32_t transform) {
-    (void)wl_output;
-    (void)phys_width;
-    (void)phys_height;
-    (void)subpixel;
-    (void)make;
-    (void)model;
-    gsr_wayland_output *gsr_output = data;
-    gsr_output->pos.x = x;
-    gsr_output->pos.y = y;
-    gsr_output->transform = transform;
-}
-
-static void output_handle_mode(void *data, struct wl_output *wl_output, uint32_t flags, int32_t width, int32_t height, int32_t refresh) {
-    (void)wl_output;
-    (void)flags;
-    (void)refresh;
-    gsr_wayland_output *gsr_output = data;
-    gsr_output->size.x = width;
-    gsr_output->size.y = height;
-}
-
-static void output_handle_done(void *data, struct wl_output *wl_output) {
-    (void)data;
-    (void)wl_output;
-}
-
-static void output_handle_scale(void* data, struct wl_output *wl_output, int32_t factor) {
-    (void)data;
-    (void)wl_output;
-    (void)factor;
-}
-
-static void output_handle_name(void *data, struct wl_output *wl_output, const char *name) {
-    (void)wl_output;
-    gsr_wayland_output *gsr_output = data;
-    if(gsr_output->name) {
-        free(gsr_output->name);
-        gsr_output->name = NULL;
-    }
-    gsr_output->name = strdup(name);
-}
-
-static void output_handle_description(void *data, struct wl_output *wl_output, const char *description) {
-    (void)data;
-    (void)wl_output;
-    (void)description;
-}
-
-static const struct wl_output_listener output_listener = {
-    .geometry = output_handle_geometry,
-    .mode = output_handle_mode,
-    .done = output_handle_done,
-    .scale = output_handle_scale,
-    .name = output_handle_name,
-    .description = output_handle_description,
-};
-
-static void registry_add_object(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) {
-    (void)version;
-    gsr_egl *egl = data;
-    if (strcmp(interface, "wl_compositor") == 0) {
-        if(egl->wayland.compositor) {
-            wl_compositor_destroy(egl->wayland.compositor);
-            egl->wayland.compositor = NULL;
-        }
-        egl->wayland.compositor = wl_registry_bind(registry, name, &wl_compositor_interface, 1);
-    } else if(strcmp(interface, wl_output_interface.name) == 0) {
-        if(version < 4) {
-            fprintf(stderr, "gsr warning: wl output interface version is < 4, expected >= 4 to capture a monitor. Using KMS capture instead\n");
-            return;
-        }
-
-        if(egl->wayland.num_outputs == GSR_MAX_OUTPUTS) {
-            fprintf(stderr, "gsr warning: reached maximum outputs (%d), ignoring output %u\n", GSR_MAX_OUTPUTS, name);
-            return;
-        }
-
-        gsr_wayland_output *gsr_output = &egl->wayland.outputs[egl->wayland.num_outputs];
-        egl->wayland.num_outputs++;
-        *gsr_output = (gsr_wayland_output) {
-            .wl_name = name,
-            .output = wl_registry_bind(registry, name, &wl_output_interface, 4),
-            .pos = { .x = 0, .y = 0 },
-            .size = { .x = 0, .y = 0 },
-            .transform = 0,
-            .name = NULL,
-        };
-        wl_output_add_listener(gsr_output->output, &output_listener, gsr_output);
-    }
-}
-
-static void registry_remove_object(void *data, struct wl_registry *registry, uint32_t name) {
-    (void)data;
-    (void)registry;
-    (void)name;
-}
-
-static struct wl_registry_listener registry_listener = {
-    .global = registry_add_object,
-    .global_remove = registry_remove_object,
-};
+#define GLX_CONTEXT_PRIORITY_LEVEL_EXT    0x3100
+#define GLX_CONTEXT_PRIORITY_HIGH_EXT     0x3101
+#define GLX_CONTEXT_PRIORITY_MEDIUM_EXT   0x3102
+#define GLX_CONTEXT_PRIORITY_LOW_EXT      0x3103

 static void reset_cap_nice(void) {
    cap_t caps = cap_get_proc();
@@ -135,75 +46,8 @@ static void reset_cap_nice(void) {
    cap_free(caps);
 }

-static void store_x11_monitor(const gsr_monitor *monitor, void *userdata) {
-    gsr_egl *egl = userdata;
-    if(egl->x11.num_outputs == GSR_MAX_OUTPUTS) {
-        fprintf(stderr, "gsr warning: reached maximum outputs (%d), ignoring output %s\n", GSR_MAX_OUTPUTS, monitor->name);
-        return;
-    }
-
-    char *monitor_name = strdup(monitor->name);
-    if(!monitor_name)
-        return;
-
-    const int index = egl->x11.num_outputs;
-    egl->x11.outputs[index].name = monitor_name;
-    egl->x11.outputs[index].pos = monitor->pos;
-    egl->x11.outputs[index].size = monitor->size;
-    egl->x11.outputs[index].connector_id = monitor->connector_id;
-    egl->x11.outputs[index].rotation = monitor->rotation;
-    egl->x11.outputs[index].monitor_identifier = monitor->monitor_identifier;
-    ++egl->x11.num_outputs;
-}
-
-#define GLX_DRAWABLE_TYPE        0x8010
-#define GLX_RENDER_TYPE            0x8011
-#define GLX_RGBA_BIT            0x00000001
-#define GLX_WINDOW_BIT            0x00000001
-#define GLX_PIXMAP_BIT            0x00000002
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT      0x20D1
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT   0x20D3
-#define GLX_TEXTURE_2D_BIT_EXT            0x00000002
-#define GLX_DOUBLEBUFFER    5
-#define GLX_RED_SIZE        8
-#define GLX_GREEN_SIZE        9
-#define GLX_BLUE_SIZE        10
-#define GLX_ALPHA_SIZE        11
-#define GLX_DEPTH_SIZE        12
-#define GLX_RGBA_TYPE            0x8014
-
-#define GLX_CONTEXT_PRIORITY_LEVEL_EXT    0x3100
-#define GLX_CONTEXT_PRIORITY_HIGH_EXT     0x3101
-#define GLX_CONTEXT_PRIORITY_MEDIUM_EXT   0x3102
-#define GLX_CONTEXT_PRIORITY_LOW_EXT      0x3103
-
-static GLXFBConfig glx_fb_config_choose(gsr_egl *self) {
-    const int glx_visual_attribs[] = {
-        GLX_RENDER_TYPE, GLX_RGBA_BIT,
-        GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
-        // TODO:
-        //GLX_BIND_TO_TEXTURE_RGBA_EXT, 1,
-        //GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT,
-        GLX_DOUBLEBUFFER, True,
-        GLX_RED_SIZE, 8,
-        GLX_GREEN_SIZE, 8,
-        GLX_BLUE_SIZE, 8,
-        GLX_ALPHA_SIZE, 0,
-        GLX_DEPTH_SIZE, 0,
-        None, None
-    };
-
-    // TODO: Cleanup
-    int c = 0;
-    GLXFBConfig *fb_configs = self->glXChooseFBConfig(self->x11.dpy, DefaultScreen(self->x11.dpy), glx_visual_attribs, &c);
-    if(c == 0 || !fb_configs)
-        return NULL;
-
-    return fb_configs[0];
-}
-
 // TODO: Create egl context without surface (in other words, x11/wayland agnostic, doesn't require x11/wayland dependency)
-static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
+static bool gsr_egl_create_window(gsr_egl *self) {
    EGLConfig  ecfg;
    int32_t    num_config = 0;

@@ -216,43 +60,14 @@ static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {

    const int32_t ctxattr[] = {
        EGL_CONTEXT_CLIENT_VERSION, 2,
-        EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_HIGH_IMG, /* requires cap_sys_nice, ignored otherwise */
+        //EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_HIGH_IMG, /* requires cap_sys_nice, ignored otherwise */
        EGL_NONE, EGL_NONE
    };

-    if(wayland) {
-        self->wayland.dpy = wl_display_connect(NULL);
-        if(!self->wayland.dpy) {
-            fprintf(stderr, "gsr error: gsr_egl_create_window failed: wl_display_connect failed\n");
-            goto fail;
-        }
-
-        self->wayland.registry = wl_display_get_registry(self->wayland.dpy); // TODO: Error checking
-        wl_registry_add_listener(self->wayland.registry, &registry_listener, self); // TODO: Error checking
-
-        // Fetch globals
-        wl_display_roundtrip(self->wayland.dpy);
-
-        // Fetch wl_output
-        wl_display_roundtrip(self->wayland.dpy);
-
-        if(!self->wayland.compositor) {
-            fprintf(stderr, "gsr error: gsr_gl_create_window failed: failed to find compositor\n");
-            goto fail;
-        }
-    } else {
-        self->x11.window = XCreateWindow(self->x11.dpy, DefaultRootWindow(self->x11.dpy), 0, 0, 16, 16, 0, CopyFromParent, InputOutput, CopyFromParent, 0, NULL);
-
-        if(!self->x11.window) {
-            fprintf(stderr, "gsr error: gsr_gl_create_window failed: failed to create gl window\n");
-            goto fail;
-        }
-    }
-
    // TODO: Use EGL_OPENGL_ES_API as amd requires that for external texture, but that breaks software encoding
    self->eglBindAPI(EGL_OPENGL_API);

-    self->egl_display = self->eglGetDisplay(self->wayland.dpy ? (EGLNativeDisplayType)self->wayland.dpy : (EGLNativeDisplayType)self->x11.dpy);
+    self->egl_display = self->eglGetDisplay((EGLNativeDisplayType)gsr_window_get_display(self->window));
    if(!self->egl_display) {
        fprintf(stderr, "gsr error: gsr_egl_create_window failed: eglGetDisplay failed\n");
        goto fail;
@@ -274,15 +89,7 @@ static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
        goto fail;
    }

-    if(wayland) {
-        // TODO: Error check?
-        self->wayland.surface = wl_compositor_create_surface(self->wayland.compositor);
-        self->wayland.window = wl_egl_window_create(self->wayland.surface, 16, 16);
-        self->egl_surface = self->eglCreateWindowSurface(self->egl_display, ecfg, (EGLNativeWindowType)self->wayland.window, NULL);
-    } else {
-        self->egl_surface = self->eglCreateWindowSurface(self->egl_display, ecfg, (EGLNativeWindowType)self->x11.window, NULL);
-    }
-
+    self->egl_surface = self->eglCreateWindowSurface(self->egl_display, ecfg, (EGLNativeWindowType)gsr_window_get_window(self->window), NULL);
    if(!self->egl_surface) {
        fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to create window surface\n");
        goto fail;
@@ -293,11 +100,6 @@ static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
        goto fail;
    }

-    if(!wayland) {
-        self->x11.num_outputs = 0;
-        for_each_active_monitor_output_x11_not_cached(self->x11.dpy, store_x11_monitor, self);
-    }
-
    reset_cap_nice();
    return true;

@@ -307,8 +109,36 @@ static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
    return false;
 }

+static GLXFBConfig glx_fb_config_choose(gsr_egl *self, Display *display) {
+    const int glx_visual_attribs[] = {
+        GLX_RENDER_TYPE, GLX_RGBA_BIT,
+        GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+        // TODO:
+        //GLX_BIND_TO_TEXTURE_RGBA_EXT, 1,
+        //GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT,
+        GLX_DOUBLEBUFFER, True,
+        GLX_RED_SIZE, 8,
+        GLX_GREEN_SIZE, 8,
+        GLX_BLUE_SIZE, 8,
+        GLX_ALPHA_SIZE, 0,
+        GLX_DEPTH_SIZE, 0,
+        None, None
+    };
+
+    // TODO: Cleanup
+    int c = 0;
+    GLXFBConfig *fb_configs = self->glXChooseFBConfig(display, DefaultScreen(display), glx_visual_attribs, &c);
+    if(c == 0 || !fb_configs)
+        return NULL;
+
+    return fb_configs[0];
+}
+
 static bool gsr_egl_switch_to_glx_context(gsr_egl *self) {
    // TODO: Cleanup
+    assert(gsr_window_get_display_server(self->window) == GSR_DISPLAY_SERVER_X11);
+    Display *display = gsr_window_get_display(self->window);
+    const Window window = (Window)gsr_window_get_window(self->window);

    if(self->egl_context) {
        self->eglMakeCurrent(self->egl_display, NULL, NULL, NULL);
@@ -326,21 +156,21 @@ static bool gsr_egl_switch_to_glx_context(gsr_egl *self) {
        self->egl_display = NULL;
    }

-    self->glx_fb_config = glx_fb_config_choose(self);
+    self->glx_fb_config = glx_fb_config_choose(self, display);
    if(!self->glx_fb_config) {
        fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to find a suitable fb config\n");
        goto fail;
    }

    // TODO:
-    //self->glx_context = self->glXCreateContextAttribsARB(self->x11.dpy, self->glx_fb_config, NULL, True, context_attrib_list);
-    self->glx_context = self->glXCreateNewContext(self->x11.dpy, self->glx_fb_config, GLX_RGBA_TYPE, NULL, True);
+    //self->glx_context = self->glXCreateContextAttribsARB(display, self->glx_fb_config, NULL, True, context_attrib_list);
+    self->glx_context = self->glXCreateNewContext(display, self->glx_fb_config, GLX_RGBA_TYPE, NULL, True);
    if(!self->glx_context) {
        fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to create glx context\n");
        goto fail;
    }

-    if(!self->glXMakeContextCurrent(self->x11.dpy, self->x11.window, self->x11.window, self->glx_context)) {
+    if(!self->glXMakeContextCurrent(display, window, window, self->glx_context)) {
        fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to make glx context current\n");
        goto fail;
    }
@@ -349,8 +179,8 @@ static bool gsr_egl_switch_to_glx_context(gsr_egl *self) {

    fail:
    if(self->glx_context) {
-        self->glXMakeContextCurrent(self->x11.dpy, None, None, NULL);
-        self->glXDestroyContext(self->x11.dpy, self->glx_context);
+        self->glXMakeContextCurrent(display, None, None, NULL);
+        self->glXDestroyContext(display, self->glx_context);
        self->glx_context = NULL;
        self->glx_fb_config = NULL;
    }
@@ -514,28 +344,59 @@ static bool gsr_egl_load_gl(gsr_egl *self, void *library) {
    return true;
 }

-// #define GL_DEBUG_TYPE_ERROR               0x824C
-// static void debug_callback( unsigned int source,
-//                  unsigned int type,
-//                  unsigned int id,
-//                  unsigned int severity,
-//                  int length,
-//                  const char* message,
-//                  const void* userParam )
-// {
-//     (void)source;
-//     (void)id;
-//     (void)length;
-//     (void)userParam;
-//   fprintf( stderr, "GL CALLBACK: %s type = 0x%x, severity = 0x%x, message = %s\n",
-//            ( type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : "" ),
-//             type, severity, message );
-// }
+#define GL_DEBUG_TYPE_ERROR               0x824C
+#define GL_DEBUG_SEVERITY_NOTIFICATION    0x826B
+static void debug_callback(unsigned int source, unsigned int type, unsigned int id, unsigned int severity, int length, const char* message, const void* userParam) {
+    (void)source;
+    (void)id;
+    (void)length;
+    (void)userParam;
+    if(severity != GL_DEBUG_SEVERITY_NOTIFICATION)
+        fprintf(stderr, "gsr info: gl callback: %s type = 0x%x, severity = 0x%x, message = %s\n", type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : "", type, severity, message);
+}

-bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_capture) {
+/* TODO: check for glx swap control extension string (GLX_EXT_swap_control, etc) */
+static void set_vertical_sync_enabled(gsr_egl *egl, int enabled) {
+    int result = 0;
+
+    if(egl->glXSwapIntervalEXT) {
+        assert(gsr_window_get_display_server(egl->window) == GSR_DISPLAY_SERVER_X11);
+        Display *display = gsr_window_get_display(egl->window);
+        const Window window = (Window)gsr_window_get_window(egl->window);
+        egl->glXSwapIntervalEXT(display, window, enabled ? 1 : 0);
+    } else if(egl->glXSwapIntervalMESA) {
+        result = egl->glXSwapIntervalMESA(enabled ? 1 : 0);
+    } else if(egl->glXSwapIntervalSGI) {
+        result = egl->glXSwapIntervalSGI(enabled ? 1 : 0);
+    } else {
+        static int warned = 0;
+        if (!warned) {
+            warned = 1;
+            fprintf(stderr, "gsr warning: setting vertical sync not supported\n");
+        }
+    }
+
+    if(result != 0)
+        fprintf(stderr, "gsr warning: setting vertical sync failed\n");
+}
+
+static void gsr_egl_disable_vsync(gsr_egl *self) {
+    switch(self->context_type) {
+        case GSR_GL_CONTEXT_TYPE_EGL: {
+            self->eglSwapInterval(self->egl_display, 0);
+            break;
+        }
+        case GSR_GL_CONTEXT_TYPE_GLX: {
+            set_vertical_sync_enabled(self, 0);
+            break;
+        }
+    }
+}
+
+bool gsr_egl_load(gsr_egl *self, gsr_window *window, bool is_monitor_capture, bool enable_debug) {
    memset(self, 0, sizeof(gsr_egl));
-    self->x11.dpy = dpy;
    self->context_type = GSR_GL_CONTEXT_TYPE_EGL;
+    self->window = window;

    dlerror(); /* clear */
    self->egl_library = dlopen("libEGL.so.1", RTLD_LAZY);
@@ -547,7 +408,7 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_cap
    self->glx_library = dlopen("libGLX.so.0", RTLD_LAZY);

    self->gl_library = dlopen("libGL.so.1", RTLD_LAZY);
-    if(!self->egl_library) {
+    if(!self->gl_library) {
        fprintf(stderr, "gsr error: gsr_egl_load: failed to load libGL.so.1, error: %s\n", dlerror());
        goto fail;
    }
@@ -565,7 +426,7 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_cap
    if(!gsr_egl_proc_load_egl(self))
        goto fail;

-    if(!gsr_egl_create_window(self, wayland))
+    if(!gsr_egl_create_window(self))
        goto fail;

    if(!gl_get_gpu_info(self, &self->gpu_info))
@@ -578,7 +439,7 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_cap
    }

    /* Nvfbc requires glx */
-    if(!wayland && is_monitor_capture && self->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA) {
+    if(gsr_window_get_display_server(self->window) == GSR_DISPLAY_SERVER_X11 && is_monitor_capture && self->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA) {
        self->context_type = GSR_GL_CONTEXT_TYPE_GLX;
        self->dri_card_path = NULL;
        if(!gsr_egl_switch_to_glx_context(self))
@@ -588,8 +449,21 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_cap
    self->glEnable(GL_BLEND);
    self->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

-    //self->glEnable(GL_DEBUG_OUTPUT);
-    //self->glDebugMessageCallback(debug_callback, NULL);
+    if(enable_debug) {
+        self->glEnable(GL_DEBUG_OUTPUT);
+        self->glDebugMessageCallback(debug_callback, NULL);
+    }
+
+    gsr_egl_disable_vsync(self);
+
+    if(self->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA) {
+        /* This fixes nvenc codecs unable to load on openSUSE tumbleweed because of a cuda error. Don't ask me why */
+        const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
+        if(inside_flatpak)
+            system("flatpak-spawn --host -- nvidia-smi -f /dev/null");
+        else
+            system("nvidia-smi -f /dev/null");
+    }

    return true;

@@ -616,63 +490,14 @@ void gsr_egl_unload(gsr_egl *self) {
    }

    if(self->glx_context) {
-        self->glXMakeContextCurrent(self->x11.dpy, None, None, NULL);
-        self->glXDestroyContext(self->x11.dpy, self->glx_context);
+        assert(gsr_window_get_display_server(self->window) == GSR_DISPLAY_SERVER_X11);
+        Display *display = gsr_window_get_display(self->window);
+        self->glXMakeContextCurrent(display, None, None, NULL);
+        self->glXDestroyContext(display, self->glx_context);
        self->glx_context = NULL;
        self->glx_fb_config = NULL;
    }

-    if(self->x11.window) {
-        XDestroyWindow(self->x11.dpy, self->x11.window);
-        self->x11.window = None;
-    }
-
-    for(int i = 0; i < self->x11.num_outputs; ++i) {
-        if(self->x11.outputs[i].name) {
-            free(self->x11.outputs[i].name);
-            self->x11.outputs[i].name = NULL;
-        }
-    }
-    self->x11.num_outputs = 0;
-
-    if(self->wayland.window) {
-        wl_egl_window_destroy(self->wayland.window);
-        self->wayland.window = NULL;
-    }
-
-    if(self->wayland.surface) {
-        wl_surface_destroy(self->wayland.surface);
-        self->wayland.surface = NULL;
-    }
-
-    for(int i = 0; i < self->wayland.num_outputs; ++i) {
-        if(self->wayland.outputs[i].output) {
-            wl_output_destroy(self->wayland.outputs[i].output);
-            self->wayland.outputs[i].output = NULL;
-        }
-
-        if(self->wayland.outputs[i].name) {
-            free(self->wayland.outputs[i].name);
-            self->wayland.outputs[i].name = NULL;
-        }
-    }
-    self->wayland.num_outputs = 0;
-
-    if(self->wayland.compositor) {
-        wl_compositor_destroy(self->wayland.compositor);
-        self->wayland.compositor = NULL;
-    }
-
-    if(self->wayland.registry) {
-        wl_registry_destroy(self->wayland.registry);
-        self->wayland.registry = NULL;
-    }
-
-    if(self->wayland.dpy) {
-        wl_display_disconnect(self->wayland.dpy);
-        self->wayland.dpy = NULL;
-    }
-
    if(self->egl_library) {
        dlclose(self->egl_library);
        self->egl_library = NULL;
@@ -691,25 +516,6 @@ void gsr_egl_unload(gsr_egl *self) {
    memset(self, 0, sizeof(gsr_egl));
 }

-bool gsr_egl_process_event(gsr_egl *self) {
-    switch(gsr_egl_get_display_server(self)) {
-        case GSR_DISPLAY_SERVER_X11: {
-            if(XPending(self->x11.dpy)) {
-                XNextEvent(self->x11.dpy, &self->x11.xev);
-                return true;
-            }
-            return false;
-        }
-        case GSR_DISPLAY_SERVER_WAYLAND: {
-            // TODO: pselect on wl_display_get_fd before doing dispatch
-            const bool events_available = wl_display_dispatch_pending(self->wayland.dpy) > 0;
-            wl_display_flush(self->wayland.dpy);
-            return events_available;
-        }
-    }
-    return false;
-}
-
 void gsr_egl_swap_buffers(gsr_egl *self) {
    /* This uses less cpu than swap buffer on nvidia */
    // TODO: Do these and remove swap
@@ -717,21 +523,9 @@ void gsr_egl_swap_buffers(gsr_egl *self) {
    //self->glFinish();
    if(self->egl_display) {
        self->eglSwapBuffers(self->egl_display, self->egl_surface);
-    } else if(self->x11.window) {
-        self->glXSwapBuffers(self->x11.dpy, self->x11.window);
+    } else if(gsr_window_get_display_server(self->window) == GSR_DISPLAY_SERVER_X11) {
+        Display *display = gsr_window_get_display(self->window);
+        const Window window = (Window)gsr_window_get_window(self->window);
+        self->glXSwapBuffers(display, window);
    }
 }
-
-gsr_display_server gsr_egl_get_display_server(const gsr_egl *self) {
-    if(self->wayland.dpy)
-        return GSR_DISPLAY_SERVER_WAYLAND;
-    else
-        return GSR_DISPLAY_SERVER_X11;
-}
-
-XEvent* gsr_egl_get_event_data(gsr_egl *self) {
-    if(gsr_egl_get_display_server(self) == GSR_DISPLAY_SERVER_X11)
-        return &self->x11.xev;
-    else
-        return NULL;
-}
--- a/src/encoder/video/nvenc.c
+++ b/src/encoder/video/nvenc.c
@@ -1,6 +1,7 @@
 #include "../../../include/encoder/video/nvenc.h"
 #include "../../../include/egl.h"
 #include "../../../include/cuda.h"
+#include "../../../include/window/window.h"

 #include <libavcodec/avcodec.h>
 #include <libavutil/hwcontext_cuda.h>
@@ -128,8 +129,10 @@ static void gsr_video_encoder_nvenc_stop(gsr_video_encoder_nvenc *self, AVCodecC
 static bool gsr_video_encoder_nvenc_start(gsr_video_encoder *encoder, AVCodecContext *video_codec_context, AVFrame *frame) {
    gsr_video_encoder_nvenc *self = encoder->priv;

-    const bool overclock = gsr_egl_get_display_server(self->params.egl) == GSR_DISPLAY_SERVER_X11 ? self->params.overclock : false;
-    if(!gsr_cuda_load(&self->cuda, self->params.egl->x11.dpy, overclock)) {
+    const bool is_x11 = gsr_window_get_display_server(self->params.egl->window) == GSR_DISPLAY_SERVER_X11;
+    const bool overclock = is_x11 ? self->params.overclock : false;
+    Display *display = is_x11 ? gsr_window_get_display(self->params.egl->window) : NULL;
+    if(!gsr_cuda_load(&self->cuda, display, overclock)) {
        fprintf(stderr, "gsr error: gsr_video_encoder_nvenc_start: failed to load cuda\n");
        gsr_video_encoder_nvenc_stop(self, video_codec_context);
        return false;
--- a/src/image_writer.c
+++ b/src/image_writer.c
@@ -0,0 +1,85 @@
+#include "../include/image_writer.h"
+#include "../include/egl.h"
+
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "../external/stb_image_write.h"
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <assert.h>
+
+static unsigned int gl_create_texture(gsr_egl *egl, int width, int height, int internal_format, unsigned int format) {
+    unsigned int texture_id = 0;
+    egl->glGenTextures(1, &texture_id);
+    egl->glBindTexture(GL_TEXTURE_2D, texture_id);
+    egl->glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
+
+    egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+
+    egl->glBindTexture(GL_TEXTURE_2D, 0);
+    return texture_id;
+}
+
+/* TODO: Support hdr/10-bit */
+bool gsr_image_writer_init(gsr_image_writer *self, gsr_image_writer_source source, gsr_egl *egl, int width, int height) {
+    assert(source == GSR_IMAGE_WRITER_SOURCE_OPENGL);
+    self->source = source;
+    self->egl = egl;
+    self->width = width;
+    self->height = height;
+    self->texture = gl_create_texture(self->egl, self->width, self->height, GL_RGB8, GL_RGB); /* TODO: use GL_RGB16 instead of GL_RGB8 for hdr/10-bit */
+    if(self->texture == 0) {
+        fprintf(stderr, "gsr error: gsr_image_writer_init: failed to create texture\n");
+        return false;
+    }
+    return true;
+}
+
+void gsr_image_writer_deinit(gsr_image_writer *self) {
+    if(self->texture) {
+        self->egl->glDeleteTextures(1, &self->texture);
+        self->texture = 0;
+    }
+}
+
+bool gsr_image_writer_write_to_file(gsr_image_writer *self, const char *filepath, gsr_image_format image_format, int quality) {
+    if(quality < 1)
+        quality = 1;
+    else if(quality > 100)
+        quality = 100;
+
+    uint8_t *frame_data = malloc(self->width * self->height * 3);
+    if(!frame_data) {
+        fprintf(stderr, "gsr error: gsr_image_writer_write_to_file: failed to allocate memory for image frame\n");
+        return false;
+    }
+
+    // TODO: hdr support
+    self->egl->glBindTexture(GL_TEXTURE_2D, self->texture);
+    // We could use glGetTexSubImage, but it's only available starting from opengl 4.5
+    self->egl->glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, frame_data);
+    self->egl->glBindTexture(GL_TEXTURE_2D, 0);
+
+    self->egl->glFlush();
+    self->egl->glFinish();
+    
+    bool success = false;
+    switch(image_format) {
+        case GSR_IMAGE_FORMAT_JPEG:
+            success = stbi_write_jpg(filepath, self->width, self->height, 3, frame_data, quality);
+            break;
+        case GSR_IMAGE_FORMAT_PNG:
+            success = stbi_write_png(filepath, self->width, self->height, 3, frame_data, 0);
+            break;
+    }
+
+    if(!success)
+        fprintf(stderr, "gsr error: gsr_image_writer_write_to_file: failed to write image data to output file %s\n", filepath);
+
+    free(frame_data);
+    return success;
+}
--- a/src/main.cpp
+++ b/src/main.cpp
--- a/src/pipewire_audio.c
+++ b/src/pipewire_audio.c
@@ -0,0 +1,804 @@
+#include "../include/pipewire_audio.h"
+
+#include <pipewire/pipewire.h>
+#include <pipewire/extensions/metadata.h>
+#include <pipewire/impl-module.h>
+
+static void on_core_info_cb(void *user_data, const struct pw_core_info *info) {
+    gsr_pipewire_audio *self = user_data;
+    //fprintf(stderr, "server name: %s\n", info->name);
+}
+
+static void on_core_error_cb(void *user_data, uint32_t id, int seq, int res, const char *message) {
+    gsr_pipewire_audio *self = user_data;
+    //fprintf(stderr, "gsr error: pipewire: error id:%u seq:%d res:%d: %s\n", id, seq, res, message);
+    pw_thread_loop_signal(self->thread_loop, false);
+}
+
+static void on_core_done_cb(void *user_data, uint32_t id, int seq) {
+    gsr_pipewire_audio *self = user_data;
+    if(id == PW_ID_CORE && self->server_version_sync == seq)
+        pw_thread_loop_signal(self->thread_loop, false);
+}
+
+static const struct pw_core_events core_events = {
+    PW_VERSION_CORE_EVENTS,
+    .info = on_core_info_cb,
+    .done = on_core_done_cb,
+    .error = on_core_error_cb,
+};
+
+static gsr_pipewire_audio_node* gsr_pipewire_audio_get_node_by_name_case_insensitive(gsr_pipewire_audio *self, const char *node_name, gsr_pipewire_audio_node_type node_type) {
+    for(int i = 0; i < self->num_stream_nodes; ++i) {
+        const gsr_pipewire_audio_node *node = &self->stream_nodes[i];
+        if(node->type == node_type && strcasecmp(node->name, node_name) == 0)
+            return &self->stream_nodes[i];
+    }
+    return NULL;
+}
+
+static gsr_pipewire_audio_port* gsr_pipewire_audio_get_node_port_by_name(gsr_pipewire_audio *self, uint32_t node_id, const char *port_name) {
+    for(int i = 0; i < self->num_ports; ++i) {
+        if(self->ports[i].node_id == node_id && strcmp(self->ports[i].name, port_name) == 0)
+            return &self->ports[i];
+    }
+    return NULL;
+}
+
+static bool requested_link_matches_name_case_insensitive(const gsr_pipewire_audio_requested_link *requested_link, const char *name) {
+    for(int i = 0; i < requested_link->num_outputs; ++i) {
+        if(requested_link->outputs[i].type == GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_STANDARD && strcasecmp(requested_link->outputs[i].name, name) == 0)
+            return true;
+    }
+    return false;
+}
+
+static bool requested_link_has_type(const gsr_pipewire_audio_requested_link *requested_link, gsr_pipewire_audio_requested_type type) {
+    for(int i = 0; i < requested_link->num_outputs; ++i) {
+        if(requested_link->outputs[i].type == type)
+            return true;
+    }
+    return false;
+}
+
+static void gsr_pipewire_get_node_input_port_by_type(gsr_pipewire_audio *self, const gsr_pipewire_audio_node *input_node, gsr_pipewire_audio_link_input_type input_type,
+    const gsr_pipewire_audio_port **input_fl_port, const gsr_pipewire_audio_port **input_fr_port)
+{
+    *input_fl_port = NULL;
+    *input_fr_port = NULL;
+
+    switch(input_type) {
+        case GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_STREAM: {
+            *input_fl_port = gsr_pipewire_audio_get_node_port_by_name(self, input_node->id, "input_FL");
+            *input_fr_port = gsr_pipewire_audio_get_node_port_by_name(self, input_node->id, "input_FR");
+            break;
+        }
+        case GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_SINK: {
+            *input_fl_port = gsr_pipewire_audio_get_node_port_by_name(self, input_node->id, "playback_FL");
+            *input_fr_port = gsr_pipewire_audio_get_node_port_by_name(self, input_node->id, "playback_FR");
+            break;
+        }
+    }
+}
+
+static void gsr_pipewire_get_node_output_port_by_type(gsr_pipewire_audio *self, const gsr_pipewire_audio_node *output_node, gsr_pipewire_audio_node_type output_type,
+    const gsr_pipewire_audio_port **output_fl_port, const gsr_pipewire_audio_port **output_fr_port)
+{
+    *output_fl_port = NULL;
+    *output_fr_port = NULL;
+
+    switch(output_type) {
+        case GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT:
+            *output_fl_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "output_FL");
+            *output_fr_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "output_FR");
+            break;
+        case GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_INPUT:
+            *output_fl_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "monitor_FL");
+            *output_fr_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "monitor_FR");
+            break;
+        case GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE: {
+            *output_fl_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "monitor_FL");
+            *output_fr_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "monitor_FR");
+            if(!*output_fl_port || !*output_fr_port) {
+                *output_fl_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "capture_FL");
+                *output_fr_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "capture_FR");
+            }
+            if(!*output_fl_port || !*output_fr_port) {
+                const gsr_pipewire_audio_port *output_mono_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "monitor_MONO");
+                if(!output_mono_port)
+                    output_mono_port = gsr_pipewire_audio_get_node_port_by_name(self, output_node->id, "capture_MONO");
+
+                if(output_mono_port) {
+                    *output_fl_port = output_mono_port;
+                    *output_fr_port = output_mono_port;
+                }
+            }
+            break;
+        }
+    }
+}
+
+static void gsr_pipewire_audio_establish_link(gsr_pipewire_audio *self, const gsr_pipewire_audio_port *input_fl_port, const gsr_pipewire_audio_port *input_fr_port,
+    const gsr_pipewire_audio_port *output_fl_port, const gsr_pipewire_audio_port *output_fr_port)
+{
+    // TODO: Detect if link already exists before so we dont create these proxies when not needed
+
+    //fprintf(stderr, "linking!\n");
+    // TODO: error check and cleanup
+    {
+        struct pw_properties *props = pw_properties_new(NULL, NULL);
+        pw_properties_setf(props, PW_KEY_LINK_OUTPUT_PORT, "%u", output_fl_port->id);
+        pw_properties_setf(props, PW_KEY_LINK_INPUT_PORT, "%u", input_fl_port->id);
+        // TODO: Clean this up when removing node
+        struct pw_proxy *proxy = pw_core_create_object(self->core, "link-factory", PW_TYPE_INTERFACE_Link, PW_VERSION_LINK, &props->dict, 0);
+        //self->server_version_sync = pw_core_sync(self->core, PW_ID_CORE, self->server_version_sync);
+        pw_properties_free(props);
+    }
+
+    {
+        struct pw_properties *props = pw_properties_new(NULL, NULL);
+        pw_properties_setf(props, PW_KEY_LINK_OUTPUT_PORT, "%u", output_fr_port->id);
+        pw_properties_setf(props, PW_KEY_LINK_INPUT_PORT, "%u", input_fr_port->id);
+        // TODO: Clean this up when removing node
+        struct pw_proxy *proxy = pw_core_create_object(self->core, "link-factory", PW_TYPE_INTERFACE_Link, PW_VERSION_LINK, &props->dict, 0);
+        //self->server_version_sync = pw_core_sync(self->core, PW_ID_CORE, self->server_version_sync);
+        pw_properties_free(props);
+    }
+}
+
+static void gsr_pipewire_audio_create_link(gsr_pipewire_audio *self, const gsr_pipewire_audio_requested_link *requested_link) {
+    const gsr_pipewire_audio_node_type requested_link_node_type = requested_link->input_type == GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_STREAM ? GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_INPUT : GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE;
+    const gsr_pipewire_audio_node *stream_input_node = gsr_pipewire_audio_get_node_by_name_case_insensitive(self, requested_link->input_name, requested_link_node_type);
+    if(!stream_input_node)
+        return;
+
+    const gsr_pipewire_audio_port *input_fl_port = NULL;
+    const gsr_pipewire_audio_port *input_fr_port = NULL;
+    gsr_pipewire_get_node_input_port_by_type(self, stream_input_node, requested_link->input_type, &input_fl_port, &input_fr_port);
+    if(!input_fl_port || !input_fr_port)
+        return;
+
+    for(int i = 0; i < self->num_stream_nodes; ++i) {
+        const gsr_pipewire_audio_node *output_node = &self->stream_nodes[i];
+        if(output_node->type != requested_link->output_type)
+            continue;
+
+        const bool requested_link_matches_app = requested_link_matches_name_case_insensitive(requested_link, output_node->name);
+        if(requested_link->inverted) {
+            if(requested_link_matches_app)
+                continue;
+        } else {
+            if(!requested_link_matches_app)
+                continue;
+        }
+
+        const gsr_pipewire_audio_port *output_fl_port = NULL;
+        const gsr_pipewire_audio_port *output_fr_port = NULL;
+        gsr_pipewire_get_node_output_port_by_type(self, output_node, requested_link->output_type, &output_fl_port, &output_fr_port);
+        if(!output_fl_port || !output_fr_port)
+            continue;
+
+        gsr_pipewire_audio_establish_link(self, input_fl_port, input_fr_port, output_fl_port, output_fr_port);
+    }
+}
+
+static void gsr_pipewire_audio_create_links(gsr_pipewire_audio *self) {
+    for(int i = 0; i < self->num_requested_links; ++i) {
+        gsr_pipewire_audio_create_link(self, &self->requested_links[i]);
+    }
+}
+
+static void gsr_pipewire_audio_create_link_for_default_devices(gsr_pipewire_audio *self, const gsr_pipewire_audio_requested_link *requested_link, gsr_pipewire_audio_requested_type default_device_type) {
+    if(default_device_type == GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_STANDARD)
+        return;
+
+    const char *device_name = default_device_type == GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT ? self->default_output_device_name : self->default_input_device_name;
+    if(device_name[0] == '\0')
+        return;
+
+    if(!requested_link_has_type(requested_link, default_device_type))
+        return;
+
+    const gsr_pipewire_audio_node_type requested_link_node_type = requested_link->input_type == GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_STREAM ? GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_INPUT : GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE;
+    const gsr_pipewire_audio_node *stream_input_node = gsr_pipewire_audio_get_node_by_name_case_insensitive(self, requested_link->input_name, requested_link_node_type);
+    if(!stream_input_node)
+        return;
+
+    const gsr_pipewire_audio_port *input_fl_port = NULL;
+    const gsr_pipewire_audio_port *input_fr_port = NULL;
+    gsr_pipewire_get_node_input_port_by_type(self, stream_input_node, requested_link->input_type, &input_fl_port, &input_fr_port);
+    if(!input_fl_port || !input_fr_port)
+        return;
+
+    const gsr_pipewire_audio_node *stream_output_node = gsr_pipewire_audio_get_node_by_name_case_insensitive(self, device_name, GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE);
+    if(!stream_output_node)
+        return;
+
+    const gsr_pipewire_audio_port *output_fl_port = NULL;
+    const gsr_pipewire_audio_port *output_fr_port = NULL;
+    gsr_pipewire_get_node_output_port_by_type(self, stream_output_node, requested_link->output_type, &output_fl_port, &output_fr_port);
+    if(!output_fl_port || !output_fr_port)
+        return;
+
+    gsr_pipewire_audio_establish_link(self, input_fl_port, input_fr_port, output_fl_port, output_fr_port);
+    //fprintf(stderr, "establishing a link from %u to %u\n", stream_output_node->id, stream_input_node->id);
+}
+
+static void gsr_pipewire_audio_create_links_for_default_devices(gsr_pipewire_audio *self, gsr_pipewire_audio_requested_type default_device_type) {
+    for(int i = 0; i < self->num_requested_links; ++i) {
+        gsr_pipewire_audio_create_link_for_default_devices(self, &self->requested_links[i], default_device_type);
+    }
+}
+
+static void gsr_pipewire_audio_destroy_links_by_output_to_input(gsr_pipewire_audio *self, uint32_t output_node_id, uint32_t input_node_id) {
+    for(int i = 0; i < self->num_links; ++i) {
+        if(self->links[i].output_node_id == output_node_id && self->links[i].input_node_id == input_node_id)
+            pw_registry_destroy(self->registry, self->links[i].id);
+    }
+}
+
+static void gsr_pipewire_destroy_default_device_link(gsr_pipewire_audio *self, const gsr_pipewire_audio_requested_link *requested_link, gsr_pipewire_audio_requested_type default_device_type) {
+    if(default_device_type == GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_STANDARD)
+        return;
+
+    const char *device_name = default_device_type == GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT ? self->default_output_device_name : self->default_input_device_name;
+    if(device_name[0] == '\0')
+        return;
+
+    if(!requested_link_has_type(requested_link, default_device_type))
+        return;
+
+    /* default_output and default_input can be the same device. In that case both are the same link and we dont want to remove the link */
+    const gsr_pipewire_audio_requested_type opposite_device_type = default_device_type == GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT ? GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_INPUT : GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT;
+    const char *opposite_device_name = opposite_device_type == GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT ? self->default_output_device_name : self->default_input_device_name;
+    if(requested_link_has_type(requested_link, opposite_device_type) && strcmp(device_name, opposite_device_name) == 0)
+        return;
+
+    const gsr_pipewire_audio_node_type requested_link_node_type = requested_link->input_type == GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_STREAM ? GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_INPUT : GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE;
+    const gsr_pipewire_audio_node *stream_input_node = gsr_pipewire_audio_get_node_by_name_case_insensitive(self, requested_link->input_name, requested_link_node_type);
+    if(!stream_input_node)
+        return;
+
+    const gsr_pipewire_audio_node *stream_output_node = gsr_pipewire_audio_get_node_by_name_case_insensitive(self, device_name, GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE);
+    if(!stream_output_node)
+        return;
+
+    if(requested_link_matches_name_case_insensitive(requested_link, stream_output_node->name))
+        return;
+
+    gsr_pipewire_audio_destroy_links_by_output_to_input(self, stream_output_node->id, stream_input_node->id);
+    //fprintf(stderr, "destroying a link from %u to %u\n", stream_output_node->id, stream_input_node->id);
+}
+
+static void gsr_pipewire_destroy_default_device_links(gsr_pipewire_audio *self, gsr_pipewire_audio_requested_type default_device_type) {
+    for(int i = 0; i < self->num_requested_links; ++i) {
+        gsr_pipewire_destroy_default_device_link(self, &self->requested_links[i], default_device_type);
+    }
+}
+
+static bool json_get_value(const char *json_str, const char *key, char *value, size_t value_size) {
+    char key_full[32];
+    const int key_full_size = snprintf(key_full, sizeof(key_full), "\"%s\":", key);
+    const char *start = strstr(json_str, key_full);
+    if(!start)
+        return false;
+    
+    start += key_full_size;
+    const char *value_start = strchr(start, '"');
+    if(!value_start)
+        return false;
+
+    value_start += 1;
+    const char *value_end = strchr(value_start, '"');
+    if(!value_end)
+        return false;
+
+    snprintf(value, value_size, "%.*s", (int)(value_end - value_start), value_start);
+    return true;
+}
+
+static int on_metadata_property_cb(void *data, uint32_t id, const char *key, const char *type, const char *value) {
+	(void)type;
+    gsr_pipewire_audio *self = data;
+
+	if(id == PW_ID_CORE && key && value) {
+        char value_decoded[128];
+        if(strcmp(key, "default.audio.sink") == 0) {
+            if(json_get_value(value, "name", value_decoded, sizeof(value_decoded)) && strcmp(value_decoded, self->default_output_device_name) != 0) {
+                gsr_pipewire_destroy_default_device_links(self, GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT);
+                snprintf(self->default_output_device_name, sizeof(self->default_output_device_name), "%s", value_decoded);
+                gsr_pipewire_audio_create_links_for_default_devices(self, GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT);
+            }
+        } else if(strcmp(key, "default.audio.source") == 0) {
+            if(json_get_value(value, "name", value_decoded, sizeof(value_decoded)) && strcmp(value_decoded, self->default_input_device_name) != 0) {
+                gsr_pipewire_destroy_default_device_links(self, GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_INPUT);
+                snprintf(self->default_input_device_name, sizeof(self->default_input_device_name), "%s", value_decoded);
+                gsr_pipewire_audio_create_links_for_default_devices(self, GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_INPUT);
+            }
+        }
+	}
+
+	return 0;
+}
+
+static const struct pw_metadata_events metadata_events = {
+	PW_VERSION_METADATA_EVENTS,
+	.property = on_metadata_property_cb,
+};
+
+static void on_metadata_proxy_removed_cb(void *data) {
+    gsr_pipewire_audio *self = data;
+    if(self->metadata_proxy) {
+        // TODO:
+        //pw_proxy_destroy(self->metadata_proxy);
+        //self->metadata_proxy = NULL;
+    }
+}
+
+static void on_metadata_proxy_destroy_cb(void *data) {
+	gsr_pipewire_audio *self = data;
+
+    // TODO:
+	//spa_hook_remove(&metadata->metadata_listener);
+	//spa_hook_remove(&metadata->proxy_listener);
+	//spa_zero(metadata->metadata_listener);
+	//spa_zero(metadata->proxy_listener);
+
+	//self->metadata_proxy = NULL;
+}
+
+static const struct pw_proxy_events metadata_proxy_events = {
+	PW_VERSION_PROXY_EVENTS,
+	.removed = on_metadata_proxy_removed_cb,
+	.destroy = on_metadata_proxy_destroy_cb,
+};
+
+static bool gsr_pipewire_audio_listen_on_metadata(gsr_pipewire_audio *self, uint32_t id) {
+    if(self->metadata_proxy) {
+        pw_proxy_destroy(self->metadata_proxy);
+        self->metadata_proxy = NULL;
+    }
+
+    self->metadata_proxy = pw_registry_bind(self->registry, id, PW_TYPE_INTERFACE_Metadata, PW_VERSION_METADATA, 0);
+    if(!self->metadata_proxy) {
+        fprintf(stderr, "gsr error: gsr_pipewire_audio_listen_on_metadata: failed to bind to registry\n");
+        return false;
+    }
+
+    // TODO:
+    pw_proxy_add_object_listener(self->metadata_proxy, &self->metadata_listener, &metadata_events, self);
+
+    //struct spa_hook proxy_listener;
+    //pw_proxy_add_listener(self->metadata_proxy, &proxy_listener, &metadata_proxy_events, self);
+    return true;
+}
+
+static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
+                  const char *type, uint32_t version,
+                  const struct spa_dict *props)
+{
+    //fprintf(stderr, "add: id: %d, type: %s\n", (int)id, type);
+    if(!props || !type)
+        return;
+
+    //pw_properties_new_dict(props);
+
+    gsr_pipewire_audio *self = (gsr_pipewire_audio*)data;
+    if(strcmp(type, PW_TYPE_INTERFACE_Node) == 0) {
+        const char *node_name = spa_dict_lookup(props, PW_KEY_NODE_NAME);
+        const char *media_class = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
+        //fprintf(stderr, "  node id: %u, node name: %s, media class: %s\n", id, node_name, media_class);
+        const bool is_stream_output = media_class && strcmp(media_class, "Stream/Output/Audio") == 0;
+        const bool is_stream_input = media_class && strcmp(media_class, "Stream/Input/Audio") == 0;
+        const bool is_sink = media_class && strcmp(media_class, "Audio/Sink") == 0;
+        const bool is_source = media_class && strcmp(media_class, "Audio/Source") == 0;
+        if(self->num_stream_nodes < GSR_PIPEWIRE_AUDIO_MAX_STREAM_NODES && node_name && (is_stream_output || is_stream_input || is_sink || is_source)) {
+            //const char *application_binary = spa_dict_lookup(props, PW_KEY_APP_PROCESS_BINARY);
+            //const char *application_name = spa_dict_lookup(props, PW_KEY_APP_NAME);
+            //fprintf(stderr, "  node name: %s, app binary: %s, app name: %s\n", node_name, application_binary, application_name);
+
+            char *node_name_copy = strdup(node_name);
+            if(node_name_copy) {
+                self->stream_nodes[self->num_stream_nodes].id = id;
+                self->stream_nodes[self->num_stream_nodes].name = node_name_copy;
+                if(is_stream_output)
+                    self->stream_nodes[self->num_stream_nodes].type = GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT;
+                else if(is_stream_input)
+                    self->stream_nodes[self->num_stream_nodes].type = GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_INPUT;
+                else if(is_sink || is_source)
+                    self->stream_nodes[self->num_stream_nodes].type = GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE;
+                ++self->num_stream_nodes;
+
+                gsr_pipewire_audio_create_links(self);
+            }
+        } else if(self->num_stream_nodes >= GSR_PIPEWIRE_AUDIO_MAX_STREAM_NODES) {
+            fprintf(stderr, "gsr error: reached the maximum amount of audio stream nodes\n");
+        }
+    } else if(strcmp(type, PW_TYPE_INTERFACE_Port) == 0) {
+        const char *port_name = spa_dict_lookup(props, PW_KEY_PORT_NAME);
+
+        const char *port_direction = spa_dict_lookup(props, PW_KEY_PORT_DIRECTION);
+        gsr_pipewire_audio_port_direction direction = -1;
+        if(port_direction && strcmp(port_direction, "in") == 0)
+            direction = GSR_PIPEWIRE_AUDIO_PORT_DIRECTION_INPUT;
+        else if(port_direction && strcmp(port_direction, "out") == 0)
+            direction = GSR_PIPEWIRE_AUDIO_PORT_DIRECTION_OUTPUT;
+
+        const char *node_id = spa_dict_lookup(props, PW_KEY_NODE_ID);
+        const int node_id_num = node_id ? atoi(node_id) : 0;
+
+        if(self->num_ports < GSR_PIPEWIRE_AUDIO_MAX_PORTS && port_name && direction >= 0 && node_id_num > 0) {
+            //fprintf(stderr, "  port name: %s, node id: %d, direction: %s\n", port_name, node_id_num, port_direction);
+            char *port_name_copy = strdup(port_name);
+            if(port_name_copy) {
+                //fprintf(stderr, "  port id: %u, node id: %u, name: %s\n", id, node_id_num, port_name_copy);
+                self->ports[self->num_ports].id = id;
+                self->ports[self->num_ports].node_id = node_id_num;
+                self->ports[self->num_ports].direction = direction;
+                self->ports[self->num_ports].name = port_name_copy;
+                ++self->num_ports;
+
+                gsr_pipewire_audio_create_links(self);
+            }
+        } else if(self->num_ports >= GSR_PIPEWIRE_AUDIO_MAX_PORTS) {
+            fprintf(stderr, "gsr error: reached the maximum amount of audio ports\n");
+        }
+    } else if(strcmp(type, PW_TYPE_INTERFACE_Link) == 0) {
+        const char *output_node = spa_dict_lookup(props, PW_KEY_LINK_OUTPUT_NODE);
+        const char *input_node = spa_dict_lookup(props, PW_KEY_LINK_INPUT_NODE);
+
+        const uint32_t output_node_id_num = output_node ? atoi(output_node) : 0;
+        const uint32_t input_node_id_num = input_node ? atoi(input_node) : 0;
+        if(self->num_links < GSR_PIPEWIRE_AUDIO_MAX_LINKS && output_node_id_num > 0 && input_node_id_num > 0) {
+            //fprintf(stderr, "  new link (%u): %u -> %u\n", id, output_node_id_num, input_node_id_num);
+            self->links[self->num_links].id = id;
+            self->links[self->num_links].output_node_id = output_node_id_num;
+            self->links[self->num_links].input_node_id = input_node_id_num;
+            ++self->num_links;
+        } else if(self->num_ports >= GSR_PIPEWIRE_AUDIO_MAX_LINKS) {
+            fprintf(stderr, "gsr error: reached the maximum amount of audio links\n");
+        }
+    } else if(strcmp(type, PW_TYPE_INTERFACE_Metadata) == 0) {
+        const char *name = spa_dict_lookup(props, PW_KEY_METADATA_NAME);
+        if(name && strcmp(name, "default") == 0)
+            gsr_pipewire_audio_listen_on_metadata(self, id);
+    }
+}
+
+static bool gsr_pipewire_audio_remove_node_by_id(gsr_pipewire_audio *self, uint32_t node_id) {
+    for(int i = 0; i < self->num_stream_nodes; ++i) {
+        if(self->stream_nodes[i].id != node_id)
+            continue;
+
+        free(self->stream_nodes[i].name);
+        self->stream_nodes[i] = self->stream_nodes[self->num_stream_nodes - 1];
+        --self->num_stream_nodes;
+        return true;
+    }
+    return false;
+}
+
+static bool gsr_pipewire_audio_remove_port_by_id(gsr_pipewire_audio *self, uint32_t port_id) {
+    for(int i = 0; i < self->num_ports; ++i) {
+        if(self->ports[i].id != port_id)
+            continue;
+
+        free(self->ports[i].name);
+        self->ports[i] = self->ports[self->num_ports - 1];
+        --self->num_ports;
+        return true;
+    }
+    return false;
+}
+
+static bool gsr_pipewire_audio_remove_link_by_id(gsr_pipewire_audio *self, uint32_t link_id) {
+    for(int i = 0; i < self->num_links; ++i) {
+        if(self->links[i].id != link_id)
+            continue;
+
+        self->links[i] = self->links[self->num_links - 1];
+        --self->num_links;
+        return true;
+    }
+    return false;
+}
+
+static void registry_event_global_remove(void *data, uint32_t id) {
+    //fprintf(stderr, "remove: %d\n", (int)id);
+    gsr_pipewire_audio *self = (gsr_pipewire_audio*)data;
+    if(gsr_pipewire_audio_remove_node_by_id(self, id)) {
+        //fprintf(stderr, "removed node\n");
+        return;
+    }
+
+    if(gsr_pipewire_audio_remove_port_by_id(self, id)) {
+        //fprintf(stderr, "removed port\n");
+        return;
+    }
+
+    if(gsr_pipewire_audio_remove_link_by_id(self, id)) {
+        //fprintf(stderr, "removed link\n");
+        return;
+    }
+}
+
+static const struct pw_registry_events registry_events = {
+    PW_VERSION_REGISTRY_EVENTS,
+    .global = registry_event_global,
+    .global_remove = registry_event_global_remove,
+};
+
+bool gsr_pipewire_audio_init(gsr_pipewire_audio *self) {
+    memset(self, 0, sizeof(*self));
+
+    pw_init(NULL, NULL);
+    
+    self->thread_loop = pw_thread_loop_new("gsr screen capture", NULL);
+    if(!self->thread_loop) {
+        fprintf(stderr, "gsr error: gsr_pipewire_audio_init: failed to create pipewire thread\n");
+        gsr_pipewire_audio_deinit(self);
+        return false;
+    }
+
+    self->context = pw_context_new(pw_thread_loop_get_loop(self->thread_loop), NULL, 0);
+    if(!self->context) {
+        fprintf(stderr, "gsr error: gsr_pipewire_audio_init: failed to create pipewire context\n");
+        gsr_pipewire_audio_deinit(self);
+        return false;
+    }
+
+    pw_context_load_module(self->context, "libpipewire-module-link-factory", NULL, NULL);
+
+    pw_thread_loop_lock(self->thread_loop);
+
+    if(pw_thread_loop_start(self->thread_loop) < 0) {
+        fprintf(stderr, "gsr error: gsr_pipewire_audio_init: failed to start thread\n");
+        pw_thread_loop_unlock(self->thread_loop);
+        gsr_pipewire_audio_deinit(self);
+        return false;
+    }
+
+    self->core = pw_context_connect(self->context, pw_properties_new(PW_KEY_REMOTE_NAME, NULL, NULL), 0);
+    if(!self->core) {
+        pw_thread_loop_unlock(self->thread_loop);
+        gsr_pipewire_audio_deinit(self);
+        return false;
+    }
+
+    // TODO: Error check
+    pw_core_add_listener(self->core, &self->core_listener, &core_events, self);
+
+    self->registry = pw_core_get_registry(self->core, PW_VERSION_REGISTRY, 0);
+    pw_registry_add_listener(self->registry, &self->registry_listener, &registry_events, self);
+
+    self->server_version_sync = pw_core_sync(self->core, PW_ID_CORE, 0);
+    pw_thread_loop_wait(self->thread_loop);
+    pw_thread_loop_unlock(self->thread_loop);
+    return true;
+}
+
+void gsr_pipewire_audio_deinit(gsr_pipewire_audio *self) {
+    if(self->thread_loop) {
+        //pw_thread_loop_wait(self->thread_loop);
+        pw_thread_loop_stop(self->thread_loop);
+    }
+
+    for(int i = 0; i < self->num_virtual_sink_proxies; ++i) {
+        if(self->virtual_sink_proxies[i]) {
+            pw_proxy_destroy(self->virtual_sink_proxies[i]);
+            self->virtual_sink_proxies[i] = NULL;
+        }
+    }
+    self->num_virtual_sink_proxies = 0;
+
+    if(self->metadata_proxy) {
+        pw_proxy_destroy(self->metadata_proxy);
+        self->metadata_proxy = NULL;
+    }
+
+    if(self->core) {
+        pw_core_disconnect(self->core);
+        self->core = NULL;
+    }
+
+    if(self->context) {
+        pw_context_destroy(self->context);
+        self->context = NULL;
+    }
+
+    if(self->thread_loop) {
+        pw_thread_loop_destroy(self->thread_loop);
+        self->thread_loop = NULL;
+    }
+
+    for(int i = 0; i < self->num_stream_nodes; ++i) {
+        free(self->stream_nodes[i].name);
+    }
+    self->num_stream_nodes = 0;
+
+    for(int i = 0; i < self->num_ports; ++i) {
+        free(self->ports[i].name);
+    }
+    self->num_ports = 0;
+
+    self->num_links = 0;
+
+    for(int i = 0; i < self->num_requested_links; ++i) {
+        for(int j = 0; j < self->requested_links[i].num_outputs; ++j) {
+            free(self->requested_links[i].outputs[j].name);
+        }
+        free(self->requested_links[i].outputs);
+        free(self->requested_links[i].input_name);
+    }
+    self->num_requested_links = 0;
+
+#if PW_CHECK_VERSION(0, 3, 49)
+    pw_deinit();
+#endif
+}
+
+static struct pw_properties* gsr_pipewire_create_null_audio_sink(const char *name) {
+    char props_str[512];
+    snprintf(props_str, sizeof(props_str), "{ factory.name=support.null-audio-sink node.name=\"%s\" media.class=Audio/Sink object.linger=false audio.position=[FL FR] monitor.channel-volumes=true monitor.passthrough=true adjust_time=0 node.description=gsr-app-sink slaves=\"\" }", name);
+    struct pw_properties *props = pw_properties_new_string(props_str);
+    if(!props) {
+        fprintf(stderr, "gsr error: gsr_pipewire_create_null_audio_sink: failed to create virtual sink properties\n");
+        return NULL;
+    }
+    return props;
+}
+
+bool gsr_pipewire_audio_create_virtual_sink(gsr_pipewire_audio *self, const char *name) {
+    if(self->num_virtual_sink_proxies == GSR_PIPEWIRE_AUDIO_MAX_VIRTUAL_SINKS) {
+        fprintf(stderr, "gsr error: gsr_pipewire_audio_create_virtual_sink: reached max number of virtual sinks\n");
+        return false;
+    }
+
+    pw_thread_loop_lock(self->thread_loop);
+
+    struct pw_properties *virtual_sink_props = gsr_pipewire_create_null_audio_sink(name);
+    if(!virtual_sink_props) {
+        pw_thread_loop_unlock(self->thread_loop);
+        return false;
+    }
+
+    struct pw_proxy *virtual_sink_proxy = pw_core_create_object(self->core, "adapter", PW_TYPE_INTERFACE_Node, PW_VERSION_NODE, &virtual_sink_props->dict, 0);
+    // TODO:
+    // If these are done then the above needs sizeof(*self) as the last argument
+    //pw_proxy_add_object_listener(virtual_sink_proxy, &pd->object_listener, &node_events, self);
+	//pw_proxy_add_listener(virtual_sink_proxy, &pd->proxy_listener, &proxy_events, self);
+    // TODO: proxy
+    pw_properties_free(virtual_sink_props);
+    if(!virtual_sink_proxy) {
+        fprintf(stderr, "gsr error: gsr_pipewire_audio_create_virtual_sink: failed to create virtual sink\n");
+        pw_thread_loop_unlock(self->thread_loop);
+        return false;
+    }
+
+    self->server_version_sync = pw_core_sync(self->core, PW_ID_CORE, self->server_version_sync);
+    pw_thread_loop_wait(self->thread_loop);
+    pw_thread_loop_unlock(self->thread_loop);
+
+    self->virtual_sink_proxies[self->num_virtual_sink_proxies] = virtual_sink_proxy;
+    ++self->num_virtual_sink_proxies;
+
+    return true;
+}
+
+static bool string_remove_suffix(char *str, const char *suffix) {
+    int str_len = strlen(str);
+    int suffix_len = strlen(suffix);
+    if(str_len >= suffix_len && memcmp(str + str_len - suffix_len, suffix, suffix_len) == 0) {
+        str[str_len - suffix_len] = '\0';
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool gsr_pipewire_audio_add_links_to_output(gsr_pipewire_audio *self, const char **output_names, int num_output_names, const char *input_name, gsr_pipewire_audio_node_type output_type, gsr_pipewire_audio_link_input_type input_type, bool inverted) {
+    if(self->num_requested_links >= GSR_PIPEWIRE_AUDIO_MAX_REQUESTED_LINKS) {
+        fprintf(stderr, "gsr error: reached the maximum amount of audio links\n");
+        return false;
+    }
+    
+    gsr_pipewire_audio_requested_output *outputs = calloc(num_output_names, sizeof(gsr_pipewire_audio_requested_output));
+    if(!outputs)
+        return false;
+
+    char *input_name_copy = strdup(input_name);
+    if(!input_name_copy)
+        goto error;
+
+    if(input_type == GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_SINK)
+        string_remove_suffix(input_name_copy, ".monitor");
+
+    for(int i = 0; i < num_output_names; ++i) {
+        outputs[i].name = strdup(output_names[i]);
+        if(!outputs[i].name)
+            goto error;
+
+        outputs[i].type = GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_STANDARD;
+        if(output_type == GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE) {
+            string_remove_suffix(outputs[i].name, ".monitor");
+
+            if(strcmp(outputs[i].name, "default_output") == 0)
+                outputs[i].type = GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT;
+            else if(strcmp(outputs[i].name, "default_input") == 0)
+                outputs[i].type = GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_INPUT;
+            else
+                outputs[i].type = GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_STANDARD;
+        }
+    }
+
+    pw_thread_loop_lock(self->thread_loop);
+    self->requested_links[self->num_requested_links].outputs = outputs;
+    self->requested_links[self->num_requested_links].num_outputs = num_output_names;
+    self->requested_links[self->num_requested_links].input_name = input_name_copy;
+    self->requested_links[self->num_requested_links].output_type = output_type;
+    self->requested_links[self->num_requested_links].input_type = input_type;
+    self->requested_links[self->num_requested_links].inverted = inverted;
+    ++self->num_requested_links;
+    gsr_pipewire_audio_create_link(self, &self->requested_links[self->num_requested_links - 1]);
+    gsr_pipewire_audio_create_link_for_default_devices(self, &self->requested_links[self->num_requested_links - 1], GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_OUTPUT);
+    gsr_pipewire_audio_create_link_for_default_devices(self, &self->requested_links[self->num_requested_links - 1], GSR_PIPEWIRE_AUDIO_REQUESTED_TYPE_DEFAULT_INPUT);
+    pw_thread_loop_unlock(self->thread_loop);
+
+    return true;
+
+    error:
+    free(input_name_copy);
+    for(int i = 0; i < num_output_names; ++i) {
+        free(outputs[i].name);
+    }
+    free(outputs);
+    return false;
+}
+
+bool gsr_pipewire_audio_add_link_from_apps_to_stream(gsr_pipewire_audio *self, const char **app_names, int num_app_names, const char *stream_name_input) {
+    return gsr_pipewire_audio_add_links_to_output(self, app_names, num_app_names, stream_name_input, GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT, GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_STREAM, false);
+}
+
+bool gsr_pipewire_audio_add_link_from_apps_to_stream_inverted(gsr_pipewire_audio *self, const char **app_names, int num_app_names, const char *stream_name_input) {
+    return gsr_pipewire_audio_add_links_to_output(self, app_names, num_app_names, stream_name_input, GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT, GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_STREAM, true);
+}
+
+bool gsr_pipewire_audio_add_link_from_apps_to_sink(gsr_pipewire_audio *self, const char **app_names, int num_app_names, const char *sink_name_input) {
+    return gsr_pipewire_audio_add_links_to_output(self, app_names, num_app_names, sink_name_input, GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT, GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_SINK, false);
+}
+
+bool gsr_pipewire_audio_add_link_from_apps_to_sink_inverted(gsr_pipewire_audio *self, const char **app_names, int num_app_names, const char *sink_name_input) {
+    return gsr_pipewire_audio_add_links_to_output(self, app_names, num_app_names, sink_name_input, GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT, GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_SINK, true);
+}
+
+bool gsr_pipewire_audio_add_link_from_sources_to_sink(gsr_pipewire_audio *self, const char **source_names, int num_source_names, const char *sink_name_input) {
+    return gsr_pipewire_audio_add_links_to_output(self, source_names, num_source_names, sink_name_input, GSR_PIPEWIRE_AUDIO_NODE_TYPE_SINK_OR_SOURCE, GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_SINK, false);
+}
+
+void gsr_pipewire_audio_for_each_app(gsr_pipewire_audio *self, gsr_pipewire_audio_app_query_callback callback, void *userdata) {
+    pw_thread_loop_lock(self->thread_loop);
+    for(int i = 0; i < self->num_stream_nodes; ++i) {
+        const gsr_pipewire_audio_node *node = &self->stream_nodes[i];
+        if(node->type != GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT)
+            continue;
+
+        bool duplicate_app = false;
+        for(int j = i - 1; j >= 0; --j) {
+            const gsr_pipewire_audio_node *prev_node = &self->stream_nodes[j];
+            if(prev_node->type != GSR_PIPEWIRE_AUDIO_NODE_TYPE_STREAM_OUTPUT)
+                continue;
+
+            if(strcasecmp(node->name, prev_node->name) == 0) {
+                duplicate_app = true;
+                break;
+            }
+        }
+
+        if(duplicate_app)
+            continue;
+
+        if(!callback(node->name, userdata))
+            break;
+    }
+    pw_thread_loop_unlock(self->thread_loop);
+}
--- a/src/pipewire_video.c
+++ b/src/pipewire_video.c
@@ -1,4 +1,4 @@
-#include "../include/pipewire.h"
+#include "../include/pipewire_video.h"
 #include "../include/egl.h"
 #include "../include/utils.h"

@@ -13,8 +13,8 @@

 /* This code is partially based on xr-video-player pipewire implementation which is based on obs-studio's pipewire implementation */

-/* TODO: Make gsr_pipewire_init asynchronous */
-/* TODO: Support 10-bit capture (hdr) when pipewire supports it */
+/* TODO: Make gsr_pipewire_video_init asynchronous */
+/* TODO: Support hdr when pipewire supports it */
 /* TODO: Test all of the image formats */

 #ifndef SPA_POD_PROP_FLAG_DONT_FIXATE
@@ -25,12 +25,12 @@
    (sizeof(struct spa_meta_cursor) + sizeof(struct spa_meta_bitmap) + \
     width * height * 4)

-static bool parse_pw_version(gsr_pipewire_data_version *dst, const char *version) {
+static bool parse_pw_version(gsr_pipewire_video_data_version *dst, const char *version) {
    const int n_matches = sscanf(version, "%d.%d.%d", &dst->major, &dst->minor, &dst->micro);
    return n_matches == 3;
 }

-static bool check_pw_version(const gsr_pipewire_data_version *pw_version, int major, int minor, int micro) {
+static bool check_pw_version(const gsr_pipewire_video_data_version *pw_version, int major, int minor, int micro) {
    if (pw_version->major != major)
        return pw_version->major > major;
    if (pw_version->minor != minor)
@@ -38,7 +38,7 @@ static bool check_pw_version(const gsr_pipewire_data_version *pw_version, int ma
    return pw_version->micro >= micro;
 }

-static void update_pw_versions(gsr_pipewire *self, const char *version) {
+static void update_pw_versions(gsr_pipewire_video *self, const char *version) {
    fprintf(stderr, "gsr info: pipewire: server version: %s\n", version);
    fprintf(stderr, "gsr info: pipewire: library version: %s\n", pw_get_library_version());
    fprintf(stderr, "gsr info: pipewire: header version: %s\n", pw_get_headers_version());
@@ -47,32 +47,38 @@ static void update_pw_versions(gsr_pipewire *self, const char *version) {
 }

 static void on_core_info_cb(void *user_data, const struct pw_core_info *info) {
-    gsr_pipewire *self = user_data;
+    gsr_pipewire_video *self = user_data;
    update_pw_versions(self, info->version);
 }

 static void on_core_error_cb(void *user_data, uint32_t id, int seq, int res, const char *message) {
-    gsr_pipewire *self = user_data;
+    gsr_pipewire_video *self = user_data;
    fprintf(stderr, "gsr error: pipewire: error id:%u seq:%d res:%d: %s\n", id, seq, res, message);
    pw_thread_loop_signal(self->thread_loop, false);
 }

 static void on_core_done_cb(void *user_data, uint32_t id, int seq) {
-    gsr_pipewire *self = user_data;
+    gsr_pipewire_video *self = user_data;
    if (id == PW_ID_CORE && self->server_version_sync == seq)
        pw_thread_loop_signal(self->thread_loop, false);
 }

 static bool is_cursor_format_supported(const enum spa_video_format format) {
    switch(format) {
-        case SPA_VIDEO_FORMAT_RGBx: return true;
-        case SPA_VIDEO_FORMAT_BGRx: return true;
-        case SPA_VIDEO_FORMAT_xRGB: return true;
-        case SPA_VIDEO_FORMAT_xBGR: return true;
-        case SPA_VIDEO_FORMAT_RGBA: return true;
-        case SPA_VIDEO_FORMAT_BGRA: return true;
-        case SPA_VIDEO_FORMAT_ARGB: return true;
-        case SPA_VIDEO_FORMAT_ABGR: return true;
+        case SPA_VIDEO_FORMAT_RGBx:       return true;
+        case SPA_VIDEO_FORMAT_BGRx:       return true;
+        case SPA_VIDEO_FORMAT_RGBA:       return true;
+        case SPA_VIDEO_FORMAT_BGRA:       return true;
+        case SPA_VIDEO_FORMAT_RGB:        return true;
+        case SPA_VIDEO_FORMAT_BGR:        return true;
+        case SPA_VIDEO_FORMAT_ARGB:       return true;
+        case SPA_VIDEO_FORMAT_ABGR:       return true;
+#if PW_CHECK_VERSION(0, 3, 41)
+        case SPA_VIDEO_FORMAT_xRGB_210LE: return true;
+        case SPA_VIDEO_FORMAT_xBGR_210LE: return true;
+        case SPA_VIDEO_FORMAT_ARGB_210LE: return true;
+        case SPA_VIDEO_FORMAT_ABGR_210LE: return true;
+#endif
        default:                    break;
    }
    return false;
@@ -86,7 +92,7 @@ static const struct pw_core_events core_events = {
 };

 static void on_process_cb(void *user_data) {
-    gsr_pipewire *self = user_data;
+    gsr_pipewire_video *self = user_data;
    struct spa_meta_cursor *cursor = NULL;
    //struct spa_meta *video_damage = NULL;

@@ -122,8 +128,8 @@ static void on_process_cb(void *user_data) {
        }

        self->dmabuf_num_planes = buffer->n_datas;
-        if(self->dmabuf_num_planes > GSR_PIPEWIRE_DMABUF_MAX_PLANES)
-            self->dmabuf_num_planes = GSR_PIPEWIRE_DMABUF_MAX_PLANES;
+        if(self->dmabuf_num_planes > GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES)
+            self->dmabuf_num_planes = GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES;

        for(size_t i = 0; i < self->dmabuf_num_planes; ++i) {
            self->dmabuf_data[i].fd = dup(buffer->datas[i].fd);
@@ -206,7 +212,7 @@ read_metadata:
 }

 static void on_param_changed_cb(void *user_data, uint32_t id, const struct spa_pod *param) {
-    gsr_pipewire *self = user_data;
+    gsr_pipewire_video *self = user_data;

    if (!param || id != SPA_PARAM_Format)
        return;
@@ -276,7 +282,7 @@ static void on_param_changed_cb(void *user_data, uint32_t id, const struct spa_p

 static void on_state_changed_cb(void *user_data, enum pw_stream_state old, enum pw_stream_state state, const char *error) {
    (void)old;
-    gsr_pipewire *self = user_data;
+    gsr_pipewire_video *self = user_data;

    fprintf(stderr, "gsr info: pipewire: stream %p state: \"%s\" (error: %s)\n",
         (void*)self->stream, pw_stream_state_as_string(state),
@@ -291,7 +297,7 @@ static const struct pw_stream_events stream_events = {
 };

 static inline struct spa_pod *build_format(struct spa_pod_builder *b,
-                       const gsr_pipewire_video_info *ovi,
+                       const gsr_pipewire_video_video_info *ovi,
                       uint32_t format, const uint64_t *modifiers,
                       size_t modifier_count)
 {
@@ -338,36 +344,58 @@ static inline struct spa_pod *build_format(struct spa_pod_builder *b,
 /* For some reason gstreamer formats are in opposite order to drm formats */
 static int64_t spa_video_format_to_drm_format(const enum spa_video_format format) {
    switch(format) {
-        case SPA_VIDEO_FORMAT_RGBx: return DRM_FORMAT_XBGR8888;
-        case SPA_VIDEO_FORMAT_BGRx: return DRM_FORMAT_XRGB8888;
-        case SPA_VIDEO_FORMAT_RGBA: return DRM_FORMAT_ABGR8888;
-        case SPA_VIDEO_FORMAT_BGRA: return DRM_FORMAT_ARGB8888;
-        case SPA_VIDEO_FORMAT_RGB:  return DRM_FORMAT_XBGR8888;
-        case SPA_VIDEO_FORMAT_BGR:  return DRM_FORMAT_XRGB8888;
+        case SPA_VIDEO_FORMAT_RGBx:       return DRM_FORMAT_XBGR8888;
+        case SPA_VIDEO_FORMAT_BGRx:       return DRM_FORMAT_XRGB8888;
+        case SPA_VIDEO_FORMAT_RGBA:       return DRM_FORMAT_ABGR8888;
+        case SPA_VIDEO_FORMAT_BGRA:       return DRM_FORMAT_ARGB8888;
+        case SPA_VIDEO_FORMAT_RGB:        return DRM_FORMAT_XBGR8888;
+        case SPA_VIDEO_FORMAT_BGR:        return DRM_FORMAT_XRGB8888;
+        case SPA_VIDEO_FORMAT_ARGB:       return DRM_FORMAT_XRGB8888;
+        case SPA_VIDEO_FORMAT_ABGR:       return DRM_FORMAT_XRGB8888;
+#if PW_CHECK_VERSION(0, 3, 41)
+        case SPA_VIDEO_FORMAT_xRGB_210LE: return DRM_FORMAT_XRGB2101010;
+        case SPA_VIDEO_FORMAT_xBGR_210LE: return DRM_FORMAT_XBGR2101010;
+        case SPA_VIDEO_FORMAT_ARGB_210LE: return DRM_FORMAT_ARGB2101010;
+        case SPA_VIDEO_FORMAT_ABGR_210LE: return DRM_FORMAT_ABGR2101010;
+#endif
        default:                    break;
    }
    return DRM_FORMAT_INVALID;
 }

-static const enum spa_video_format video_formats[] = {
+#if PW_CHECK_VERSION(0, 3, 41)
+#define GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS GSR_PIPEWIRE_VIDEO_MAX_VIDEO_FORMATS
+#else
+#define GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS 8
+#endif
+
+static const enum spa_video_format video_formats[GSR_PIPEWIRE_VIDEO_MAX_VIDEO_FORMATS] = {
    SPA_VIDEO_FORMAT_BGRA,
    SPA_VIDEO_FORMAT_BGRx,
    SPA_VIDEO_FORMAT_BGR,
    SPA_VIDEO_FORMAT_RGBx,
    SPA_VIDEO_FORMAT_RGBA,
    SPA_VIDEO_FORMAT_RGB,
+    SPA_VIDEO_FORMAT_ARGB,
+    SPA_VIDEO_FORMAT_ABGR,
+#if PW_CHECK_VERSION(0, 3, 41)
+    SPA_VIDEO_FORMAT_xRGB_210LE,
+    SPA_VIDEO_FORMAT_xBGR_210LE,
+    SPA_VIDEO_FORMAT_ARGB_210LE,
+    SPA_VIDEO_FORMAT_ABGR_210LE
+#endif
 };

-static bool gsr_pipewire_build_format_params(gsr_pipewire *self, struct spa_pod_builder *pod_builder, struct spa_pod **params, uint32_t *num_params) {
+static bool gsr_pipewire_video_build_format_params(gsr_pipewire_video *self, struct spa_pod_builder *pod_builder, struct spa_pod **params, uint32_t *num_params) {
    *num_params = 0;

    if(!check_pw_version(&self->server_version, 0, 3, 33))
        return false;

-    for(size_t i = 0; i < GSR_PIPEWIRE_NUM_VIDEO_FORMATS; i++) {
+    for(size_t i = 0; i < GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS; i++) {
        if(self->supported_video_formats[i].modifiers_size == 0)
            continue;
-        params[i] = build_format(pod_builder, &self->video_info, self->supported_video_formats[i].format, self->modifiers + self->supported_video_formats[i].modifiers_index, self->supported_video_formats[i].modifiers_size);
+        params[*num_params] = build_format(pod_builder, &self->video_info, self->supported_video_formats[i].format, self->modifiers + self->supported_video_formats[i].modifiers_index, self->supported_video_formats[i].modifiers_size);
        ++(*num_params);
    }

@@ -376,15 +404,15 @@ static bool gsr_pipewire_build_format_params(gsr_pipewire *self, struct spa_pod_

 static void renegotiate_format(void *data, uint64_t expirations) {
    (void)expirations;
-    gsr_pipewire *self = (gsr_pipewire*)data;
+    gsr_pipewire_video *self = (gsr_pipewire_video*)data;

    pw_thread_loop_lock(self->thread_loop);

-    struct spa_pod *params[GSR_PIPEWIRE_NUM_VIDEO_FORMATS];
+    struct spa_pod *params[GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS];
    uint32_t num_video_formats = 0;
-    uint8_t params_buffer[2048];
+    uint8_t params_buffer[4096];
    struct spa_pod_builder pod_builder = SPA_POD_BUILDER_INIT(params_buffer, sizeof(params_buffer));
-    if (!gsr_pipewire_build_format_params(self, &pod_builder, params, &num_video_formats)) {
+    if (!gsr_pipewire_video_build_format_params(self, &pod_builder, params, &num_video_formats)) {
        pw_thread_loop_unlock(self->thread_loop);
        return;
    }
@@ -393,7 +421,7 @@ static void renegotiate_format(void *data, uint64_t expirations) {
    pw_thread_loop_unlock(self->thread_loop);
 }

-static bool spa_video_format_get_modifiers(gsr_pipewire *self, const enum spa_video_format format, uint64_t *modifiers, int32_t max_modifiers, int32_t *num_modifiers) {
+static bool spa_video_format_get_modifiers(gsr_pipewire_video *self, const enum spa_video_format format, uint64_t *modifiers, int32_t max_modifiers, int32_t *num_modifiers) {
    *num_modifiers = 0;

    if(max_modifiers == 0) {
@@ -413,6 +441,11 @@ static bool spa_video_format_get_modifiers(gsr_pipewire *self, const enum spa_vi
    }

    const int64_t drm_format = spa_video_format_to_drm_format(format);
+    if(drm_format == DRM_FORMAT_INVALID) {
+        fprintf(stderr, "gsr error: spa_video_format_get_modifiers: unsupported format: %d\n", (int)format);
+        return false;
+    }
+
    if(!self->egl->eglQueryDmaBufModifiersEXT(self->egl->egl_display, drm_format, max_modifiers, modifiers, NULL, num_modifiers)) {
        fprintf(stderr, "gsr error: spa_video_format_get_modifiers: eglQueryDmaBufModifiersEXT failed with drm format %d, %" PRIi64 "\n", (int)format, drm_format);
        //modifiers[0] = DRM_FORMAT_MOD_LINEAR;
@@ -430,36 +463,36 @@ static bool spa_video_format_get_modifiers(gsr_pipewire *self, const enum spa_vi
    return true;
 }

-static void gsr_pipewire_init_modifiers(gsr_pipewire *self) {
-    for(size_t i = 0; i < GSR_PIPEWIRE_NUM_VIDEO_FORMATS; i++) {
+static void gsr_pipewire_video_init_modifiers(gsr_pipewire_video *self) {
+    for(size_t i = 0; i < GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS; i++) {
        self->supported_video_formats[i].format = video_formats[i];
        int32_t num_modifiers = 0;
-        spa_video_format_get_modifiers(self, self->supported_video_formats[i].format, self->modifiers + self->num_modifiers, GSR_PIPEWIRE_MAX_MODIFIERS - self->num_modifiers, &num_modifiers);
+        spa_video_format_get_modifiers(self, self->supported_video_formats[i].format, self->modifiers + self->num_modifiers, GSR_PIPEWIRE_VIDEO_MAX_MODIFIERS - self->num_modifiers, &num_modifiers);
        self->supported_video_formats[i].modifiers_index = self->num_modifiers;
        self->supported_video_formats[i].modifiers_size = num_modifiers;
    }
 }

-static bool gsr_pipewire_setup_stream(gsr_pipewire *self) {
-    struct spa_pod *params[GSR_PIPEWIRE_NUM_VIDEO_FORMATS];
+static bool gsr_pipewire_video_setup_stream(gsr_pipewire_video *self) {
+    struct spa_pod *params[GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS];
    uint32_t num_video_formats = 0;
-    uint8_t params_buffer[2048];
+    uint8_t params_buffer[4096];
    struct spa_pod_builder pod_builder = SPA_POD_BUILDER_INIT(params_buffer, sizeof(params_buffer));

-    self->thread_loop = pw_thread_loop_new("PipeWire thread loop", NULL);
+    self->thread_loop = pw_thread_loop_new("gsr screen capture", NULL);
    if(!self->thread_loop) {
-        fprintf(stderr, "gsr error: gsr_pipewire_setup_stream: failed to create pipewire thread\n");
+        fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to create pipewire thread\n");
        goto error;
    }

    self->context = pw_context_new(pw_thread_loop_get_loop(self->thread_loop), NULL, 0);
    if(!self->context) {
-        fprintf(stderr, "gsr error: gsr_pipewire_setup_stream: failed to create pipewire context\n");
+        fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to create pipewire context\n");
        goto error;
    }

    if(pw_thread_loop_start(self->thread_loop) < 0) {
-        fprintf(stderr, "gsr error: gsr_pipewire_setup_stream: failed to start thread\n");
+        fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to start thread\n");
        goto error;
    }

@@ -469,20 +502,20 @@ static bool gsr_pipewire_setup_stream(gsr_pipewire *self) {
    self->core = pw_context_connect_fd(self->context, fcntl(self->fd, F_DUPFD_CLOEXEC, 5), NULL, 0);
    if(!self->core) {
        pw_thread_loop_unlock(self->thread_loop);
-        fprintf(stderr, "gsr error: gsr_pipewire_setup_stream: failed to connect to fd %d\n", self->fd);
+        fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to connect to fd %d\n", self->fd);
        goto error;
    }

    // TODO: Error check
    pw_core_add_listener(self->core, &self->core_listener, &core_events, self);

-    gsr_pipewire_init_modifiers(self);
+    gsr_pipewire_video_init_modifiers(self);

    // TODO: Cleanup?
    self->reneg = pw_loop_add_event(pw_thread_loop_get_loop(self->thread_loop), renegotiate_format, self);
    if(!self->reneg) {
        pw_thread_loop_unlock(self->thread_loop);
-        fprintf(stderr, "gsr error: gsr_pipewire_setup_stream: pw_loop_add_event failed\n");
+        fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: pw_loop_add_event failed\n");
        goto error;
    }

@@ -495,14 +528,14 @@ static bool gsr_pipewire_setup_stream(gsr_pipewire *self) {
                          PW_KEY_MEDIA_ROLE, "Screen", NULL));
    if(!self->stream) {
        pw_thread_loop_unlock(self->thread_loop);
-        fprintf(stderr, "gsr error: gsr_pipewire_setup_stream: failed to create stream\n");
+        fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to create stream\n");
        goto error;
    }
    pw_stream_add_listener(self->stream, &self->stream_listener, &stream_events, self);

-    if(!gsr_pipewire_build_format_params(self, &pod_builder, params, &num_video_formats)) {
+    if(!gsr_pipewire_video_build_format_params(self, &pod_builder, params, &num_video_formats)) {
        pw_thread_loop_unlock(self->thread_loop);
-        fprintf(stderr, "gsr error: gsr_pipewire_setup_stream: failed to build format params\n");
+        fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to build format params\n");
        goto error;
    }

@@ -512,7 +545,7 @@ static bool gsr_pipewire_setup_stream(gsr_pipewire *self) {
        num_video_formats) < 0)
    {
        pw_thread_loop_unlock(self->thread_loop);
-        fprintf(stderr, "gsr error: gsr_pipewire_setup_stream: failed to connect stream\n");
+        fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to connect stream\n");
        goto error;
    }

@@ -549,7 +582,7 @@ static bool gsr_pipewire_setup_stream(gsr_pipewire *self) {
 }

 static int pw_init_counter = 0;
-bool gsr_pipewire_init(gsr_pipewire *self, int pipewire_fd, uint32_t pipewire_node, int fps, bool capture_cursor, gsr_egl *egl) {
+bool gsr_pipewire_video_init(gsr_pipewire_video *self, int pipewire_fd, uint32_t pipewire_node, int fps, bool capture_cursor, gsr_egl *egl) {
    if(pw_init_counter == 0)
        pw_init(NULL, NULL);
    ++pw_init_counter;
@@ -559,8 +592,8 @@ bool gsr_pipewire_init(gsr_pipewire *self, int pipewire_fd, uint32_t pipewire_no
    self->fd = pipewire_fd;
    self->node = pipewire_node;
    if(pthread_mutex_init(&self->mutex, NULL) != 0) {
-        fprintf(stderr, "gsr error: gsr_pipewire_init: failed to initialize mutex\n");
-        gsr_pipewire_deinit(self);
+        fprintf(stderr, "gsr error: gsr_pipewire_video_init: failed to initialize mutex\n");
+        gsr_pipewire_video_deinit(self);
        return false;
    }
    self->mutex_initialized = true;
@@ -568,15 +601,15 @@ bool gsr_pipewire_init(gsr_pipewire *self, int pipewire_fd, uint32_t pipewire_no
    self->video_info.fps_den = 1;
    self->cursor.visible = capture_cursor;
    
-    if(!gsr_pipewire_setup_stream(self)) {
-        gsr_pipewire_deinit(self);
+    if(!gsr_pipewire_video_setup_stream(self)) {
+        gsr_pipewire_video_deinit(self);
        return false;
    }

    return true;
 }

-void gsr_pipewire_deinit(gsr_pipewire *self) {
+void gsr_pipewire_video_deinit(gsr_pipewire_video *self) {
    if(self->thread_loop) {
        //pw_thread_loop_wait(self->thread_loop);
        pw_thread_loop_stop(self->thread_loop);
@@ -636,7 +669,7 @@ void gsr_pipewire_deinit(gsr_pipewire *self) {
    }
 }

-static EGLImage gsr_pipewire_create_egl_image(gsr_pipewire *self, const int *fds, const uint32_t *offsets, const uint32_t *pitches, const uint64_t *modifiers, bool use_modifiers) {
+static EGLImage gsr_pipewire_video_create_egl_image(gsr_pipewire_video *self, const int *fds, const uint32_t *offsets, const uint32_t *pitches, const uint64_t *modifiers, bool use_modifiers) {
    intptr_t img_attr[44];
    setup_dma_buf_attrs(img_attr, spa_video_format_to_drm_format(self->format.info.raw.format), self->format.info.raw.size.width, self->format.info.raw.size.height,
        fds, offsets, pitches, modifiers, self->dmabuf_num_planes, use_modifiers);
@@ -650,11 +683,11 @@ static EGLImage gsr_pipewire_create_egl_image(gsr_pipewire *self, const int *fds
    return image;
 }

-static EGLImage gsr_pipewire_create_egl_image_with_fallback(gsr_pipewire *self) {
-    int fds[GSR_PIPEWIRE_DMABUF_MAX_PLANES];
-    uint32_t offsets[GSR_PIPEWIRE_DMABUF_MAX_PLANES];
-    uint32_t pitches[GSR_PIPEWIRE_DMABUF_MAX_PLANES];
-    uint64_t modifiers[GSR_PIPEWIRE_DMABUF_MAX_PLANES];
+static EGLImage gsr_pipewire_video_create_egl_image_with_fallback(gsr_pipewire_video *self) {
+    int fds[GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES];
+    uint32_t offsets[GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES];
+    uint32_t pitches[GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES];
+    uint64_t modifiers[GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES];
    for(size_t i = 0; i < self->dmabuf_num_planes; ++i) {
        fds[i] = self->dmabuf_data[i].fd;
        offsets[i] = self->dmabuf_data[i].offset;
@@ -664,19 +697,19 @@ static EGLImage gsr_pipewire_create_egl_image_with_fallback(gsr_pipewire *self)

    EGLImage image = NULL;
    if(self->no_modifiers_fallback) {
-        image = gsr_pipewire_create_egl_image(self, fds, offsets, pitches, modifiers, false);
+        image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, false);
    } else {
-        image = gsr_pipewire_create_egl_image(self, fds, offsets, pitches, modifiers, true);
+        image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, true);
        if(!image) {
-            fprintf(stderr, "gsr error: gsr_pipewire_create_egl_image_with_fallback: failed to create egl image with modifiers, trying without modifiers\n");
+            fprintf(stderr, "gsr error: gsr_pipewire_video_create_egl_image_with_fallback: failed to create egl image with modifiers, trying without modifiers\n");
            self->no_modifiers_fallback = true;
-            image = gsr_pipewire_create_egl_image(self, fds, offsets, pitches, modifiers, false);
+            image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, false);
        }
    }
    return image;
 }

-static bool gsr_pipewire_bind_image_to_texture(gsr_pipewire *self, EGLImage image, unsigned int texture_id, bool external_texture) {
+static bool gsr_pipewire_video_bind_image_to_texture(gsr_pipewire_video *self, EGLImage image, unsigned int texture_id, bool external_texture) {
    const int texture_target = external_texture ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D;
    while(self->egl->glGetError() != 0){}
    self->egl->glBindTexture(texture_target, texture_id);
@@ -686,19 +719,19 @@ static bool gsr_pipewire_bind_image_to_texture(gsr_pipewire *self, EGLImage imag
    return success;
 }

-static void gsr_pipewire_bind_image_to_texture_with_fallback(gsr_pipewire *self, gsr_texture_map texture_map, EGLImage image) {
+static void gsr_pipewire_video_bind_image_to_texture_with_fallback(gsr_pipewire_video *self, gsr_texture_map texture_map, EGLImage image) {
    if(self->external_texture_fallback) {
-        gsr_pipewire_bind_image_to_texture(self, image, texture_map.external_texture_id, true);
+        gsr_pipewire_video_bind_image_to_texture(self, image, texture_map.external_texture_id, true);
    } else {
-        if(!gsr_pipewire_bind_image_to_texture(self, image, texture_map.texture_id, false)) {
-            fprintf(stderr, "gsr error: gsr_pipewire_map_texture: failed to bind image to texture, trying with external texture\n");
+        if(!gsr_pipewire_video_bind_image_to_texture(self, image, texture_map.texture_id, false)) {
+            fprintf(stderr, "gsr error: gsr_pipewire_video_map_texture: failed to bind image to texture, trying with external texture\n");
            self->external_texture_fallback = true;
-            gsr_pipewire_bind_image_to_texture(self, image, texture_map.external_texture_id, true);
+            gsr_pipewire_video_bind_image_to_texture(self, image, texture_map.external_texture_id, true);
        }
    }
 }

-static void gsr_pipewire_update_cursor_texture(gsr_pipewire *self, gsr_texture_map texture_map) {
+static void gsr_pipewire_video_update_cursor_texture(gsr_pipewire_video *self, gsr_texture_map texture_map) {
    if(!self->cursor.data)
        return;

@@ -715,9 +748,9 @@ static void gsr_pipewire_update_cursor_texture(gsr_pipewire *self, gsr_texture_m
    self->cursor.data = NULL;
 }

-bool gsr_pipewire_map_texture(gsr_pipewire *self, gsr_texture_map texture_map, gsr_pipewire_region *region, gsr_pipewire_region *cursor_region, gsr_pipewire_dmabuf_data *dmabuf_data, int *num_dmabuf_data, uint32_t *fourcc, uint64_t *modifiers, bool *using_external_image) {
-    for(int i = 0; i < GSR_PIPEWIRE_DMABUF_MAX_PLANES; ++i) {
-        memset(&dmabuf_data[i], 0, sizeof(gsr_pipewire_dmabuf_data));
+bool gsr_pipewire_video_map_texture(gsr_pipewire_video *self, gsr_texture_map texture_map, gsr_pipewire_video_region *region, gsr_pipewire_video_region *cursor_region, gsr_pipewire_video_dmabuf_data *dmabuf_data, int *num_dmabuf_data, uint32_t *fourcc, uint64_t *modifiers, bool *using_external_image) {
+    for(int i = 0; i < GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES; ++i) {
+        memset(&dmabuf_data[i], 0, sizeof(gsr_pipewire_video_dmabuf_data));
    }
    *num_dmabuf_data = 0;
    *using_external_image = self->external_texture_fallback;
@@ -730,14 +763,14 @@ bool gsr_pipewire_map_texture(gsr_pipewire *self, gsr_texture_map texture_map, g
        return false;
    }

-    EGLImage image = gsr_pipewire_create_egl_image_with_fallback(self);
+    EGLImage image = gsr_pipewire_video_create_egl_image_with_fallback(self);
    if(image) {
-        gsr_pipewire_bind_image_to_texture_with_fallback(self, texture_map, image);
+        gsr_pipewire_video_bind_image_to_texture_with_fallback(self, texture_map, image);
        *using_external_image = self->external_texture_fallback;
        self->egl->eglDestroyImage(self->egl->egl_display, image);
    }

-    gsr_pipewire_update_cursor_texture(self, texture_map);
+    gsr_pipewire_video_update_cursor_texture(self, texture_map);

    region->x = 0;
    region->y = 0;
@@ -773,7 +806,7 @@ bool gsr_pipewire_map_texture(gsr_pipewire *self, gsr_texture_map texture_map, g
    return true;
 }

-bool gsr_pipewire_is_damaged(gsr_pipewire *self) {
+bool gsr_pipewire_video_is_damaged(gsr_pipewire_video *self) {
    bool damaged = false;
    pthread_mutex_lock(&self->mutex);
    damaged = self->damaged;
@@ -781,7 +814,7 @@ bool gsr_pipewire_is_damaged(gsr_pipewire *self) {
    return damaged;
 }

-void gsr_pipewire_clear_damage(gsr_pipewire *self) {
+void gsr_pipewire_video_clear_damage(gsr_pipewire_video *self) {
    pthread_mutex_lock(&self->mutex);
    self->damaged = false;
    pthread_mutex_unlock(&self->mutex);
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -8,12 +8,16 @@ extern "C" {
 #include <string.h>
 #include <cmath>
 #include <time.h>
+#include <mutex>

 #include <pulse/pulseaudio.h>
 #include <pulse/mainloop.h>
 #include <pulse/xmalloc.h>
 #include <pulse/error.h>

+#define RECONNECT_TRY_TIMEOUT_SECONDS 0.5
+#define DEVICE_NAME_MAX_SIZE 128
+
 #define CHECK_DEAD_GOTO(p, rerror, label)                               \
    do {                                                                \
        if (!(p)->context || !PA_CONTEXT_IS_GOOD(pa_context_get_state((p)->context)) || \
@@ -29,6 +33,12 @@ extern "C" {
        }                                                               \
    } while(false);

+enum class DeviceType {
+    STANDARD,
+    DEFAULT_OUTPUT,
+    DEFAULT_INPUT
+};
+
 struct pa_handle {
    pa_context *context;
    pa_stream *stream;
@@ -42,50 +52,152 @@ struct pa_handle {

    int operation_success;
    double latency_seconds;
+
+    pa_buffer_attr attr;
+    pa_sample_spec ss;
+
+    std::mutex reconnect_mutex;
+    DeviceType device_type;
+    char stream_name[256];
+    bool reconnect;
+    double reconnect_last_tried_seconds;
+
+    char device_name[DEVICE_NAME_MAX_SIZE];
+    char default_output_device_name[DEVICE_NAME_MAX_SIZE];
+    char default_input_device_name[DEVICE_NAME_MAX_SIZE];
 };

-static void pa_sound_device_free(pa_handle *s) {
-    assert(s);
+static void pa_sound_device_free(pa_handle *p) {
+    assert(p);

-    if (s->stream)
-        pa_stream_unref(s->stream);
-
-    if (s->context) {
-        pa_context_disconnect(s->context);
-        pa_context_unref(s->context);
+    if (p->stream) {
+        pa_stream_unref(p->stream);
+        p->stream = NULL;
    }

-    if (s->mainloop)
-        pa_mainloop_free(s->mainloop);
-
-    if (s->output_data) {
-        free(s->output_data);
-        s->output_data = NULL;
+    if (p->context) {
+        pa_context_disconnect(p->context);
+        pa_context_unref(p->context);
+        p->context = NULL;
    }

-    pa_xfree(s);
+    if (p->mainloop) {
+        pa_mainloop_free(p->mainloop);
+        p->mainloop = NULL;
+    }
+
+    if (p->output_data) {
+        free(p->output_data);
+        p->output_data = NULL;
+    }
+
+    pa_xfree(p);
+}
+
+static void subscribe_update_default_devices(pa_context*, const pa_server_info *server_info, void *userdata) {
+    pa_handle *handle = (pa_handle*)userdata;
+    std::lock_guard<std::mutex> lock(handle->reconnect_mutex);
+
+    if(server_info->default_sink_name) {
+        // TODO: Size check
+        snprintf(handle->default_output_device_name, sizeof(handle->default_output_device_name), "%s.monitor", server_info->default_sink_name);
+        if(handle->device_type == DeviceType::DEFAULT_OUTPUT && strcmp(handle->device_name, server_info->default_sink_name) != 0) {
+            handle->reconnect = true;
+            handle->reconnect_last_tried_seconds = clock_get_monotonic_seconds();
+            // TODO: Size check
+            snprintf(handle->device_name, sizeof(handle->device_name), "%s", handle->default_output_device_name);
+        }
+    }
+
+    if(server_info->default_source_name) {
+        // TODO: Size check
+        snprintf(handle->default_input_device_name, sizeof(handle->default_input_device_name), "%s", server_info->default_source_name);
+        if(handle->device_type == DeviceType::DEFAULT_INPUT && strcmp(handle->device_name, server_info->default_sink_name) != 0) {
+            handle->reconnect = true;
+            handle->reconnect_last_tried_seconds = clock_get_monotonic_seconds();
+            // TODO: Size check
+            snprintf(handle->device_name, sizeof(handle->device_name), "%s", handle->default_input_device_name);
+        }
+    }
+}
+
+static void subscribe_cb(pa_context *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
+    (void)idx;
+    pa_handle *handle = (pa_handle*)userdata;
+    if(t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
+        pa_operation *pa = pa_context_get_server_info(c, subscribe_update_default_devices, handle);
+        if(pa)
+            pa_operation_unref(pa);
+    }
+}
+
+static void store_default_devices(pa_context*, const pa_server_info *server_info, void *userdata) {
+    pa_handle *handle = (pa_handle*)userdata;
+    if(server_info->default_sink_name)
+        snprintf(handle->default_output_device_name, sizeof(handle->default_output_device_name), "%s.monitor", server_info->default_sink_name);
+    if(server_info->default_source_name)
+        snprintf(handle->default_input_device_name, sizeof(handle->default_input_device_name), "%s", server_info->default_source_name);
+}
+
+static bool startup_get_default_devices(pa_handle *p, const char *device_name) {
+    pa_operation *pa = pa_context_get_server_info(p->context, store_default_devices, p);
+    while(pa) {
+        pa_operation_state state = pa_operation_get_state(pa);
+        if(state == PA_OPERATION_DONE) {
+            pa_operation_unref(pa);
+            break;
+        } else if(state == PA_OPERATION_CANCELLED) {
+            pa_operation_unref(pa);
+            return false;
+        }
+        pa_mainloop_iterate(p->mainloop, 1, NULL);
+    }
+
+    if(p->default_output_device_name[0] == '\0') {
+        fprintf(stderr, "Error: failed to find default audio output device\n");
+        return false;
+    }
+
+    if(strcmp(device_name, "default_output") == 0) {
+        snprintf(p->device_name, sizeof(p->device_name), "%s", p->default_output_device_name);
+        p->device_type = DeviceType::DEFAULT_OUTPUT;
+    } else if(strcmp(device_name, "default_input") == 0) {
+        snprintf(p->device_name, sizeof(p->device_name), "%s", p->default_input_device_name);
+        p->device_type = DeviceType::DEFAULT_INPUT;
+    } else {
+        snprintf(p->device_name, sizeof(p->device_name), "%s", device_name);
+        p->device_type = DeviceType::STANDARD;
+    }
+
+    return true;
 }

 static pa_handle* pa_sound_device_new(const char *server,
        const char *name,
-        const char *dev,
+        const char *device_name,
        const char *stream_name,
        const pa_sample_spec *ss,
        const pa_buffer_attr *attr,
        int *rerror) {
    pa_handle *p;
-    int error = PA_ERR_INTERNAL, r;
+    int error = PA_ERR_INTERNAL;
+    pa_operation *pa = NULL;

    p = pa_xnew0(pa_handle, 1);
-    p->read_data = NULL;
-    p->read_length = 0;
-    p->read_index = 0;
-    p->latency_seconds = 0.0;
+    p->attr = *attr;
+    p->ss = *ss;
+    snprintf(p->stream_name, sizeof(p->stream_name), "%s", stream_name);
+
+    p->reconnect = true;
+    p->reconnect_last_tried_seconds = clock_get_monotonic_seconds() - 1000.0;
+    p->default_output_device_name[0] = '\0';
+    p->default_input_device_name[0] = '\0';
+    p->device_type = DeviceType::STANDARD;

    const int buffer_size = attr->fragsize;
    void *buffer = malloc(buffer_size);
    if(!buffer) {
-        fprintf(stderr, "failed to allocate buffer for audio\n");
+        fprintf(stderr, "Error: failed to allocate buffer for audio\n");
        *rerror = -1;
        return NULL;
    }
@@ -119,32 +231,13 @@ static pa_handle* pa_sound_device_new(const char *server,
        pa_mainloop_iterate(p->mainloop, 1, NULL);
    }

-    if (!(p->stream = pa_stream_new(p->context, stream_name, ss, NULL))) {
-        error = pa_context_errno(p->context);
+    if(!startup_get_default_devices(p, device_name))
        goto fail;
-    }

-    r = pa_stream_connect_record(p->stream, dev, attr,
-        (pa_stream_flags_t)(PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_ADJUST_LATENCY|PA_STREAM_AUTO_TIMING_UPDATE));
-
-    if (r < 0) {
-        error = pa_context_errno(p->context);
-        goto fail;
-    }
-
-    for (;;) {
-        pa_stream_state_t state = pa_stream_get_state(p->stream);
-
-        if (state == PA_STREAM_READY)
-            break;
-
-        if (!PA_STREAM_IS_GOOD(state)) {
-            error = pa_context_errno(p->context);
-            goto fail;
-        }
-
-        pa_mainloop_iterate(p->mainloop, 1, NULL);
-    }
+    pa_context_set_subscribe_callback(p->context, subscribe_cb, p);
+    pa = pa_context_subscribe(p->context, PA_SUBSCRIPTION_MASK_SERVER, NULL, NULL);
+    if(pa)
+        pa_operation_unref(pa);

    return p;

@@ -155,10 +248,65 @@ fail:
    return NULL;
 }

+static bool pa_sound_device_should_reconnect(pa_handle *p, double now, char *device_name, size_t device_name_size) {
+    std::lock_guard<std::mutex> lock(p->reconnect_mutex);
+    if(p->reconnect && now - p->reconnect_last_tried_seconds >= RECONNECT_TRY_TIMEOUT_SECONDS) {
+        p->reconnect_last_tried_seconds = now;
+        // TODO: Size check
+        snprintf(device_name, device_name_size, "%s", p->device_name);
+        return true;
+    }
+    return false;
+}
+
+static bool pa_sound_device_handle_reconnect(pa_handle *p, char *device_name, size_t device_name_size, double now) {
+    int r;
+    if(!pa_sound_device_should_reconnect(p, now, device_name, device_name_size))
+        return true;
+
+    if(p->stream) {
+        pa_stream_disconnect(p->stream);
+        pa_stream_unref(p->stream);
+        p->stream = NULL;
+    }
+
+    if(!(p->stream = pa_stream_new(p->context, p->stream_name, &p->ss, NULL))) {
+        //pa_context_errno(p->context);
+        return false;
+    }
+
+    r = pa_stream_connect_record(p->stream, device_name, &p->attr,
+        (pa_stream_flags_t)(PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_ADJUST_LATENCY|PA_STREAM_AUTO_TIMING_UPDATE));
+
+    if(r < 0) {
+        //pa_context_errno(p->context);
+        return false;
+    }
+
+    for(;;) {
+        pa_stream_state_t state = pa_stream_get_state(p->stream);
+
+        if(state == PA_STREAM_READY)
+            break;
+
+        if(!PA_STREAM_IS_GOOD(state)) {
+            //pa_context_errno(p->context);
+            return false;
+        }
+
+        pa_mainloop_iterate(p->mainloop, 1, NULL);
+    }
+
+    std::lock_guard<std::mutex> lock(p->reconnect_mutex);
+    p->reconnect = false;
+    return true;
+}
+
 static int pa_sound_device_read(pa_handle *p, double timeout_seconds) {
    assert(p);

    const double start_time = clock_get_monotonic_seconds();
+    char device_name[DEVICE_NAME_MAX_SIZE];

    bool success = false;
    int r = 0;
@@ -166,6 +314,9 @@ static int pa_sound_device_read(pa_handle *p, double timeout_seconds) {
    pa_usec_t latency = 0;
    int negative = 0;

+    if(!pa_sound_device_handle_reconnect(p, device_name, sizeof(device_name), start_time))
+        goto fail;
+
    CHECK_DEAD_GOTO(p, rerror, fail);

    while (p->output_index < p->output_length) {
@@ -275,7 +426,7 @@ int sound_device_get_by_name(SoundDevice *device, const char *device_name, const
    int error = 0;
    pa_handle *handle = pa_sound_device_new(nullptr, description, device_name, description, &ss, &buffer_attr, &error);
    if(!handle) {
-        fprintf(stderr, "pa_sound_device_new() failed: %s. Audio input device %s might not be valid\n", pa_strerror(error), description);
+        fprintf(stderr, "Error: pa_sound_device_new() failed: %s. Audio input device %s might not be valid\n", pa_strerror(error), device_name);
        return -1;
    }

@@ -322,8 +473,7 @@ static void pa_state_cb(pa_context *c, void *userdata) {
    }
 }

-static void pa_sourcelist_cb(pa_context *ctx, const pa_source_info *source_info, int eol, void *userdata) {
-    (void)ctx;
+static void pa_sourcelist_cb(pa_context*, const pa_source_info *source_info, int eol, void *userdata) {
    if(eol > 0)
        return;

@@ -339,17 +489,27 @@ static void pa_server_info_cb(pa_context*, const pa_server_info *server_info, vo
        audio_devices->default_input = server_info->default_source_name;
 }

-static void get_pulseaudio_default_inputs(AudioDevices &audio_devices) {
-    pa_mainloop *main_loop = pa_mainloop_new();
+static void server_info_callback(pa_context*, const pa_server_info *server_info, void *userdata) {
+    bool *is_server_pipewire = (bool*)userdata;
+    if(server_info->server_name && strstr(server_info->server_name, "PipeWire"))
+        *is_server_pipewire = true;
+}

-    pa_context *ctx = pa_context_new(pa_mainloop_get_api(main_loop), "gpu-screen-recorder-gtk");
-    pa_context_connect(ctx, NULL, PA_CONTEXT_NOFLAGS, NULL);
+static void get_pulseaudio_default_inputs(AudioDevices &audio_devices) {
    int state = 0;
    int pa_ready = 0;
-    pa_context_set_state_callback(ctx, pa_state_cb, &pa_ready);
-
    pa_operation *pa_op = NULL;

+    pa_mainloop *main_loop = pa_mainloop_new();
+    if(!main_loop)
+        return;
+
+    pa_context *ctx = pa_context_new(pa_mainloop_get_api(main_loop), "gpu-screen-recorder");
+    if(pa_context_connect(ctx, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0)
+        goto done;
+
+    pa_context_set_state_callback(ctx, pa_state_cb, &pa_ready);
+
    for(;;) {
        // Not ready
        if(pa_ready == 0) {
@@ -366,36 +526,38 @@ static void get_pulseaudio_default_inputs(AudioDevices &audio_devices) {
        }

        // Couldn't get connection to the server
-        if(pa_ready == 2 || (state == 1 && pa_op && pa_operation_get_state(pa_op) == PA_OPERATION_DONE)) {
-            if(pa_op)
-                pa_operation_unref(pa_op);
-            pa_context_disconnect(ctx);
-            pa_context_unref(ctx);
-            pa_mainloop_free(main_loop);
-            return;
-        }
+        if(pa_ready == 2 || (state == 1 && pa_op && pa_operation_get_state(pa_op) == PA_OPERATION_DONE))
+            break;

        pa_mainloop_iterate(main_loop, 1, NULL);
    }

+    done:
+    if(pa_op)
+        pa_operation_unref(pa_op);
+    pa_context_disconnect(ctx);
+    pa_context_unref(ctx);
    pa_mainloop_free(main_loop);
 }

 AudioDevices get_pulseaudio_inputs() {
    AudioDevices audio_devices;
+    int state = 0;
+    int pa_ready = 0;
+    pa_operation *pa_op = NULL;

    // TODO: Do this in the same connection below instead of two separate connections
    get_pulseaudio_default_inputs(audio_devices);

    pa_mainloop *main_loop = pa_mainloop_new();
+    if(!main_loop)
+        return audio_devices;

    pa_context *ctx = pa_context_new(pa_mainloop_get_api(main_loop), "gpu-screen-recorder");
-    pa_context_connect(ctx, NULL, PA_CONTEXT_NOFLAGS, NULL);
-    int state = 0;
-    int pa_ready = 0;
-    pa_context_set_state_callback(ctx, pa_state_cb, &pa_ready);
+    if(pa_context_connect(ctx, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0)
+        goto done;

-    pa_operation *pa_op = NULL;
+    pa_context_set_state_callback(ctx, pa_state_cb, &pa_ready);

    for(;;) {
        // Not ready
@@ -413,17 +575,64 @@ AudioDevices get_pulseaudio_inputs() {
        }

        // Couldn't get connection to the server
-        if(pa_ready == 2 || (state == 1 && pa_op && pa_operation_get_state(pa_op) == PA_OPERATION_DONE)) {
-            if(pa_op)
-                pa_operation_unref(pa_op);
-            pa_context_disconnect(ctx);
-            pa_context_unref(ctx);
+        if(pa_ready == 2 || (state == 1 && pa_op && pa_operation_get_state(pa_op) == PA_OPERATION_DONE))
            break;
-        }

        pa_mainloop_iterate(main_loop, 1, NULL);
    }

+    done:
+    if(pa_op)
+        pa_operation_unref(pa_op);
+    pa_context_disconnect(ctx);
+    pa_context_unref(ctx);
    pa_mainloop_free(main_loop);
    return audio_devices;
 }
+
+bool pulseaudio_server_is_pipewire() {
+    int state = 0;
+    int pa_ready = 0;
+    pa_operation *pa_op = NULL;
+    bool is_server_pipewire = false;
+
+    pa_mainloop *main_loop = pa_mainloop_new();
+    if(!main_loop)
+        return is_server_pipewire;
+
+    pa_context *ctx = pa_context_new(pa_mainloop_get_api(main_loop), "gpu-screen-recorder");
+    if(pa_context_connect(ctx, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0)
+        goto done;
+
+    pa_context_set_state_callback(ctx, pa_state_cb, &pa_ready);
+
+    for(;;) {
+        // Not ready
+        if(pa_ready == 0) {
+            pa_mainloop_iterate(main_loop, 1, NULL);
+            continue;
+        }
+
+        switch(state) {
+            case 0: {
+                pa_op = pa_context_get_server_info(ctx, server_info_callback, &is_server_pipewire);
+                ++state;
+                break;
+            }
+        }
+
+        // Couldn't get connection to the server
+        if(pa_ready == 2 || (state == 1 && pa_op && pa_operation_get_state(pa_op) == PA_OPERATION_DONE))
+            break;
+
+        pa_mainloop_iterate(main_loop, 1, NULL);
+    }
+
+    done:
+    if(pa_op)
+        pa_operation_unref(pa_op);
+    pa_context_disconnect(ctx);
+    pa_context_unref(ctx);
+    pa_mainloop_free(main_loop);
+    return is_server_pipewire;
+}
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,4 +1,5 @@
 #include "../include/utils.h"
+#include "../include/window/window.h"

 #include <time.h>
 #include <string.h>
@@ -7,6 +8,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <sys/random.h>
 #include <errno.h>
 #include <assert.h>

@@ -27,14 +29,23 @@ double clock_get_monotonic_seconds(void) {
    return (double)ts.tv_sec + (double)ts.tv_nsec * 0.000000001;
 }

-static gsr_monitor_rotation wayland_transform_to_gsr_rotation(int32_t rot) {
-    switch(rot) {
-        case 0: return GSR_MONITOR_ROT_0;
-        case 1: return GSR_MONITOR_ROT_90;
-        case 2: return GSR_MONITOR_ROT_180;
-        case 3: return GSR_MONITOR_ROT_270;
+bool generate_random_characters(char *buffer, int buffer_size, const char *alphabet, size_t alphabet_size) {
+    /* TODO: Use other functions on other platforms than linux */
+    if(getrandom(buffer, buffer_size, 0) < buffer_size) {
+        fprintf(stderr, "Failed to get random bytes, error: %s\n", strerror(errno));
+        return false;
    }
-    return GSR_MONITOR_ROT_0;
+
+    for(int i = 0; i < buffer_size; ++i) {
+        unsigned char c = *(unsigned char*)&buffer[i];
+        buffer[i] = alphabet[c % alphabet_size];
+    }
+
+    return true;
+}
+
+bool generate_random_characters_standard_alphabet(char *buffer, int buffer_size) {
+    return generate_random_characters(buffer, buffer_size, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 62);
 }

 static const XRRModeInfo* get_mode_info(const XRRScreenResources *sr, RRMode id) {
@@ -71,6 +82,16 @@ static uint32_t x11_output_get_connector_id(Display *dpy, RROutput output, Atom
    return result;
 }

+static vec2i get_monitor_size_rotated(int width, int height, gsr_monitor_rotation rotation) {
+    vec2i size = { .x = width, .y = height };
+    if(rotation == GSR_MONITOR_ROT_90 || rotation == GSR_MONITOR_ROT_270) {
+        int tmp_x = size.x;
+        size.x = size.y;
+        size.y = tmp_x;
+    }
+    return size;
+}
+
 void for_each_active_monitor_output_x11_not_cached(Display *display, active_monitor_callback callback, void *userdata) {
    XRRScreenResources *screen_res = XRRGetScreenResources(display, DefaultRootWindow(display));
    if(!screen_res)
@@ -84,16 +105,23 @@ void for_each_active_monitor_output_x11_not_cached(Display *display, active_moni
        if(out_info && out_info->crtc && out_info->connection == RR_Connected) {
            XRRCrtcInfo *crt_info = XRRGetCrtcInfo(display, screen_res, out_info->crtc);
            if(crt_info && crt_info->mode) {
+                // We want to use the current mode info width/height (mode_info->width/height) instead of crtc info width/height (crt_info->width/height) because crtc info
+                // is scaled if the monitor is scaled (xrandr --output DP-1 --scale 1.5). Normally this is not an issue for x11 applications,
+                // but gpu screen recorder captures the drm framebuffer instead of x11 api. This drm framebuffer which doesn't increase in size when using xrandr scaling.
+                // Maybe a better option would be to get the drm crtc size instead.
                const XRRModeInfo *mode_info = get_mode_info(screen_res, crt_info->mode);
                if(mode_info && out_info->nameLen < (int)sizeof(display_name)) {
                    snprintf(display_name, sizeof(display_name), "%.*s", (int)out_info->nameLen, out_info->name);
+                    const gsr_monitor_rotation rotation = x11_rotation_to_gsr_rotation(crt_info->rotation);
+                    const vec2i monitor_size = get_monitor_size_rotated(mode_info->width, mode_info->height, rotation);
+
                    const gsr_monitor monitor = {
                        .name = display_name,
                        .name_len = out_info->nameLen,
                        .pos = { .x = crt_info->x, .y = crt_info->y },
-                        .size = { .x = (int)crt_info->width, .y = (int)crt_info->height },
+                        .size = monitor_size,
                        .connector_id = x11_output_get_connector_id(display, screen_res->outputs[i], randr_connector_id_atom),
-                        .rotation = x11_rotation_to_gsr_rotation(crt_info->rotation),
+                        .rotation = rotation,
                        .monitor_identifier = out_info->crtc
                    };
                    callback(&monitor, userdata);
@@ -109,31 +137,22 @@ void for_each_active_monitor_output_x11_not_cached(Display *display, active_moni
    XRRFreeScreenResources(screen_res);
 }

-void for_each_active_monitor_output_x11(const gsr_egl *egl, active_monitor_callback callback, void *userdata) {
-    for(int i = 0; i < egl->x11.num_outputs; ++i) {
-        const gsr_x11_output *output = &egl->x11.outputs[i];
-        const gsr_monitor monitor = {
-            .name = output->name,
-            .name_len = strlen(output->name),
-            .pos = output->pos,
-            .size = output->size,
-            .connector_id = output->connector_id,
-            .rotation = output->rotation,
-            .monitor_identifier = output->monitor_identifier
-        };
-        callback(&monitor, userdata);
-    }
+/* TODO: Support more connector types */
+int get_connector_type_by_name(const char *name) {
+    int len = strlen(name);
+    if(len >= 5 && strncmp(name, "HDMI-", 5) == 0)
+        return 1;
+    else if(len >= 3 && strncmp(name, "DP-", 3) == 0)
+        return 2;
+    else if(len >= 12 && strncmp(name, "DisplayPort-", 12) == 0)
+        return 3;
+    else if(len >= 4 && strncmp(name, "eDP-", 4) == 0)
+        return 4;
+    else
+        return -1;
 }

-typedef struct {
-    int type;
-    int count;
-    int count_active;
-} drm_connector_type_count;
-
-#define CONNECTOR_TYPE_COUNTS 32
-
-static drm_connector_type_count* drm_connector_types_get_index(drm_connector_type_count *type_counts, int *num_type_counts, int connector_type) {
+drm_connector_type_count* drm_connector_types_get_index(drm_connector_type_count *type_counts, int *num_type_counts, int connector_type) {
    for(int i = 0; i < *num_type_counts; ++i) {
        if(type_counts[i].type == connector_type)
            return &type_counts[i];
@@ -150,6 +169,10 @@ static drm_connector_type_count* drm_connector_types_get_index(drm_connector_typ
    return &type_counts[index];
 }

+uint32_t monitor_identifier_from_type_and_count(int monitor_type_index, int monitor_type_count) {
+    return ((uint32_t)monitor_type_index << 16) | ((uint32_t)monitor_type_count);
+}
+
 static bool connector_get_property_by_name(int drmfd, drmModeConnectorPtr props, const char *name, uint64_t *result) {
    for(int i = 0; i < props->count_props; ++i) {
        drmModePropertyPtr prop = drmModeGetProperty(drmfd, props->props[i]);
@@ -165,61 +188,12 @@ static bool connector_get_property_by_name(int drmfd, drmModeConnectorPtr props,
    return false;
 }

-/* TODO: Support more connector types */
-static int get_connector_type_by_name(const char *name) {
-    int len = strlen(name);
-    if(len >= 5 && strncmp(name, "HDMI-", 5) == 0)
-        return 1;
-    else if(len >= 3 && strncmp(name, "DP-", 3) == 0)
-        return 2;
-    else if(len >= 12 && strncmp(name, "DisplayPort-", 12) == 0)
-        return 3;
-    else if(len >= 4 && strncmp(name, "eDP-", 4) == 0)
-        return 4;
-    else
-        return -1;
-}
-
-static uint32_t monitor_identifier_from_type_and_count(int monitor_type_index, int monitor_type_count) {
-    return ((uint32_t)monitor_type_index << 16) | ((uint32_t)monitor_type_count);
-}
-
-static void for_each_active_monitor_output_wayland(const gsr_egl *egl, active_monitor_callback callback, void *userdata) {
-    drm_connector_type_count type_counts[CONNECTOR_TYPE_COUNTS];
-    int num_type_counts = 0;
-
-    for(int i = 0; i < egl->wayland.num_outputs; ++i) {
-        const gsr_wayland_output *output = &egl->wayland.outputs[i];
-        if(!output->name)
-            continue;
-
-        const int connector_type_index = get_connector_type_by_name(output->name);
-        drm_connector_type_count *connector_type = NULL;
-        if(connector_type_index != -1)
-            connector_type = drm_connector_types_get_index(type_counts, &num_type_counts, connector_type_index);
-        
-        if(connector_type) {
-            ++connector_type->count;
-            ++connector_type->count_active;
-        }
-
-        const gsr_monitor monitor = {
-            .name = output->name,
-            .name_len = strlen(output->name),
-            .pos = { .x = output->pos.x, .y = output->pos.y },
-            .size = { .x = output->size.x, .y = output->size.y },
-            .connector_id = 0,
-            .rotation = wayland_transform_to_gsr_rotation(output->transform),
-            .monitor_identifier = connector_type ? monitor_identifier_from_type_and_count(connector_type_index, connector_type->count_active) : 0
-        };
-        callback(&monitor, userdata);
-    }
-}
-
-static void for_each_active_monitor_output_drm(const gsr_egl *egl, active_monitor_callback callback, void *userdata) {
-    int fd = open(egl->card_path, O_RDONLY);
-    if(fd == -1)
+static void for_each_active_monitor_output_drm(const char *card_path, active_monitor_callback callback, void *userdata) {
+    int fd = open(card_path, O_RDONLY);
+    if(fd == -1) {
+        fprintf(stderr, "gsr error: for_each_active_monitor_output_drm failed, failed to open \"%s\", error: %s\n", card_path, strerror(errno));
        return;
+    }

    drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1);

@@ -278,16 +252,14 @@ static void for_each_active_monitor_output_drm(const gsr_egl *egl, active_monito
    close(fd);
 }

-void for_each_active_monitor_output(const gsr_egl *egl, gsr_connection_type connection_type, active_monitor_callback callback, void *userdata) {
+void for_each_active_monitor_output(const gsr_window *window, const char *card_path, gsr_connection_type connection_type, active_monitor_callback callback, void *userdata) {
    switch(connection_type) {
        case GSR_CONNECTION_X11:
-            for_each_active_monitor_output_x11(egl, callback, userdata);
-            break;
        case GSR_CONNECTION_WAYLAND:
-            for_each_active_monitor_output_wayland(egl, callback, userdata);
+            gsr_window_for_each_active_monitor_output_cached(window, callback, userdata);
            break;
        case GSR_CONNECTION_DRM:
-            for_each_active_monitor_output_drm(egl, callback, userdata);
+            for_each_active_monitor_output_drm(card_path, callback, userdata);
            break;
    }
 }
@@ -310,7 +282,7 @@ bool get_monitor_by_name(const gsr_egl *egl, gsr_connection_type connection_type
    userdata.name_len = strlen(name);
    userdata.monitor = monitor;
    userdata.found_monitor = false;
-    for_each_active_monitor_output(egl, connection_type, get_monitor_by_name_callback, &userdata);
+    for_each_active_monitor_output(egl->window, egl->card_path, connection_type, get_monitor_by_name_callback, &userdata);
    return userdata.found_monitor;
 }

@@ -342,14 +314,14 @@ static void get_monitor_by_connector_id_callback(const gsr_monitor *monitor, voi
    }
 }

-gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_egl *egl, const gsr_monitor *monitor) {
-    if(gsr_egl_get_display_server(egl) == GSR_DISPLAY_SERVER_WAYLAND) {
+gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_window *window, const gsr_monitor *monitor) {
+    if(gsr_window_get_display_server(window) == GSR_DISPLAY_SERVER_WAYLAND) {
        {
            get_monitor_by_connector_id_userdata userdata;
            userdata.monitor = monitor;
            userdata.rotation = GSR_MONITOR_ROT_0;
            userdata.match_found = false;
-            for_each_active_monitor_output_wayland(egl, get_monitor_by_name_and_size_callback, &userdata);
+            gsr_window_for_each_active_monitor_output_cached(window, get_monitor_by_name_and_size_callback, &userdata);
            if(userdata.match_found)
                return userdata.rotation;
        }
@@ -358,7 +330,7 @@ gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_egl *egl,
            userdata.monitor = monitor;
            userdata.rotation = GSR_MONITOR_ROT_0;
            userdata.match_found = false;
-            for_each_active_monitor_output_wayland(egl, get_monitor_by_connector_id_callback, &userdata);
+            gsr_window_for_each_active_monitor_output_cached(window, get_monitor_by_connector_id_callback, &userdata);
            return userdata.rotation;
        }
    } else {
@@ -366,7 +338,7 @@ gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_egl *egl,
        userdata.monitor = monitor;
        userdata.rotation = GSR_MONITOR_ROT_0;
        userdata.match_found = false;
-        for_each_active_monitor_output_x11(egl, get_monitor_by_connector_id_callback, &userdata);
+        gsr_window_for_each_active_monitor_output_cached(window, get_monitor_by_connector_id_callback, &userdata);
        return userdata.rotation;
    }

@@ -378,9 +350,13 @@ bool gl_get_gpu_info(gsr_egl *egl, gsr_gpu_info *info) {
    bool supported = true;
    const unsigned char *gl_vendor = egl->glGetString(GL_VENDOR);
    const unsigned char *gl_renderer = egl->glGetString(GL_RENDERER);
+    const unsigned char *gl_version = egl->glGetString(GL_VERSION);

    info->gpu_version = 0;
    info->is_steam_deck = false;
+    info->driver_major = 0;
+    info->driver_minor = 0;
+    info->driver_patch = 0;

    if(!gl_vendor) {
        fprintf(stderr, "gsr error: failed to get gpu vendor\n");
@@ -400,6 +376,8 @@ bool gl_get_gpu_info(gsr_egl *egl, gsr_gpu_info *info) {

    if(strstr((const char*)gl_vendor, "AMD"))
        info->vendor = GSR_GPU_VENDOR_AMD;
+    else if(strstr((const char*)gl_vendor, "Mesa") && gl_renderer && strstr((const char*)gl_renderer, "AMD"))
+        info->vendor = GSR_GPU_VENDOR_AMD;
    else if(strstr((const char*)gl_vendor, "Intel"))
        info->vendor = GSR_GPU_VENDOR_INTEL;
    else if(strstr((const char*)gl_vendor, "NVIDIA"))
@@ -416,11 +394,34 @@ bool gl_get_gpu_info(gsr_egl *egl, gsr_gpu_info *info) {
        info->is_steam_deck = strstr((const char*)gl_renderer, "vangogh") != NULL;
    }

+    if(gl_version) {
+        const char *mesa_p = strstr((const char*)gl_version, "Mesa ");
+        if(mesa_p) {
+            mesa_p += 5;
+            int major = 0;
+            int minor = 0;
+            int patch = 0;
+            if(sscanf(mesa_p, "%d.%d.%d", &major, &minor, &patch) == 3) {
+                info->driver_major = major;
+                info->driver_minor = minor;
+                info->driver_patch = patch;
+            }
+        }
+    }
+
    end:
    return supported;
 }

-static bool try_card_has_valid_plane(const char *card_path) {
+bool version_greater_than(int major, int minor, int patch, int other_major, int other_minor, int other_patch) {
+    return (major > other_major) || (major == other_major && minor > other_minor) || (major == other_major && minor == other_minor && patch > other_patch);
+}
+
+bool gl_driver_version_greater_than(const gsr_gpu_info *gpu_info, int major, int minor, int patch) {
+    return version_greater_than(gpu_info->driver_major, gpu_info->driver_minor, gpu_info->driver_patch, major, minor, patch);
+}
+
+bool try_card_has_valid_plane(const char *card_path) {
    drmVersion *ver = NULL;
    drmModePlaneResPtr planes = NULL;
    bool found_screen_card = false;
@@ -634,9 +635,12 @@ static VADisplay video_codec_context_get_vaapi_display(AVCodecContext *video_cod
 }

 bool video_codec_context_is_vaapi(AVCodecContext *video_codec_context) {
+    if(!video_codec_context)
+        return false;
+
    AVBufferRef *hw_frames_ctx = video_codec_context->hw_frames_ctx;
    if(!hw_frames_ctx)
-        return NULL;
+        return false;

    AVHWFramesContext *hw_frame_context = (AVHWFramesContext*)hw_frames_ctx->data;
    AVHWDeviceContext *device_context = (AVHWDeviceContext*)hw_frame_context->device_ctx;
@@ -736,6 +740,8 @@ bool vaapi_copy_drm_planes_to_video_surface(AVCodecContext *video_codec_context,
        .height = dest_size.y
    };

+    const bool scaled = dest_size.x != source_size.x || dest_size.y != source_size.y;
+
    // Copying a surface to another surface will automatically perform the color conversion. Thanks vaapi!
    VAProcPipelineParameterBuffer params = {0};
    params.surface = input_surface_id;
@@ -743,7 +749,7 @@ bool vaapi_copy_drm_planes_to_video_surface(AVCodecContext *video_codec_context,
    params.surface_region = &source_region;
    params.output_region = &output_region;
    params.output_background_color = 0;
-    params.filter_flags = VA_FRAME_PICTURE;
+    params.filter_flags = scaled ? (VA_FILTER_SCALING_HQ | VA_FILTER_INTERPOLATION_BILINEAR) : 0;
    params.pipeline_flags = VA_PROC_PIPELINE_FAST;

    params.input_color_properties.colour_primaries = 1;
@@ -837,7 +843,7 @@ bool vaapi_copy_egl_image_to_video_surface(gsr_egl *egl, EGLImage image, vec2i s
    }

    if(texture_num_planes <= 0 || texture_num_planes > 8) {
-        fprintf(stderr, "gsr error: gsr_capture_xcomposite_vaapi_tick: expected planes size to be 0<planes<8 for drm buf, got %d planes\n", texture_num_planes);
+        fprintf(stderr, "gsr error: gsr_capture_xcomposite_vaapi_tick: expected planes size to be 0<planes<=8 for drm buf, got %d planes\n", texture_num_planes);
        return false;
    }

@@ -875,3 +881,20 @@ bool vaapi_copy_egl_image_to_video_surface(gsr_egl *egl, EGLImage image, vec2i s

    return success;
 }
+
+vec2i scale_keep_aspect_ratio(vec2i from, vec2i to) {
+    if(from.x == 0 || from.y == 0)
+        return (vec2i){0, 0};
+
+    const double height_to_width_ratio = (double)from.y / (double)from.x;
+    from.x = to.x;
+    from.y = from.x * height_to_width_ratio;
+    
+    if(from.y > to.y) {
+        const double width_height_ratio = (double)from.x / (double)from.y;
+        from.y = to.y;
+        from.x = from.y * width_height_ratio;
+    }
+
+    return from;
+}
--- a/src/window/window.c
+++ b/src/window/window.c
@@ -0,0 +1,30 @@
+#include "../../include/window/window.h"
+#include <stddef.h>
+
+void gsr_window_destroy(gsr_window *self);
+
+bool gsr_window_process_event(gsr_window *self) {
+    return self->process_event(self);
+}
+
+XEvent* gsr_window_get_event_data(gsr_window *self) {
+    if(self->get_event_data)
+        return self->get_event_data(self);
+    return NULL;
+}
+
+gsr_display_server gsr_window_get_display_server(const gsr_window *self) {
+    return self->get_display_server();
+}
+
+void* gsr_window_get_display(gsr_window *self) {
+    return self->get_display(self);
+}
+
+void* gsr_window_get_window(gsr_window *self) {
+    return self->get_window(self);
+}
+
+void gsr_window_for_each_active_monitor_output_cached(const gsr_window *self, active_monitor_callback callback, void *userdata) {
+    self->for_each_active_monitor_output_cached(self, callback, userdata);
+}
--- a/src/window/window_wayland.c
+++ b/src/window/window_wayland.c
@@ -0,0 +1,321 @@
+#include "../../include/window/window_wayland.h"
+
+#include "../../include/vec2.h"
+#include "../../include/defs.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <wayland-client.h>
+#include <wayland-egl.h>
+
+#define GSR_MAX_OUTPUTS 32
+
+typedef struct {
+    uint32_t wl_name;
+    void *output;
+    vec2i pos;
+    vec2i size;
+    int32_t transform;
+    char *name;
+} gsr_wayland_output;
+
+typedef struct {
+    void *display;
+    void *window;
+    void *registry;
+    void *surface;
+    void *compositor;
+    gsr_wayland_output outputs[GSR_MAX_OUTPUTS];
+    int num_outputs;
+} gsr_window_wayland;
+
+static void output_handle_geometry(void *data, struct wl_output *wl_output,
+        int32_t x, int32_t y, int32_t phys_width, int32_t phys_height,
+        int32_t subpixel, const char *make, const char *model,
+        int32_t transform) {
+    (void)wl_output;
+    (void)phys_width;
+    (void)phys_height;
+    (void)subpixel;
+    (void)make;
+    (void)model;
+    gsr_wayland_output *gsr_output = data;
+    gsr_output->pos.x = x;
+    gsr_output->pos.y = y;
+    gsr_output->transform = transform;
+}
+
+static void output_handle_mode(void *data, struct wl_output *wl_output, uint32_t flags, int32_t width, int32_t height, int32_t refresh) {
+    (void)wl_output;
+    (void)flags;
+    (void)refresh;
+    gsr_wayland_output *gsr_output = data;
+    gsr_output->size.x = width;
+    gsr_output->size.y = height;
+}
+
+static void output_handle_done(void *data, struct wl_output *wl_output) {
+    (void)data;
+    (void)wl_output;
+}
+
+static void output_handle_scale(void* data, struct wl_output *wl_output, int32_t factor) {
+    (void)data;
+    (void)wl_output;
+    (void)factor;
+}
+
+static void output_handle_name(void *data, struct wl_output *wl_output, const char *name) {
+    (void)wl_output;
+    gsr_wayland_output *gsr_output = data;
+    if(gsr_output->name) {
+        free(gsr_output->name);
+        gsr_output->name = NULL;
+    }
+    gsr_output->name = strdup(name);
+}
+
+static void output_handle_description(void *data, struct wl_output *wl_output, const char *description) {
+    (void)data;
+    (void)wl_output;
+    (void)description;
+}
+
+static const struct wl_output_listener output_listener = {
+    .geometry = output_handle_geometry,
+    .mode = output_handle_mode,
+    .done = output_handle_done,
+    .scale = output_handle_scale,
+    .name = output_handle_name,
+    .description = output_handle_description,
+};
+
+static void registry_add_object(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) {
+    (void)version;
+    gsr_window_wayland *window_wayland = data;
+    if (strcmp(interface, "wl_compositor") == 0) {
+        if(window_wayland->compositor) {
+            wl_compositor_destroy(window_wayland->compositor);
+            window_wayland->compositor = NULL;
+        }
+        window_wayland->compositor = wl_registry_bind(registry, name, &wl_compositor_interface, 1);
+    } else if(strcmp(interface, wl_output_interface.name) == 0) {
+        if(version < 4) {
+            fprintf(stderr, "gsr warning: wl output interface version is < 4, expected >= 4 to capture a monitor. Using KMS capture instead\n");
+            return;
+        }
+
+        if(window_wayland->num_outputs == GSR_MAX_OUTPUTS) {
+            fprintf(stderr, "gsr warning: reached maximum outputs (%d), ignoring output %u\n", GSR_MAX_OUTPUTS, name);
+            return;
+        }
+
+        gsr_wayland_output *gsr_output = &window_wayland->outputs[window_wayland->num_outputs];
+        window_wayland->num_outputs++;
+        *gsr_output = (gsr_wayland_output) {
+            .wl_name = name,
+            .output = wl_registry_bind(registry, name, &wl_output_interface, 4),
+            .pos = { .x = 0, .y = 0 },
+            .size = { .x = 0, .y = 0 },
+            .transform = 0,
+            .name = NULL,
+        };
+        wl_output_add_listener(gsr_output->output, &output_listener, gsr_output);
+    }
+}
+
+static void registry_remove_object(void *data, struct wl_registry *registry, uint32_t name) {
+    (void)data;
+    (void)registry;
+    (void)name;
+}
+
+static struct wl_registry_listener registry_listener = {
+    .global = registry_add_object,
+    .global_remove = registry_remove_object,
+};
+
+static void gsr_window_wayland_deinit(gsr_window_wayland *self) {
+    if(self->window) {
+        wl_egl_window_destroy(self->window);
+        self->window = NULL;
+    }
+
+    if(self->surface) {
+        wl_surface_destroy(self->surface);
+        self->surface = NULL;
+    }
+
+    for(int i = 0; i < self->num_outputs; ++i) {
+        if(self->outputs[i].output) {
+            wl_output_destroy(self->outputs[i].output);
+            self->outputs[i].output = NULL;
+        }
+
+        if(self->outputs[i].name) {
+            free(self->outputs[i].name);
+            self->outputs[i].name = NULL;
+        }
+    }
+    self->num_outputs = 0;
+
+    if(self->compositor) {
+        wl_compositor_destroy(self->compositor);
+        self->compositor = NULL;
+    }
+
+    if(self->registry) {
+        wl_registry_destroy(self->registry);
+        self->registry = NULL;
+    }
+
+    if(self->display) {
+        wl_display_disconnect(self->display);
+        self->display = NULL;
+    }
+}
+
+static bool gsr_window_wayland_init(gsr_window_wayland *self) {
+    self->display = wl_display_connect(NULL);
+    if(!self->display) {
+        fprintf(stderr, "gsr error: gsr_window_wayland_init failed: failed to connect to the Wayland server\n");
+        goto fail;
+    }
+
+    self->registry = wl_display_get_registry(self->display); // TODO: Error checking
+    wl_registry_add_listener(self->registry, &registry_listener, self); // TODO: Error checking
+
+    // Fetch globals
+    wl_display_roundtrip(self->display);
+
+    // Fetch wl_output
+    wl_display_roundtrip(self->display);
+
+    if(!self->compositor) {
+        fprintf(stderr, "gsr error: gsr_window_wayland_init failed: failed to find compositor\n");
+        goto fail;
+    }
+
+    self->surface = wl_compositor_create_surface(self->compositor);
+    if(!self->surface) {
+        fprintf(stderr, "gsr error: gsr_window_wayland_init failed: failed to create surface\n");
+        goto fail;
+    }
+
+    self->window = wl_egl_window_create(self->surface, 16, 16);
+    if(!self->window) {
+        fprintf(stderr, "gsr error: gsr_window_wayland_init failed: failed to create window\n");
+        goto fail;
+    }
+
+    return true;
+
+    fail:
+    gsr_window_wayland_deinit(self);
+    return false;
+}
+
+static void gsr_window_wayland_destroy(gsr_window *window) {
+    gsr_window_wayland *self = window->priv;
+    gsr_window_wayland_deinit(self);
+    free(self);
+    free(window);
+}
+
+static bool gsr_window_wayland_process_event(gsr_window *window) {
+    gsr_window_wayland *self = window->priv;
+    // TODO: pselect on wl_display_get_fd before doing dispatch
+    const bool events_available = wl_display_dispatch_pending(self->display) > 0;
+    wl_display_flush(self->display);
+    return events_available;
+}
+
+static gsr_display_server gsr_wayland_get_display_server(void) {
+    return GSR_DISPLAY_SERVER_WAYLAND;
+}
+
+static void* gsr_window_wayland_get_display(gsr_window *window) {
+    gsr_window_wayland *self = window->priv;
+    return self->display;
+}
+
+static void* gsr_window_wayland_get_window(gsr_window *window) {
+    gsr_window_wayland *self = window->priv;
+    return self->window;
+}
+
+static gsr_monitor_rotation wayland_transform_to_gsr_rotation(int32_t rot) {
+    switch(rot) {
+        case 0: return GSR_MONITOR_ROT_0;
+        case 1: return GSR_MONITOR_ROT_90;
+        case 2: return GSR_MONITOR_ROT_180;
+        case 3: return GSR_MONITOR_ROT_270;
+    }
+    return GSR_MONITOR_ROT_0;
+}
+
+static void gsr_window_wayland_for_each_active_monitor_output_cached(const gsr_window *window, active_monitor_callback callback, void *userdata) {
+    const gsr_window_wayland *self = window->priv;
+    drm_connector_type_count type_counts[CONNECTOR_TYPE_COUNTS];
+    int num_type_counts = 0;
+
+    for(int i = 0; i < self->num_outputs; ++i) {
+        const gsr_wayland_output *output = &self->outputs[i];
+        if(!output->name)
+            continue;
+
+        const int connector_type_index = get_connector_type_by_name(output->name);
+        drm_connector_type_count *connector_type = NULL;
+        if(connector_type_index != -1)
+            connector_type = drm_connector_types_get_index(type_counts, &num_type_counts, connector_type_index);
+        
+        if(connector_type) {
+            ++connector_type->count;
+            ++connector_type->count_active;
+        }
+
+        const gsr_monitor monitor = {
+            .name = output->name,
+            .name_len = strlen(output->name),
+            .pos = { .x = output->pos.x, .y = output->pos.y },
+            .size = { .x = output->size.x, .y = output->size.y },
+            .connector_id = 0,
+            .rotation = wayland_transform_to_gsr_rotation(output->transform),
+            .monitor_identifier = connector_type ? monitor_identifier_from_type_and_count(connector_type_index, connector_type->count_active) : 0
+        };
+        callback(&monitor, userdata);
+    }
+}
+
+gsr_window* gsr_window_wayland_create(void) {
+    gsr_window *window = calloc(1, sizeof(gsr_window));
+    if(!window)
+        return window;
+
+    gsr_window_wayland *window_wayland = calloc(1, sizeof(gsr_window_wayland));
+    if(!window_wayland) {
+        free(window);
+        return NULL;
+    }
+
+    if(!gsr_window_wayland_init(window_wayland)) {
+        free(window_wayland);
+        free(window);
+        return NULL;
+    }
+
+    *window = (gsr_window) {
+        .destroy = gsr_window_wayland_destroy,
+        .process_event = gsr_window_wayland_process_event,
+        .get_event_data = NULL,
+        .get_display_server = gsr_wayland_get_display_server,
+        .get_display = gsr_window_wayland_get_display,
+        .get_window = gsr_window_wayland_get_window,
+        .for_each_active_monitor_output_cached = gsr_window_wayland_for_each_active_monitor_output_cached,
+        .priv = window_wayland
+    };
+
+    return window;
+}
--- a/src/window/window_x11.c
+++ b/src/window/window_x11.c
@@ -0,0 +1,162 @@
+#include "../../include/window/window_x11.h"
+
+#include "../../include/vec2.h"
+#include "../../include/defs.h"
+#include "../../include/utils.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <X11/Xlib.h>
+
+#define GSR_MAX_OUTPUTS 32
+
+typedef struct {
+    char *name;
+    vec2i pos;
+    vec2i size;
+    uint32_t connector_id;
+    gsr_monitor_rotation rotation;
+    uint32_t monitor_identifier; /* crtc id */
+} gsr_x11_output;
+
+typedef struct {
+    Display *display;
+    Window window;
+    gsr_x11_output outputs[GSR_MAX_OUTPUTS];
+    int num_outputs;
+    XEvent xev;
+} gsr_window_x11;
+
+static void store_x11_monitor(const gsr_monitor *monitor, void *userdata) {
+    gsr_window_x11 *window_x11 = userdata;
+    if(window_x11->num_outputs == GSR_MAX_OUTPUTS) {
+        fprintf(stderr, "gsr warning: reached maximum outputs (%d), ignoring output %s\n", GSR_MAX_OUTPUTS, monitor->name);
+        return;
+    }
+
+    char *monitor_name = strdup(monitor->name);
+    if(!monitor_name)
+        return;
+
+    const int index = window_x11->num_outputs;
+    window_x11->outputs[index].name = monitor_name;
+    window_x11->outputs[index].pos = monitor->pos;
+    window_x11->outputs[index].size = monitor->size;
+    window_x11->outputs[index].connector_id = monitor->connector_id;
+    window_x11->outputs[index].rotation = monitor->rotation;
+    window_x11->outputs[index].monitor_identifier = monitor->monitor_identifier;
+    ++window_x11->num_outputs;
+}
+
+static void gsr_window_x11_deinit(gsr_window_x11 *self) {
+    if(self->window) {
+        XDestroyWindow(self->display, self->window);
+        self->window = None;
+    }
+
+    for(int i = 0; i < self->num_outputs; ++i) {
+        if(self->outputs[i].name) {
+            free(self->outputs[i].name);
+            self->outputs[i].name = NULL;
+        }
+    }
+    self->num_outputs = 0;
+}
+
+static bool gsr_window_x11_init(gsr_window_x11 *self) {
+    self->window = XCreateWindow(self->display, DefaultRootWindow(self->display), 0, 0, 16, 16, 0, CopyFromParent, InputOutput, CopyFromParent, 0, NULL);
+    if(!self->window) {
+        fprintf(stderr, "gsr error: gsr_window_x11_init failed: failed to create gl window\n");
+        return false;
+    }
+
+    self->num_outputs = 0;
+    for_each_active_monitor_output_x11_not_cached(self->display, store_x11_monitor, self);
+    return true;
+}
+
+static void gsr_window_x11_destroy(gsr_window *window) {
+    gsr_window_x11 *self = window->priv;
+    gsr_window_x11_deinit(self);
+    free(self);
+    free(window);
+}
+
+static bool gsr_window_x11_process_event(gsr_window *window) {
+    gsr_window_x11 *self = window->priv;
+    if(XPending(self->display)) {
+        XNextEvent(self->display, &self->xev);
+        return true;
+    }
+    return false;
+}
+
+static XEvent* gsr_window_x11_get_event_data(gsr_window *window) {
+    gsr_window_x11 *self = window->priv;
+    return &self->xev;
+}
+
+static gsr_display_server gsr_window_x11_get_display_server(void) {
+    return GSR_DISPLAY_SERVER_X11;
+}
+
+static void* gsr_window_x11_get_display(gsr_window *window) {
+    gsr_window_x11 *self = window->priv;
+    return self->display;
+}
+
+static void* gsr_window_x11_get_window(gsr_window *window) {
+    gsr_window_x11 *self = window->priv;
+    return (void*)self->window;
+}
+
+static void gsr_window_x11_for_each_active_monitor_output_cached(const gsr_window *window, active_monitor_callback callback, void *userdata) {
+    const gsr_window_x11 *self = window->priv;
+    for(int i = 0; i < self->num_outputs; ++i) {
+        const gsr_x11_output *output = &self->outputs[i];
+        const gsr_monitor monitor = {
+            .name = output->name,
+            .name_len = strlen(output->name),
+            .pos = output->pos,
+            .size = output->size,
+            .connector_id = output->connector_id,
+            .rotation = output->rotation,
+            .monitor_identifier = output->monitor_identifier
+        };
+        callback(&monitor, userdata);
+    }
+}
+
+gsr_window* gsr_window_x11_create(Display *display) {
+    gsr_window *window = calloc(1, sizeof(gsr_window));
+    if(!window)
+        return window;
+
+    gsr_window_x11 *window_x11 = calloc(1, sizeof(gsr_window_x11));
+    if(!window_x11) {
+        free(window);
+        return NULL;
+    }
+
+    window_x11->display = display;
+    if(!gsr_window_x11_init(window_x11)) {
+        free(window_x11);
+        free(window);
+        return NULL;
+    }
+
+    *window = (gsr_window) {
+        .destroy = gsr_window_x11_destroy,
+        .process_event = gsr_window_x11_process_event,
+        .get_event_data = gsr_window_x11_get_event_data,
+        .get_display_server = gsr_window_x11_get_display_server,
+        .get_display = gsr_window_x11_get_display,
+        .get_window = gsr_window_x11_get_window,
+        .for_each_active_monitor_output_cached = gsr_window_x11_for_each_active_monitor_output_cached,
+        .priv = window_x11
+    };
+
+    return window;
+}
Author	SHA1	Message	Date
dec05eba	9bfeb95e39	5.2.0	2025-02-27 15:55:18 +01:00
dec05eba	ae2929d4f7	Pipewire: auto change default_output/default_input connected nodes when the default devices are changed in system audio settings	2025-02-27 01:43:16 +01:00
dec05eba	d9eb44fae0	Audio device capture: make default output/input switch recording source the default output/input is changed in the audio server	2025-02-26 18:08:00 +01:00
dec05eba	d9f61602d0	5.1.3	2025-02-24 22:27:00 +01:00
dec05eba	a60fa9b68d	Higher jpeg quality, we can afford that	2025-02-24 21:40:20 +01:00
dec05eba	ec092f20c8	Fix merging audio with audio device and app audio where one audio device is a microphone with mono input	2025-02-24 19:46:01 +01:00
dec05eba	d12f312bc1	Change jpeg quality parameters	2025-02-24 01:30:16 +01:00
dec05eba	34f0eeebcd	m	2025-02-23 01:13:40 +01:00
dec05eba	c63c1cfae3	Update README	2025-02-22 23:00:12 +01:00
dec05eba	7e8d6b3f33	Make nvidia-smi run in flatpak on host	2025-02-22 18:51:27 +01:00
dec05eba	0d1560c128	Dont show nvidia-smi output	2025-02-22 18:46:56 +01:00
dec05eba	5c14babb80	Force nvenc codecs to work on opensuse	2025-02-22 18:35:15 +01:00
dec05eba	ce4a8574f8	Make it possible to stop screenshot with sigint	2025-02-22 13:20:36 +01:00
dec05eba	42b1f8eacb	5.1.2	2025-02-22 01:05:53 +01:00
dec05eba	000da7d640	Make image output lossy (use stb image writer), also significantly improves performance for jpeg	2025-02-22 01:05:29 +01:00
dec05eba	fe4cd2bb0e	Make fps option (default to 60)	2025-02-21 20:32:28 +01:00
dec05eba	51d883b97f	Mention that hdr only works in 'prefer color accuracy' mode	2025-02-20 02:46:41 +01:00
dec05eba	3c0b607154	m	2025-02-17 19:23:54 +01:00
dec05eba	3050043dab	m	2025-02-17 19:22:46 +01:00
dec05eba	015570ca75	5.1.1	2025-02-16 16:15:03 +01:00
dec05eba	2de33ded99	Minor cleanup	2025-02-16 15:30:24 +01:00
dec05eba	a8b26621d4	Only show codec warning for image output	2025-02-16 14:29:06 +01:00
dec05eba	1b5cde0789	Support taking a screenshot (-o image.jpg/image.png)	2025-02-16 14:21:17 +01:00
dec05eba	62bbdd7c30	Revert kde plasma 6.2 hdr workaround code	2025-02-15 16:57:37 +01:00
dec05eba	b250731b1c	Info about hdr	2025-02-15 16:52:26 +01:00
dec05eba	ac5003dea6	Revert readme for hdr	2025-02-13 01:08:04 +01:00
dec05eba	e869b55878	Revert hdr color fix. It looked better for fullscreen hdr games before	2025-02-13 01:05:37 +01:00
dec05eba	38f1ef0f9b	m	2025-02-11 09:40:28 +01:00
dec05eba	d217aec053	Minor -sc fix for flatpak	2025-02-10 18:07:10 +01:00
dec05eba	d088586296	Make plasmashell check work in flatpak	2025-02-10 17:04:31 +01:00
dec05eba	ddc3871b27	Change hdr colors again	2025-02-09 16:49:39 +01:00
dec05eba	3b3d8e893d	Make hdr better for limited range colors	2025-02-09 16:32:03 +01:00
dec05eba	a3b9b89a7f	Attempt to fix incorrect hdr colors on kde plasma 6.2	2025-02-09 06:51:22 +01:00
dec05eba	86df5a580e	HDR: always set has_primaries and has_luminance, otherwise data will be missing from file	2025-02-08 22:43:33 +01:00
dec05eba	1b8d3b3f56	hdr works, for fullscreen applications?	2025-02-08 21:32:06 +01:00
dec05eba	2ee6c9dc92	Fix crash when trying to capture hdr and it fails Also move replay buffer frames reset to right after saving instead when the save has finished.	2025-02-08 19:30:43 +01:00
dec05eba	7babffaa01	Improve argument parsing	2025-02-07 23:47:39 +01:00
dec05eba	4ac5da0c1c	m	2025-02-06 01:57:20 +01:00
dec05eba	1cb9066dbb	Increase replay max allowed duration to 3 hours	2025-02-06 01:56:17 +01:00
Alex Murkoff	31ca53540a	fix: proper cleanup for init_filter_graph	2025-01-28 19:45:00 +01:00
dec05eba	26e9029579	Pipewire: support 10-bit formats (where alpha is 2 bits, total 32-bits)	2025-01-27 10:30:31 +01:00
dec05eba	cafcda1022	5.1.0	2025-01-25 19:56:43 +01:00
dec05eba	450bc0ac4a	Dont normalize audio for mixed audio. This matches app audio\|device audio mix, fixes mic audio being decreased	2025-01-25 19:54:33 +01:00
dec05eba	8e267bb3b0	m	2025-01-24 10:06:52 +01:00
dec05eba	6e545c7ca0	-overlay-replay > -restart-replay-on-save	2025-01-24 10:06:09 +01:00
dec05eba	802067d1df	-overlapping-replay > -overlap-replay	2025-01-24 00:29:57 +01:00
dec05eba	b55096544b	Add version to --info output	2025-01-23 23:56:19 +01:00
dec05eba	e87ade6ee3	Add -overlapping-replay option to clear replay buffer after a save	2025-01-23 23:52:31 +01:00
dec05eba	832052a012	m	2025-01-19 00:32:20 +01:00
dec05eba	bae0fdd949	Mesa check version 24.3.6	2025-01-18 21:59:29 +01:00
dec05eba	bcaf312bca	5.0.1	2025-01-18 21:38:39 +01:00
dec05eba	b559c56d80	Mention amd recording performance issue	2025-01-18 21:38:17 +01:00
dec05eba	59df69bf6a	amd: disable vaapi surface copy unless mesa 2.3.4 is used, which fixes a performance issue. Otherwise we get stutter in some games	2025-01-18 21:12:28 +01:00
dec05eba	b68400ca20	Add -gl-debug option to make it easier to debug user issues that cant easily be reproduced	2025-01-16 22:55:20 +01:00
dec05eba	4211dfa2f8	Mention OpenMandriva package	2025-01-13 21:29:22 +01:00
dec05eba	5baa4b82e3	Fix possibility of monitor captured changing on wayland when monitors are reconfigured	2025-01-13 00:42:00 +01:00
dec05eba	3a200a4c9f	Workaround teamspeak crashing when recording app audio	2025-01-10 23:59:15 +01:00
dec05eba	f6f8f20686	Update TODO	2025-01-08 17:28:17 +01:00
dec05eba	43d353b7b4	Unset DRI_PRIME as well when gpu offloading cant be used	2025-01-08 17:17:33 +01:00
dec05eba	621f253f00	Minor change	2025-01-03 17:14:30 +01:00
dec05eba	68a7dc1b7f	README: mention icc profile	2025-01-02 10:42:27 +01:00
dec05eba	fbaa73bfc7	Prefix program arguments error with error:	2024-12-31 10:40:07 +01:00
dec05eba	01e3a7a8cd	Use poll instead of select	2024-12-30 05:24:40 +01:00
dec05eba	027b29cb6e	5.0.0	2024-12-29 21:13:10 +01:00
David Rosca	954f9abe2a	kms_server: Use MOD_INVALID when modifiers are not supported Fixes VAAPI import on older AMD cards that doesn't support modifiers.	2024-12-28 10:39:25 +01:00
dec05eba	2c51e8630d	Exit with exit code 50 if invalid audio device. Exit with exit code 51 if invalid monitor	2024-12-26 15:21:47 +01:00
dec05eba	c1048a3d20	Make '-w screen' capture the first monitor on nvidia x11 as well to make it work like amd, intel and nvidia wayland. Keep screen-direct for all monitors, that is gsync compatible	2024-12-26 13:49:20 +01:00
dec05eba	a006261ade	Fix --list-capture-options with card path not working on x11 nvidia because x11 nvidia doesn't use dri	2024-12-09 01:57:10 +01:00
dec05eba	3af2ea52c2	4.3.5 - fix build on some distros with older spa version	2024-12-08 23:33:48 +01:00
dec05eba	da08e318a6	Remove shit	2024-12-08 23:26:14 +01:00
dec05eba	10dd7f1c64	Yeet the unecessary properties error location code, it fails to build on some versions of spa	2024-12-08 23:24:36 +01:00
dec05eba	fc45439b31	Attempt to fix build on some distros	2024-12-08 23:01:29 +01:00
dec05eba	0b9fe9a897	4.3.4 - minor fixes and refactoring	2024-12-08 03:15:18 +01:00
dec05eba	a25cbc1ef6	Fix window creation on wayland	2024-12-08 03:14:00 +01:00
dec05eba	d138a1fe73	Add card path to --info, add card path and vendor to --list-capture-options if known to speed up the command	2024-12-08 02:52:58 +01:00
dec05eba	c259a19b9d	Refactor windowing from egl to window_x11/window_wayland, yolo	2024-12-08 02:17:41 +01:00
dec05eba	655fd3756b	Comment out unused egl priority for now because amd error is misleading	2024-12-07 22:39:03 +01:00
dec05eba	175ed79b06	Fix virtual sink not destroyed if gsr is forcefully killed (use pipewire to create the virtual sink instead of pulseaudio)	2024-12-06 12:53:44 +01:00
dec05eba	1b40947884	Add error output when reaching max ports/stream nodes/links	2024-12-05 19:14:00 +01:00
dec05eba	8941e12c61	Increase pipewire audio max nodes/ports limit	2024-12-05 19:08:01 +01:00
dec05eba	00b132c7b4	Remove incorrect references to -aa and -aai	2024-12-05 17:48:21 +01:00
dec05eba	508934b14a	Mention fedora package, remove old and likely broken gentoo ebuild	2024-11-30 13:24:30 +01:00
dec05eba	51265d3536	--help improvement	2024-11-29 18:36:11 +01:00
dec05eba	0ae3c1f827	Repurpose '/' in audio argument to set the audio track name, not the recording node name in pulseaudio/pipewire. This also now allows setting audio track name when recording application audio	2024-11-28 11:42:39 +01:00
dec05eba	c2cd9c3473	Print --help to stdout instead of stderr	2024-11-28 10:42:23 +01:00
dec05eba	d472d8d41e	Dont allow running the program as the root user	2024-11-24 22:52:12 +01:00
dec05eba	8644c72ac9	4.3.3 - fix startup on linux mint	2024-11-22 18:56:45 +01:00
dec05eba	41b3136797	Only report monitors when /dev/dri/cardN is available (its not available on linux mint for some reason with prime setup)	2024-11-22 18:13:01 +01:00
dec05eba	8e94d6a696	Dont run any pipewire if audio server is not pipewire (fix freeze on linux mint 21.3 pulseaudio system in flatpak)	2024-11-22 17:36:23 +01:00
dec05eba	dcc1bf1e2a	Remove GSR_APP_AUDIO macro use when not needed	2024-11-22 00:14:33 +01:00
dec05eba	3489834204	4.3.2	2024-11-21 21:31:52 +01:00
dec05eba	02673c4644	Fix portal capture on broken amd drivers: fallback to opengl copy instead of vaapi on known buggy mesa version	2024-11-21 00:25:56 +01:00
dec05eba	68c9781f44	print	2024-11-21 00:01:18 +01:00
dec05eba	2879d64d40	Revert "va sync buffer/surface" This reverts commit `a033d7c98a`.	2024-11-21 00:01:01 +01:00
dec05eba	a033d7c98a	va sync buffer/surface	2024-11-20 23:37:55 +01:00
dec05eba	5cf1e7953b	Revert "Temp portal dont use fast path" This reverts commit `25142df6e5`.	2024-11-20 22:51:11 +01:00
dec05eba	25142df6e5	Temp portal dont use fast path	2024-11-20 22:44:26 +01:00
dec05eba	cbf4cba5a9	Allow recording app audio with -a, deprecate -aa and -aai Use -a "app:brave" instead of -aa "brave". Use -a "app-inverse:brave" instead of -aai "brave". This now allows merging audio devices and app audio into the same audio track.	2024-11-20 19:09:42 +01:00
dec05eba	6e0f5413d9	4.3.1	2024-11-18 02:04:06 +01:00
dec05eba	62ff649204	--info also verify pipewire connection for app audio	2024-11-17 13:16:42 +01:00
dec05eba	0ee68146a7	Disable application audio recording on pulseaudio	2024-11-17 01:12:12 +01:00
dec05eba	bf577eec0b	Exclude duplicate app from --list-application-audio	2024-11-17 00:43:24 +01:00
dec05eba	0c59349d12	4.3.0 - support application audio recording	2024-11-16 17:20:55 +01:00
dec05eba	c2ae721dca	--info: output if app audio is supported (if compiled with it and pipewire server)	2024-11-16 17:20:02 +01:00
dec05eba	a509bb023b	gpu-screen-recorder-git > gpu-screen-recorder	2024-11-15 19:56:40 +01:00
dec05eba	4d3e95d7b5	nvidia x11: fix black screen regression	2024-11-13 10:21:07 +01:00
dec05eba	1ff38c2699	Use module-null-sink instead of module-combine-sink	2024-11-13 00:47:15 +01:00
dec05eba	c8fdf2f174	Fix build without app_audio build option	2024-11-11 00:18:10 +01:00
dec05eba	c11306c5fd	Add --list-capture-options option	2024-11-11 00:06:29 +01:00
dec05eba	4240f0e334	Add -aa and -aai options to record audio only from selected applications Use the --list-application-audio option to list available applications to record from.	2024-11-10 23:54:39 +01:00
dec05eba	f1b4979365	Fix incorrect color format in x11 cursor (bgr instead of rgb)	2024-11-09 02:45:20 +01:00
dec05eba	e647d0c4bc	Revert x11 drm cursor switcharoo	2024-11-09 00:39:34 +01:00
dec05eba	76c565684f	Prefer drm cursor over x11 on x11, to fix correct position and size when x11 output is scaled	2024-11-08 23:57:59 +01:00
dec05eba	34c0edc991	Fixed TODO	2024-11-08 21:33:11 +01:00
dec05eba	e18e5d7143	Simpler xrandr monitor query (do the same thing as before)	2024-11-08 21:31:47 +01:00
dec05eba	70fced3889	x11: fix correct monitor capture size when output is scaled	2024-11-08 20:52:08 +01:00
dec05eba	0686b924de	Prepare for pipewire audio routing	2024-11-08 18:40:33 +01:00
dec05eba	ab662f1ed5	Change libx264 preset to veryfast and tune to film	2024-11-07 16:34:24 +01:00
dec05eba	74d30f16ad	Set buffer size	2024-11-05 17:49:49 +01:00
dec05eba	030947e33a	Default replay service to cbr for better file size (less ram usage) and 60 seconds	2024-11-05 10:25:48 +01:00
dec05eba	35390796cd	usage	2024-11-05 09:31:32 +01:00
dec05eba	70b9e3d6ff	Revert bitrate calculation	2024-11-05 09:23:39 +01:00
dec05eba	953953eac7	m	2024-11-05 01:45:15 +01:00
dec05eba	10fe4f6c51	4.2.5	2024-11-05 01:09:25 +01:00
dec05eba	aac9b9cde7	Fix incorrect bitrate calculation for constant bitrate	2024-11-05 01:08:56 +01:00
dec05eba	258f690a89	Update issues link	2024-11-01 09:18:27 +01:00
dec05eba	ea139ab9bb	Mention opensuse	2024-10-28 23:05:56 +01:00
dec05eba	05c74e5a77	Mention the new UI	2024-10-27 23:11:11 +01:00
dec05eba	07ce374201	Fix cursor position when scaling output with multiple monitors on monitor capture on x11	2024-10-26 23:55:41 +02:00
dec05eba	112640282d	Add option to change output resolution (-s)	2024-10-26 20:58:00 +02:00
dec05eba	5ffa725367	Add unofficial sources list	2024-10-24 23:31:33 +02:00
dec05eba	a03463082f	Revert "Debug output temp" This reverts commit `86c57c85ac`.	2024-10-24 15:26:47 +02:00
dec05eba	86c57c85ac	Debug output temp	2024-10-24 15:11:47 +02:00
dec05eba	1aae305a36	Revert "Temp debug output" This reverts commit `919c87768e`.	2024-10-24 15:08:43 +02:00
dec05eba	919c87768e	Temp debug output	2024-10-24 14:55:39 +02:00
dec05eba	ff77c64309	Mesa && AMD check	2024-10-23 22:01:03 +02:00
dec05eba	293ec193ba	Support old amd gpus that need radeon driver	2024-10-23 21:26:05 +02:00