Pipewire: support alpha textures again, do alpha blending and clear

background if fourcc is alpha.
Pipewire: dont attempt to use modifier if modifier is 0x0
2026-04-03 02:01:39 +09:00 · 2025-07-20 23:33:49 +02:00 · 2025-07-20 21:48:39 +02:00 · 2025-07-07 17:27:57 +02:00 · 2025-07-06 23:20:25 +02:00 · 2025-07-06 23:19:44 +02:00
52 changed files with 1893 additions and 1059 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ tests/compile_commands.json
 .vscode/

 build/
+debug-build/

 *.o
 gpu-screen-recorder
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ 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.
+This software works on X11 and Wayland on AMD, Intel and NVIDIA. Replay data is stored in RAM by default but there is an option to store it on disk instead.
 ### 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.
@@ -70,6 +70,8 @@ Here are some known unofficial packages:
 * Fedora: [Copr](https://copr.fedorainfracloud.org/coprs/brycensranch/gpu-screen-recorder-git/)
 * OpenMandriva: [gpu-screen-recorder](https://github.com/OpenMandrivaAssociation/gpu-screen-recorder)
 * Solus: [gpu-screen-recorder](https://github.com/getsolus/packages/tree/main/packages/g/gpu-screen-recorder)
+* Nobara: [Nobara wiki](https://wiki.nobaraproject.org/en/general-usage/additional-software/GPU-Screen-Recorder)
+* AppImage [AppImage GitHub releases](https://github.com/pkgforge-dev/gpu-screen-recorder-AppImage/releases)

 # Dependencies
 GPU Screen Recorder uses meson build system so you need to install `meson` to build GPU Screen Recorder.
@@ -77,7 +79,6 @@ GPU Screen Recorder uses meson build system so you need to install `meson` to bu
 ## Build dependencies
 These are the dependencies needed to build GPU Screen Recorder:

-* libglvnd (which provides libgl, libglx and libegl)
 * vulkan-headers
 * ffmpeg (libavcodec, libavformat, libavutil, libswresample, libavfilter)
 * x11 (libx11, libxcomposite, libxrandr, libxfixes, libxdamage)
@@ -85,11 +86,11 @@ These are the dependencies needed to build GPU Screen Recorder:
 * libva (and libva-drm)
 * libdrm
 * libcap
-* wayland-client
-* wayland-egl
-* wayland-scanner
+* wayland (wayland-client, wayland-egl, wayland-scanner)

 ## Runtime dependencies
+* libglvnd (which provides libgl, libglx and libegl) is needed. Your system needs to support at least OpenGL ES 3.0 (released in 2012)
+
 There are also additional dependencies needed at runtime depending on your GPU vendor:

 ### AMD
@@ -98,7 +99,7 @@ There are also additional dependencies needed at runtime depending on your GPU v

 ### Intel
 * mesa
-* vaapi (intel-media-driver/libva-intel-driver/linux-firmware, depending on which intel iGPU you have)
+* vaapi (intel-media-driver/libva-intel-driver/linux-firmware-intel, depending on which intel iGPU you have)

 ### NVIDIA
 * cuda runtime (libcuda.so.1) (libnvidia-compute)
@@ -127,7 +128,9 @@ in this case you could record a window or a monitor with the name `DP-1`.\
 To list available audio devices that you can use you can run `gpu-screen-recorder --list-audio-devices` and the name to use is on the left size of the `|`.\
 To list available audio application names that you can use you can run `gpu-screen-recorder --list-application-audio`.
 ## 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.
+Streaming works the same way 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.\
+GPU Screen Recorder uses Ffmpeg so GPU Screen Recorder supports all protocols that Ffmpeg supports.\
+If you want to reduce latency one thing you can do is to use the `-keyint` option, for example `-keyint 0.5`. Lower value means lower latency at the cost of increased bitrate/decreased quality.
 ## Replay mode
 Run `gpu-screen-recorder` with the `-c mp4` and `-r` option, for example: `gpu-screen-recorder -w screen -f 60 -r 30 -c mp4 -o ~/Videos`. Note that in this case, `-o` should point to a directory.\
 If `-df yes` is set, replays are save in folders based on the date.
@@ -137,7 +140,8 @@ This can be used for example to show a notification when a replay has been saved
 The replay buffer is stored in ram (as encoded video), so don't use a too large replay time and/or video quality unless you have enough ram to store it.
 ## Recording while using replay/streaming
 You can record a regular video while using replay/streaming by launching GPU Screen Recorder with the `-ro` option to specify a directory where to save the recording.\
-To start/stop (and save) recording use the SIGRTMIN signal, for example `pkill -SIGRTMIN -f gpu-screen-recorder`. The name of the video will be displayed in stdout when saving the video.
+To start/stop (and save) recording use the SIGRTMIN signal, for example `pkill -SIGRTMIN -f gpu-screen-recorder`. The name of the video will be displayed in stdout when saving the video.\
+This way of recording while using replay/streaming is more efficient than running GPU Screen Recorder multiple times since this way it only records the screen and encodes the video once.
 ## Controlling GPU Screen Recorder remotely
 To save a video in replay mode, you need to send signal SIGUSR1 to gpu screen recorder. You can do this by running `pkill -SIGUSR1 -f gpu-screen-recorder`.\
 To stop recording send SIGINT to gpu screen recorder. You can do this by running `pkill -SIGINT -f 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.\
@@ -168,7 +172,7 @@ See [https://git.dec05eba.com/?p=about](https://git.dec05eba.com/?p=about).
 # FAQ
 ## It tells me that my AMD/Intel GPU is not supported or that my GPU doesn't support h264/hevc, but that's not true!
 Some linux distros (such as manjaro and fedora) disable hardware accelerated h264/hevc on AMD/Intel because of "patent license issues". If you are using an arch-based distro then you can install mesa-git instead of mesa and if you are using another distro then you may have to switch to a better distro. On fedora based distros you can follow this: [Hardware Accelerated Codec](https://rpmfusion.org/Howto/Multimedia).\
-If you installed GPU Screen Recorder flatpak then you can try installing mesa-extra freedesktop runtime by running this command: `flatpak install --system org.freedesktop.Platform.GL.default//23.08-extra`
+You can alternatively install the flatpak version of GPU Screen Recorder from [flathub](https://flathub.org/apps/details/com.dec05eba.gpu_screen_recorder) which doesn't have this issue on any distro.
 ## I have an old nvidia GPU that supports nvenc but I get a cuda error when trying to record
 Newer ffmpeg versions don't support older nvidia cards. Try installing GPU Screen Recorder flatpak from [flathub](https://flathub.org/apps/details/com.dec05eba.gpu_screen_recorder) instead. It comes with an older ffmpeg version which might work for your GPU.
 ## I get a black screen/glitches while live streaming
@@ -188,9 +192,18 @@ You have to either record in hdr mode (-k `hevc_hdr` or -k `av1_hdr` option) to
 ## GPU Screen Recorder records night light when recording in HDR mode
 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).
+To fix this you can either just press cancel, which will allow you to continue or record the video in .mkv format or constant frame rate (-fm cfr). I recommend recording the video in .mkv format and variable frame rate (-fm vfr).
 ## 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.
 ## GPU Screen Recorder starts lagging after 30-40 minutes when launching GPU Screen Recorder from steam command launcher
 This is a [steam issue](https://github.com/ValveSoftware/steam-for-linux/issues/11446). Prepend the gpu-screen-recorder command with `LD_PREFIX=""`, for example `LD_PREFIX="" gpu-screen-recorder -w screen -o video.mp4`.
+## How do I apply audio effects, such as noise suppression?
+You have to use external software for that, such as Easy Effects or NoiseTorch.
+## How do I choose which GPU to record/encode with?
+It's not really possible except in some cases. You can only record with the GPU that is displaying the graphics on your monitor.\
+Some laptops have display adapters that connect external monitors directly to the external GPU (if you have one)
+and on Wayland the external GPU will display the graphics for that monitor.
+In that case you can record the monitor with the external GPU by launching GPU Screen Recorder with [prime-run or by setting the DRI_PRIME environment variable](https://wiki.archlinux.org/title/PRIME) depending on your GPU brand.\
+However if you really want to change which GPU you want to record and encode with with then you can instead configure your display server (Xorg or Wayland compositor) to run with that GPU,
+then GPU Screen Recorder will automatically use that same GPU for recording and encoding.
--- a/43
+++ b/43
@@ -177,9 +177,7 @@ 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 application audio recording without pipewire 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).

@@ -278,3 +276,42 @@ Fix constant framerate not working properly on amd/intel because capture framera
    It also appears to skip audio frames on nvidia wayland? why? that should be fine, but it causes video stuttering because of audio/video sync.

 Add option to pass a fd (from socketpair) to use for rpc. In the rpc have a common header, with protocol version, data type and data in an enum.
+
+Add the option to set audio track name, for example with -a "track-name:blabla|device:default_output|app:firefox"
+
+Maybe disable qp/vbr for replay. In that case we can preallocate all replay data (for both ram and disk) and write to that directly when receiving packet (dont do that when also recording at the same time).
+    That could improve performance/disk write optimization and maybe even reduce ram usage because of less blocks/fragmentation.
+
+When rpc is added add the option to add/remove audio devices/app audio and also overlays (from new capture sources).
+
+Support hdr screenshot.
+
+Recreate opengl context on loss. This can happen if there is a gpu driver bug, causing context to need to be recreated. This is a nice improvement to not break recording even with buggy driver.
+
+Support saving video with surround sound. Surround sound audio capture does work, but it gets downmixed to stereo.
+
+Add (render) plugin support. To simplify it (and possibly best performance) create one rgba texture (with the size of the output video) that is used across all plugins.
+    Create a framebuffer and set this texture and the target and set the framebuffer as active before calling the plugins.
+    Then the plugins can render simply by doing simple opengl draw functions.
+    Maybe send some metadata to the plugin, such as video (and framebuffer) size. Although this data can be retrieved from the active framebuffer.
+
+Either support webcam support with raw yuyv, mapping the buffer directly to opengl. Or use mjpeg, mapping the buffer directly to vaapi jpeg decoder and then get then map the decoded buffer to opengl.
+    Some webcams dont support raw yuyv and many webcams support higher framerates for mjpeg.
+
+Allow medium, high, very_high and ultra quality for -bm cbr. If that is used then it will automatically estimate the best bitrate for that quality based on resolution and fps.
+    Maybe do this in the ui instead (or both?), to show estimated file size.
+
+Maybe remove shader compute code. It doesn't seem necessary anymore now that glSwapBuffer/glFinish isn't used. dbus server isn't needed anymore either, the code can be moved back to the gpu screen recorder process.
+
+Add proper check if opengl functions are supported. dlsym for the symbol will return a no-op function if it's not supported, so it silently fails if used.
+
+Colors are offset to bottom left by 1 pixel or so on steam deck in landscape mode.
+
+When constant framerate is used (and for audio) multiple frames need to be encoded after resuming from suspend.
+    The clock jumps forward by around 2-3 seconds (on my machine). Is there a way to make sure the clock doesn't jump forward?
+
+Colors are correct, but they look incorrect for thin elements, such as colored text. This can be improved by sampling neighbor pixels for color average.
+
+Record first video/audio frame immediately.
+
+Disable GL_DEPTH_TEST, GL_CULL_FACE.
--- a/extra/gpu-screen-recorder.service
+++ b/extra/gpu-screen-recorder.service
@@ -5,7 +5,7 @@ Description=GPU Screen Recorder Service
 EnvironmentFile=-%h/.config/gpu-screen-recorder.env
 Environment=WINDOW=screen
 Environment=CONTAINER=mp4
-Environment=QUALITY=50000
+Environment=QUALITY=40000
 Environment=BITRATE_MODE=cbr
 Environment=CODEC=auto
 Environment=AUDIO_CODEC=opus
@@ -27,4 +27,4 @@ Restart=on-failure
 RestartSec=5s

 [Install]
-WantedBy=default.target
+WantedBy=default.target
--- a/extra/meson_post_install.sh
+++ b/extra/meson_post_install.sh
@@ -3,15 +3,3 @@
 # Needed to remove password prompt when recording a monitor (without desktop portal option) on amd/intel or nvidia wayland
 /usr/sbin/setcap cap_sys_admin+ep ${MESON_INSTALL_DESTDIR_PREFIX}/bin/gsr-kms-server \
    || echo "\n!!! Please re-run install as root\n"
-
-# Cant do this because it breaks desktop portal (create session)!!!.
-# For some reason the desktop portal tries to access /proc/gpu-screen-recorder-pid/root from the portal process
-# which doesn't work because for some reason CAP_SYS_NICE on a program makes /proc/self/root not readable by other processes.
-# The reason portal reads that file might be because portal seems to have a security feature where its able to identify the
-# process and if the session token is stolen by another application then it will ignore the session token as it wasn't that
-# application that created the session token.
-# ---
-# This is needed (for EGL_CONTEXT_PRIORITY_HIGH_IMG) to allow gpu screen recorder to run faster than the heaviest application on AMD.
-# For example when trying to record a game at 60 fps and the game drops to 45 fps in some place that would also make gpu screen recorder
-# drop to 45 fps unless this setcap is used.
-#/usr/sbin/setcap cap_sys_nice+ep ${MESON_INSTALL_DESTDIR_PREFIX}/bin/gpu-screen-recorder
--- a/include/args_parser.h
+++ b/include/args_parser.h
@@ -8,8 +8,7 @@

 typedef struct gsr_egl gsr_egl;

-#define NUM_ARGS 29
-#define WINDOW_STR_MAX_SIZE 128
+#define NUM_ARGS 30

 typedef enum {
    ARG_TYPE_STRING,
@@ -68,7 +67,8 @@ typedef struct {
    gsr_audio_codec audio_codec;
    gsr_bitrate_mode bitrate_mode;
    gsr_video_quality video_quality;
-    char window[WINDOW_STR_MAX_SIZE];
+    gsr_replay_storage replay_storage;
+    char window[64];
    const char *container_format;
    const char *filename;
    const char *replay_recording_directory;
--- a/include/capture/capture.h
+++ b/include/capture/capture.h
@@ -22,12 +22,13 @@ typedef struct {
 } gsr_capture_metadata;

 struct gsr_capture {
-    /* These methods should not be called manually. Call gsr_capture_* instead */
+    /* These methods should not be called manually. Call gsr_capture_* instead. |capture_metdata->width| and |capture_metadata->height| should be set by this function */
    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, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion);
+    bool (*capture_has_synchronous_task)(gsr_capture *cap); /* can be NULL. If this returns true then the time spent in |capture| is ignored for video/audio (capture is paused while the synchronous task happens) */
+    int (*capture)(gsr_capture *cap, gsr_capture_metadata *capture_metadata, gsr_color_conversion *color_conversion); /* Return 0 if the frame was captured */
    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 */
--- a/include/color_conversion.h
+++ b/include/color_conversion.h
@@ -50,6 +50,7 @@ typedef struct {

    gsr_color_range color_range;
    bool load_external_image_shader;
+    bool force_graphics_shader;
 } gsr_color_conversion_params;

 typedef struct {
@@ -77,6 +78,7 @@ void gsr_color_conversion_deinit(gsr_color_conversion *self);

 void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_id, vec2i destination_pos, vec2i destination_size, vec2i source_pos, vec2i source_size, vec2i texture_size, gsr_rotation rotation, gsr_source_color source_color, bool external_texture, bool alpha_blending);
 void gsr_color_conversion_clear(gsr_color_conversion *self);
+void gsr_color_conversion_read_destination_texture(gsr_color_conversion *self, int destination_texture_index, int x, int y, int width, int height, unsigned int color_format, unsigned int data_format, void *pixels);

 gsr_rotation gsr_monitor_rotation_to_rotation(gsr_monitor_rotation monitor_rotation);

--- a/include/dbus.h
+++ b/include/dbus.h
@@ -7,16 +7,6 @@

 #define DBUS_RANDOM_STR_SIZE 16

-typedef struct {
-    DBusConnection *con;
-    DBusError err;
-    char random_str[DBUS_RANDOM_STR_SIZE + 1];
-    unsigned int handle_counter;
-    bool desktop_portal_rule_added;
-    uint32_t screencast_version;
-    char *screencast_restore_token;
-} gsr_dbus;
-
 typedef enum {
    GSR_PORTAL_CAPTURE_TYPE_MONITOR = 1 << 0,
    GSR_PORTAL_CAPTURE_TYPE_WINDOW  = 1 << 1,
@@ -30,6 +20,16 @@ typedef enum {
    GSR_PORTAL_CURSOR_MODE_METADATA = 1 << 2
 } gsr_portal_cursor_mode;

+typedef struct {
+    DBusConnection *con;
+    DBusError err;
+    char random_str[DBUS_RANDOM_STR_SIZE + 1];
+    unsigned int handle_counter;
+    bool desktop_portal_rule_added;
+    uint32_t screencast_version;
+    char *screencast_restore_token;
+} gsr_dbus;
+
 /* Blocking. TODO: Make non-blocking */
 bool gsr_dbus_init(gsr_dbus *self, const char *screencast_restore_token);
 void gsr_dbus_deinit(gsr_dbus *self);
--- a/include/defs.h
+++ b/include/defs.h
@@ -10,7 +10,7 @@ typedef enum {
    GSR_GPU_VENDOR_AMD,
    GSR_GPU_VENDOR_INTEL,
    GSR_GPU_VENDOR_NVIDIA,
-    GSR_GPU_VENDOR_BROADCOM
+    GSR_GPU_VENDOR_BROADCOM,
 } gsr_gpu_vendor;

 typedef struct {
@@ -23,13 +23,13 @@ typedef enum {
    GSR_MONITOR_ROT_0,
    GSR_MONITOR_ROT_90,
    GSR_MONITOR_ROT_180,
-    GSR_MONITOR_ROT_270
+    GSR_MONITOR_ROT_270,
 } gsr_monitor_rotation;

 typedef enum {
    GSR_CONNECTION_X11,
    GSR_CONNECTION_WAYLAND,
-    GSR_CONNECTION_DRM
+    GSR_CONNECTION_DRM,
 } gsr_connection_type;

 typedef enum {
@@ -88,14 +88,19 @@ typedef enum {

 typedef enum {
    GSR_COLOR_RANGE_LIMITED,
-    GSR_COLOR_RANGE_FULL
+    GSR_COLOR_RANGE_FULL,
 } gsr_color_range;

 typedef enum {
    GSR_COLOR_DEPTH_8_BITS,
-    GSR_COLOR_DEPTH_10_BITS
+    GSR_COLOR_DEPTH_10_BITS,
 } gsr_color_depth;

+typedef enum {
+    GSR_REPLAY_STORAGE_RAM,
+    GSR_REPLAY_STORAGE_DISK,
+} gsr_replay_storage;
+
 bool video_codec_is_hdr(gsr_video_codec video_codec);
 gsr_video_codec hdr_video_codec_to_sdr_video_codec(gsr_video_codec video_codec);
 gsr_color_depth video_codec_to_bit_depth(gsr_video_codec video_codec);
--- a/include/egl.h
+++ b/include/egl.h
@@ -48,8 +48,11 @@ typedef void(*__GLXextFuncPtr)(void);
 #define EGL_OPENGL_ES_API                       0x30A0
 #define EGL_OPENGL_BIT                          0x0008
 #define EGL_OPENGL_ES_BIT                       0x0001
+#define EGL_OPENGL_ES2_BIT                      0x0004
+#define EGL_OPENGL_ES3_BIT                      0x00000040
 #define EGL_NONE                                0x3038
 #define EGL_CONTEXT_CLIENT_VERSION              0x3098
+#define EGL_CONTEXT_OPENGL_DEBUG                0x31B0
 #define EGL_BACK_BUFFER                         0x3084
 #define EGL_GL_TEXTURE_2D                       0x30B1
 #define EGL_TRUE                                1
@@ -83,10 +86,6 @@ typedef void(*__GLXextFuncPtr)(void);
 #define EGL_ALPHA_SIZE                          0x3021
 #define EGL_BLUE_SIZE                           0x3022
 #define EGL_GREEN_SIZE                          0x3023
-#define EGL_CONTEXT_PRIORITY_LEVEL_IMG          0x3100
-#define EGL_CONTEXT_PRIORITY_HIGH_IMG           0x3101
-#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG         0x3102
-#define EGL_CONTEXT_PRIORITY_LOW_IMG            0x3103
 #define EGL_DEVICE_EXT                          0x322C
 #define EGL_DRM_DEVICE_FILE_EXT                 0x3233

@@ -131,7 +130,7 @@ typedef void(*__GLXextFuncPtr)(void);
 #define GL_BLEND                                0x0BE2
 #define GL_SRC_ALPHA                            0x0302
 #define GL_ONE_MINUS_SRC_ALPHA                  0x0303
-#define GL_DEBUG_OUTPUT                         0x92E0
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS             0x8242
 #define GL_SCISSOR_TEST                         0x0C11
 #define GL_PACK_ALIGNMENT                       0x0D05
 #define GL_UNPACK_ALIGNMENT                     0x0CF5
@@ -141,8 +140,6 @@ typedef void(*__GLXextFuncPtr)(void);
 #define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS  0x90EB
 #define GL_TEXTURE0                             0x84C0
 #define GL_TEXTURE1                             0x84C1
-#define GL_CLAMP_TO_BORDER                      0x812D
-#define GL_TEXTURE_BORDER_COLOR                 0x1004
 #define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT      0x00000020
 #define GL_ALL_BARRIER_BITS                     0xFFFFFFFF

@@ -265,6 +262,7 @@ struct gsr_egl {
    void (*glGetTexLevelParameteriv)(unsigned int target, int level, unsigned int pname, int *params);
    void (*glTexImage2D)(unsigned int target, int level, int internalFormat, int width, int height, int border, unsigned int format, unsigned int type, const void *pixels);
    void (*glTexSubImage2D)(unsigned int target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type, const void *pixels);
+    void (*glTexStorage2D)(unsigned int target, int levels, unsigned int internalformat, int width, int height);
    void (*glGetTexImage)(unsigned int target, int level, unsigned int format, unsigned int type, void *pixels);
    void (*glGenFramebuffers)(int n, unsigned int *framebuffers);
    void (*glBindFramebuffer)(unsigned int target, unsigned int framebuffer);
--- a/include/encoder/encoder.h
+++ b/include/encoder/encoder.h
@@ -1,7 +1,7 @@
 #ifndef GSR_ENCODER_H
 #define GSR_ENCODER_H

-#include "../replay_buffer.h"
+#include "../replay_buffer/replay_buffer.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
@@ -23,8 +23,7 @@ typedef struct {
 } gsr_encoder_recording_destination;

 typedef struct {
-    gsr_replay_buffer replay_buffer;
-    bool has_replay_buffer;
+    gsr_replay_buffer *replay_buffer;
    pthread_mutex_t file_write_mutex;
    bool mutex_created;

@@ -33,7 +32,7 @@ typedef struct {
    size_t recording_destination_id_counter;
 } gsr_encoder;

-bool gsr_encoder_init(gsr_encoder *self, size_t replay_buffer_num_packets);
+bool gsr_encoder_init(gsr_encoder *self, gsr_replay_storage replay_storage, size_t replay_buffer_num_packets, double replay_buffer_time, const char *replay_directory);
 void gsr_encoder_deinit(gsr_encoder *self);

 void gsr_encoder_receive_packets(gsr_encoder *self, AVCodecContext *codec_context, int64_t pts, int stream_index);
--- a/include/pipewire_audio.h
+++ b/include/pipewire_audio.h
@@ -8,12 +8,6 @@

 #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 */
@@ -84,20 +78,25 @@ typedef struct {
    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_node *stream_nodes;
+    size_t num_stream_nodes;
+    size_t stream_nodes_capacity_items;

-    gsr_pipewire_audio_port ports[GSR_PIPEWIRE_AUDIO_MAX_PORTS];
-    int num_ports;
+    gsr_pipewire_audio_port *ports;
+    size_t num_ports;
+    size_t ports_capacity_items;

-    gsr_pipewire_audio_link links[GSR_PIPEWIRE_AUDIO_MAX_LINKS];
-    int num_links;
+    gsr_pipewire_audio_link *links;
+    size_t num_links;
+    size_t links_capacity_items;

-    gsr_pipewire_audio_requested_link requested_links[GSR_PIPEWIRE_AUDIO_MAX_REQUESTED_LINKS];
-    int num_requested_links;
+    gsr_pipewire_audio_requested_link *requested_links;
+    size_t num_requested_links;
+    size_t requested_links_capacity_items;

-    struct pw_proxy *virtual_sink_proxies[GSR_PIPEWIRE_AUDIO_MAX_VIRTUAL_SINKS];
-    int num_virtual_sink_proxies;
+    struct pw_proxy **virtual_sink_proxies;
+    size_t num_virtual_sink_proxies;
+    size_t virtual_sink_proxies_capacity_items;
 } gsr_pipewire_audio;

 bool gsr_pipewire_audio_init(gsr_pipewire_audio *self);
--- a/include/pipewire_video.h
+++ b/include/pipewire_video.h
@@ -65,6 +65,7 @@ typedef struct {
    struct spa_video_info format;
    int server_version_sync;
    bool negotiated;
+    bool renegotiated;
    bool damaged;

    struct {
@@ -94,6 +95,9 @@ typedef struct {

    uint64_t modifiers[GSR_PIPEWIRE_VIDEO_MAX_MODIFIERS];
    size_t num_modifiers;
+
+    bool paused;
+    double paused_start_secs;
 } gsr_pipewire_video;

 /*
@@ -108,5 +112,6 @@ void gsr_pipewire_video_deinit(gsr_pipewire_video *self);
 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);
+bool gsr_pipewire_video_should_restart(gsr_pipewire_video *self);

 #endif /* GSR_PIPEWIRE_VIDEO_H */
--- a/include/replay_buffer.h
+++ b/include/replay_buffer.h
@@ -1,41 +0,0 @@
-#ifndef GSR_REPLAY_BUFFER_H
-#define GSR_REPLAY_BUFFER_H
-
-#include <pthread.h>
-#include <stdbool.h>
-#include <libavcodec/packet.h>
-
-typedef struct {
-    AVPacket packet;
-    int ref_counter;
-    double timestamp;
-} gsr_av_packet;
-
-gsr_av_packet* gsr_av_packet_create(const AVPacket *av_packet, double timestamp);
-gsr_av_packet* gsr_av_packet_ref(gsr_av_packet *self);
-void gsr_av_packet_unref(gsr_av_packet *self);
-
-typedef struct {
-    gsr_av_packet **packets;
-    size_t capacity_num_packets;
-    size_t num_packets;
-    size_t index;
-    pthread_mutex_t mutex;
-    bool mutex_initialized;
-    bool owns_mutex;
-} gsr_replay_buffer;
-
-bool gsr_replay_buffer_init(gsr_replay_buffer *self, size_t replay_buffer_num_packets);
-void gsr_replay_buffer_deinit(gsr_replay_buffer *self);
-
-bool gsr_replay_buffer_append(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp);
-void gsr_replay_buffer_clear(gsr_replay_buffer *self);
-gsr_av_packet* gsr_replay_buffer_get_packet_at_index(gsr_replay_buffer *self, size_t index);
-/* The clone has to be deinitialized before the replay buffer it clones */
-bool gsr_replay_buffer_clone(const gsr_replay_buffer *self, gsr_replay_buffer *destination);
-/* Returns 0 if replay buffer is empty */
-size_t gsr_replay_buffer_find_packet_index_by_time_passed(gsr_replay_buffer *self, int seconds);
-/* Returns -1 if not found */
-size_t gsr_replay_buffer_find_keyframe(gsr_replay_buffer *self, size_t start_index, int stream_index, bool invert_stream_index);
-
-#endif /* GSR_REPLAY_BUFFER_H */
--- a/include/replay_buffer/replay_buffer.h
+++ b/include/replay_buffer/replay_buffer.h
@@ -0,0 +1,54 @@
+#ifndef GSR_REPLAY_BUFFER_H
+#define GSR_REPLAY_BUFFER_H
+
+#include "../defs.h"
+#include <pthread.h>
+#include <stdbool.h>
+#include <libavcodec/packet.h>
+
+typedef struct gsr_replay_buffer gsr_replay_buffer;
+
+typedef struct {
+    size_t packet_index;
+    size_t file_index;
+} gsr_replay_buffer_iterator;
+
+struct gsr_replay_buffer {
+    void (*destroy)(gsr_replay_buffer *self);
+    bool (*append)(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp);
+    void (*clear)(gsr_replay_buffer *self);
+    AVPacket* (*iterator_get_packet)(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator);
+    /* The returned data should be free'd with free */
+    uint8_t* (*iterator_get_packet_data)(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator);
+    /* The clone has to be destroyed before the replay buffer it clones is destroyed */
+    gsr_replay_buffer* (*clone)(gsr_replay_buffer *self);
+    /* Returns {0, 0} if replay buffer is empty */
+    gsr_replay_buffer_iterator (*find_packet_index_by_time_passed)(gsr_replay_buffer *self, int seconds);
+    /* Returns {-1, 0} if not found */
+    gsr_replay_buffer_iterator (*find_keyframe)(gsr_replay_buffer *self, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index);
+    bool (*iterator_next)(gsr_replay_buffer *self, gsr_replay_buffer_iterator *iterator);
+
+    pthread_mutex_t mutex;
+    bool mutex_initialized;
+    gsr_replay_buffer *original_replay_buffer;
+};
+
+gsr_replay_buffer* gsr_replay_buffer_create(gsr_replay_storage replay_storage, const char *replay_directory, double replay_buffer_time, size_t replay_buffer_num_packets);
+void gsr_replay_buffer_destroy(gsr_replay_buffer *self);
+
+void gsr_replay_buffer_lock(gsr_replay_buffer *self);
+void gsr_replay_buffer_unlock(gsr_replay_buffer *self);
+bool gsr_replay_buffer_append(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp);
+void gsr_replay_buffer_clear(gsr_replay_buffer *self);
+AVPacket* gsr_replay_buffer_iterator_get_packet(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator);
+/* The returned data should be free'd with free */
+uint8_t* gsr_replay_buffer_iterator_get_packet_data(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator);
+/* The clone has to be destroyed before the replay buffer it clones is destroyed */
+gsr_replay_buffer* gsr_replay_buffer_clone(gsr_replay_buffer *self);
+/* Returns {0, 0} if replay buffer is empty */
+gsr_replay_buffer_iterator gsr_replay_buffer_find_packet_index_by_time_passed(gsr_replay_buffer *self, int seconds);
+/* Returns {-1, 0} if not found */
+gsr_replay_buffer_iterator gsr_replay_buffer_find_keyframe(gsr_replay_buffer *self, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index);
+bool gsr_replay_buffer_iterator_next(gsr_replay_buffer *self, gsr_replay_buffer_iterator *iterator);
+
+#endif /* GSR_REPLAY_BUFFER_H */
--- a/include/replay_buffer/replay_buffer_disk.h
+++ b/include/replay_buffer/replay_buffer_disk.h
@@ -0,0 +1,44 @@
+#ifndef GSR_REPLAY_BUFFER_DISK_H
+#define GSR_REPLAY_BUFFER_DISK_H
+
+#include "replay_buffer.h"
+#include <limits.h>
+
+#define GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES 1024
+
+typedef struct {
+    AVPacket packet;
+    size_t data_index;
+    double timestamp;
+} gsr_av_packet_disk;
+
+typedef struct {
+    size_t id;
+    double start_timestamp;
+    double end_timestamp;
+    int ref_counter;
+    int fd;
+    
+    gsr_av_packet_disk *packets;
+    size_t capacity_num_packets;
+    size_t num_packets;
+} gsr_replay_buffer_file;
+
+typedef struct {
+    gsr_replay_buffer replay_buffer;
+    double replay_buffer_time;
+
+    size_t storage_counter;
+    size_t storage_num_bytes_written;
+    int storage_fd;
+    gsr_replay_buffer_file *files[GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES]; // GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES * REPLAY_BUFFER_FILE_SIZE_BYTES = 256gb, should be enough for everybody
+    size_t num_files;
+
+    char replay_directory[PATH_MAX];
+
+    bool owns_directory;
+} gsr_replay_buffer_disk;
+
+gsr_replay_buffer* gsr_replay_buffer_disk_create(const char *replay_directory, double replay_buffer_time);
+
+#endif /* GSR_REPLAY_BUFFER_DISK_H */
--- a/include/replay_buffer/replay_buffer_ram.h
+++ b/include/replay_buffer/replay_buffer_ram.h
@@ -0,0 +1,22 @@
+#ifndef GSR_REPLAY_BUFFER_RAM_H
+#define GSR_REPLAY_BUFFER_RAM_H
+
+#include "replay_buffer.h"
+
+typedef struct {
+    AVPacket packet;
+    int ref_counter;
+    double timestamp;
+} gsr_av_packet_ram;
+
+typedef struct {
+    gsr_replay_buffer replay_buffer;
+    gsr_av_packet_ram **packets;
+    size_t capacity_num_packets;
+    size_t num_packets;
+    size_t index;
+} gsr_replay_buffer_ram;
+
+gsr_replay_buffer* gsr_replay_buffer_ram_create(size_t replay_buffer_num_packets);
+
+#endif /* GSR_REPLAY_BUFFER_RAM_H */
--- a/include/utils.h
+++ b/include/utils.h
@@ -7,8 +7,6 @@
 #include <stdbool.h>
 #include <stdint.h>

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

@@ -29,12 +27,6 @@ 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);
@@ -46,7 +38,7 @@ bool get_monitor_by_name(const gsr_egl *egl, gsr_connection_type connection_type
 bool drm_monitor_get_display_server_data(const gsr_window *window, const gsr_monitor *monitor, gsr_monitor_rotation *monitor_rotation, vec2i *monitor_position);

 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);
+int get_connector_type_id_by_name(const char *name);
 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);
@@ -61,7 +53,6 @@ int create_directory_recursive(char *path);

 /* |img_attr| needs to be at least 44 in size */
 void setup_dma_buf_attrs(intptr_t *img_attr, uint32_t format, uint32_t width, uint32_t height, const int *fds, const uint32_t *offsets, const uint32_t *pitches, const uint64_t *modifiers, int num_planes, bool use_modifier);
-bool video_codec_context_is_vaapi(AVCodecContext *video_codec_context);

 vec2i scale_keep_aspect_ratio(vec2i from, vec2i to);

--- a/kms/client/kms_client.c
+++ b/kms/client/kms_client.c
@@ -13,7 +13,12 @@
 #include <sys/wait.h>
 #include <poll.h>
 #include <sys/stat.h>
+#ifdef __linux__
 #include <sys/capability.h>
+#endif
+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+#endif

 #define GSR_SOCKET_PAIR_LOCAL  0
 #define GSR_SOCKET_PAIR_REMOTE 1
@@ -119,8 +124,11 @@ static int recv_msg_from_server(int server_pid, int server_fd, gsr_kms_response

 /* We have to use $HOME because in flatpak there is no simple path that is accessible, read and write, that multiple flatpak instances can access */
 static bool create_socket_path(char *output_path, size_t output_path_size) {
+    const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
    const char *home = getenv("HOME");
-    if(!home)
+    // Portable home with AppImage can cause the socket path to be longer than 108 characters (unix domain socket path max length).
+    // Using gsr-kms-socket in $HOME is only needed in flatpak, so use /tmp everywhere else instead.
+    if(!home || !inside_flatpak)
        home = "/tmp";

    char random_characters[11];
@@ -132,6 +140,7 @@ static bool create_socket_path(char *output_path, size_t output_path_size) {
    return true;
 }

+#ifdef __linux__
 static bool readlink_realpath(const char *filepath, char *buffer) {
    char symlinked_path[PATH_MAX];
    ssize_t bytes_written = readlink(filepath, symlinked_path, sizeof(symlinked_path) - 1);
@@ -149,6 +158,7 @@ static bool readlink_realpath(const char *filepath, char *buffer) {

    return true;
 }
+#endif

 static bool strcat_safe(char *str, int size, const char *str_to_add) {
    const int str_len = strlen(str);
@@ -220,10 +230,24 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) {
    }

    char server_filepath[PATH_MAX];
+#ifdef __linux__
    if(!readlink_realpath("/proc/self/exe", server_filepath)) {
        fprintf(stderr, "gsr error: gsr_kms_client_init: failed to resolve /proc/self/exe\n");
        return -1;
    }
+
+#elif defined(__FreeBSD__)
+    int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, getpid() };
+    size_t size = PATH_MAX;
+
+    if (sysctl(mib, 4, server_filepath, &size, NULL, 0) != 0) {
+        fprintf(stderr, "gsr error: gsr_kms_client_init: failed to resolve pathname using sysctl\n");
+        return -1;
+    }
+
+#else
+#error "Implement it by yourself"
+#endif
    file_get_directory(server_filepath);

    if(!strcat_safe(server_filepath, sizeof(server_filepath), "/gsr-kms-server")) {
@@ -250,6 +274,7 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) {
    if(geteuid() == 0) {
        has_perm = true;
    } else {
+#ifdef __linux__
        cap_t kms_server_cap = cap_get_file(server_filepath);
        if(kms_server_cap) {
            cap_flag_value_t res = CAP_CLEAR;
@@ -267,6 +292,9 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) {
            else
                fprintf(stderr, "gsr info: gsr_kms_client_init: failed to get cap\n");
        }
+#else
+        fprintf(stderr, "gsr info: gsr_kms_client_init: platform doesn't support cap\n");
+#endif
    }

    if(socketpair(AF_UNIX, SOCK_STREAM, 0, self->socket_pair) == -1) {
@@ -312,12 +340,14 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) {
            const char *args[] = { "pkexec", server_filepath, self->initial_socket_path, card_path, NULL };
            execvp(args[0], (char *const*)args);
        }
-        fprintf(stderr, "gsr error: gsr_kms_client_init: execvp failed, error: %s\n", strerror(errno));
+        fprintf(stderr, "gsr error: gsr_kms_client_init: failed to launch \"gsr-kms-server\", error: %s\n", strerror(errno));
        _exit(127);
    } else { /* parent */
        self->kms_server_pid = pid;
    }

+    // We need this dumb-shit retardation with unix domain socket and then replace it with socketpair because
+    // pkexec doesn't work with socketpair................
    fprintf(stderr, "gsr info: gsr_kms_client_init: waiting for server to connect\n");
    struct pollfd poll_fd = {
        .fd = self->initial_socket_fd,
@@ -387,6 +417,7 @@ void cleanup_socket(gsr_kms_client *self, bool kill_server) {

    if(kill_server && self->kms_server_pid > 0) {
        kill(self->kms_server_pid, SIGKILL);
+        // TODO:
        //int status;
        //waitpid(self->kms_server_pid, &status, 0);
        self->kms_server_pid = -1;
--- a/kms/server/kms_server.c
+++ b/kms/server/kms_server.c
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <locale.h>

 #include <unistd.h>
 #include <limits.h>
@@ -434,6 +435,8 @@ static double clock_get_monotonic_seconds(void) {
 }

 int main(int argc, char **argv) {
+    setlocale(LC_ALL, "C"); // Sigh... stupid C
+
    int res = 0;
    int socket_fd = 0;
    gsr_drm drm;
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('gpu-screen-recorder', ['c', 'cpp'], version : '5.4.0', default_options : ['warning_level=2'])
+project('gpu-screen-recorder', ['c', 'cpp'], version : '5.6.2', default_options : ['warning_level=2'])

 add_project_arguments('-Wshadow', language : ['c', 'cpp'])
 if get_option('buildtype') == 'debug'
@@ -26,6 +26,9 @@ src = [
    'src/window/window.c',
    'src/window/x11.c',
    'src/window/wayland.c',
+    'src/replay_buffer/replay_buffer.c',
+    'src/replay_buffer/replay_buffer_ram.c',
+    'src/replay_buffer/replay_buffer_disk.c',
    'src/egl.c',
    'src/cuda.c',
    'src/xnvctrl.c',
@@ -40,7 +43,6 @@ src = [
    'src/image_writer.c',
    'src/args_parser.c',
    'src/defs.c',
-    'src/replay_buffer.c',
    'src/sound.cpp',
    'src/main.cpp',
 ]
@@ -63,12 +65,17 @@ dep = [
    dependency('libavfilter'),
    dependency('libva'),
    dependency('libva-drm'),
-    dependency('libcap'),
    dependency('libdrm'),
    dependency('wayland-egl'),
    dependency('wayland-client'),
 ]

+if build_machine.system() == 'linux'
+    dep += [
+        dependency('libcap'),
+    ]
+endif
+
 uses_pipewire = false

 if get_option('portal') == true
@@ -77,7 +84,6 @@ if get_option('portal') == true
        'src/dbus.c',
        'src/pipewire_video.c',
    ]
-    dep += dependency('dbus-1')
    add_project_arguments('-DGSR_PORTAL', language : ['c', 'cpp'])
    uses_pipewire = true
 endif
@@ -94,6 +100,7 @@ if uses_pipewire == true
    dep += [
        dependency('libpipewire-0.3'),
        dependency('libspa-0.2'),
+        dependency('dbus-1'),
    ]
 endif

--- a/project.conf
+++ b/project.conf
@@ -1,7 +1,7 @@
 [package]
 name = "gpu-screen-recorder"
 type = "executable"
-version = "5.4.0"
+version = "5.6.2"
 platforms = ["posix"]

 [config]
--- a/protocol/xdg-output-unstable-v1.xml
+++ b/protocol/xdg-output-unstable-v1.xml
@@ -151,7 +151,7 @@
 	   summary="height in global compositor space"/>
    </event>

-    <event name="done" deprecated-since="3">
+    <event name="done">
      <description summary="all information about the output have been sent">
 	This event is sent after all other properties of an xdg_output
 	have been sent.
--- a/scripts/replay-application-name.sh
+++ b/scripts/replay-application-name.sh
@@ -3,4 +3,4 @@
 window=$(xdotool selectwindow)
 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 -bm cbr -q 45000 -r 60 -o "$HOME/Videos/Replays/$window_name"
+gpu-screen-recorder -w "$window" -f 60 -c mkv -a default_output -bm cbr -q 40000 -r 60 -o "$HOME/Videos/Replays/$window_name"
--- a/scripts/start-replay.sh
+++ b/scripts/start-replay.sh
@@ -3,4 +3,4 @@
 pidof -q gpu-screen-recorder && exit 0
 video_path="$HOME/Videos"
 mkdir -p "$video_path"
-gpu-screen-recorder -w screen -f 60 -a default_output -c mkv -bm cbr -q 45000 -r 30 -o "$video_path"
+gpu-screen-recorder -w screen -f 60 -a default_output -c mkv -bm cbr -q 40000 -r 30 -o "$video_path"
--- a/scripts/toggle-recording.sh
+++ b/scripts/toggle-recording.sh
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+killall -SIGINT gpu-screen-recorder && sleep 0.5 && notify-send -t 1500 -u low 'GPU Screen Recorder' 'Stopped recording' && exit 0;
+video="$HOME/Videos/$(date +"Video_%Y-%m-%d_%H-%M-%S.mp4")"
+notify-send -t 1500 -u low 'GPU Screen Recorder' "Started recording video to $video"
+gpu-screen-recorder -w screen -f 60 -a "default_output" -o "$video"
--- a/src/args_parser.c
+++ b/src/args_parser.c
@@ -69,6 +69,11 @@ static const ArgEnum tune_enums[] = {
    { .name = "quality",     .value = GSR_TUNE_QUALITY     },
 };

+static const ArgEnum replay_storage_enums[] = {
+    { .name = "ram",  .value = GSR_REPLAY_STORAGE_RAM  },
+    { .name = "disk", .value = GSR_REPLAY_STORAGE_DISK },
+};
+
 static void arg_deinit(Arg *arg) {
    if(arg->values) {
        free(arg->values);
@@ -185,11 +190,10 @@ static double args_get_double_by_key(Arg *args, int num_args, const char *key, d
 static void usage_header() {
    const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
    const char *program_name = inside_flatpak ? "flatpak run --command=gpu-screen-recorder com.dec05eba.gpu_screen_recorder" : "gpu-screen-recorder";
-    printf("usage: %s -w <window_id|monitor|focused|portal|region> [-c <container_format>] [-s WxH] [-region WxH+X+Y] [-f <fps>] [-a <audio_input>] [-q <quality>] [-r <replay_buffer_size_sec>] [-restart-replay-on-save yes|no] [-k h264|hevc|av1|vp8|vp9|hevc_hdr|av1_hdr|hevc_10bit|av1_10bit] [-ac aac|opus|flac] [-ab <bitrate>] [-oc yes|no] [-fm cfr|vfr|content] [-bm auto|qp|vbr|cbr] [-cr limited|full] [-tune performance|quality] [-df yes|no] [-sc <script_path>] [-cursor yes|no] [-keyint <value>] [-restore-portal-session yes|no] [-portal-session-token-filepath filepath] [-encoder gpu|cpu] [-o <output_file>] [-ro <output_directory>] [--list-capture-options [card_path]] [--list-audio-devices] [--list-application-audio] [-v yes|no] [-gl-debug yes|no] [--version] [-h|--help]\n", program_name);
+    printf("usage: %s -w <window_id|monitor|focused|portal|region> [-c <container_format>] [-s WxH] [-region WxH+X+Y] [-f <fps>] [-a <audio_input>] [-q <quality>] [-r <replay_buffer_size_sec>] [-replay-storage ram|disk] [-restart-replay-on-save yes|no] [-k h264|hevc|av1|vp8|vp9|hevc_hdr|av1_hdr|hevc_10bit|av1_10bit] [-ac aac|opus|flac] [-ab <bitrate>] [-oc yes|no] [-fm cfr|vfr|content] [-bm auto|qp|vbr|cbr] [-cr limited|full] [-tune performance|quality] [-df yes|no] [-sc <script_path>] [-cursor yes|no] [-keyint <value>] [-restore-portal-session yes|no] [-portal-session-token-filepath filepath] [-encoder gpu|cpu] [-o <output_file>] [-ro <output_directory>] [--list-capture-options [card_path]] [--list-audio-devices] [--list-application-audio] [-v yes|no] [-gl-debug yes|no] [--version] [-h|--help]\n", program_name);
    fflush(stdout);
 }

-// TODO: Update with portal info
 static void usage_full() {
    const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
    const char *program_name = inside_flatpak ? "flatpak run --command=gpu-screen-recorder com.dec05eba.gpu_screen_recorder" : "gpu-screen-recorder";
@@ -229,7 +233,6 @@ static void usage_full() {
    printf("  -a    Audio device or application to record from (pulse audio device). Can be specified multiple times. Each time this is specified a new audio track is added for the specified audio device or application.\n");
    printf("        The audio device can also be \"default_output\" in which case the default output device is used, or \"default_input\" in which case the default input device is used.\n");
    printf("        Multiple audio sources can be merged into one audio track by using \"|\" as a separator into one -a argument, for example: -a \"default_output|default_input\".\n");
-    printf("        A name can be given to the audio track by prefixing the audio with <name>/, for example \"track name/default_output\" or \"track name/default_output|default_input\".\n");
    printf("        The audio name can also be prefixed with \"device:\", for example: -a \"device:default_output\".\n");
    printf("        To record audio from an application then prefix the audio name with \"app:\", for example: -a \"app:Brave\". The application name is case-insensitive.\n");
    printf("        To record audio from all applications except the provided ones prefix the audio name with \"app-inverse:\", for example: -a \"app-inverse:Brave\".\n");
@@ -250,9 +253,14 @@ static void usage_full() {
    printf("\n");
    printf("  -r    Replay buffer time in seconds. If this is set, then only the last seconds as set by this option will be stored\n");
    printf("        and the video will only be saved when the gpu-screen-recorder is closed. This feature is similar to Nvidia's instant replay feature This option has be between 5 and 1200.\n");
-    printf("        Note that the video data is stored in RAM, so don't use too long replay buffer time and use constant bitrate option (-bm cbr) to prevent RAM usage from going too high in busy scenes.\n");
+    printf("        Note that the video data is stored in RAM (unless -replay-storage disk is used), so don't use too long replay buffer time and use constant bitrate option (-bm cbr) to prevent RAM usage from going too high in busy scenes.\n");
    printf("        Optional, disabled by default.\n");
    printf("\n");
+    printf("  -replay-storage\n");
+    printf("        Specify where temporary replay is stored. Should be either 'ram' or 'disk'. If set to 'disk' then replay data is stored in temporary files in the same directory as -o.\n");
+    printf("        Preferably avoid setting this to 'disk' unless -o is set to a HDD, as constant writes to a SSD can reduce the life-time of the SSD.\n");
+    printf("        Optional, set to 'ram' by default.\n");
+    printf("\n");
    printf("  -restart-replay-on-save\n");
    printf("        Restart replay on save. For example if this is set to 'no' and replay time (-r) is set to 60 seconds and a replay is saved once then the first replay video is 60 seconds long\n");
    printf("        and if a replay is saved 10 seconds later then the second replay video will also be 60 seconds long and contain 50 seconds of the previous video as well.\n");
@@ -388,8 +396,10 @@ static void usage_full() {
    printf("EXAMPLES:\n");
    printf("  %s -w screen -f 60 -a default_output -o video.mp4\n", program_name);
    printf("  %s -w screen -f 60 -a default_output -a default_input -o video.mp4\n", program_name);
+    printf("  %s -w $(xdotool selectwindow) -f 60 -a default_output -o video.mp4\n", program_name);
    printf("  %s -w screen -f 60 -a \"default_output|default_input\" -o video.mp4\n", program_name);
    printf("  %s -w screen -f 60 -a default_output -c mkv -r 60 -o \"$HOME/Videos\"\n", program_name);
+    printf("  %s -w screen -f 60 -a default_output -c mkv -r 1800 -replay-storage disk -bm cbr -q 40000 -o \"$HOME/Videos\"\n", program_name);
    printf("  %s -w screen -f 60 -a default_output -c mkv -sc script.sh -r 60 -o \"$HOME/Videos\"\n", program_name);
    printf("  %s -w portal -f 60 -a default_output -restore-portal-session yes -o video.mp4\n", program_name);
    printf("  %s -w screen -f 60 -a default_output -bm cbr -q 15000 -o video.mp4\n", program_name);
@@ -437,6 +447,7 @@ static bool args_parser_set_values(args_parser *self) {
    self->video_codec = (gsr_video_codec)args_get_enum_by_key(self->args, NUM_ARGS, "-k", GSR_VIDEO_CODEC_AUTO);
    self->audio_codec = (gsr_audio_codec)args_get_enum_by_key(self->args, NUM_ARGS, "-ac", GSR_AUDIO_CODEC_OPUS);
    self->bitrate_mode = (gsr_bitrate_mode)args_get_enum_by_key(self->args, NUM_ARGS, "-bm", GSR_BITRATE_MODE_AUTO);
+    self->replay_storage = (gsr_replay_storage)args_get_enum_by_key(self->args, NUM_ARGS, "-replay-storage", GSR_REPLAY_STORAGE_RAM);

    const char *window = args_get_value_by_key(self->args, NUM_ARGS, "-w");
    snprintf(self->window, sizeof(self->window), "%s", window);
@@ -454,7 +465,7 @@ static bool args_parser_set_values(args_parser *self) {
    self->keyint = args_get_double_by_key(self->args, NUM_ARGS, "-keyint", 2.0);

    if(self->audio_codec == GSR_AUDIO_CODEC_FLAC) {
-        fprintf(stderr, "Warning: flac audio codec is temporary disabled, using opus audio codec instead\n");
+        fprintf(stderr, "gsr warning: flac audio codec is temporary disabled, using opus audio codec instead\n");
        self->audio_codec = GSR_AUDIO_CODEC_OPUS;
    }

@@ -462,7 +473,7 @@ static bool args_parser_set_values(args_parser *self) {
    if(self->portal_session_token_filepath) {
        int len = strlen(self->portal_session_token_filepath);
        if(len > 0 && self->portal_session_token_filepath[len - 1] == '/') {
-            fprintf(stderr, "Error: -portal-session-token-filepath should be a path to a file but it ends with a /: %s\n", self->portal_session_token_filepath);
+            fprintf(stderr, "gsr error: -portal-session-token-filepath should be a path to a file but it ends with a /: %s\n", self->portal_session_token_filepath);
            return false;
        }
    }
@@ -471,13 +482,13 @@ static bool args_parser_set_values(args_parser *self) {
    if(self->recording_saved_script) {
        struct stat buf;
        if(stat(self->recording_saved_script, &buf) == -1 || !S_ISREG(buf.st_mode)) {
-            fprintf(stderr, "Error: Script \"%s\" either doesn't exist or it's not a file\n", self->recording_saved_script);
+            fprintf(stderr, "gsr error: Script \"%s\" either doesn't exist or it's not a file\n", self->recording_saved_script);
            usage();
            return false;
        }

        if(!(buf.st_mode & S_IXUSR)) {
-            fprintf(stderr, "Error: Script \"%s\" is not executable\n", self->recording_saved_script);
+            fprintf(stderr, "gsr error: Script \"%s\" is not executable\n", self->recording_saved_script);
            usage();
            return false;
        }
@@ -489,19 +500,19 @@ static bool args_parser_set_values(args_parser *self) {

    if(self->bitrate_mode == GSR_BITRATE_MODE_CBR) {
        if(!quality_str) {
-            fprintf(stderr, "Error: option '-q' is required when using '-bm cbr' option\n");
+            fprintf(stderr, "gsr error: option '-q' is required when using '-bm cbr' option\n");
            usage();
            return false;
        }

        if(sscanf(quality_str, "%" PRIi64, &self->video_bitrate) != 1) {
-            fprintf(stderr, "Error: -q argument \"%s\" is not an integer value. When using '-bm cbr' option '-q' is expected to be an integer value\n", quality_str);
+            fprintf(stderr, "gsr error: -q argument \"%s\" is not an integer value. When using '-bm cbr' option '-q' is expected to be an integer value\n", quality_str);
            usage();
            return false;
        }

        if(self->video_bitrate < 0) {
-            fprintf(stderr, "Error: -q is expected to be 0 or larger, got %" PRIi64 "\n", self->video_bitrate);
+            fprintf(stderr, "gsr error: -q is expected to be 0 or larger, got %" PRIi64 "\n", self->video_bitrate);
            usage();
            return false;
        }
@@ -520,7 +531,7 @@ static bool args_parser_set_values(args_parser *self) {
        } else if(strcmp(quality_str, "ultra") == 0) {
            self->video_quality = GSR_VIDEO_QUALITY_ULTRA;
        } else {
-            fprintf(stderr, "Error: -q should either be 'medium', 'high', 'very_high' or 'ultra', got: '%s'\n", quality_str);
+            fprintf(stderr, "gsr error: -q should either be 'medium', 'high', 'very_high' or 'ultra', got: '%s'\n", quality_str);
            usage();
            return false;
        }
@@ -528,7 +539,7 @@ static bool args_parser_set_values(args_parser *self) {

    const char *output_resolution_str = args_get_value_by_key(self->args, NUM_ARGS, "-s");
    if(!output_resolution_str && strcmp(self->window, "focused") == 0) {
-        fprintf(stderr, "Error: option -s is required when using '-w focused' option\n");
+        fprintf(stderr, "gsr error: option -s is required when using '-w focused' option\n");
        usage();
        return false;
    }
@@ -536,13 +547,13 @@ static bool args_parser_set_values(args_parser *self) {
    self->output_resolution = (vec2i){0, 0};
    if(output_resolution_str) {
        if(sscanf(output_resolution_str, "%dx%d", &self->output_resolution.x, &self->output_resolution.y) != 2) {
-            fprintf(stderr, "Error: invalid value for option -s '%s', expected a value in format WxH\n", output_resolution_str);
+            fprintf(stderr, "gsr error: invalid value for option -s '%s', expected a value in format WxH\n", output_resolution_str);
            usage();
            return false;
        }

        if(self->output_resolution.x < 0 || self->output_resolution.y < 0) {
-            fprintf(stderr, "Error: invalid value for option -s '%s', expected width and height to be greater or equal to 0\n", output_resolution_str);
+            fprintf(stderr, "gsr error: invalid value for option -s '%s', expected width and height to be greater or equal to 0\n", output_resolution_str);
            usage();
            return false;
        }
@@ -553,25 +564,25 @@ static bool args_parser_set_values(args_parser *self) {
    const char *region_str = args_get_value_by_key(self->args, NUM_ARGS, "-region");
    if(region_str) {
        if(strcmp(self->window, "region") != 0) {
-            fprintf(stderr, "Error: option -region can only be used when option '-w region' is used\n");
+            fprintf(stderr, "gsr error: option -region can only be used when option '-w region' is used\n");
            usage();
            return false;
        }

        if(sscanf(region_str, "%dx%d+%d+%d", &self->region_size.x, &self->region_size.y, &self->region_position.x, &self->region_position.y) != 4) {
-            fprintf(stderr, "Error: invalid value for option -region '%s', expected a value in format WxH+X+Y\n", region_str);
+            fprintf(stderr, "gsr error: invalid value for option -region '%s', expected a value in format WxH+X+Y\n", region_str);
            usage();
            return false;
        }

        if(self->region_size.x < 0 || self->region_size.y < 0 || self->region_position.x < 0 || self->region_position.y < 0) {
-            fprintf(stderr, "Error: invalid value for option -region '%s', expected width, height, x and y to be greater or equal to 0\n", region_str);
+            fprintf(stderr, "gsr error: invalid value for option -region '%s', expected width, height, x and y to be greater or equal to 0\n", region_str);
            usage();
            return false;
        }
    } else {
        if(strcmp(self->window, "region") == 0) {
-            fprintf(stderr, "Error: option -region is required when '-w region' is used\n");
+            fprintf(stderr, "gsr error: option -region is required when '-w region' is used\n");
            usage();
            return false;
        }
@@ -593,7 +604,7 @@ static bool args_parser_set_values(args_parser *self) {
        self->is_livestream = is_livestream_path(self->filename);
        if(self->is_livestream) {
            if(is_replaying) {
-                fprintf(stderr, "Error: replay mode is not applicable to live streaming\n");
+                fprintf(stderr, "gsr error: replay mode is not applicable to live streaming\n");
                return false;
            }
        } else {
@@ -603,20 +614,20 @@ static bool args_parser_set_values(args_parser *self) {
                char *directory = dirname(directory_buf);
                if(strcmp(directory, ".") != 0 && strcmp(directory, "/") != 0) {
                    if(create_directory_recursive(directory) != 0) {
-                        fprintf(stderr, "Error: failed to create directory for output file: %s\n", self->filename);
+                        fprintf(stderr, "gsr error: failed to create directory for output file: %s\n", self->filename);
                        return false;
                    }
                }
            } else {
                if(!self->container_format) {
-                    fprintf(stderr, "Error: option -c is required when using option -r\n");
+                    fprintf(stderr, "gsr error: option -c is required when using option -r\n");
                    usage();
                    return false;
                }

                struct stat buf;
                if(stat(self->filename, &buf) != -1 && !S_ISDIR(buf.st_mode)) {
-                    fprintf(stderr, "Error: File \"%s\" exists but it's not a directory\n", self->filename);
+                    fprintf(stderr, "gsr error: File \"%s\" exists but it's not a directory\n", self->filename);
                    usage();
                    return false;
                }
@@ -626,13 +637,13 @@ static bool args_parser_set_values(args_parser *self) {
        if(!is_replaying) {
            self->filename = "/dev/stdout";
        } else {
-            fprintf(stderr, "Error: Option -o is required when using option -r\n");
+            fprintf(stderr, "gsr error: Option -o is required when using option -r\n");
            usage();
            return false;
        }

        if(!self->container_format) {
-            fprintf(stderr, "Error: option -c is required when not using option -o\n");
+            fprintf(stderr, "gsr error: option -c is required when not using option -o\n");
            usage();
            return false;
        }
@@ -645,10 +656,10 @@ static bool args_parser_set_values(args_parser *self) {

    const bool is_portal_capture = strcmp(self->window, "portal") == 0;
    if(!self->restore_portal_session && is_portal_capture)
-        fprintf(stderr, "Info: option '-w portal' was used without '-restore-portal-session yes'. The previous screencast session will be ignored\n");
+        fprintf(stderr, "gsr info: option '-w portal' was used without '-restore-portal-session yes'. The previous screencast session will be ignored\n");

    if(self->is_livestream && self->recording_saved_script) {
-        fprintf(stderr, "Warning: live stream detected, -sc script is ignored\n");
+        fprintf(stderr, "gsr warning: live stream detected, -sc script is ignored\n");
        self->recording_saved_script = NULL;
    }

@@ -693,7 +704,7 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
            arg_handlers->list_capture_options(card_path, userdata);
            return true;
        } else {
-            fprintf(stderr, "Error: expected --list-capture-options to be called with either no extra arguments or 1 extra argument (card path)\n");
+            fprintf(stderr, "gsr error: expected --list-capture-options to be called with either no extra arguments or 1 extra argument (card path)\n");
            return false;
        }
    }
@@ -713,7 +724,7 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
    self->args[arg_index++] = (Arg){ .key = "-q",                             .optional = true,  .list = false, .type = ARG_TYPE_STRING  };
    self->args[arg_index++] = (Arg){ .key = "-o",                             .optional = true,  .list = false, .type = ARG_TYPE_STRING  };
    self->args[arg_index++] = (Arg){ .key = "-ro",                            .optional = true,  .list = false, .type = ARG_TYPE_STRING  };
-    self->args[arg_index++] = (Arg){ .key = "-r",                             .optional = true,  .list = false, .type = ARG_TYPE_I64, .integer_value_min = 2, .integer_value_max = 10800 };
+    self->args[arg_index++] = (Arg){ .key = "-r",                             .optional = true,  .list = false, .type = ARG_TYPE_I64, .integer_value_min = 2, .integer_value_max = 86400 };
    self->args[arg_index++] = (Arg){ .key = "-restart-replay-on-save",        .optional = true,  .list = false, .type = ARG_TYPE_BOOLEAN };
    self->args[arg_index++] = (Arg){ .key = "-k",                             .optional = true,  .list = false, .type = ARG_TYPE_ENUM, .enum_values = video_codec_enums, .num_enum_values = sizeof(video_codec_enums)/sizeof(ArgEnum) };
    self->args[arg_index++] = (Arg){ .key = "-ac",                            .optional = true,  .list = false, .type = ARG_TYPE_ENUM, .enum_values = audio_codec_enums, .num_enum_values = sizeof(audio_codec_enums)/sizeof(ArgEnum) };
@@ -733,25 +744,26 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
    self->args[arg_index++] = (Arg){ .key = "-restore-portal-session",        .optional = true,  .list = false, .type = ARG_TYPE_BOOLEAN };
    self->args[arg_index++] = (Arg){ .key = "-portal-session-token-filepath", .optional = true,  .list = false, .type = ARG_TYPE_STRING  };
    self->args[arg_index++] = (Arg){ .key = "-encoder",                       .optional = true,  .list = false, .type = ARG_TYPE_ENUM, .enum_values = video_encoder_enums, .num_enum_values = sizeof(video_encoder_enums)/sizeof(ArgEnum) };
+    self->args[arg_index++] = (Arg){ .key = "-replay-storage",                .optional = true,  .list = false, .type = ARG_TYPE_ENUM, .enum_values = replay_storage_enums, .num_enum_values = sizeof(replay_storage_enums)/sizeof(ArgEnum) };
    assert(arg_index == NUM_ARGS);

    for(int i = 1; i < argc; i += 2) {
        const char *arg_name = argv[i];
        Arg *arg = args_get_by_key(self->args, NUM_ARGS, arg_name);
        if(!arg) {
-            fprintf(stderr, "Error: invalid argument '%s'\n", arg_name);
+            fprintf(stderr, "gsr error: invalid argument '%s'\n", arg_name);
            usage();
            return false;
        }

        if(arg->num_values > 0 && !arg->list) {
-            fprintf(stderr, "Error: expected argument '%s' to only be specified once\n", arg_name);
+            fprintf(stderr, "gsr error: expected argument '%s' to only be specified once\n", arg_name);
            usage();
            return false;
        }

        if(i + 1 >= argc) {
-            fprintf(stderr, "Error: missing value for argument '%s'\n", arg_name);
+            fprintf(stderr, "gsr error: missing value for argument '%s'\n", arg_name);
            usage();
            return false;
        }
@@ -767,7 +779,7 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
                } else if(strcmp(arg_value, "no") == 0) {
                    arg->typed_value.boolean = false;
                } else {
-                    fprintf(stderr, "Error: %s should either be 'yes' or 'no', got: '%s'\n", arg_name, arg_value);
+                    fprintf(stderr, "gsr error: %s should either be 'yes' or 'no', got: '%s'\n", arg_name, arg_value);
                    usage();
                    return false;
                }
@@ -775,7 +787,7 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
            }
            case ARG_TYPE_ENUM: {
                if(!arg_get_enum_value_by_name(arg, arg_value, &arg->typed_value.enum_value)) {
-                    fprintf(stderr, "Error: %s should either be ", arg_name);
+                    fprintf(stderr, "gsr error: %s should either be ", arg_name);
                    arg_print_expected_enum_names(arg);
                    fprintf(stderr, ", got: '%s'\n", arg_value);
                    usage();
@@ -785,19 +797,19 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
            }
            case ARG_TYPE_I64: {
                if(sscanf(arg_value, "%" PRIi64, &arg->typed_value.i64_value) != 1) {
-                    fprintf(stderr, "Error: %s argument \"%s\" is not an integer\n", arg_name, arg_value);
+                    fprintf(stderr, "gsr error: %s argument \"%s\" is not an integer\n", arg_name, arg_value);
                    usage();
                    return false;
                }

                if(arg->typed_value.i64_value < arg->integer_value_min) {
-                    fprintf(stderr, "Error: %s argument is expected to be larger than %" PRIi64 ", got %" PRIi64 "\n", arg_name, arg->integer_value_min, arg->typed_value.i64_value);
+                    fprintf(stderr, "gsr error: %s argument is expected to be larger than %" PRIi64 ", got %" PRIi64 "\n", arg_name, arg->integer_value_min, arg->typed_value.i64_value);
                    usage();
                    return false;
                }

                if(arg->typed_value.i64_value > arg->integer_value_max) {
-                    fprintf(stderr, "Error: %s argument is expected to be less than %" PRIi64 ", got %" PRIi64 "\n", arg_name, arg->integer_value_max, arg->typed_value.i64_value);
+                    fprintf(stderr, "gsr error: %s argument is expected to be less than %" PRIi64 ", got %" PRIi64 "\n", arg_name, arg->integer_value_max, arg->typed_value.i64_value);
                    usage();
                    return false;
                }
@@ -805,19 +817,19 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
            }
            case ARG_TYPE_DOUBLE: {
                if(sscanf(arg_value, "%lf", &arg->typed_value.d_value) != 1) {
-                    fprintf(stderr, "Error: %s argument \"%s\" is not an floating-point number\n", arg_name, arg_value);
+                    fprintf(stderr, "gsr error: %s argument \"%s\" is not an floating-point number\n", arg_name, arg_value);
                    usage();
                    return false;
                }

                if(arg->typed_value.d_value < arg->integer_value_min) {
-                    fprintf(stderr, "Error: %s argument is expected to be larger than %" PRIi64 ", got %lf\n", arg_name, arg->integer_value_min, arg->typed_value.d_value);
+                    fprintf(stderr, "gsr error: %s argument is expected to be larger than %" PRIi64 ", got %lf\n", arg_name, arg->integer_value_min, arg->typed_value.d_value);
                    usage();
                    return false;
                }

                if(arg->typed_value.d_value > arg->integer_value_max) {
-                    fprintf(stderr, "Error: %s argument is expected to be less than %" PRIi64 ", got %lf\n", arg_name, arg->integer_value_max, arg->typed_value.d_value);
+                    fprintf(stderr, "gsr error: %s argument is expected to be less than %" PRIi64 ", got %lf\n", arg_name, arg->integer_value_max, arg->typed_value.d_value);
                    usage();
                    return false;
                }
@@ -826,7 +838,7 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
        }

        if(!arg_append_value(arg, arg_value)) {
-            fprintf(stderr, "Error: failed to append argument, out of memory\n");
+            fprintf(stderr, "gsr error: failed to append argument, out of memory\n");
            return false;
        }
    }
@@ -834,7 +846,7 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
    for(int i = 0; i < NUM_ARGS; ++i) {
        const Arg *arg = &self->args[i];
        if(!arg->optional && arg->num_values == 0) {
-            fprintf(stderr, "Error: missing argument '%s'\n", arg->key);
+            fprintf(stderr, "gsr error: missing argument '%s'\n", arg->key);
            usage();
            return false;
        }
@@ -858,45 +870,45 @@ bool args_parser_validate_with_gl_info(args_parser *self, gsr_egl *egl) {
    }

    if(egl->gpu_info.is_steam_deck && self->bitrate_mode == GSR_BITRATE_MODE_QP) {
-        fprintf(stderr, "Warning: qp bitrate mode is not supported on Steam Deck because of Steam Deck driver bugs. Using vbr instead\n");
+        fprintf(stderr, "gsr warning: qp bitrate mode is not supported on Steam Deck because of Steam Deck driver bugs. Using vbr instead\n");
        self->bitrate_mode = GSR_BITRATE_MODE_VBR;
    }

    if(self->video_encoder == GSR_VIDEO_ENCODER_HW_CPU && self->bitrate_mode == GSR_BITRATE_MODE_VBR) {
-        fprintf(stderr, "Warning: bitrate mode has been forcefully set to qp because software encoding option doesn't support vbr option\n");
+        fprintf(stderr, "gsr warning: bitrate mode has been forcefully set to qp because software encoding option doesn't support vbr option\n");
        self->bitrate_mode = GSR_BITRATE_MODE_QP;
    }

    if(egl->gpu_info.vendor != GSR_GPU_VENDOR_NVIDIA && self->overclock) {
-        fprintf(stderr, "Info: overclock option has no effect on amd/intel, ignoring option\n");
+        fprintf(stderr, "gsr info: overclock option has no effect on amd/intel, ignoring option\n");
        self->overclock = false;
    }

    if(egl->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA && self->overclock && wayland) {
-        fprintf(stderr, "Info: overclocking is not possible on nvidia on wayland, ignoring option\n");
+        fprintf(stderr, "gsr info: overclocking is not possible on nvidia on wayland, ignoring option\n");
        self->overclock = false;
    }

    if(egl->gpu_info.is_steam_deck) {
-        fprintf(stderr, "Warning: steam deck has multiple driver issues. One of them has been reported here: https://github.com/ValveSoftware/SteamOS/issues/1609\n"
+        fprintf(stderr, "gsr warning: steam deck has multiple driver issues. One of them has been reported here: https://github.com/ValveSoftware/SteamOS/issues/1609\n"
            "If you have issues with GPU Screen Recorder on steam deck that you don't have on a desktop computer then report the issue to Valve and/or AMD.\n");
    }

    self->very_old_gpu = false;
    if(egl->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA && egl->gpu_info.gpu_version != 0 && egl->gpu_info.gpu_version < 900) {
-        fprintf(stderr, "Info: your gpu appears to be very old (older than maxwell architecture). Switching to lower preset\n");
+        fprintf(stderr, "gsr info: your gpu appears to be very old (older than maxwell architecture). Switching to lower preset\n");
        self->very_old_gpu = true;
    }

    if(video_codec_is_hdr(self->video_codec) && !wayland) {
-        fprintf(stderr, "Error: hdr video codec option %s is not available on X11\n", video_codec_to_string(self->video_codec));
+        fprintf(stderr, "gsr error: hdr video codec option %s is not available on X11\n", video_codec_to_string(self->video_codec));
        usage();
        return false;
    }

    const bool is_portal_capture = strcmp(self->window, "portal") == 0;
    if(video_codec_is_hdr(self->video_codec) && is_portal_capture) {
-        fprintf(stderr, "Warning: portal capture option doesn't support hdr yet (PipeWire doesn't support hdr), the video will be tonemapped from hdr to sdr\n");
+        fprintf(stderr, "gsr warning: portal capture option doesn't support hdr yet (PipeWire doesn't support hdr), the video will be tonemapped from hdr to sdr\n");
        self->video_codec = hdr_video_codec_to_sdr_video_codec(self->video_codec);
    }

--- a/src/capture/kms.c
+++ b/src/capture/kms.c
@@ -12,7 +12,7 @@
 #include <fcntl.h>

 #include <xf86drm.h>
-#include <libdrm/drm_fourcc.h>
+#include <drm_fourcc.h>

 #include <libavutil/mastering_display_metadata.h>

@@ -108,22 +108,14 @@ static int max_int(int a, int b) {
 }

 static void gsr_capture_kms_create_input_texture_ids(gsr_capture_kms *self) {
-    const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-
    self->params.egl->glGenTextures(1, &self->input_texture_id);
    self->params.egl->glBindTexture(GL_TEXTURE_2D, self->input_texture_id);
-    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);

    self->params.egl->glGenTextures(1, &self->external_input_texture_id);
    self->params.egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, self->external_input_texture_id);
-    self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameterfv(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_BORDER_COLOR, border_color);
    self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    self->params.egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0);
@@ -133,9 +125,6 @@ static void gsr_capture_kms_create_input_texture_ids(gsr_capture_kms *self) {

    self->params.egl->glGenTextures(1, &self->cursor_texture_id);
    self->params.egl->glBindTexture(cursor_texture_id_target, self->cursor_texture_id);
-    self->params.egl->glTexParameteri(cursor_texture_id_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameteri(cursor_texture_id_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameterfv(cursor_texture_id_target, GL_TEXTURE_BORDER_COLOR, border_color);
    self->params.egl->glTexParameteri(cursor_texture_id_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    self->params.egl->glTexParameteri(cursor_texture_id_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    self->params.egl->glBindTexture(cursor_texture_id_target, 0);
--- a/src/capture/nvfbc.c
+++ b/src/capture/nvfbc.c
@@ -289,12 +289,12 @@ static int gsr_capture_nvfbc_start(gsr_capture *cap, gsr_capture_metadata *captu
    int driver_major_version = 0;
    int driver_minor_version = 0;
    if(self->params.direct_capture && get_driver_version(&driver_major_version, &driver_minor_version)) {
-        fprintf(stderr, "Info: detected nvidia version: %d.%d\n", driver_major_version, driver_minor_version);
+        fprintf(stderr, "gsr info: detected nvidia version: %d.%d\n", driver_major_version, driver_minor_version);

        // TODO:
        if(version_at_least(driver_major_version, driver_minor_version, 515, 57) && version_less_than(driver_major_version, driver_minor_version, 520, 56)) {
            self->params.direct_capture = false;
-            fprintf(stderr, "Warning: \"screen-direct\" has temporary been disabled as it causes stuttering with driver versions >= 515.57 and < 520.56. Please update your driver if possible. Capturing \"screen\" instead.\n");
+            fprintf(stderr, "gsr warning: \"screen-direct\" has temporary been disabled as it causes stuttering with driver versions >= 515.57 and < 520.56. Please update your driver if possible. Capturing \"screen\" instead.\n");
        }

        // TODO:
@@ -304,7 +304,7 @@ static int gsr_capture_nvfbc_start(gsr_capture *cap, gsr_capture_metadata *captu
            if(version_at_least(driver_major_version, driver_minor_version, 515, 57))
                self->supports_direct_cursor = true;
            else
-                fprintf(stderr, "Info: capturing \"screen-direct\" but driver version appears to be less than 515.57. Disabling capture of cursor. Please update your driver if you want to capture your cursor or record \"screen\" instead.\n");
+                fprintf(stderr, "gsr info: capturing \"screen-direct\" but driver version appears to be less than 515.57. Disabling capture of cursor. Please update your driver if you want to capture your cursor or record \"screen\" instead.\n");
        }
        */
    }
--- a/src/capture/portal.c
+++ b/src/capture/portal.c
@@ -11,6 +11,15 @@
 #include <limits.h>
 #include <assert.h>

+#define PORTAL_CAPTURE_CANCELED_BY_USER_EXIT_CODE 60
+
+typedef enum {
+    PORTAL_CAPTURE_SETUP_IDLE,
+    PORTAL_CAPTURE_SETUP_IN_PROGRESS,
+    PORTAL_CAPTURE_SETUP_FINISHED,
+    PORTAL_CAPTURE_SETUP_FAILED
+} gsr_portal_capture_setup_state;
+
 typedef struct {
    gsr_capture_portal_params params;

@@ -23,6 +32,15 @@ typedef struct {
    vec2i capture_size;
    gsr_pipewire_video_dmabuf_data dmabuf_data[GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES];
    int num_dmabuf_data;
+
+    gsr_pipewire_video_region region;
+    gsr_pipewire_video_region cursor_region;
+    uint32_t pipewire_fourcc;
+    uint64_t pipewire_modifiers;
+    bool using_external_image;
+
+    bool should_stop;
+    bool stop_is_error;
 } gsr_capture_portal;

 static void gsr_capture_portal_cleanup_plane_fds(gsr_capture_portal *self) {
@@ -52,43 +70,25 @@ static void gsr_capture_portal_stop(gsr_capture_portal *self) {
    }

    gsr_capture_portal_cleanup_plane_fds(self);
-
    gsr_pipewire_video_deinit(&self->pipewire);
-
-    if(self->session_handle) {
-        free(self->session_handle);
-        self->session_handle = NULL;
-    }
-
    gsr_dbus_deinit(&self->dbus);
 }

 static void gsr_capture_portal_create_input_textures(gsr_capture_portal *self) {
-    const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-
    self->params.egl->glGenTextures(1, &self->texture_map.texture_id);
    self->params.egl->glBindTexture(GL_TEXTURE_2D, self->texture_map.texture_id);
-    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);

    self->params.egl->glGenTextures(1, &self->texture_map.external_texture_id);
    self->params.egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, self->texture_map.external_texture_id);
-    self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameterfv(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_BORDER_COLOR, border_color);
    self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    self->params.egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0);

    self->params.egl->glGenTextures(1, &self->texture_map.cursor_texture_id);
    self->params.egl->glBindTexture(GL_TEXTURE_2D, self->texture_map.cursor_texture_id);
-    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    self->params.egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
@@ -234,19 +234,13 @@ 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_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();
    while(clock_get_monotonic_seconds() - start_time < 5.0) {
-        bool uses_external_image = false;
-        uint32_t fourcc = 0;
-        uint64_t modifiers = 0;
-        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;
+        if(gsr_pipewire_video_map_texture(&self->pipewire, self->texture_map, &self->region, &self->cursor_region, self->dmabuf_data, &self->num_dmabuf_data, &self->pipewire_fourcc, &self->pipewire_modifiers, &self->using_external_image)) {
+            self->capture_size.x = self->region.width;
+            self->capture_size.y = self->region.height;
            fprintf(stderr, "gsr info: gsr_capture_portal_start: pipewire negotiation finished\n");
            return true;
        }
@@ -257,45 +251,51 @@ static bool gsr_capture_portal_get_frame_dimensions(gsr_capture_portal *self) {
    return false;
 }

-static int gsr_capture_portal_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata) {
-    gsr_capture_portal *self = cap->priv;
-
+static int gsr_capture_portal_setup(gsr_capture_portal *self, int fps) {
    gsr_capture_portal_create_input_textures(self);

    int pipewire_fd = 0;
    uint32_t pipewire_node = 0;
    const int response_status = gsr_capture_portal_setup_dbus(self, &pipewire_fd, &pipewire_node);
    if(response_status != 0) {
-        gsr_capture_portal_stop(self);
        // Response status values:
        // 0: Success, the request is carried out
        // 1: The user cancelled the interaction
        // 2: The user interaction was ended in some other way
        // Response status value 2 happens usually if there was some kind of error in the desktop portal on the system
        if(response_status == 2) {
-            fprintf(stderr, "gsr error: gsr_capture_portal_start: desktop portal capture failed. Either you Wayland compositor doesn't support desktop portal capture or it's incorrectly setup on your system\n");
+            fprintf(stderr, "gsr error: gsr_capture_portal_setup: desktop portal capture failed. Either you Wayland compositor doesn't support desktop portal capture or it's incorrectly setup on your system\n");
            return 50;
        } else if(response_status == 1) {
-            fprintf(stderr, "gsr error: gsr_capture_portal_start: desktop portal capture failed. It seems like desktop portal capture was canceled by the user.\n");
-            return 60;
+            fprintf(stderr, "gsr error: gsr_capture_portal_setup: desktop portal capture failed. It seems like desktop portal capture was canceled by the user.\n");
+            return PORTAL_CAPTURE_CANCELED_BY_USER_EXIT_CODE;
        } else {
            return -1;
        }
    }

-    fprintf(stderr, "gsr info: gsr_capture_portal_start: setting up pipewire\n");
+    fprintf(stderr, "gsr info: gsr_capture_portal_setup: setting up pipewire\n");
    /* TODO: support hdr when pipewire supports it */
    /* gsr_pipewire closes the pipewire fd, even on failure */
-    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);
+    if(!gsr_pipewire_video_init(&self->pipewire, pipewire_fd, pipewire_node, fps, self->params.record_cursor, self->params.egl)) {
+        fprintf(stderr, "gsr error: gsr_capture_portal_setup: failed to setup pipewire with fd: %d, node: %" PRIu32 "\n", pipewire_fd, pipewire_node);
        return -1;
    }
-    fprintf(stderr, "gsr info: gsr_capture_portal_start: pipewire setup finished\n");
+    fprintf(stderr, "gsr info: gsr_capture_portal_setup: pipewire setup finished\n");

-    if(!gsr_capture_portal_get_frame_dimensions(self)) {
-        gsr_capture_portal_stop(self);
+    if(!gsr_capture_portal_get_frame_dimensions(self))
        return -1;
+
+    return 0;
+}
+
+static int gsr_capture_portal_start(gsr_capture *cap, gsr_capture_metadata *capture_metadata) {
+    gsr_capture_portal *self = cap->priv;
+
+    const int result = gsr_capture_portal_setup(self, capture_metadata->fps);
+    if(result != 0) {
+        gsr_capture_portal_stop(self);
+        return result;
    }

    if(self->params.output_resolution.x == 0 && self->params.output_resolution.y == 0) {
@@ -314,24 +314,49 @@ static int max_int(int a, int b) {
    return a > b ? a : b;
 }

+static bool gsr_capture_portal_capture_has_synchronous_task(gsr_capture *cap) {
+    gsr_capture_portal *self = cap->priv;
+    return gsr_pipewire_video_should_restart(&self->pipewire);
+}
+
+static bool fourcc_has_alpha(uint32_t fourcc) {
+    const uint8_t *p = (const uint8_t*)&fourcc;
+    for(int i = 0; i < 4; ++i) {
+        if(p[i] == 'A')
+            return true;
+    }
+    return false;
+}
+
 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_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_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;
-            gsr_color_conversion_clear(color_conversion);
+    if(self->should_stop)
+        return -1;
+
+    if(gsr_pipewire_video_should_restart(&self->pipewire)) {
+        fprintf(stderr, "gsr info: gsr_capture_portal_capture: pipewire capture was paused, trying to start capture again\n");
+        gsr_capture_portal_stop(self);
+        const int result = gsr_capture_portal_setup(self, capture_metadata->fps);
+        if(result != 0) {
+            self->stop_is_error = result != PORTAL_CAPTURE_CANCELED_BY_USER_EXIT_CODE;
+            self->should_stop = true;
+        }
+        return -1;
+    }
+
+    /* TODO: Handle formats other than RGB(A) */
+    if(self->num_dmabuf_data == 0) {
+        if(gsr_pipewire_video_map_texture(&self->pipewire, self->texture_map, &self->region, &self->cursor_region, self->dmabuf_data, &self->num_dmabuf_data, &self->pipewire_fourcc, &self->pipewire_modifiers, &self->using_external_image)) {
+            if(self->region.width != self->capture_size.x || self->region.height != self->capture_size.y) {
+                self->capture_size.x = self->region.width;
+                self->capture_size.y = self->region.height;
+                gsr_color_conversion_clear(color_conversion);
+            }
+        } else {
+            return -1;
        }
-    } else {
-        return 0;
    }

    const bool is_scaled = self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0;
@@ -345,27 +370,31 @@ static int gsr_capture_portal_capture(gsr_capture *cap, gsr_capture_metadata *ca

    // TODO: Handle region crop

-    gsr_color_conversion_draw(color_conversion, using_external_image ? self->texture_map.external_texture_id : self->texture_map.texture_id,
-        target_pos, output_size,
-        (vec2i){region.x, region.y}, self->capture_size, self->capture_size,
-        GSR_ROT_0, GSR_SOURCE_COLOR_RGB, using_external_image, false);
+    const bool fourcc_alpha = fourcc_has_alpha(self->pipewire_fourcc);
+    if(fourcc_alpha)
+        gsr_color_conversion_clear(color_conversion);

-    if(self->params.record_cursor && self->texture_map.cursor_texture_id > 0 && cursor_region.width > 0) {
+    gsr_color_conversion_draw(color_conversion, self->using_external_image ? self->texture_map.external_texture_id : self->texture_map.texture_id,
+       target_pos, output_size,
+       (vec2i){self->region.x, self->region.y}, self->capture_size, self->capture_size,
+       GSR_ROT_0, GSR_SOURCE_COLOR_RGB, self->using_external_image, fourcc_alpha);
+
+    if(self->params.record_cursor && self->texture_map.cursor_texture_id > 0 && self->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 * scale.x),
-            target_pos.y + (cursor_region.y * scale.y)
+            target_pos.x + (self->cursor_region.x * scale.x),
+            target_pos.y + (self->cursor_region.y * scale.y)
        };

        self->params.egl->glEnable(GL_SCISSOR_TEST);
        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 * scale.x, cursor_region.height * scale.y},
-            (vec2i){0, 0}, (vec2i){cursor_region.width, cursor_region.height}, (vec2i){cursor_region.width, cursor_region.height},
+            (vec2i){cursor_pos.x, cursor_pos.y}, (vec2i){self->cursor_region.width * scale.x, self->cursor_region.height * scale.y},
+            (vec2i){0, 0}, (vec2i){self->cursor_region.width, self->cursor_region.height}, (vec2i){self->cursor_region.width, self->cursor_region.height},
            GSR_ROT_0, GSR_SOURCE_COLOR_RGB, false, true);
        self->params.egl->glDisable(GL_SCISSOR_TEST);
    }
@@ -383,6 +412,13 @@ static bool gsr_capture_portal_uses_external_image(gsr_capture *cap) {
    return true;
 }

+static bool gsr_capture_portal_should_stop(gsr_capture *cap, bool *err) {
+    gsr_capture_portal *self = cap->priv;
+    if(err)
+        *err = self->stop_is_error;
+    return self->should_stop;
+}
+
 static bool gsr_capture_portal_is_damaged(gsr_capture *cap) {
    gsr_capture_portal *self = cap->priv;
    return gsr_pipewire_video_is_damaged(&self->pipewire);
@@ -424,7 +460,8 @@ gsr_capture* gsr_capture_portal_create(const gsr_capture_portal_params *params)
    *cap = (gsr_capture) {
        .start = gsr_capture_portal_start,
        .tick = NULL,
-        .should_stop = NULL,
+        .should_stop = gsr_capture_portal_should_stop,
+        .capture_has_synchronous_task = gsr_capture_portal_capture_has_synchronous_task,
        .capture = gsr_capture_portal_capture,
        .uses_external_image = gsr_capture_portal_uses_external_image,
        .is_damaged = gsr_capture_portal_is_damaged,
--- a/src/codec_query/vaapi.c
+++ b/src/codec_query/vaapi.c
@@ -116,7 +116,7 @@ static bool get_supported_video_codecs(VADisplay va_dpy, gsr_supported_video_cod
    int va_minor = 0;
    if(vaInitialize(va_dpy, &va_major, &va_minor) != VA_STATUS_SUCCESS) {
        fprintf(stderr, "gsr error: gsr_get_supported_video_codecs_vaapi: vaInitialize failed\n");
-        goto fail;
+        return false;
    }

    int num_profiles = vaMaxNumProfiles(va_dpy);
--- a/src/color_conversion.c
+++ b/src/color_conversion.c
@@ -89,15 +89,13 @@ static void get_compute_shader_header(char *header, size_t header_size, bool ext
    if(external_texture) {
        snprintf(header, header_size,
            "#version 310 es\n"
-            "#extension GL_ARB_compute_shader: enable\n"
            "#extension GL_OES_EGL_image_external : enable\n"
            "#extension GL_OES_EGL_image_external_essl3 : require\n"
            "layout(binding = 0) uniform highp samplerExternalOES img_input;\n"
            "layout(binding = 1) uniform highp sampler2D img_background;\n");
    } else {
        snprintf(header, header_size,
-            "#version 420\n"
-            "#extension GL_ARB_compute_shader: enable\n"
+            "#version 310 es\n"
            "layout(binding = 0) uniform highp sampler2D img_input;\n"
            "layout(binding = 1) uniform highp sampler2D img_background;\n");
    }
@@ -109,7 +107,7 @@ static int load_compute_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_com
    char header[512];
    get_compute_shader_header(header, sizeof(header), external_texture);

-    char compute_shader[2048];
+    char compute_shader[4096];
    snprintf(compute_shader, sizeof(compute_shader),
        "%s"
        "layout (local_size_x = %d, local_size_y = %d, local_size_z = 1) in;\n"
@@ -127,12 +125,16 @@ static int load_compute_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_com
        "    ivec2 output_size = textureSize(img_background, 0);\n"
        "    vec2 rotated_texel_coord = vec2(texel_coord - source_position - size_shift) * rotation_matrix + vec2(size_shift) + 0.5;\n"
        "    vec2 output_texel_coord = vec2(texel_coord - source_position + target_position) + 0.5;\n"
-        "    vec4 source_color = texture(img_input, rotated_texel_coord/vec2(size));\n"
+        "    vec2 source_color_coords = rotated_texel_coord/vec2(size);\n"
+        "    vec4 source_color = texture(img_input, source_color_coords);\n"
+        "    if(source_color_coords.x > 1.0 || source_color_coords.y > 1.0)\n"
+        "        source_color.rgba = vec4(0.0, 0.0, 0.0, %s);\n"
        "    vec4 source_color_yuv = RGBtoYUV * vec4(source_color.rgb, 1.0);\n"
        "    vec4 output_color_yuv = %s;\n"
        "    float y_color = mix(output_color_yuv.r, source_color_yuv.r, source_color.a);\n"
        "    imageStore(img_output, texel_coord + target_position, vec4(y_color, 1.0, 1.0, 1.0));\n"
        "}\n", header, max_local_size_dim, max_local_size_dim, color_transform_matrix,
+            alpha_blending ? "0.0" : "1.0",
            alpha_blending ? "texture(img_background, output_texel_coord/vec2(output_size))" : "source_color_yuv");

    if(gsr_shader_init(shader, egl, NULL, NULL, compute_shader) != 0)
@@ -151,7 +153,7 @@ static int load_compute_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_co
    char header[512];
    get_compute_shader_header(header, sizeof(header), external_texture);

-    char compute_shader[2048];
+    char compute_shader[4096];
    snprintf(compute_shader, sizeof(compute_shader),
        "%s"
        "layout (local_size_x = %d, local_size_y = %d, local_size_z = 1) in;\n"
@@ -169,12 +171,16 @@ static int load_compute_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_co
        "    ivec2 output_size = textureSize(img_background, 0);\n"
        "    vec2 rotated_texel_coord = vec2(texel_coord - source_position - size_shift) * rotation_matrix + vec2(size_shift) + 0.5;\n"
        "    vec2 output_texel_coord = vec2(texel_coord - source_position + target_position) + 0.5;\n"
-        "    vec4 source_color = texture(img_input, rotated_texel_coord/vec2(size>>1));\n" // size/2
+        "    vec2 source_color_coords = rotated_texel_coord/vec2(size>>1);\n"
+        "    vec4 source_color = texture(img_input, source_color_coords);\n" // size/2
+        "    if(source_color_coords.x > 1.0 || source_color_coords.y > 1.0)\n"
+        "        source_color.rgba = vec4(0.0, 0.0, 0.0, %s);\n"
        "    vec4 source_color_yuv = RGBtoYUV * vec4(source_color.rgb, 1.0);\n"
        "    vec4 output_color_yuv = %s;\n"
        "    vec2 uv_color = mix(output_color_yuv.rg, source_color_yuv.gb, source_color.a);\n"
        "    imageStore(img_output, texel_coord + target_position, vec4(uv_color, 1.0, 1.0));\n"
        "}\n", header, max_local_size_dim, max_local_size_dim, color_transform_matrix,
+            alpha_blending ? "0.0" : "1.0",
            alpha_blending ? "texture(img_background, output_texel_coord/vec2(output_size))" : "source_color_yuv");

    if(gsr_shader_init(shader, egl, NULL, NULL, compute_shader) != 0)
@@ -191,10 +197,11 @@ static int load_compute_shader_rgb(gsr_shader *shader, gsr_egl *egl, gsr_color_c
    char header[512];
    get_compute_shader_header(header, sizeof(header), external_texture);

-    char compute_shader[2048];
+    char compute_shader[4096];
    snprintf(compute_shader, sizeof(compute_shader),
        "%s"
        "layout (local_size_x = %d, local_size_y = %d, local_size_z = 1) in;\n"
+        "precision highp float;\n"
        "uniform ivec2 source_position;\n"
        "uniform ivec2 target_position;\n"
        "uniform vec2 scale;\n"
@@ -207,11 +214,15 @@ static int load_compute_shader_rgb(gsr_shader *shader, gsr_egl *egl, gsr_color_c
        "    ivec2 output_size = textureSize(img_background, 0);\n"
        "    vec2 rotated_texel_coord = vec2(texel_coord - source_position - size_shift) * rotation_matrix + vec2(size_shift) + 0.5;\n"
        "    vec2 output_texel_coord = vec2(texel_coord - source_position + target_position) + 0.5;\n"
-        "    vec4 source_color = texture(img_input, rotated_texel_coord/vec2(size));\n"
+        "    vec2 source_color_coords = rotated_texel_coord/vec2(size);\n"
+        "    vec4 source_color = texture(img_input, source_color_coords);\n"
+        "    if(source_color_coords.x > 1.0 || source_color_coords.y > 1.0)\n"
+        "        source_color.rgba = vec4(0.0, 0.0, 0.0, %s);\n"
        "    vec4 output_color = %s;\n"
        "    vec3 color = mix(output_color.rgb, source_color.rgb, source_color.a);\n"
        "    imageStore(img_output, texel_coord + target_position, vec4(color, 1.0));\n"
        "}\n", header, max_local_size_dim, max_local_size_dim,
+            alpha_blending ? "0.0" : "1.0",
            alpha_blending ? "texture(img_background, output_texel_coord/vec2(output_size))" : "source_color");

    if(gsr_shader_init(shader, egl, NULL, NULL, compute_shader) != 0)
@@ -243,7 +254,6 @@ static int load_graphics_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_gr
        "}                                                 \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";
@@ -306,7 +316,6 @@ static unsigned int load_graphics_shader_uv(gsr_shader *shader, gsr_egl *egl, gs
        "}                                               \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";
@@ -367,7 +376,6 @@ static unsigned int load_graphics_shader_rgb(gsr_shader *shader, gsr_egl *egl, g
        "}                                                 \n");

    const char *main_code =
-        main_code =
            "  vec4 pixel = texture(tex1, texcoords_out);                                          \n"
            "  FragColor = pixel;                                                                  \n";

@@ -620,20 +628,33 @@ int gsr_color_conversion_init(gsr_color_conversion *self, const gsr_color_conver
        }
    }

-    if(!gsr_color_conversion_load_compute_shaders(self)) {
+    if(self->params.force_graphics_shader) {
        self->compute_shaders_failed_to_load = true;
-        fprintf(stderr, "gsr info: failed to load one or more compute shaders, run gpu-screen-recorder with the '-gl-debug yes' option to see why. Falling back to slower graphics shader instead\n");
+        self->external_compute_shaders_failed_to_load = true;
+        
        if(!gsr_color_conversion_load_graphics_shaders(self))
            goto err;
-    }

-    if(self->params.load_external_image_shader) {
-        if(!gsr_color_conversion_load_external_compute_shaders(self)) {
-            self->external_compute_shaders_failed_to_load = true;
-            fprintf(stderr, "gsr info: failed to load one or more external compute shaders, run gpu-screen-recorder with the '-gl-debug yes' option to see why. Falling back to slower graphics shader instead\n");
+        if(self->params.load_external_image_shader) {
            if(!gsr_color_conversion_load_external_graphics_shaders(self))
                goto err;
        }
+    } else {
+        if(!gsr_color_conversion_load_compute_shaders(self)) {
+            self->compute_shaders_failed_to_load = true;
+            fprintf(stderr, "gsr info: failed to load one or more compute shaders, run gpu-screen-recorder with the '-gl-debug yes' option to see why. Falling back to slower graphics shader instead\n");
+            if(!gsr_color_conversion_load_graphics_shaders(self))
+                goto err;
+        }
+
+        if(self->params.load_external_image_shader) {
+            if(!gsr_color_conversion_load_external_compute_shaders(self)) {
+                self->external_compute_shaders_failed_to_load = true;
+                fprintf(stderr, "gsr info: failed to load one or more external compute shaders, run gpu-screen-recorder with the '-gl-debug yes' option to see why. Falling back to slower graphics shader instead\n");
+                if(!gsr_color_conversion_load_external_graphics_shaders(self))
+                    goto err;
+            }
+        }
    }

    if(load_framebuffers(self) != 0)
@@ -920,7 +941,6 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
        source_position.x += source_pos.x;
        source_position.y += source_pos.y;
        gsr_color_conversion_draw_graphics(self, texture_id, external_texture, rotation_matrix, source_position, source_size, destination_pos, texture_size, scale, source_color);
-        // TODO: Is glFlush and glFinish needed here for graphics garbage?
    } else {
        switch(rotation) {
            case GSR_ROT_0:
@@ -955,6 +975,7 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
        }
    }

+    self->params.egl->glFlush();
    // TODO: Use the minimal barrier required
    self->params.egl->glMemoryBarrier(GL_ALL_BARRIER_BITS); // GL_SHADER_IMAGE_ACCESS_BARRIER_BIT
    self->params.egl->glUseProgram(0);
@@ -998,6 +1019,13 @@ void gsr_color_conversion_clear(gsr_color_conversion *self) {
    self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, 0);
 }

+void gsr_color_conversion_read_destination_texture(gsr_color_conversion *self, int destination_texture_index, int x, int y, int width, int height, unsigned int color_format, unsigned int data_format, void *pixels) {
+    assert(destination_texture_index >= 0 && destination_texture_index < self->params.num_destination_textures);
+    self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, self->framebuffers[destination_texture_index]);
+    self->params.egl->glReadPixels(x, y, width, height, color_format, data_format, pixels);
+    self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, 0);
+}
+
 gsr_rotation gsr_monitor_rotation_to_rotation(gsr_monitor_rotation monitor_rotation) {
    return (gsr_rotation)monitor_rotation;
 }
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -56,10 +56,6 @@ static bool gsr_cursor_set_from_x11_cursor_image(gsr_cursor *self, XFixesCursorI
    self->egl->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, self->size.x, self->size.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, cursor_data);
    free(cursor_data);

-    const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    self->egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

--- a/src/dbus.c
+++ b/src/dbus.c
@@ -1,5 +1,6 @@
 #include "../include/dbus.h"
-#include "../include/utils.h"
+
+#include <sys/random.h>

 #include <stdio.h>
 #include <string.h>
@@ -28,6 +29,25 @@ typedef struct {
    };
 } dict_entry;

+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 bool generate_random_characters_standard_alphabet(char *buffer, int buffer_size) {
+    return generate_random_characters(buffer, buffer_size, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 62);
+}
+
 static const char* dict_value_type_to_string(dict_value_type type) {
    switch(type) {
        case DICT_TYPE_STRING: return "string";
--- a/src/egl.c
+++ b/src/egl.c
@@ -9,7 +9,6 @@
 #include <dlfcn.h>
 #include <assert.h>
 #include <unistd.h>
-#include <sys/capability.h>

 // TODO: rename gsr_egl to something else since this includes both egl and glx and in the future maybe vulkan too

@@ -29,43 +28,28 @@
 #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 void reset_cap_nice(void) {
-    cap_t caps = cap_get_proc();
-    if(!caps)
-        return;
-
-    const cap_value_t cap_to_remove = CAP_SYS_NICE;
-    cap_set_flag(caps, CAP_EFFECTIVE, 1, &cap_to_remove, CAP_CLEAR);
-    cap_set_flag(caps, CAP_PERMITTED, 1, &cap_to_remove, CAP_CLEAR);
-    cap_set_proc(caps);
-    cap_free(caps);
-}
-
 // 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) {
+static bool gsr_egl_create_window(gsr_egl *self, bool enable_debug) {
    EGLConfig  ecfg;
    int32_t    num_config = 0;

-    // TODO: Use EGL_OPENGL_ES_BIT as amd requires that for external texture, but that breaks software encoding
    const int32_t attr[] = {
        EGL_BUFFER_SIZE, 24,
-        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT,
        EGL_NONE, EGL_NONE
    };

-    const int32_t ctxattr[] = {
+    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_NONE, EGL_NONE
+        EGL_NONE, EGL_NONE, EGL_NONE
    };

-    // TODO: Use EGL_OPENGL_ES_API as amd requires that for external texture, but that breaks software encoding
-    self->eglBindAPI(EGL_OPENGL_API);
+    if(enable_debug) {
+        ctxattr[2] = EGL_CONTEXT_OPENGL_DEBUG;
+        ctxattr[3] = EGL_TRUE;
+    }
+
+    self->eglBindAPI(EGL_OPENGL_ES_API);

    self->egl_display = self->eglGetDisplay((EGLNativeDisplayType)gsr_window_get_display(self->window));
    if(!self->egl_display) {
@@ -100,16 +84,15 @@ static bool gsr_egl_create_window(gsr_egl *self) {
        goto fail;
    }

-    reset_cap_nice();
    return true;

    fail:
-    reset_cap_nice();
    gsr_egl_unload(self);
    return false;
 }

 static GLXFBConfig glx_fb_config_choose(gsr_egl *self, Display *display) {
+    // TODO: OpenGL debug context?
    const int glx_visual_attribs[] = {
        GLX_RENDER_TYPE, GLX_RGBA_BIT,
        GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
@@ -300,6 +283,7 @@ static bool gsr_egl_load_gl(gsr_egl *self, void *library) {
        { (void**)&self->glGetTexLevelParameteriv, "glGetTexLevelParameteriv" },
        { (void**)&self->glTexImage2D, "glTexImage2D" },
        { (void**)&self->glTexSubImage2D, "glTexSubImage2D" },
+        { (void**)&self->glTexStorage2D, "glTexStorage2D" },
        { (void**)&self->glGetTexImage, "glGetTexImage" },
        { (void**)&self->glGenFramebuffers, "glGenFramebuffers" },
        { (void**)&self->glBindFramebuffer, "glBindFramebuffer" },
@@ -445,7 +429,7 @@ bool gsr_egl_load(gsr_egl *self, gsr_window *window, bool is_monitor_capture, bo
    if(!gsr_egl_proc_load_egl(self))
        goto fail;

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

    if(!gl_get_gpu_info(self, &self->gpu_info))
@@ -465,25 +449,25 @@ bool gsr_egl_load(gsr_egl *self, gsr_window *window, bool is_monitor_capture, bo
            goto fail;
    }

+    if(enable_debug) {
+        self->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+        self->glDebugMessageCallback(debug_callback, NULL);
+    }
+
    self->glEnable(GL_BLEND);
    self->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    self->glPixelStorei(GL_PACK_ALIGNMENT, 1);
    self->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);

-    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");
+            system("flatpak-spawn --host -- sh -c 'grep -q openSUSE /etc/os-release && nvidia-smi -f /dev/null'");
        else
-            system("nvidia-smi -f /dev/null");
+            system("sh -c 'grep -q openSUSE /etc/os-release && nvidia-smi -f /dev/null'");
    }

    return true;
@@ -538,15 +522,7 @@ void gsr_egl_unload(gsr_egl *self) {
 }

 void gsr_egl_swap_buffers(gsr_egl *self) {
-    /* This uses less cpu than swap buffer on nvidia */
-    // TODO: Do these and remove swap
-    //self->glFlush();
-    //self->glFinish();
-    if(self->egl_display) {
-        self->eglSwapBuffers(self->egl_display, self->egl_surface);
-    } 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);
-    }
+    self->glFlush();
+    // TODO: Use the minimal barrier required
+    self->glMemoryBarrier(GL_ALL_BARRIER_BITS); // GL_SHADER_IMAGE_ACCESS_BARRIER_BIT
 }
--- a/src/encoder/encoder.c
+++ b/src/encoder/encoder.c
@@ -7,7 +7,7 @@
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>

-bool gsr_encoder_init(gsr_encoder *self, size_t replay_buffer_num_packets) {
+bool gsr_encoder_init(gsr_encoder *self, gsr_replay_storage replay_storage, size_t replay_buffer_num_packets, double replay_buffer_time, const char *replay_directory) {
    memset(self, 0, sizeof(*self));
    self->num_recording_destinations = 0;
    self->recording_destination_id_counter = 0;
@@ -19,12 +19,12 @@ bool gsr_encoder_init(gsr_encoder *self, size_t replay_buffer_num_packets) {
    self->mutex_created = true;

    if(replay_buffer_num_packets > 0) {
-        if(!gsr_replay_buffer_init(&self->replay_buffer, replay_buffer_num_packets)) {
+        self->replay_buffer = gsr_replay_buffer_create(replay_storage, replay_directory, replay_buffer_time, replay_buffer_num_packets);
+        if(!self->replay_buffer) {
            fprintf(stderr, "gsr error: gsr_encoder_init: failed to create replay buffer\n");
            gsr_encoder_deinit(self);
            return false;
        }
-        self->has_replay_buffer = true;
    }

    return true;
@@ -36,8 +36,11 @@ void gsr_encoder_deinit(gsr_encoder *self)  {
        pthread_mutex_destroy(&self->file_write_mutex);
    }

-    gsr_replay_buffer_deinit(&self->replay_buffer);
-    self->has_replay_buffer = false;
+    if(self->replay_buffer) {
+        gsr_replay_buffer_destroy(self->replay_buffer);
+        self->replay_buffer = NULL;
+    }
+
    self->num_recording_destinations = 0;
    self->recording_destination_id_counter = 0;
 }
@@ -56,9 +59,9 @@ void gsr_encoder_receive_packets(gsr_encoder *self, AVCodecContext *codec_contex
            av_packet->pts = pts;
            av_packet->dts = pts;

-            if(self->has_replay_buffer) {
+            if(self->replay_buffer) {
                const double time_now = clock_get_monotonic_seconds();
-                if(!gsr_replay_buffer_append(&self->replay_buffer, av_packet, time_now))
+                if(!gsr_replay_buffer_append(self->replay_buffer, av_packet, time_now))
                    fprintf(stderr, "gsr error: gsr_encoder_receive_packets: failed to add replay buffer data\n");
            }

--- a/src/encoder/video/software.c
+++ b/src/encoder/video/software.c
@@ -71,16 +71,15 @@ void gsr_video_encoder_software_stop(gsr_video_encoder_software *self, AVCodecCo
 }

 static void gsr_video_encoder_software_copy_textures_to_frame(gsr_video_encoder *encoder, AVFrame *frame, gsr_color_conversion *color_conversion) {
-    gsr_video_encoder_software *self = encoder->priv;
+    (void)encoder;
+    //gsr_video_encoder_software *self = encoder->priv;
    // TODO: hdr support
    const unsigned int formats[2] = { GL_RED, GL_RG };
+    const int div[2] = {1, 2}; // divide UV texture size by 2 because chroma is half size
    for(int i = 0; i < 2; ++i) {
-        self->params.egl->glBindTexture(GL_TEXTURE_2D, self->target_textures[i]);
-        // We could use glGetTexSubImage and then we wouldn't have to use a specific linesize (LINESIZE_ALIGNMENT) that adds padding,
-        // but glGetTexSubImage is only available starting from opengl 4.5.
-        self->params.egl->glGetTexImage(GL_TEXTURE_2D, 0, formats[i], GL_UNSIGNED_BYTE, frame->data[i]);
+        // TODO: Use glPixelStore?
+        gsr_color_conversion_read_destination_texture(color_conversion, i, 0, 0, frame->width / div[i], frame->height / div[i], formats[i], GL_UNSIGNED_BYTE, frame->data[i]);
    }
-    self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
    // cap_kms->kms.base.egl->eglSwapBuffers(cap_kms->kms.base.egl->egl_display, cap_kms->kms.base.egl->egl_surface);

    //self->params.egl->glFlush();
--- a/src/encoder/video/vaapi.c
+++ b/src/encoder/video/vaapi.c
@@ -92,10 +92,6 @@ static bool gsr_video_encoder_vaapi_setup_textures(gsr_video_encoder_vaapi *self
    if(self->prime.fourcc == VA_FOURCC_NV12 || self->prime.fourcc == VA_FOURCC_P010) {
        const uint32_t *formats = self->prime.fourcc == VA_FOURCC_NV12 ? formats_nv12 : formats_p010;
        const int div[2] = {1, 2}; // divide UV texture size by 2 because chroma is half size
-        const float border_colors[2][4] = {
-            {0.0f, 0.0f, 0.0f, 1.0f},
-            {0.5f, 0.5f, 0.0f, 1.0f}
-        };

        self->params.egl->glGenTextures(2, self->target_textures);
        for(int i = 0; i < 2; ++i) {
@@ -125,9 +121,6 @@ static bool gsr_video_encoder_vaapi_setup_textures(gsr_video_encoder_vaapi *self
            }

            self->params.egl->glBindTexture(GL_TEXTURE_2D, self->target_textures[i]);
-            self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-            self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-            self->params.egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_colors[i]);
            self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
            self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

--- a/src/encoder/video/vulkan.c
+++ b/src/encoder/video/vulkan.c
@@ -23,7 +23,7 @@ static bool gsr_video_encoder_vulkan_setup_context(gsr_video_encoder_vulkan *sel
    AVDictionary *options = NULL;
    //av_dict_set(&options, "linear_images", "1", 0);
    //av_dict_set(&options, "disable_multiplane", "1", 0);
-
+#if 0
    // TODO: Use correct device
    if(av_hwdevice_ctx_create(&self->device_ctx, AV_HWDEVICE_TYPE_VULKAN, NULL, options, 0) < 0) {
        fprintf(stderr, "gsr error: gsr_video_encoder_vulkan_setup_context: failed to create hardware device context\n");
@@ -57,6 +57,7 @@ static bool gsr_video_encoder_vulkan_setup_context(gsr_video_encoder_vulkan *sel

    video_codec_context->hw_frames_ctx = av_buffer_ref(frame_context);
    av_buffer_unref(&frame_context);
+#endif
    return true;
 }

@@ -99,7 +100,7 @@ static bool gsr_video_encoder_vulkan_setup_textures(gsr_video_encoder_vulkan *se
    }

    while(self->params.egl->glGetError()) {}
-
+#if 0
    AVVkFrame *target_surface_id = (AVVkFrame*)frame->data[0];
    AVVulkanDeviceContext* vv = video_codec_context_get_vulkan_data(video_codec_context);
    const size_t luma_size = frame->width * frame->height;
@@ -224,7 +225,7 @@ static bool gsr_video_encoder_vulkan_setup_textures(gsr_video_encoder_vulkan *se
        fprintf(stderr, "3 gl error: %d\n", self->params.egl->glGetError());
        self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
     }
-
+#endif
    return true;
 }

--- a/src/image_writer.c
+++ b/src/image_writer.c
@@ -71,11 +71,15 @@ static bool gsr_image_writer_write_opengl_texture_to_file(gsr_image_writer *self
        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_RGBA, GL_UNSIGNED_BYTE, frame_data);
-    self->egl->glBindTexture(GL_TEXTURE_2D, 0);
+    unsigned int fbo = 0;
+    self->egl->glGenFramebuffers(1, &fbo);
+    self->egl->glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+    self->egl->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->texture, 0);
+
+    self->egl->glReadPixels(0, 0, self->width, self->height, GL_RGBA, GL_UNSIGNED_BYTE, frame_data);
+
+    self->egl->glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    self->egl->glDeleteFramebuffers(1, &fbo);

    self->egl->glFlush();
    self->egl->glFinish();
--- a/src/main.cpp
+++ b/src/main.cpp
--- a/src/pipewire_audio.c
+++ b/src/pipewire_audio.c
@@ -4,6 +4,11 @@
 #include <pipewire/extensions/metadata.h>
 #include <pipewire/impl-module.h>

+typedef struct {
+    const gsr_pipewire_audio_port *output_port;
+    const gsr_pipewire_audio_port *input_port;
+} gsr_pipewire_audio_desired_link;
+
 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);
@@ -29,7 +34,7 @@ static const struct pw_core_events core_events = {
 };

 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) {
+    for(size_t 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];
@@ -38,7 +43,7 @@ static gsr_pipewire_audio_node* gsr_pipewire_audio_get_node_by_name_case_insensi
 }

 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) {
+    for(size_t 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];
    }
@@ -81,69 +86,68 @@ static void gsr_pipewire_get_node_input_port_by_type(gsr_pipewire_audio *self, c
    }
 }

-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 bool string_starts_with(const char *str, const char *substr) {
+    const int len = strlen(str);
+    const int substr_len = strlen(substr);
+    return len >= substr_len && memcmp(str, substr, substr_len) == 0;
 }

-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)
+static bool string_ends_with(const char *str, const char *substr) {
+    const int len = strlen(str);
+    const int substr_len = strlen(substr);
+    return len >= substr_len && memcmp(str + len - substr_len, substr, substr_len) == 0;
+}
+
+/* Returns number of desired links */
+static size_t gsr_pipewire_get_node_output_ports(gsr_pipewire_audio *self, const gsr_pipewire_audio_node *output_node,
+    gsr_pipewire_audio_desired_link *desired_links, size_t desired_links_max_size,
+    const gsr_pipewire_audio_port *input_fl_port, const gsr_pipewire_audio_port *input_fr_port)
 {
-    // TODO: Detect if link already exists before so we dont create these proxies when not needed
+    size_t num_desired_links = 0;
+    for(size_t i = 0; i < self->num_ports && num_desired_links < desired_links_max_size; ++i) {
+        if(self->ports[i].node_id != output_node->id)
+            continue;
+
+        if(string_starts_with(self->ports[i].name, "playback_"))
+            continue;
+
+        if(string_ends_with(self->ports[i].name, "_MONO") || string_ends_with(self->ports[i].name, "_FC") || string_ends_with(self->ports[i].name, "_LFE")) {
+            if(num_desired_links + 2 >= desired_links_max_size)
+                break;
+
+            desired_links[num_desired_links + 0] = (gsr_pipewire_audio_desired_link){ .output_port = &self->ports[i], .input_port = input_fl_port };
+            desired_links[num_desired_links + 1] = (gsr_pipewire_audio_desired_link){ .output_port = &self->ports[i], .input_port = input_fr_port };
+            num_desired_links += 2;
+        } else if(string_ends_with(self->ports[i].name, "_FL") || string_ends_with(self->ports[i].name, "_RL") || string_ends_with(self->ports[i].name, "_SL")) {
+            if(num_desired_links + 1 >= desired_links_max_size)
+                break;
+
+            desired_links[num_desired_links] = (gsr_pipewire_audio_desired_link){ .output_port = &self->ports[i], .input_port = input_fl_port };
+            num_desired_links += 1;
+        } else if(string_ends_with(self->ports[i].name, "_FR") || string_ends_with(self->ports[i].name, "_RR") || string_ends_with(self->ports[i].name, "_SR")) {
+            if(num_desired_links + 1 >= desired_links_max_size)
+                break;
+
+            desired_links[num_desired_links] = (gsr_pipewire_audio_desired_link){ .output_port = &self->ports[i], .input_port = input_fr_port };
+            num_desired_links += 1;
+        }
+    }
+    return num_desired_links;
+}
+
+static void gsr_pipewire_audio_establish_link(gsr_pipewire_audio *self, const gsr_pipewire_audio_port *output_port, const gsr_pipewire_audio_port *input_port) {
+    // TODO: Detect if link already exists before so we dont create these proxies when not needed.
+    // We could do that by saving which nodes have been linked with which nodes after linking them.

    //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);
-    }
+    struct pw_properties *props = pw_properties_new(NULL, NULL);
+    pw_properties_setf(props, PW_KEY_LINK_OUTPUT_PORT, "%u", output_port->id);
+    pw_properties_setf(props, PW_KEY_LINK_INPUT_PORT, "%u", input_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) {
@@ -158,7 +162,8 @@ static void gsr_pipewire_audio_create_link(gsr_pipewire_audio *self, const gsr_p
    if(!input_fl_port || !input_fr_port)
        return;

-    for(int i = 0; i < self->num_stream_nodes; ++i) {
+    gsr_pipewire_audio_desired_link desired_links[64];
+    for(size_t 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;
@@ -172,18 +177,15 @@ static void gsr_pipewire_audio_create_link(gsr_pipewire_audio *self, const gsr_p
                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);
+        const size_t num_desired_links = gsr_pipewire_get_node_output_ports(self, output_node, desired_links, 64, input_fl_port, input_fr_port);
+        for(size_t j = 0; j < num_desired_links; ++j) {
+            gsr_pipewire_audio_establish_link(self, desired_links[j].output_port, desired_links[j].input_port);
+        }
    }
 }

 static void gsr_pipewire_audio_create_links(gsr_pipewire_audio *self) {
-    for(int i = 0; i < self->num_requested_links; ++i) {
+    for(size_t i = 0; i < self->num_requested_links; ++i) {
        gsr_pipewire_audio_create_link(self, &self->requested_links[i]);
    }
 }
@@ -214,24 +216,21 @@ static void gsr_pipewire_audio_create_link_for_default_devices(gsr_pipewire_audi
    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);
+    gsr_pipewire_audio_desired_link desired_links[64];
+    const size_t num_desired_links = gsr_pipewire_get_node_output_ports(self, stream_output_node, desired_links, 64, input_fl_port, input_fr_port);
+    for(size_t i = 0; i < num_desired_links; ++i) {
+        gsr_pipewire_audio_establish_link(self, desired_links[i].output_port, desired_links[i].input_port);
+    }
 }

 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) {
+    for(size_t 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) {
+    for(size_t 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);
    }
@@ -271,7 +270,7 @@ static void gsr_pipewire_destroy_default_device_link(gsr_pipewire_audio *self, c
 }

 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) {
+    for(size_t i = 0; i < self->num_requested_links; ++i) {
        gsr_pipewire_destroy_default_device_link(self, &self->requested_links[i], default_device_type);
    }
 }
@@ -370,6 +369,24 @@ static bool gsr_pipewire_audio_listen_on_metadata(gsr_pipewire_audio *self, uint
    return true;
 }

+static bool array_ensure_capacity(void **array, size_t size, size_t *capacity_items, size_t element_size) {
+    if(size + 1 >= *capacity_items) {
+        size_t new_capacity_items = *capacity_items * 2;
+        if(new_capacity_items == 0)
+            new_capacity_items = 32;
+
+        void *new_data = realloc(*array, new_capacity_items * element_size);
+        if(!new_data) {
+            fprintf(stderr, "gsr error: pipewire_audio: failed to reallocate memory\n");
+            return false;
+        }
+
+        *array = new_data;
+        *capacity_items = new_capacity_items;
+    }
+    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)
@@ -389,11 +406,14 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
        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)) {
+        if(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);

+            if(!array_ensure_capacity((void**)&self->stream_nodes, self->num_stream_nodes, &self->stream_nodes_capacity_items, sizeof(gsr_pipewire_audio_node)))
+                return;
+
            char *node_name_copy = strdup(node_name);
            if(node_name_copy) {
                self->stream_nodes[self->num_stream_nodes].id = id;
@@ -408,8 +428,6 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,

                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);
@@ -424,7 +442,10 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
        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) {
+        if(port_name && direction >= 0 && node_id_num > 0) {
+            if(!array_ensure_capacity((void**)&self->ports, self->num_ports, &self->ports_capacity_items, sizeof(gsr_pipewire_audio_port)))
+                return;
+
            //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) {
@@ -437,8 +458,6 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,

                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);
@@ -446,14 +465,15 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,

        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) {
+        if(output_node_id_num > 0 && input_node_id_num > 0) {
+            if(!array_ensure_capacity((void**)&self->links, self->num_links, &self->links_capacity_items, sizeof(gsr_pipewire_audio_link)))
+                return;
+
            //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);
@@ -463,7 +483,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
 }

 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) {
+    for(size_t i = 0; i < self->num_stream_nodes; ++i) {
        if(self->stream_nodes[i].id != node_id)
            continue;

@@ -476,7 +496,7 @@ static bool gsr_pipewire_audio_remove_node_by_id(gsr_pipewire_audio *self, uint3
 }

 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) {
+    for(size_t i = 0; i < self->num_ports; ++i) {
        if(self->ports[i].id != port_id)
            continue;

@@ -489,7 +509,7 @@ static bool gsr_pipewire_audio_remove_port_by_id(gsr_pipewire_audio *self, uint3
 }

 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) {
+    for(size_t i = 0; i < self->num_links; ++i) {
        if(self->links[i].id != link_id)
            continue;

@@ -580,13 +600,19 @@ void gsr_pipewire_audio_deinit(gsr_pipewire_audio *self) {
        pw_thread_loop_stop(self->thread_loop);
    }

-    for(int i = 0; i < self->num_virtual_sink_proxies; ++i) {
+    for(size_t 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;
+    self->virtual_sink_proxies_capacity_items = 0;
+
+    if(self->virtual_sink_proxies) {
+        free(self->virtual_sink_proxies);
+        self->virtual_sink_proxies = NULL;
+    }

    if(self->metadata_proxy) {
        spa_hook_remove(&self->metadata_listener);
@@ -615,26 +641,50 @@ void gsr_pipewire_audio_deinit(gsr_pipewire_audio *self) {
        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);
+    if(self->stream_nodes) {
+        for(size_t i = 0; i < self->num_stream_nodes; ++i) {
+            free(self->stream_nodes[i].name);
        }
-        free(self->requested_links[i].outputs);
-        free(self->requested_links[i].input_name);
+        self->num_stream_nodes = 0;
+        self->stream_nodes_capacity_items = 0;
+
+        free(self->stream_nodes);
+        self->stream_nodes = NULL;
+    }
+
+    if(self->ports) {
+        for(size_t i = 0; i < self->num_ports; ++i) {
+            free(self->ports[i].name);
+        }
+        self->num_ports = 0;
+        self->ports_capacity_items = 0;
+
+        free(self->ports);
+        self->ports = NULL;
+    }
+
+    if(self->links) {
+        self->num_links = 0;
+        self->links_capacity_items = 0;
+
+        free(self->links);
+        self->links = NULL;
+    }
+
+    if(self->requested_links) {
+        for(size_t 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;
+        self->requested_links_capacity_items = 0;
+
+        free(self->requested_links);
+        self->requested_links = NULL;
    }
-    self->num_requested_links = 0;

 #if PW_CHECK_VERSION(0, 3, 49)
    pw_deinit();
@@ -653,10 +703,8 @@ static struct pw_properties* gsr_pipewire_create_null_audio_sink(const char *nam
 }

 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");
+    if(!array_ensure_capacity((void**)&self->virtual_sink_proxies, self->num_virtual_sink_proxies, &self->virtual_sink_proxies_capacity_items, sizeof(struct pw_proxy*)))
        return false;
-    }

    pw_thread_loop_lock(self->thread_loop);

@@ -701,10 +749,8 @@ static bool string_remove_suffix(char *str, const char *suffix) {
 }

 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");
+    if(!array_ensure_capacity((void**)&self->requested_links, self->num_requested_links, &self->requested_links_capacity_items, sizeof(gsr_pipewire_audio_requested_link)))
        return false;
-    }
    
    gsr_pipewire_audio_requested_output *outputs = calloc(num_output_names, sizeof(gsr_pipewire_audio_requested_output));
    if(!outputs)
@@ -781,7 +827,7 @@ bool gsr_pipewire_audio_add_link_from_sources_to_sink(gsr_pipewire_audio *self,

 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) {
+    for(int i = 0; i < (int)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;
--- a/src/pipewire_video.c
+++ b/src/pipewire_video.c
@@ -6,7 +6,7 @@
 #include <spa/param/video/format-utils.h>
 #include <spa/debug/types.h>

-#include <libdrm/drm_fourcc.h>
+#include <drm_fourcc.h>

 #include <fcntl.h>
 #include <unistd.h>
@@ -280,13 +280,21 @@ static void on_param_changed_cb(void *user_data, uint32_t id, const struct spa_p
    self->negotiated = true;
 }

-static void on_state_changed_cb(void *user_data, enum pw_stream_state old, enum pw_stream_state state, const char *error) {
-    (void)old;
+static void on_state_changed_cb(void *user_data, enum pw_stream_state prev_state, enum pw_stream_state new_state, const char *error) {
    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),
+    fprintf(stderr, "gsr info: pipewire: stream %p previous state: \"%s\", new state: \"%s\" (error: %s)\n",
+         (void*)self->stream, pw_stream_state_as_string(prev_state), pw_stream_state_as_string(new_state),
         error ? error : "none");
+
+    pthread_mutex_lock(&self->mutex);
+    if(new_state == PW_STREAM_STATE_PAUSED) {
+        self->paused_start_secs = clock_get_monotonic_seconds();
+        self->paused = true;
+    } else {
+        self->paused = false;
+    }
+    pthread_mutex_unlock(&self->mutex);
 }

 static const struct pw_stream_events stream_events = {
@@ -350,15 +358,15 @@ static int64_t spa_video_format_to_drm_format(const enum spa_video_format format
        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;
+        case SPA_VIDEO_FORMAT_ARGB:       return DRM_FORMAT_BGRA8888;
+        case SPA_VIDEO_FORMAT_ABGR:       return DRM_FORMAT_RGBA8888;
 #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;
+        default:                          break;
    }
    return DRM_FORMAT_INVALID;
 }
@@ -370,20 +378,20 @@ static int64_t spa_video_format_to_drm_format(const enum spa_video_format format
 #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
+    SPA_VIDEO_FORMAT_ABGR_210LE,
 #endif
+    SPA_VIDEO_FORMAT_RGBA,
+    SPA_VIDEO_FORMAT_BGRA,
+    SPA_VIDEO_FORMAT_ARGB,
+    SPA_VIDEO_FORMAT_ABGR,
 };

 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) {
@@ -438,6 +446,8 @@ static bool spa_video_format_get_modifiers(gsr_pipewire_video *self, const enum
        //modifiers[0] = DRM_FORMAT_MOD_LINEAR;
        //modifiers[1] = DRM_FORMAT_MOD_INVALID;
        //*num_modifiers = 2;
+        modifiers[0] = DRM_FORMAT_MOD_INVALID;
+        *num_modifiers = 1;
        return false;
    }

@@ -452,7 +462,8 @@ static bool spa_video_format_get_modifiers(gsr_pipewire_video *self, const enum
        //modifiers[0] = DRM_FORMAT_MOD_LINEAR;
        //modifiers[1] = DRM_FORMAT_MOD_INVALID;
        //*num_modifiers = 2;
-        *num_modifiers = 0;
+        modifiers[0] = DRM_FORMAT_MOD_INVALID;
+        *num_modifiers = 1;
        return false;
    }

@@ -471,6 +482,27 @@ static void gsr_pipewire_video_init_modifiers(gsr_pipewire_video *self) {
        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;
+        self->num_modifiers += num_modifiers;
+    }
+}
+
+static void gsr_pipewire_video_format_remove_modifier(gsr_pipewire_video *self, gsr_video_format *video_format, uint64_t modifier) {
+    for(size_t i = 0; i < video_format->modifiers_size; ++i) {
+        if(self->modifiers[video_format->modifiers_index + i] != modifier)
+            continue;
+
+        for(size_t j = i + 1; j < video_format->modifiers_size; ++j) {
+            self->modifiers[j - 1] = self->modifiers[j];
+        }
+        --video_format->modifiers_size;
+        return;
+    }
+}
+
+static void gsr_pipewire_video_remove_modifier(gsr_pipewire_video *self, uint64_t modifier) {
+    for(size_t i = 0; i < GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS; i++) {
+        gsr_video_format *video_format = &self->supported_video_formats[i];
+        gsr_pipewire_video_format_remove_modifier(self, video_format, modifier);
    }
 }

@@ -651,6 +683,7 @@ void gsr_pipewire_video_deinit(gsr_pipewire_video *self) {
    self->dmabuf_num_planes = 0;

    self->negotiated = false;
+    self->renegotiated = false;

    if(self->mutex_initialized) {
        pthread_mutex_destroy(&self->mutex);
@@ -702,9 +735,19 @@ static EGLImage gsr_pipewire_video_create_egl_image_with_fallback(gsr_pipewire_v
    } else {
        image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, true);
        if(!image) {
-            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_video_create_egl_image(self, fds, offsets, pitches, modifiers, false);
+            if(self->renegotiated || self->format.info.raw.modifier == DRM_FORMAT_MOD_INVALID) {
+                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_video_create_egl_image(self, fds, offsets, pitches, modifiers, false);
+            } else {
+                fprintf(stderr, "gsr error: gsr_pipewire_video_create_egl_image_with_fallback: failed to create egl image with modifiers, renegotiating with a different modifier\n");
+                self->negotiated = false;
+                self->renegotiated = true;
+                gsr_pipewire_video_remove_modifier(self, self->format.info.raw.modifier);
+                pw_thread_loop_lock(self->thread_loop);
+                pw_loop_signal_event(pw_thread_loop_get_loop(self->thread_loop), self->reneg);
+                pw_thread_loop_unlock(self->thread_loop);
+            }
        }
    }
    return image;
@@ -736,13 +779,9 @@ static void gsr_pipewire_video_update_cursor_texture(gsr_pipewire_video *self, g
    if(!self->cursor.data)
        return;

-    const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
    self->egl->glBindTexture(GL_TEXTURE_2D, texture_map.cursor_texture_id);
    // TODO: glTextureSubImage2D if same size
    self->egl->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, self->cursor.width, self->cursor.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, self->cursor.data);
-    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    self->egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
    self->egl->glBindTexture(GL_TEXTURE_2D, 0);
@@ -767,12 +806,15 @@ bool gsr_pipewire_video_map_texture(gsr_pipewire_video *self, gsr_texture_map te
    }

    EGLImage image = gsr_pipewire_video_create_egl_image_with_fallback(self);
-    if(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);
+    if(!image) {
+        pthread_mutex_unlock(&self->mutex);
+        return false;
    }

+    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_video_update_cursor_texture(self, texture_map);

    region->x = 0;
@@ -810,6 +852,9 @@ bool gsr_pipewire_video_map_texture(gsr_pipewire_video *self, gsr_texture_map te
 }

 bool gsr_pipewire_video_is_damaged(gsr_pipewire_video *self) {
+    if(!self->mutex_initialized)
+        return false;
+
    bool damaged = false;
    pthread_mutex_lock(&self->mutex);
    damaged = self->damaged;
@@ -818,7 +863,21 @@ bool gsr_pipewire_video_is_damaged(gsr_pipewire_video *self) {
 }

 void gsr_pipewire_video_clear_damage(gsr_pipewire_video *self) {
+    if(!self->mutex_initialized)
+        return;
+
    pthread_mutex_lock(&self->mutex);
    self->damaged = false;
    pthread_mutex_unlock(&self->mutex);
 }
+
+bool gsr_pipewire_video_should_restart(gsr_pipewire_video *self) {
+    if(!self->mutex_initialized)
+        return false;
+
+    bool should_restart = false;
+    pthread_mutex_lock(&self->mutex);
+    should_restart = self->paused && clock_get_monotonic_seconds() - self->paused_start_secs >= 3.0;
+    pthread_mutex_unlock(&self->mutex);
+    return should_restart;
+}
--- a/src/replay_buffer.c
+++ b/src/replay_buffer.c
@@ -1,219 +0,0 @@
-#include "../include/replay_buffer.h"
-#include "../include/utils.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include <libavutil/mem.h>
-
-gsr_av_packet* gsr_av_packet_create(const AVPacket *av_packet, double timestamp) {
-    gsr_av_packet *self = malloc(sizeof(gsr_av_packet));
-    if(!self)
-        return NULL;
-
-    self->ref_counter = 1;
-    self->packet = *av_packet;
-    // Why are we doing this you ask? there is a new ffmpeg bug that causes cpu usage to increase over time when you have
-    // packets that are not being free'd until later. So we copy the packet data, free the packet and then reconstruct
-    // the packet later on when we need it, to keep packets alive only for a short period.
-    self->packet.data = av_memdup(av_packet->data, av_packet->size);
-    self->timestamp = timestamp;
-    if(!self->packet.data) {
-        free(self);
-        return NULL;
-    }
-
-    return self;
-}
-
-gsr_av_packet* gsr_av_packet_ref(gsr_av_packet *self) {
-    if(self->ref_counter >= 1)
-        ++self->ref_counter;
-    return self;
-}
-
-static void gsr_av_packet_free(gsr_av_packet *self) {
-    self->ref_counter = 0;
-    if(self->packet.data) {
-        av_free(self->packet.data);
-        self->packet.data = NULL;
-    }
-    free(self);
-}
-
-void gsr_av_packet_unref(gsr_av_packet *self) {
-    if(self->ref_counter >= 1)
-        --self->ref_counter;
-
-    if(self->ref_counter <= 0)
-        gsr_av_packet_free(self);
-}
-
-bool gsr_replay_buffer_init(gsr_replay_buffer *self, size_t replay_buffer_num_packets) {
-    assert(replay_buffer_num_packets > 0);
-    memset(self, 0, sizeof(*self));
-    self->mutex_initialized = false;
-    self->owns_mutex = true;
-    if(pthread_mutex_init(&self->mutex, NULL) != 0)
-        return false;
-
-    self->mutex_initialized = true;
-    self->capacity_num_packets = replay_buffer_num_packets;
-    self->num_packets = 0;
-    self->index = 0;
-    self->packets = calloc(self->capacity_num_packets, sizeof(gsr_av_packet*));
-    if(!self->packets) {
-        gsr_replay_buffer_deinit(self);
-        return false;
-    }
-    return true;
-}
-
-void gsr_replay_buffer_deinit(gsr_replay_buffer *self) {
-    if(self->mutex_initialized)
-        pthread_mutex_lock(&self->mutex);
-
-    for(size_t i = 0; i < self->num_packets; ++i) {
-        if(self->packets[i]) {
-            gsr_av_packet_unref(self->packets[i]);
-            self->packets[i] = NULL;
-        }
-    }
-    self->num_packets = 0;
-
-    if(self->mutex_initialized)
-        pthread_mutex_unlock(&self->mutex);
-
-    if(self->packets) {
-        free(self->packets);
-        self->packets = NULL;
-    }
-
-    self->capacity_num_packets = 0;
-    self->index = 0;
-
-    if(self->mutex_initialized && self->owns_mutex) {
-        pthread_mutex_destroy(&self->mutex);
-        self->mutex_initialized = false;
-    }
-}
-
-bool gsr_replay_buffer_append(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp) {
-    pthread_mutex_lock(&self->mutex);
-    gsr_av_packet *packet = gsr_av_packet_create(av_packet, timestamp);
-    if(!packet) {
-        pthread_mutex_unlock(&self->mutex);
-        return false;
-    }
-
-    if(self->packets[self->index]) {
-        gsr_av_packet_unref(self->packets[self->index]);
-        self->packets[self->index] = NULL;
-    }
-    self->packets[self->index] = packet;
-
-    self->index = (self->index + 1) % self->capacity_num_packets;
-    ++self->num_packets;
-    if(self->num_packets > self->capacity_num_packets)
-        self->num_packets = self->capacity_num_packets;
-
-    pthread_mutex_unlock(&self->mutex);
-    return true;
-}
-
-void gsr_replay_buffer_clear(gsr_replay_buffer *self) {
-    pthread_mutex_lock(&self->mutex);
-    for(size_t i = 0; i < self->num_packets; ++i) {
-        if(self->packets[i]) {
-            gsr_av_packet_unref(self->packets[i]);
-            self->packets[i] = NULL;
-        }
-    }
-    self->num_packets = 0;
-    self->index = 0;
-    pthread_mutex_unlock(&self->mutex);
-}
-
-gsr_av_packet* gsr_replay_buffer_get_packet_at_index(gsr_replay_buffer *self, size_t index) {
-    assert(index < self->num_packets);
-    size_t start_index = 0;
-    if(self->num_packets < self->capacity_num_packets)
-        start_index = self->num_packets - self->index;
-    else
-        start_index = self->index;
-
-    const size_t offset = (start_index + index) % self->capacity_num_packets;
-    return self->packets[offset];
-}
-
-bool gsr_replay_buffer_clone(const gsr_replay_buffer *self, gsr_replay_buffer *destination) {
-    pthread_mutex_lock(&destination->mutex);
-    memset(destination, 0, sizeof(*destination));
-    destination->owns_mutex = false;
-    destination->mutex = self->mutex;
-    destination->capacity_num_packets = self->capacity_num_packets;
-    destination->mutex_initialized = self->mutex_initialized;
-    destination->index = self->index;
-    destination->packets = calloc(destination->capacity_num_packets, sizeof(gsr_av_packet*));
-    if(!destination->packets) {
-        pthread_mutex_unlock(&destination->mutex);
-        return false;
-    }
-
-    destination->num_packets = self->num_packets;
-    for(size_t i = 0; i < destination->num_packets; ++i) {
-        destination->packets[i] = gsr_av_packet_ref(self->packets[i]);
-    }
-
-    pthread_mutex_unlock(&destination->mutex);
-    return true;
-}
-
-/* Binary search */
-size_t gsr_replay_buffer_find_packet_index_by_time_passed(gsr_replay_buffer *self, int seconds) {
-    pthread_mutex_lock(&self->mutex);
-
-    const double now = clock_get_monotonic_seconds();
-    if(self->num_packets == 0) {
-        pthread_mutex_unlock(&self->mutex);
-        return 0;
-    }
-
-    size_t lower_bound = 0;
-    size_t upper_bound = self->num_packets;
-    size_t index = 0;
-
-    for(;;) {
-        index = lower_bound + (upper_bound - lower_bound) / 2;
-        const gsr_av_packet *packet = gsr_replay_buffer_get_packet_at_index(self, index);
-        const double time_passed_since_packet = now - packet->timestamp;
-        if(time_passed_since_packet >= seconds) {
-            if(lower_bound == index)
-                break;
-            lower_bound = index;
-        } else {
-            if(upper_bound == index)
-                break;
-            upper_bound = index;
-        }
-    }
-
-    pthread_mutex_unlock(&self->mutex);
-    return index;
-}
-
-size_t gsr_replay_buffer_find_keyframe(gsr_replay_buffer *self, size_t start_index, int stream_index, bool invert_stream_index) {
-    assert(start_index < self->num_packets);
-    size_t keyframe_index = (size_t)-1;
-    pthread_mutex_lock(&self->mutex);
-    for(size_t i = start_index; i < self->num_packets; ++i) {
-        const gsr_av_packet *packet = gsr_replay_buffer_get_packet_at_index(self, i);
-        if((packet->packet.flags & AV_PKT_FLAG_KEY) && (invert_stream_index ? packet->packet.stream_index != stream_index : packet->packet.stream_index == stream_index)) {
-            keyframe_index = i;
-            break;
-        }
-    }
-    pthread_mutex_unlock(&self->mutex);
-    return keyframe_index;
-}
--- a/src/replay_buffer/replay_buffer.c
+++ b/src/replay_buffer/replay_buffer.c
@@ -0,0 +1,91 @@
+#include "../../include/replay_buffer/replay_buffer.h"
+#include "../../include/replay_buffer/replay_buffer_ram.h"
+#include "../../include/replay_buffer/replay_buffer_disk.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+gsr_replay_buffer* gsr_replay_buffer_create(gsr_replay_storage replay_storage, const char *replay_directory, double replay_buffer_time, size_t replay_buffer_num_packets) {
+    gsr_replay_buffer *replay_buffer = NULL;
+    switch(replay_storage) {
+        case GSR_REPLAY_STORAGE_RAM:
+            replay_buffer = gsr_replay_buffer_ram_create(replay_buffer_num_packets);
+            break;
+        case GSR_REPLAY_STORAGE_DISK:
+            replay_buffer = gsr_replay_buffer_disk_create(replay_directory, replay_buffer_time);
+            break;
+    }
+
+    replay_buffer->mutex_initialized = false;
+    replay_buffer->original_replay_buffer = NULL;
+    if(pthread_mutex_init(&replay_buffer->mutex, NULL) != 0) {
+        gsr_replay_buffer_destroy(replay_buffer);
+        return NULL;
+    }
+
+    replay_buffer->mutex_initialized = true;
+    return replay_buffer;
+}
+
+void gsr_replay_buffer_destroy(gsr_replay_buffer *self) {
+    self->destroy(self);
+    if(self->mutex_initialized && !self->original_replay_buffer) {
+        pthread_mutex_destroy(&self->mutex);
+        self->mutex_initialized = false;
+    }
+    self->original_replay_buffer = NULL;
+    free(self);
+}
+
+void gsr_replay_buffer_lock(gsr_replay_buffer *self) {
+    if(self->original_replay_buffer) {
+        gsr_replay_buffer_lock(self->original_replay_buffer);
+        return;
+    }
+
+    if(self->mutex_initialized)
+        pthread_mutex_lock(&self->mutex);
+}
+
+void gsr_replay_buffer_unlock(gsr_replay_buffer *self) {
+    if(self->original_replay_buffer) {
+        gsr_replay_buffer_unlock(self->original_replay_buffer);
+        return;
+    }
+
+    if(self->mutex_initialized)
+        pthread_mutex_unlock(&self->mutex);
+}
+
+bool gsr_replay_buffer_append(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp) {
+    return self->append(self, av_packet, timestamp);
+}
+
+void gsr_replay_buffer_clear(gsr_replay_buffer *self) {
+    self->clear(self);
+}
+
+AVPacket* gsr_replay_buffer_iterator_get_packet(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator) {
+    return self->iterator_get_packet(self, iterator);
+}
+
+uint8_t* gsr_replay_buffer_iterator_get_packet_data(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator) {
+    return self->iterator_get_packet_data(self, iterator);
+}
+
+gsr_replay_buffer* gsr_replay_buffer_clone(gsr_replay_buffer *self) {
+    return self->clone(self);
+}
+
+gsr_replay_buffer_iterator gsr_replay_buffer_find_packet_index_by_time_passed(gsr_replay_buffer *self, int seconds) {
+    return self->find_packet_index_by_time_passed(self, seconds);
+}
+
+gsr_replay_buffer_iterator gsr_replay_buffer_find_keyframe(gsr_replay_buffer *self, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index) {
+    return self->find_keyframe(self, start_iterator, stream_index, invert_stream_index);
+}
+
+bool gsr_replay_buffer_iterator_next(gsr_replay_buffer *self, gsr_replay_buffer_iterator *iterator) {
+    return self->iterator_next(self, iterator);
+}
--- a/src/replay_buffer/replay_buffer_disk.c
+++ b/src/replay_buffer/replay_buffer_disk.c
@@ -0,0 +1,437 @@
+#include "../../include/replay_buffer/replay_buffer_disk.h"
+#include "../../include/utils.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <time.h>
+#include <errno.h>
+#include <assert.h>
+
+#define REPLAY_BUFFER_FILE_SIZE_BYTES 1024 * 1024 * 256 /* 256MB */
+#define FILE_PREFIX "Replay"
+
+static void gsr_replay_buffer_disk_set_impl_funcs(gsr_replay_buffer_disk *self);
+
+static void gsr_av_packet_disk_init(gsr_av_packet_disk *self, const AVPacket *av_packet, size_t data_index, double timestamp) {
+    self->packet = *av_packet;
+    self->packet.data = NULL;
+    self->data_index = data_index;
+    self->timestamp = timestamp;
+}
+
+static gsr_replay_buffer_file* gsr_replay_buffer_file_create(char *replay_directory, size_t replay_storage_counter, double timestamp, int *replay_storage_fd) {
+    gsr_replay_buffer_file *self = calloc(1, sizeof(gsr_replay_buffer_file));
+    if(!self) {
+        fprintf(stderr, "gsr error: gsr_av_packet_file_init: failed to create buffer file\n");
+        return NULL;
+    }
+
+    if(create_directory_recursive(replay_directory) != 0) {
+        fprintf(stderr, "gsr error: gsr_av_packet_file_init: failed to create replay directory: %s\n", replay_directory);
+        free(self);
+        return NULL;
+    }
+
+    char filename[PATH_MAX];
+    snprintf(filename, sizeof(filename), "%s/%s_%d.gsr", replay_directory, FILE_PREFIX, (int)replay_storage_counter);
+    *replay_storage_fd = creat(filename, 0700);
+    if(*replay_storage_fd <= 0) {
+        fprintf(stderr, "gsr error: gsr_av_packet_file_init: failed to create replay file: %s\n", filename);
+        free(self);
+        return NULL;
+    }
+
+    self->id = replay_storage_counter;
+    self->start_timestamp = timestamp;
+    self->end_timestamp = timestamp;
+    self->ref_counter = 1;
+    self->fd = -1;
+
+    self->packets = NULL;
+    self->capacity_num_packets = 0;
+    self->num_packets = 0;
+    return self;
+}
+
+static gsr_replay_buffer_file* gsr_replay_buffer_file_ref(gsr_replay_buffer_file *self) {
+    if(self->ref_counter >= 1)
+        ++self->ref_counter;
+    return self;
+}
+
+static void gsr_replay_buffer_file_free(gsr_replay_buffer_file *self, const char *replay_directory) {
+    self->ref_counter = 0;
+
+    if(self->fd > 0) {
+        close(self->fd);
+        self->fd = -1;
+    }
+
+    char filename[PATH_MAX];
+    snprintf(filename, sizeof(filename), "%s/%s_%d.gsr", replay_directory, FILE_PREFIX, (int)self->id);
+    remove(filename);
+
+    if(self->packets) {
+        free(self->packets);
+        self->packets = NULL;
+    }
+    self->num_packets = 0;
+    self->capacity_num_packets = 0;
+
+    free(self);
+}
+
+static void gsr_replay_buffer_file_unref(gsr_replay_buffer_file *self, const char *replay_directory) {
+    if(self->ref_counter > 0)
+        --self->ref_counter;
+
+    if(self->ref_counter <= 0)
+        gsr_replay_buffer_file_free(self, replay_directory);
+}
+
+static void gsr_replay_buffer_disk_clear(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    for(size_t i = 0; i < self->num_files; ++i) {
+        gsr_replay_buffer_file_unref(self->files[i], self->replay_directory);
+    }
+    self->num_files = 0;
+
+    if(self->storage_fd > 0) {
+        close(self->storage_fd);
+        self->storage_fd = 0;
+    }
+
+    self->storage_num_bytes_written = 0;
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+}
+
+static void gsr_replay_buffer_disk_destroy(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_disk_clear(replay_buffer);
+
+    if(self->owns_directory) {
+        remove(self->replay_directory);
+        self->owns_directory = false;
+    }
+}
+
+static bool file_write_all(int fd, const uint8_t *data, size_t size, size_t *bytes_written_total) {
+    *bytes_written_total = 0;
+    while(*bytes_written_total < size) {
+        const ssize_t bytes_written = write(fd, data + *bytes_written_total, size - *bytes_written_total);
+        if(bytes_written == -1) {
+            if(errno == EAGAIN)
+                continue;
+            else
+                return false;
+        }
+        *bytes_written_total += bytes_written;
+    }
+    return true;
+}
+
+static bool gsr_replay_buffer_disk_create_next_file(gsr_replay_buffer_disk *self, double timestamp) {
+    if(self->num_files + 1 >= GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES) {
+        fprintf(stderr, "gsr error: gsr_replay_buffer_disk_create_next_file: too many replay buffer files created! (> %d), either reduce the replay buffer time or report this as a bug\n", (int)GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES);
+        return false;
+    }
+
+    gsr_replay_buffer_file *replay_buffer_file = gsr_replay_buffer_file_create(self->replay_directory, self->storage_counter, timestamp, &self->storage_fd);
+    if(!replay_buffer_file)
+        return false;
+
+    self->files[self->num_files] = replay_buffer_file;
+    ++self->num_files;
+    ++self->storage_counter;
+    return true;
+}
+
+static bool gsr_replay_buffer_disk_append_to_current_file(gsr_replay_buffer_disk *self, const AVPacket *av_packet, double timestamp) {
+    gsr_replay_buffer_file *replay_buffer_file = self->files[self->num_files - 1];
+    replay_buffer_file->end_timestamp = timestamp;
+
+    if(replay_buffer_file->num_packets + 1 >= replay_buffer_file->capacity_num_packets) {
+        size_t new_capacity_num_packets = replay_buffer_file->capacity_num_packets * 2;
+        if(new_capacity_num_packets == 0)
+            new_capacity_num_packets = 256;
+
+        void *new_packets = realloc(replay_buffer_file->packets, new_capacity_num_packets * sizeof(gsr_av_packet_disk));
+        if(!new_packets) {
+            fprintf(stderr, "gsr error: gsr_replay_buffer_disk_append_to_current_file: failed to reallocate replay buffer file packets\n");
+            return false;
+        }
+
+        replay_buffer_file->capacity_num_packets = new_capacity_num_packets;
+        replay_buffer_file->packets = new_packets;
+    }
+
+    gsr_av_packet_disk *packet = &replay_buffer_file->packets[replay_buffer_file->num_packets];
+    gsr_av_packet_disk_init(packet, av_packet, self->storage_num_bytes_written, timestamp);
+    ++replay_buffer_file->num_packets;
+
+    size_t bytes_written = 0;
+    const bool file_written = file_write_all(self->storage_fd, av_packet->data, av_packet->size, &bytes_written);
+    self->storage_num_bytes_written += bytes_written;
+    if(self->storage_num_bytes_written >= REPLAY_BUFFER_FILE_SIZE_BYTES) {
+        self->storage_num_bytes_written = 0;
+        close(self->storage_fd);
+        self->storage_fd = 0;
+    }
+
+    return file_written;
+}
+
+static void gsr_replay_buffer_disk_remove_first_file(gsr_replay_buffer_disk *self) {
+    gsr_replay_buffer_file_unref(self->files[0], self->replay_directory);
+    for(size_t i = 1; i < self->num_files; ++i) {
+        self->files[i - 1] = self->files[i];
+    }
+    --self->num_files;
+}
+
+static bool gsr_replay_buffer_disk_append(gsr_replay_buffer *replay_buffer, const AVPacket *av_packet, double timestamp) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    bool success = false;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    if(self->storage_fd <= 0) {
+        if(!gsr_replay_buffer_disk_create_next_file(self, timestamp))
+            goto done;
+    }
+
+    const bool data_written = gsr_replay_buffer_disk_append_to_current_file(self, av_packet, timestamp);
+
+    if(self->num_files > 1) {
+        const double buffer_time_accumulated = timestamp - self->files[1]->start_timestamp;
+        if(buffer_time_accumulated >= self->replay_buffer_time)
+            gsr_replay_buffer_disk_remove_first_file(self);
+    }
+
+    success = data_written;
+
+    done:
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return success;
+}
+
+static AVPacket* gsr_replay_buffer_disk_iterator_get_packet(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator iterator) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    assert(iterator.file_index < self->num_files);
+    assert(iterator.packet_index < self->files[iterator.file_index]->num_packets);
+    return &self->files[iterator.file_index]->packets[iterator.packet_index].packet;
+}
+
+static uint8_t* gsr_replay_buffer_disk_iterator_get_packet_data(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator iterator) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    assert(iterator.file_index < self->num_files);
+    gsr_replay_buffer_file *file = self->files[iterator.file_index];
+    assert(iterator.packet_index < file->num_packets);
+
+    if(file->fd <= 0) {
+        char filename[PATH_MAX];
+        snprintf(filename, sizeof(filename), "%s/%s_%d.gsr", self->replay_directory, FILE_PREFIX, (int)file->id);
+        file->fd = open(filename, O_RDONLY);
+        if(file->fd <= 0) {
+            fprintf(stderr, "gsr error: gsr_replay_buffer_disk_iterator_get_packet_data: failed to open file\n");
+            return NULL;
+        }
+    }
+
+    const gsr_av_packet_disk *packet = &self->files[iterator.file_index]->packets[iterator.packet_index];
+    if(lseek(file->fd, packet->data_index, SEEK_SET) == -1) {
+        fprintf(stderr, "gsr error: gsr_replay_buffer_disk_iterator_get_packet_data: failed to seek\n");
+        return NULL;
+    }
+
+    uint8_t *packet_data = malloc(packet->packet.size);
+    if(read(file->fd, packet_data, packet->packet.size) != packet->packet.size) {
+        fprintf(stderr, "gsr error: gsr_replay_buffer_disk_iterator_get_packet_data: failed to read data from file\n");
+        free(packet_data);
+        return NULL;
+    }
+
+    return packet_data;
+}
+
+static gsr_replay_buffer* gsr_replay_buffer_disk_clone(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_disk *destination = calloc(1, sizeof(gsr_replay_buffer_disk));
+    if(!destination)
+        return NULL;
+
+    gsr_replay_buffer_disk_set_impl_funcs(destination);
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    destination->replay_buffer.original_replay_buffer = replay_buffer;
+    destination->replay_buffer.mutex = self->replay_buffer.mutex;
+    destination->replay_buffer.mutex_initialized = self->replay_buffer.mutex_initialized;
+    destination->replay_buffer_time = self->replay_buffer_time;
+    destination->storage_counter = self->storage_counter;
+    destination->storage_num_bytes_written = self->storage_num_bytes_written;
+    destination->storage_fd = 0; // We only want to read from the clone. If there is a need to write to it in the future then TODO change this
+
+    for(size_t i = 0; i < self->num_files; ++i) {
+        destination->files[i] = gsr_replay_buffer_file_ref(self->files[i]);
+    }
+    destination->num_files = self->num_files;
+
+    snprintf(destination->replay_directory, sizeof(destination->replay_directory), "%s", self->replay_directory);
+    destination->owns_directory = false;
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer*)destination;
+}
+
+/* Binary search */
+static size_t gsr_replay_buffer_file_find_packet_index_by_time_passed(const gsr_replay_buffer_file *self, int seconds) {
+    const double now = clock_get_monotonic_seconds();
+    if(self->num_packets == 0) {
+        return 0;
+    }
+
+    size_t lower_bound = 0;
+    size_t upper_bound = self->num_packets;
+    size_t index = 0;
+
+    for(;;) {
+        index = lower_bound + (upper_bound - lower_bound) / 2;
+        const gsr_av_packet_disk *packet = &self->packets[index];
+        const double time_passed_since_packet = now - packet->timestamp;
+        if(time_passed_since_packet >= seconds) {
+            if(lower_bound == index)
+                break;
+            lower_bound = index;
+        } else {
+            if(upper_bound == index)
+                break;
+            upper_bound = index;
+        }
+    }
+
+    return index;
+}
+
+/* Binary search */
+static gsr_replay_buffer_iterator gsr_replay_buffer_disk_find_file_index_by_time_passed(gsr_replay_buffer *replay_buffer, int seconds) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    const double now = clock_get_monotonic_seconds();
+    if(self->num_files == 0) {
+        gsr_replay_buffer_unlock(&self->replay_buffer);
+        return (gsr_replay_buffer_iterator){0, 0};
+    }
+
+    size_t lower_bound = 0;
+    size_t upper_bound = self->num_files;
+    size_t file_index = 0;
+
+    for(;;) {
+        file_index = lower_bound + (upper_bound - lower_bound) / 2;
+        const gsr_replay_buffer_file *file = self->files[file_index];
+        const double time_passed_since_file_start = now - file->start_timestamp;
+        const double time_passed_since_file_end = now - file->end_timestamp;
+        if(time_passed_since_file_start >= seconds && time_passed_since_file_end <= seconds) {
+            break;
+        } else if(time_passed_since_file_start >= seconds) {
+            if(lower_bound == file_index)
+                break;
+            lower_bound = file_index;
+        } else {
+            if(upper_bound == file_index)
+                break;
+            upper_bound = file_index;
+        }
+    }
+
+    const gsr_replay_buffer_file *file = self->files[file_index];
+    const size_t packet_index = gsr_replay_buffer_file_find_packet_index_by_time_passed(file, seconds);
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer_iterator){packet_index, file_index};
+}
+
+static gsr_replay_buffer_iterator gsr_replay_buffer_disk_find_keyframe(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_iterator keyframe_iterator = {(size_t)-1, 0};
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    size_t packet_index = start_iterator.packet_index;
+    for(size_t file_index = start_iterator.file_index; file_index < self->num_files; ++file_index) {
+        const gsr_replay_buffer_file *file = self->files[file_index];
+        for(; packet_index < file->num_packets; ++packet_index) {
+            const gsr_av_packet_disk *packet = &file->packets[packet_index];
+            if((packet->packet.flags & AV_PKT_FLAG_KEY) && (invert_stream_index ? packet->packet.stream_index != stream_index : packet->packet.stream_index == stream_index)) {
+                keyframe_iterator.packet_index = packet_index;
+                keyframe_iterator.file_index = file_index;
+                goto done;
+            }
+        }
+        packet_index = 0;
+    }
+    done:
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return keyframe_iterator;
+}
+
+static bool gsr_replay_buffer_disk_iterator_next(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator *iterator) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    if(iterator->file_index >= self->num_files)
+        return false;
+
+    if(iterator->packet_index + 1 >= self->files[iterator->file_index]->num_packets) {
+        if(iterator->file_index + 1 >= self->num_files)
+            return false;
+
+        if(self->files[iterator->file_index + 1]->num_packets == 0)
+            return false;
+
+        ++iterator->file_index;
+        iterator->packet_index = 0;
+        return true;
+    } else {
+        ++iterator->packet_index;
+        return true;
+    }
+}
+
+static void get_current_time(char *time_str, size_t time_str_size) {
+    time_t now = time(NULL);
+    struct tm *t = localtime(&now);
+    strftime(time_str, time_str_size - 1, "%Y-%m-%d_%H-%M-%S", t);
+}
+
+static void gsr_replay_buffer_disk_set_impl_funcs(gsr_replay_buffer_disk *self) {
+    self->replay_buffer.destroy = gsr_replay_buffer_disk_destroy;
+    self->replay_buffer.append = gsr_replay_buffer_disk_append;
+    self->replay_buffer.clear = gsr_replay_buffer_disk_clear;
+    self->replay_buffer.iterator_get_packet = gsr_replay_buffer_disk_iterator_get_packet;
+    self->replay_buffer.iterator_get_packet_data = gsr_replay_buffer_disk_iterator_get_packet_data;
+    self->replay_buffer.clone = gsr_replay_buffer_disk_clone;
+    self->replay_buffer.find_packet_index_by_time_passed = gsr_replay_buffer_disk_find_file_index_by_time_passed;
+    self->replay_buffer.find_keyframe = gsr_replay_buffer_disk_find_keyframe;
+    self->replay_buffer.iterator_next = gsr_replay_buffer_disk_iterator_next;
+}
+
+gsr_replay_buffer* gsr_replay_buffer_disk_create(const char *replay_directory, double replay_buffer_time) {
+    assert(replay_buffer_time > 0);
+    gsr_replay_buffer_disk *replay_buffer = calloc(1, sizeof(gsr_replay_buffer_disk));
+    if(!replay_buffer)
+        return NULL;
+
+    char time_str[128];
+    get_current_time(time_str, sizeof(time_str));
+
+    replay_buffer->num_files = 0;
+    replay_buffer->storage_counter = 0;
+    replay_buffer->replay_buffer_time = replay_buffer_time;
+    snprintf(replay_buffer->replay_directory, sizeof(replay_buffer->replay_directory), "%s/gsr-replay-%s.gsr", replay_directory, time_str);
+    replay_buffer->owns_directory = true;
+
+    gsr_replay_buffer_disk_set_impl_funcs(replay_buffer);
+    return (gsr_replay_buffer*)replay_buffer;
+}
--- a/src/replay_buffer/replay_buffer_ram.c
+++ b/src/replay_buffer/replay_buffer_ram.c
@@ -0,0 +1,256 @@
+#include "../../include/replay_buffer/replay_buffer_ram.h"
+#include "../../include/utils.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include <libavutil/mem.h>
+
+static void gsr_replay_buffer_ram_set_impl_funcs(gsr_replay_buffer_ram *self);
+
+static gsr_av_packet_ram* gsr_av_packet_ram_create(const AVPacket *av_packet, double timestamp) {
+    gsr_av_packet_ram *self = malloc(sizeof(gsr_av_packet_ram));
+    if(!self)
+        return NULL;
+
+    self->ref_counter = 1;
+    self->packet = *av_packet;
+    self->timestamp = timestamp;
+    // Why are we doing this you ask? there is a ffmpeg bug that causes cpu usage to increase over time when you have
+    // packets that are not being free'd until later. So we copy the packet data, free the packet and then reconstruct
+    // the packet later on when we need it, to keep packets alive only for a short period.
+    self->packet.data = av_memdup(av_packet->data, av_packet->size);
+    if(!self->packet.data) {
+        free(self);
+        return NULL;
+    }
+
+    return self;
+}
+
+static gsr_av_packet_ram* gsr_av_packet_ram_ref(gsr_av_packet_ram *self) {
+    if(self->ref_counter >= 1)
+        ++self->ref_counter;
+    return self;
+}
+
+static void gsr_av_packet_ram_free(gsr_av_packet_ram *self) {
+    self->ref_counter = 0;
+    if(self->packet.data) {
+        av_free(self->packet.data);
+        self->packet.data = NULL;
+    }
+    free(self);
+}
+
+static void gsr_av_packet_ram_unref(gsr_av_packet_ram *self) {
+    if(self->ref_counter >= 1)
+        --self->ref_counter;
+
+    if(self->ref_counter <= 0)
+        gsr_av_packet_ram_free(self);
+}
+
+static void gsr_replay_buffer_ram_destroy(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    for(size_t i = 0; i < self->num_packets; ++i) {
+        if(self->packets[i]) {
+            gsr_av_packet_ram_unref(self->packets[i]);
+            self->packets[i] = NULL;
+        }
+    }
+    self->num_packets = 0;
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+
+    if(self->packets) {
+        free(self->packets);
+        self->packets = NULL;
+    }
+
+    self->capacity_num_packets = 0;
+    self->index = 0;
+}
+
+static bool gsr_replay_buffer_ram_append(gsr_replay_buffer *replay_buffer, const AVPacket *av_packet, double timestamp) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    gsr_av_packet_ram *packet = gsr_av_packet_ram_create(av_packet, timestamp);
+    if(!packet) {
+        gsr_replay_buffer_unlock(&self->replay_buffer);
+        return false;
+    }
+
+    if(self->packets[self->index]) {
+        gsr_av_packet_ram_unref(self->packets[self->index]);
+        self->packets[self->index] = NULL;
+    }
+    self->packets[self->index] = packet;
+
+    self->index = (self->index + 1) % self->capacity_num_packets;
+    ++self->num_packets;
+    if(self->num_packets > self->capacity_num_packets)
+        self->num_packets = self->capacity_num_packets;
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return true;
+}
+
+static void gsr_replay_buffer_ram_clear(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    for(size_t i = 0; i < self->num_packets; ++i) {
+        if(self->packets[i]) {
+            gsr_av_packet_ram_unref(self->packets[i]);
+            self->packets[i] = NULL;
+        }
+    }
+    self->num_packets = 0;
+    self->index = 0;
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+}
+
+static gsr_av_packet_ram* gsr_replay_buffer_ram_get_packet_at_index(gsr_replay_buffer *replay_buffer, size_t index) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    assert(index < self->num_packets);
+    size_t start_index = 0;
+    if(self->num_packets < self->capacity_num_packets)
+        start_index = self->num_packets - self->index;
+    else
+        start_index = self->index;
+
+    const size_t offset = (start_index + index) % self->capacity_num_packets;
+    return self->packets[offset];
+}
+
+static AVPacket* gsr_replay_buffer_ram_iterator_get_packet(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator iterator) {
+    return &gsr_replay_buffer_ram_get_packet_at_index(replay_buffer, iterator.packet_index)->packet;
+}
+
+static uint8_t* gsr_replay_buffer_ram_iterator_get_packet_data(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator iterator) {
+    (void)replay_buffer;
+    (void)iterator;
+    return NULL;
+}
+
+static gsr_replay_buffer* gsr_replay_buffer_ram_clone(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_ram *destination = calloc(1, sizeof(gsr_replay_buffer_ram));
+    if(!destination)
+        return NULL;
+
+    gsr_replay_buffer_ram_set_impl_funcs(destination);
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    destination->replay_buffer.original_replay_buffer = replay_buffer;
+    destination->replay_buffer.mutex = self->replay_buffer.mutex;
+    destination->replay_buffer.mutex_initialized = self->replay_buffer.mutex_initialized;
+    destination->capacity_num_packets = self->capacity_num_packets;
+    destination->index = self->index;
+    destination->packets = calloc(destination->capacity_num_packets, sizeof(gsr_av_packet_ram*));
+    if(!destination->packets) {
+        free(destination);
+        gsr_replay_buffer_unlock(&self->replay_buffer);
+        return NULL;
+    }
+
+    destination->num_packets = self->num_packets;
+    for(size_t i = 0; i < destination->num_packets; ++i) {
+        destination->packets[i] = gsr_av_packet_ram_ref(self->packets[i]);
+    }
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer*)destination;
+}
+
+/* Binary search */
+static gsr_replay_buffer_iterator gsr_replay_buffer_ram_find_packet_index_by_time_passed(gsr_replay_buffer *replay_buffer, int seconds) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    const double now = clock_get_monotonic_seconds();
+    if(self->num_packets == 0) {
+        gsr_replay_buffer_unlock(&self->replay_buffer);
+        return (gsr_replay_buffer_iterator){0, 0};
+    }
+
+    size_t lower_bound = 0;
+    size_t upper_bound = self->num_packets;
+    size_t index = 0;
+
+    for(;;) {
+        index = lower_bound + (upper_bound - lower_bound) / 2;
+        const gsr_av_packet_ram *packet = gsr_replay_buffer_ram_get_packet_at_index(replay_buffer, index);
+        const double time_passed_since_packet = now - packet->timestamp;
+        if(time_passed_since_packet >= seconds) {
+            if(lower_bound == index)
+                break;
+            lower_bound = index;
+        } else {
+            if(upper_bound == index)
+                break;
+            upper_bound = index;
+        }
+    }
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer_iterator){index, 0};
+}
+
+static gsr_replay_buffer_iterator gsr_replay_buffer_ram_find_keyframe(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    size_t keyframe_index = (size_t)-1;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    for(size_t i = start_iterator.packet_index; i < self->num_packets; ++i) {
+        const gsr_av_packet_ram *packet = gsr_replay_buffer_ram_get_packet_at_index(replay_buffer, i);
+        if((packet->packet.flags & AV_PKT_FLAG_KEY) && (invert_stream_index ? packet->packet.stream_index != stream_index : packet->packet.stream_index == stream_index)) {
+            keyframe_index = i;
+            break;
+        }
+    }
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer_iterator){keyframe_index, 0};
+}
+
+static bool gsr_replay_buffer_ram_iterator_next(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator *iterator) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    if(iterator->packet_index + 1 < self->num_packets) {
+        ++iterator->packet_index;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static void gsr_replay_buffer_ram_set_impl_funcs(gsr_replay_buffer_ram *self) {
+    self->replay_buffer.destroy = gsr_replay_buffer_ram_destroy;
+    self->replay_buffer.append = gsr_replay_buffer_ram_append;
+    self->replay_buffer.clear = gsr_replay_buffer_ram_clear;
+    self->replay_buffer.iterator_get_packet = gsr_replay_buffer_ram_iterator_get_packet;
+    self->replay_buffer.iterator_get_packet_data = gsr_replay_buffer_ram_iterator_get_packet_data;
+    self->replay_buffer.clone = gsr_replay_buffer_ram_clone;
+    self->replay_buffer.find_packet_index_by_time_passed = gsr_replay_buffer_ram_find_packet_index_by_time_passed;
+    self->replay_buffer.find_keyframe = gsr_replay_buffer_ram_find_keyframe;
+    self->replay_buffer.iterator_next = gsr_replay_buffer_ram_iterator_next;
+}
+
+gsr_replay_buffer* gsr_replay_buffer_ram_create(size_t replay_buffer_num_packets) {
+    assert(replay_buffer_num_packets > 0);
+    gsr_replay_buffer_ram *replay_buffer = calloc(1, sizeof(gsr_replay_buffer_ram));
+    if(!replay_buffer)
+        return NULL;
+
+    replay_buffer->capacity_num_packets = replay_buffer_num_packets;
+    replay_buffer->num_packets = 0;
+    replay_buffer->index = 0;
+    replay_buffer->packets = calloc(replay_buffer->capacity_num_packets, sizeof(gsr_av_packet_ram*));
+    if(!replay_buffer->packets) {
+        gsr_replay_buffer_ram_destroy(&replay_buffer->replay_buffer);
+        free(replay_buffer);
+        return NULL;
+    }
+
+    gsr_replay_buffer_ram_set_impl_funcs(replay_buffer);
+    return (gsr_replay_buffer*)replay_buffer;
+}
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -154,7 +154,7 @@ static bool startup_get_default_devices(pa_handle *p, const char *device_name) {
    }

    if(p->default_output_device_name[0] == '\0') {
-        fprintf(stderr, "Error: failed to find default audio output device\n");
+        fprintf(stderr, "gsr error: failed to find default audio output device\n");
        return false;
    }

@@ -197,7 +197,7 @@ static pa_handle* pa_sound_device_new(const char *server,
    const int buffer_size = attr->fragsize;
    void *buffer = malloc(buffer_size);
    if(!buffer) {
-        fprintf(stderr, "Error: failed to allocate buffer for audio\n");
+        fprintf(stderr, "gsr error: failed to allocate buffer for audio\n");
        *rerror = -1;
        return NULL;
    }
@@ -426,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, "Error: pa_sound_device_new() failed: %s. Audio input device %s might not be valid\n", pa_strerror(error), device_name);
+        fprintf(stderr, "gsr error: pa_sound_device_new() failed: %s. Audio input device %s might not be valid\n", pa_strerror(error), device_name);
        return -1;
    }

--- a/src/utils.c
+++ b/src/utils.c
@@ -19,6 +19,8 @@
 #include <libavcodec/avcodec.h>
 #include <libavutil/hwcontext_vaapi.h>

+#define DRM_NUM_BUF_ATTRS 4
+
 double clock_get_monotonic_seconds(void) {
    struct timespec ts;
    ts.tv_sec = 0;
@@ -108,7 +110,7 @@ void for_each_active_monitor_output_x11_not_cached(Display *display, active_moni
                // 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)) {
+                if(mode_info) {
                    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);
@@ -150,21 +152,22 @@ int get_connector_type_by_name(const char *name) {
        return -1;
 }

-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];
+int get_connector_type_id_by_name(const char *name) {
+    int len = strlen(name);
+    int num_start = 0;
+    for(int i = len - 1; i >= 0; --i) {
+        const bool is_num = name[i] >= '0' && name[i] <= '9';
+        if(!is_num) {
+            num_start = i + 1;
+            break;
+        }
    }

-    if(*num_type_counts == CONNECTOR_TYPE_COUNTS)
-        return NULL;
+    const int num_len = len - num_start;
+    if(num_len <= 0)
+        return -1;

-    const int index = *num_type_counts;
-    type_counts[index].type = connector_type;
-    type_counts[index].count = 0;
-    type_counts[index].count_active = 0;
-    ++*num_type_counts;
-    return &type_counts[index];
+    return atoi(name + num_start);
 }

 uint32_t monitor_identifier_from_type_and_count(int monitor_type_index, int monitor_type_count) {
@@ -195,9 +198,6 @@ static void for_each_active_monitor_output_drm(const char *card_path, active_mon

    drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1);

-    drm_connector_type_count type_counts[CONNECTOR_TYPE_COUNTS];
-    int num_type_counts = 0;
-
    char display_name[256];
    drmModeResPtr resources = drmModeGetResources(fd);
    if(resources) {
@@ -206,35 +206,29 @@ static void for_each_active_monitor_output_drm(const char *card_path, active_mon
            if(!connector)
                continue;

-            drm_connector_type_count *connector_type = drm_connector_types_get_index(type_counts, &num_type_counts, connector->connector_type);
-            const char *connection_name = drmModeGetConnectorTypeName(connector->connector_type);
-            const int connection_name_len = strlen(connection_name);
-            if(connector_type)
-                ++connector_type->count;
-
            if(connector->connection != DRM_MODE_CONNECTED) {
                drmModeFreeConnector(connector);
                continue;
            }

-            if(connector_type)
-                ++connector_type->count_active;
-
            uint64_t crtc_id = 0;
            connector_get_property_by_name(fd, connector, "CRTC_ID", &crtc_id);

            drmModeCrtcPtr crtc = drmModeGetCrtc(fd, crtc_id);
-            if(connector_type && crtc_id > 0 && crtc && connection_name_len + 5 < (int)sizeof(display_name)) {
-                const int display_name_len = snprintf(display_name, sizeof(display_name), "%s-%d", connection_name, connector_type->count);
+            const char *connection_name = drmModeGetConnectorTypeName(connector->connector_type);
+
+            if(connection_name && crtc_id > 0 && crtc) {
                const int connector_type_index_name = get_connector_type_by_name(display_name);
-                gsr_monitor monitor = {
+                const int display_name_len = snprintf(display_name, sizeof(display_name), "%s-%u", connection_name, connector->connector_type_id);
+
+                const gsr_monitor monitor = {
                    .name = display_name,
                    .name_len = display_name_len,
                    .pos = { .x = crtc->x, .y = crtc->y },
                    .size = { .x = (int)crtc->width, .y = (int)crtc->height },
                    .connector_id = connector->connector_id,
                    .rotation = GSR_MONITOR_ROT_0,
-                    .monitor_identifier = connector_type_index_name != -1 ? monitor_identifier_from_type_and_count(connector_type_index_name, connector_type->count_active) : 0
+                    .monitor_identifier = connector_type_index_name != -1 ? monitor_identifier_from_type_and_count(connector_type_index_name, connector->connector_type_id) : 0
                };
                callback(&monitor, userdata);
            }
@@ -516,6 +510,41 @@ int create_directory_recursive(char *path) {
 }

 void setup_dma_buf_attrs(intptr_t *img_attr, uint32_t format, uint32_t width, uint32_t height, const int *fds, const uint32_t *offsets, const uint32_t *pitches, const uint64_t *modifiers, int num_planes, bool use_modifier) {
+    const uint32_t plane_fd_attrs[DRM_NUM_BUF_ATTRS] = {
+        EGL_DMA_BUF_PLANE0_FD_EXT,
+        EGL_DMA_BUF_PLANE1_FD_EXT,
+        EGL_DMA_BUF_PLANE2_FD_EXT,
+        EGL_DMA_BUF_PLANE3_FD_EXT
+    };
+
+    const uint32_t plane_offset_attrs[DRM_NUM_BUF_ATTRS] = {
+        EGL_DMA_BUF_PLANE0_OFFSET_EXT,
+        EGL_DMA_BUF_PLANE1_OFFSET_EXT,
+        EGL_DMA_BUF_PLANE2_OFFSET_EXT,
+        EGL_DMA_BUF_PLANE3_OFFSET_EXT
+    };
+
+    const uint32_t plane_pitch_attrs[DRM_NUM_BUF_ATTRS] = {
+        EGL_DMA_BUF_PLANE0_PITCH_EXT,
+        EGL_DMA_BUF_PLANE1_PITCH_EXT,
+        EGL_DMA_BUF_PLANE2_PITCH_EXT,
+        EGL_DMA_BUF_PLANE3_PITCH_EXT
+    };
+
+    const uint32_t plane_modifier_lo_attrs[DRM_NUM_BUF_ATTRS] = {
+        EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT,
+        EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT,
+        EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT,
+        EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT
+    };
+
+    const uint32_t plane_modifier_hi_attrs[DRM_NUM_BUF_ATTRS] = {
+        EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT,
+        EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT,
+        EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT,
+        EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT
+    };
+
    size_t img_attr_index = 0;

    img_attr[img_attr_index++] = EGL_LINUX_DRM_FOURCC_EXT;
@@ -527,79 +556,23 @@ void setup_dma_buf_attrs(intptr_t *img_attr, uint32_t format, uint32_t width, ui
    img_attr[img_attr_index++] = EGL_HEIGHT;
    img_attr[img_attr_index++] = height;

-    if(num_planes >= 1) {
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_FD_EXT;
-        img_attr[img_attr_index++] = fds[0];
+    assert(num_planes <= DRM_NUM_BUF_ATTRS);
+    for(int i = 0; i < num_planes; ++i) {
+        img_attr[img_attr_index++] = plane_fd_attrs[i];
+        img_attr[img_attr_index++] = fds[i];

-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_OFFSET_EXT;
-        img_attr[img_attr_index++] = offsets[0];
+        img_attr[img_attr_index++] = plane_offset_attrs[i];
+        img_attr[img_attr_index++] = offsets[i];

-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_PITCH_EXT;
-        img_attr[img_attr_index++] = pitches[0];
+        img_attr[img_attr_index++] = plane_pitch_attrs[i];
+        img_attr[img_attr_index++] = pitches[i];

        if(use_modifier) {
-            img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT;
-            img_attr[img_attr_index++] = modifiers[0] & 0xFFFFFFFFULL;
+            img_attr[img_attr_index++] = plane_modifier_lo_attrs[i];
+            img_attr[img_attr_index++] = modifiers[i] & 0xFFFFFFFFULL;

-            img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT;
-            img_attr[img_attr_index++] = modifiers[0] >> 32ULL;
-        }
-    }
-
-    if(num_planes >= 2) {
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_FD_EXT;
-        img_attr[img_attr_index++] = fds[1];
-
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_OFFSET_EXT;
-        img_attr[img_attr_index++] = offsets[1];
-
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_PITCH_EXT;
-        img_attr[img_attr_index++] = pitches[1];
-
-        if(use_modifier) {
-            img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT;
-            img_attr[img_attr_index++] = modifiers[1] & 0xFFFFFFFFULL;
-
-            img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT;
-            img_attr[img_attr_index++] = modifiers[1] >> 32ULL;
-        }
-    }
-
-    if(num_planes >= 3) {
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_FD_EXT;
-        img_attr[img_attr_index++] = fds[2];
-
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_OFFSET_EXT;
-        img_attr[img_attr_index++] = offsets[2];
-
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_PITCH_EXT;
-        img_attr[img_attr_index++] = pitches[2];
-
-        if(use_modifier) {
-            img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT;
-            img_attr[img_attr_index++] = modifiers[2] & 0xFFFFFFFFULL;
-
-            img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT;
-            img_attr[img_attr_index++] = modifiers[2] >> 32ULL;
-        }
-    }
-
-    if(num_planes >= 4) {
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_FD_EXT;
-        img_attr[img_attr_index++] = fds[3];
-
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_OFFSET_EXT;
-        img_attr[img_attr_index++] = offsets[3];
-
-        img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_PITCH_EXT;
-        img_attr[img_attr_index++] = pitches[3];
-
-        if(use_modifier) {
-            img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT;
-            img_attr[img_attr_index++] = modifiers[3] & 0xFFFFFFFFULL;
-
-            img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT;
-            img_attr[img_attr_index++] = modifiers[3] >> 32ULL;
+            img_attr[img_attr_index++] = plane_modifier_hi_attrs[i];
+            img_attr[img_attr_index++] = modifiers[i] >> 32ULL;
        }
    }

@@ -607,33 +580,6 @@ void setup_dma_buf_attrs(intptr_t *img_attr, uint32_t format, uint32_t width, ui
    assert(img_attr_index <= 44);
 }

-static VADisplay video_codec_context_get_vaapi_display(AVCodecContext *video_codec_context) {
-    AVBufferRef *hw_frames_ctx = video_codec_context->hw_frames_ctx;
-    if(!hw_frames_ctx)
-        return NULL;
-
-    AVHWFramesContext *hw_frame_context = (AVHWFramesContext*)hw_frames_ctx->data;
-    AVHWDeviceContext *device_context = (AVHWDeviceContext*)hw_frame_context->device_ctx;
-    if(device_context->type != AV_HWDEVICE_TYPE_VAAPI)
-        return NULL;
-
-    AVVAAPIDeviceContext *vactx = device_context->hwctx;
-    return vactx->display;
-}
-
-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 false;
-
-    AVHWFramesContext *hw_frame_context = (AVHWFramesContext*)hw_frames_ctx->data;
-    AVHWDeviceContext *device_context = (AVHWDeviceContext*)hw_frame_context->device_ctx;
-    return device_context->type == AV_HWDEVICE_TYPE_VAAPI;
-}
-
 vec2i scale_keep_aspect_ratio(vec2i from, vec2i to) {
    if(from.x == 0 || from.y == 0)
        return (vec2i){0, 0};
@@ -652,22 +598,12 @@ vec2i scale_keep_aspect_ratio(vec2i from, vec2i to) {
 }

 unsigned int gl_create_texture(gsr_egl *egl, int width, int height, int internal_format, unsigned int format, int filter) {
-    float border_color[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
-    if(format == GL_RG) { // UV
-        border_color[0] = 0.5f;
-        border_color[1] = 0.5f;
-        border_color[2] = 0.0f;
-        border_color[3] = 1.0f;
-    }
-
    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->glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
+    egl->glTexStorage2D(GL_TEXTURE_2D, 1, internal_format, width, height);

-    egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
    egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
    egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);

--- a/src/window/wayland.c
+++ b/src/window/wayland.c
@@ -339,24 +339,13 @@ static gsr_monitor_rotation wayland_transform_to_gsr_rotation(int32_t rot) {

 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 int connector_type_id = get_connector_type_id_by_name(output->name);
        const gsr_monitor monitor = {
            .name = output->name,
            .name_len = strlen(output->name),
@@ -364,7 +353,7 @@ static void gsr_window_wayland_for_each_active_monitor_output_cached(const gsr_w
            .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
+            .monitor_identifier = (connector_type_index != -1 && connector_type_id != -1) ? monitor_identifier_from_type_and_count(connector_type_index, connector_type_id) : 0
        };
        callback(&monitor, userdata);
    }
--- a/src/window_texture.c
+++ b/src/window_texture.c
@@ -85,10 +85,6 @@ int window_texture_on_resize(WindowTexture *self) {
        texture_id = self->texture_id;
    }

-    const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-    self->egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
Author	SHA1	Message	Date
dec05eba	1e62e654e2	Pipewire: support alpha textures again, do alpha blending and clear background if fourcc is alpha.	2025-07-20 23:33:49 +02:00
dec05eba	4fb0dad3df	Pipewire: dont attempt to use modifier if modifier is 0x0	2025-07-20 21:48:39 +02:00
dec05eba	bd91c664a6	Proper debug context setup	2025-07-07 17:27:57 +02:00
dec05eba	e08f6bdbd6	m	2025-07-06 23:20:25 +02:00
dec05eba	3809983b54	m	2025-07-06 23:19:44 +02:00
dec05eba	0bf648d651	README: mention appimage, remove no longer valid FAQ and mention prime-run limitations	2025-07-06 23:18:58 +02:00
Er2	0794008e6f	FreeBSD: Add support	2025-07-06 19:44:46 +02:00
dec05eba	0cda785bc8	kms: use /tmp directory for temporary unix domain socket to fix too long path with AppImage portable home	2025-07-06 18:00:33 +02:00
dec05eba	2c0c53b5b3	Revert "kms: remove unix domain socket and only use socketpair" This reverts commit `46febed35e`.	2025-07-06 17:53:34 +02:00
dec05eba	46febed35e	kms: remove unix domain socket and only use socketpair	2025-07-06 17:27:46 +02:00
dec05eba	469e234841	Remove unused variable	2025-06-28 18:13:29 +02:00
dec05eba	cecaea8d6d	5.6.1	2025-06-28 18:09:57 +02:00
dec05eba	288adba81c	Change frame timing logic to always match timestamp timeout	2025-06-28 18:09:38 +02:00
dec05eba	4f32d56f21	5.6.0	2025-06-28 04:31:16 +02:00
dec05eba	b9537941c9	Restart portal capture if it's paused for 3 seconds or more (can happen if returning from lock screen) Remove dbus server, no longer needed. Just run dbus code directly.	2025-06-28 04:25:26 +02:00
dec05eba	2290f0641c	5.5.10	2025-06-23 12:52:08 +02:00
dec05eba	f9e93467b2	Pipewire: fix transparent windows having incorrect color (disable RGBA video formats)	2025-06-23 12:41:28 +02:00
dec05eba	7d7f986668	Pipewire: dont remove first frame. This fixes window capture/unfocused monitor capture being black until its updated	2025-06-23 12:35:10 +02:00
dec05eba	1b957d5b40	README: update dependency linux-firmware->linux-firmware-intel	2025-06-22 19:28:05 +02:00
dec05eba	8ad6a1f4cb	OpenGL ES version correct in README (only requires 3.0)	2025-06-16 22:41:16 +02:00
dec05eba	0cf0a9abf5	Create egl3 context	2025-06-16 22:23:26 +02:00
dec05eba	bc58e382b7	EGL_OPENGL_ES_BIT->EGL_OPENGL_ES2_BIT	2025-06-16 20:57:59 +02:00
dec05eba	630c504241	Limit nvidia-smi to opensuse because it causes huge memory leak on ubuntu/debian. Add example toggle-recording.sh script	2025-06-12 14:42:04 +02:00
dec05eba	0528bc6f31	M	2025-06-10 11:08:43 +02:00
dec05eba	a8b3e38082	Update README and TODO	2025-06-10 11:07:42 +02:00
dec05eba	d0a620a574	5.5.8	2025-06-10 10:58:21 +02:00
dec05eba	ca0be79344	Fix nvidia capture after switch to opengl es	2025-06-10 00:34:21 +02:00
dec05eba	53557133c2	Reapply "Fix screen and portal capture not working on some intel gpus" This reverts commit `7f00ce22e7`.	2025-06-10 00:32:51 +02:00
dec05eba	7f00ce22e7	Revert "Fix screen and portal capture not working on some intel gpus" This reverts commit `3ba1dbda98`.	2025-06-09 22:11:16 +02:00
dec05eba	3ba1dbda98	Fix screen and portal capture not working on some intel gpus	2025-06-09 22:07:52 +02:00
dec05eba	a849d2cdad	Add nobara package link	2025-06-08 00:39:26 +02:00
dec05eba	b0b1442a03	Swap flush and memory barrier	2025-06-07 11:51:49 +02:00
dec05eba	baa7bfd5e4	5.5.6	2025-06-07 00:56:29 +02:00
dec05eba	3b09cb7fd3	Disable cap_sys_nice which causes amd gpu crash for some people. Do glFlush instead of swapBuffers, which allows it to run at high fps anyways. Downside is that some games on kde plasma can start to stutter. Kde plasma issue?	2025-06-07 00:41:45 +02:00
dec05eba	1ab2c066b4	Remove swap buffer call	2025-06-06 23:46:11 +02:00
dec05eba	131209ddc0	Minor cleanup	2025-05-27 16:04:12 +02:00
dec05eba	b2487788c2	Fix build for newer ffmpeg	2025-05-27 08:14:00 +02:00
dec05eba	9485df761f	README update	2025-05-26 19:13:20 +02:00
dec05eba	815350a5ca	Support surround sound for application audio capture, support unlimited links	2025-05-26 17:57:51 +02:00
dec05eba	23fd8065b6	Consistent info/warning/error message structure	2025-05-26 16:33:06 +02:00
dec05eba	637d6ebfd6	Match gsr monitor name with wayland monitor name. Thanks info@leocodes	2025-05-25 19:07:59 +02:00
dec05eba	5a94122b8f	m	2025-05-21 18:33:19 +02:00
dec05eba	2b34c78459	Revert "temp test for cosmic" This reverts commit `35222bafe2`.	2025-05-15 19:48:25 +02:00
dec05eba	35222bafe2	temp test for cosmic	2025-05-15 19:17:04 +02:00
dec05eba	2a0fb9f449	cap_sys_nice fix for nixos	2025-05-11 18:39:13 +02:00
dec05eba	73fd0a30cd	Change default quality for systemd service file	2025-05-11 10:41:15 +02:00
dec05eba	085d4632d2	Show warning for missing capability	2025-05-10 21:51:14 +02:00
dec05eba	39503de742	README	2025-05-10 20:34:22 +02:00
dec05eba	0ae5b83e47	5.5.2	2025-05-10 19:23:13 +02:00
dec05eba	e1992ae3be	Revert "temp debug" This reverts commit `ce3203ebc7`.	2025-05-10 18:38:58 +02:00
dec05eba	ce3203ebc7	temp debug	2025-05-10 18:33:35 +02:00
dec05eba	e3225bc628	Move dbus code to a separate process to allow gpu-screen-recorder to use cap_sys_nice for better recording performance on amd	2025-05-10 17:10:59 +02:00
dec05eba	811a14481d	m	2025-05-05 14:00:10 +02:00
dec05eba	5cda6c0bf0	Fix incorrect replay duration saved for disk replay	2025-05-05 01:44:27 +02:00
dec05eba	3f18462af4	Change file extension of temporary replay data file from .mp4 to .gsr	2025-05-05 01:28:01 +02:00
dec05eba	c1fefb6afb	5.5.0	2025-05-04 22:01:23 +02:00
dec05eba	a409f3b3c3	Fix replay to disk not working properly when restarting replay	2025-05-04 21:52:17 +02:00
dec05eba	36c74d3411	Add -replay-storage option to specify if temporary replay data should be stored in ram or disk	2025-05-04 21:24:07 +02:00
dec05eba	2ca5f3361c	Dont list region capture option if not monitors are available for capture	2025-05-03 22:50:44 +02:00
dec05eba	200c32f08a	m	2025-05-03 20:43:28 +02:00
dec05eba	0cdc359931	Fix audio capture not working with noisetorch if combined with another source with some audio devices. Remove the ability to set audio track name for now. If you need this, email me	2025-05-03 19:29:04 +02:00
dec05eba	39bc110a20	Fix h264 software encoding not working	2025-05-03 14:12:10 +02:00
dec05eba	b4bbed2402	Fix build issues on older ffmpeg (disable unused vulkan encoder for now), fix incorrect wayland protocol file	2025-04-25 11:14:40 +02:00
dec05eba	06b559ecef	5.4.1	2025-04-23 19:48:42 +02:00
dec05eba	28bc8a0bd2	Update readme	2025-04-23 19:24:52 +02:00
dec05eba	15176579cb	Fix replay saving freeze, unable to save replay if audio is not provided	2025-04-23 19:11:58 +02:00