5.6.7

musl libc doesn't implement M_MMAP_THRESHOLD

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 by default but there is an option to store it on disk instead.
+This software works on X11 and Wayland on AMD, Intel and NVIDIA.
 ### 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.
@@ -67,9 +67,11 @@ Here are some known unofficial packages:
 * Debian/Ubuntu: [Pacstall](https://pacstall.dev/packages/gpu-screen-recorder)
 * Nix: [NixOS wiki](https://wiki.nixos.org/wiki/Gpu-screen-recorder)
 * openSUSE: [openSUSE software repository](https://software.opensuse.org/package/gpu-screen-recorder)
-* Fedora: [Copr](https://copr.fedorainfracloud.org/coprs/brycensranch/gpu-screen-recorder-git/)
+* Fedora, CentOS: [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)
@@ -88,6 +89,8 @@ These are the dependencies needed to build GPU Screen Recorder:
 * 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
@@ -96,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)
@@ -105,7 +108,7 @@ There are also additional dependencies needed at runtime depending on your GPU v
 * xnvctrl (libxnvctrl0, when using the `-oc` option)
 
 ## Optional dependencies
-When compiling GPU Screen Recorder with portal support (`-Dportal=true`, which is enabled by default) these dependencies are also needed:
+When building GPU Screen Recorder with portal support (`-Dportal=true` meson option, which is enabled by default) these dependencies are also needed:
 * libdbus
 * libpipewire (and libspa which is usually part of libpipewire)
 
@@ -125,14 +128,19 @@ 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.
 The file path to the saved replay is output to stdout. All other output from GPU Screen Recorder are output to stderr.
 You can also use the `-sc` option to specify a script that should be run (asynchronously) when the video has been saved and the script will have access to the location of the saved file as its first argument.
-This can be used for example to show a notification when a replay has been saved, to rename the video with a title that matches the game played (see `scripts/record-save-application-name.sh` as an example on how to do this on X11) or to re-encode the video.\
-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.
+This can be used for example to show a notification when a replay has been saved, to rename the video with a title that matches the game played (see `scripts/record-save-application-name.sh` as an example on how to do this on X11) or to re-encode the video.
+
+The replay buffer is stored in ram (as encoded video) by default, so don't use a too large replay time and/or video quality unless you have enough ram to store it.\
+You can use the `-replay-storage disk` option to store the replay buffer on disk instead of ram (in the same location as the output video).\
+By default videos are recorded with constant quality, but with replay mode you might want to record in constant bitrate mode instead for consistent ram/disk usage in high motion scenes. You can do that by using the `-bm cbr` option (along with `-q` option, for example `-bm cbr -q 20000`).
 ## 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.\
@@ -151,6 +159,21 @@ If you installed GPU Screen Recorder from AUR or from source and you are running
 It's configured with `$HOME/.config/gpu-screen-recorder.env` (create it if it doesn't exist). You can look at [extra/gpu-screen-recorder.env](https://git.dec05eba.com/gpu-screen-recorder/plain/extra/gpu-screen-recorder.env) to see an example.
 You can see which variables that you can use in the `gpu-screen-recorder.env` file by looking at the `extra/gpu-screen-recorder.service` file. Note that all of the variables are optional, you only have to set the ones that are you interested in.
 You can use the `scripts/save-replay.sh` script to save a replay and by default the systemd service saves videos in `$HOME/Videos`.
+## Run a script when a video is saved
+Run `gpu-screen-recorder` with the `-sc` option to specify a script that should be run when a recording/replay a saved, for example `gpu-screen-recorder -w screen -sc ./script.sh -o video.mp4`.\
+The first argument to the script is the file path to the saved video. The second argument is either "regular" for regular recordings, "replay" for replays or "screenshot" for screenshots.\
+This can be used to for example showing a notification with the name of video or moving a video to a folder based on the name of the game that was recorded.
+## Plugins
+GPU Screen Recorder supports plugins for rendering additional graphics on top of the monitor/window capture. The plugin interface is defined in `plugin/plugin.h` and it gets installed to `gsr/plugin.h` in the systems include directory (usually `/usr/include`).
+An example plugin can be found at `plugin/examples/hello_triangle`.\
+Run `gpu-screen-recorder` with the `-p` option to specify a plugin to load, for example `gpu-screen-recorder -w screen -p ./triangle.so -o video.mp4`.
+`-p` can be specified multiple times to load multiple plugins.\
+Build GPU Screen Recorder with the `-Dplugin_examples=true` meson option to build plugin examples.
+## Smoother recording
+If you record at your monitors refresh rate and enabled vsync in a game then there might be a desync between the game updating a frame and GPU Screen Recorder capturing a frame.
+This is an issue in some games.
+If you experience this issue then you might want to either disable vsync in the game or use the `-fm content` option to sync capture to the content on the screen. For example: `gpu-screen-recorder -w screen -fm content -o video.mp4`.\
+Note that this option is currently only available on X11, or with desktop portal capture on Wayland (`-w portal`).
 # Issues
 ## NVIDIA
 Nvidia drivers have an issue where CUDA breaks if CUDA is running when suspend/hibernation happens, and it remains broken until you reload the nvidia driver. `extra/gsr-nvidia.conf` will be installed by default when you install GPU Screen Recorder and that should fix this issue. If this doesn't fix the issue for you then your distro may use a different path for modprobe files. In that case you have to install that `extra/gsr-nvidia.conf` yourself into that location.
@@ -167,7 +190,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
@@ -187,11 +210,22 @@ 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`.
-## The video isn't smooth when gpu usage is 100%
-If you are using the flatpak version of GPU Screen Recorder then try installing GPU Screen Recorder from aur or source instead. Flatpak has a limitation that prevents GPU Screen Recorder from running faster when playing very heavy games.
+## 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.
+## The rotation of the video is incorrect when the monitor is rotated when using desktop portal capture
+This is a bug in kde plasma wayland. When using desktop portal capture and the monitor is rotated and a window is made fullscreen kde plasma wayland will give incorrect rotation to GPU Screen Recorder.
+This also affects other screen recording software such as obs studio.\
+Capture a monitor directly instead to workaround this issue until kde plasma devs fix it, or use another wayland compositor that doesn't have this issue.

TODO

@@ -71,26 +71,16 @@ Test if p2 state can be worked around by using pure nvenc api and overwriting cu
 
 Drop frames if live streaming cant keep up with target fps, or dynamically change resolution/quality.
 
-Support low power option.
-
 Instead of sending a big list of drm data back to kms client, send the monitor we want to record to kms server and the server should respond with only the matching monitor, and cursor.
 
 Tonemap hdr to sdr when hdr is enabled and when hevc_hdr/av1_hdr is not used.
 
-Add 10 bit record option, h264_10bit, hevc_10bit and av1_10bit.
-
 Rotate cursor texture properly (around top left origin).
 
-Setup hardware video context so we can query constraints and capabilities for better default and better error messages.
-
-Use CAP_SYS_NICE in flatpak too on the main gpu screen recorder binary. It makes recording smoother, especially with constant framerate.
-
 Modify ffmpeg to accept opengl texture for nvenc encoding. Removes extra buffers and copies.
 
 When vulkan encode is added, mention minimum nvidia driver required. (550.54.14?).
 
-Support drm plane rotation. Neither X11 nor any Wayland compositor currently rotates drm planes so this might not be needed.
-
 Investigate if there is a way to do gpu->gpu copy directly without touching system ram to enable video encoding on a different gpu. On nvidia this is possible with cudaMemcpyPeer, but how about from an intel/amd gpu to an nvidia gpu or the other way around or any combination of iGPU and dedicated GPU?
     Maybe something with clEnqueueMigrateMemObjects? on AMD something with DirectGMA maybe?
 
@@ -104,6 +94,9 @@ Enable b-frames.
 
 Support vfr matching games exact fps all the time. On x11 use damage tracking, on wayland? maybe there is drm plane damage tracking. But that may not be accurate as the compositor may update it every monitor hz anyways. On wayland maybe only support it for desktop portal + pipewire capture.
     Another method to track damage that works regardless of the display server would be to do a diff between frames with a shader.
+    A 1x1 texture could be created and then write to the texture with imageStore in glsl.
+    Multiple textures aren't needed for diff, the diff between the color conversion output can be done by using it as an input
+    as well, which would diff it against the previous frame.
 
 Support selecting which gpu to use. This can be done in egl with eglQueryDevicesEXT and then eglGetPlatformDisplayEXT. This will automatically work on AMD and Intel as vaapi uses the same device. On nvidia we need to use eglQueryDeviceAttribEXT with EGL_CUDA_DEVICE_NV.
     Maybe on glx (nvidia x11 nvfbc) we need to use __NV_PRIME_RENDER_OFFLOAD, __NV_PRIME_RENDER_OFFLOAD_PROVIDER, __GLX_VENDOR_LIBRARY_NAME, __VK_LAYER_NV_optimus, VK_ICD_FILENAMES instead. Just look at prime-run /usr/bin/prime-run.
@@ -177,9 +170,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).
 
@@ -283,3 +274,52 @@ Add the option to set audio track name, for example with -a "track-name:blabla|d
 
 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.
+
+kde plasma portal capture for screenshot doesn't work well because the portal ui is still visible when taking a screenshot because of its animation.
+
+It's possible for microphone audio to get desynced when recording together with desktop audio, when not recording app audio as well.
+    Test recording desktop audio and microphone audio together (-a "default_output|default_input") for around 30 minutes.
+
+We can use dri2connect/dri3open to get the /dev/dri/card device. Note that this doesn't work on nvidia x11.
+
+Add support for QVBR (QP with target bitrate).
+
+KDE Plasma Wayland seems to use overlay planes now in non-fullscreen mode(limited to 1 overlay plane per gpu). Check if this is the case in the latest kde on arch linux.
+    If it is, then support it in kms capture.
+
+Check if pipewire audio link-factory is available before attempting to use app audio or merging audio with pipewire.
+    Also do the same in supports_app_audio check in gpu-screen-recorder --info output.

dbus/client/dbus_client.c

@@ -1,269 +0,0 @@
-#include "dbus_client.h"
-#include "../protocol.h"
-
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <sys/prctl.h>
-#include <unistd.h>
-#include <poll.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-
-// TODO: Error checking for write/read
-
-static bool gsr_dbus_client_wait_for_startup(gsr_dbus_client *self) {
-    struct pollfd poll_fd = {
-        .fd = self->socket_pair[0],
-        .events = POLLIN,
-        .revents = 0
-    };
-    for(;;) {
-        int poll_res = poll(&poll_fd, 1, 100);
-        if(poll_res > 0 && (poll_fd.revents & POLLIN)) {
-            char msg;
-            read(self->socket_pair[0], &msg, 1);
-            return true;
-        } else {
-            int status = 0;
-            int wait_result = waitpid(self->pid, &status, WNOHANG);
-            if(wait_result != 0) {
-                int exit_code = -1;
-                if(WIFEXITED(status))
-                    exit_code = WEXITSTATUS(status);
-                fprintf(stderr, "gsr error: gsr_dbus_client_init: server side or never started, exit code: %d\n", exit_code);
-                self->pid = 0;
-                return false;
-            }
-        }
-    }
-}
-
-bool gsr_dbus_client_init(gsr_dbus_client *self, const char *screencast_restore_token) {
-    memset(self, 0, sizeof(*self));
-
-    if(socketpair(AF_UNIX, SOCK_STREAM, 0, self->socket_pair) == -1) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_init: socketpair failed, error: %s\n", strerror(errno));
-        return false;
-    }
-
-    if(screencast_restore_token) {
-        self->screencast_restore_token = strdup(screencast_restore_token);
-        if(!self->screencast_restore_token) {
-            fprintf(stderr, "gsr error: gsr_dbus_client_init: failed to clone restore token\n");
-            gsr_dbus_client_deinit(self);
-            return false;
-        }
-    }
-
-    self->pid = fork();
-    if(self->pid == -1) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_init: failed to fork process\n");
-        gsr_dbus_client_deinit(self);
-        return false;
-    } else if(self->pid == 0) { /* child */
-        char socket_pair_server_str[32];
-        snprintf(socket_pair_server_str, sizeof(socket_pair_server_str), "%d", self->socket_pair[1]);
-
-        /* Needed for NixOS for example, to make sure gsr-dbus-server doesn't inherit cap_sys_nice */
-        prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0);
-
-        const char *args[] = { "gsr-dbus-server", socket_pair_server_str, self->screencast_restore_token ? self->screencast_restore_token : "", NULL };
-        execvp(args[0], (char *const*)args);
-
-        fprintf(stderr, "gsr error: gsr_dbus_client_init: execvp failed, error: %s\n", strerror(errno));
-        _exit(127);
-    } else { /* parent */
-        if(!gsr_dbus_client_wait_for_startup(self)) {
-            gsr_dbus_client_deinit(self);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-void gsr_dbus_client_deinit(gsr_dbus_client *self) {
-    for(int i = 0; i < 2; ++i) {
-        if(self->socket_pair[i] > 0) {
-            close(self->socket_pair[i]);
-            self->socket_pair[i] = -1;
-        }
-    }
-
-    if(self->screencast_restore_token) {
-        free(self->screencast_restore_token);
-        self->screencast_restore_token = NULL;
-    }
-
-    if(self->pid > 0) {
-        kill(self->pid, SIGKILL);
-        int status = 0;
-        waitpid(self->pid, &status, 0);
-        self->pid = 0;
-    }
-}
-
-int gsr_dbus_client_screencast_create_session(gsr_dbus_client *self, char *session_handle, size_t session_handle_size) {
-    const gsr_dbus_request_message request = {
-        .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-        .type = GSR_DBUS_MESSAGE_REQ_CREATE_SESSION,
-        .create_session = (gsr_dbus_message_req_create_session) {}
-    };
-    write(self->socket_pair[0], &request, sizeof(request));
-
-    gsr_dbus_response_message response = {0};
-    read(self->socket_pair[0], &response, sizeof(response));
-
-    if(response.protocol_version != GSR_DBUS_PROTOCOL_VERSION) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_create_session: server uses protocol version %d while the client is using protocol version %d", response.protocol_version, GSR_DBUS_PROTOCOL_VERSION);
-        return -1;
-    }
-
-    if(response.type == GSR_DBUS_MESSAGE_RESP_ERROR) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_create_session: server return error: %s (%d)\n", response.error.message, (int)response.error.error_code);
-        return response.error.error_code;
-    }
-
-    if(response.type != GSR_DBUS_MESSAGE_RESP_CREATE_SESSION) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_create_session: received incorrect response type. Expected %d got %d\n", GSR_DBUS_MESSAGE_RESP_CREATE_SESSION, response.type);
-        return -1;
-    }
-
-    snprintf(session_handle, session_handle_size, "%s", response.create_session.session_handle);
-    return 0;
-}
-
-int gsr_dbus_client_screencast_select_sources(gsr_dbus_client *self, const char *session_handle, uint32_t capture_type, uint32_t cursor_mode) {
-    gsr_dbus_request_message request = {
-        .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-        .type = GSR_DBUS_MESSAGE_REQ_SELECT_SOURCES,
-        .select_sources = (gsr_dbus_message_req_select_sources) {
-            .capture_type = capture_type,
-            .cursor_mode = cursor_mode
-        }
-    };
-    snprintf(request.select_sources.session_handle, sizeof(request.select_sources.session_handle), "%s", session_handle);
-    write(self->socket_pair[0], &request, sizeof(request));
-
-    gsr_dbus_response_message response = {0};
-    read(self->socket_pair[0], &response, sizeof(response));
-
-    if(response.protocol_version != GSR_DBUS_PROTOCOL_VERSION) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_select_sources: server uses protocol version %d while the client is using protocol version %d", response.protocol_version, GSR_DBUS_PROTOCOL_VERSION);
-        return -1;
-    }
-
-    if(response.type == GSR_DBUS_MESSAGE_RESP_ERROR) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_select_sources: server return error: %s (%d)\n", response.error.message, (int)response.error.error_code);
-        return response.error.error_code;
-    }
-
-    if(response.type != GSR_DBUS_MESSAGE_RESP_SELECT_SOURCES) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_select_sources: received incorrect response type. Expected %d got %d\n", GSR_DBUS_MESSAGE_RESP_SELECT_SOURCES, response.type);
-        return -1;
-    }
-
-    return 0;
-}
-
-int gsr_dbus_client_screencast_start(gsr_dbus_client *self, const char *session_handle, uint32_t *pipewire_node) {
-    *pipewire_node = 0;
-
-    gsr_dbus_request_message request = {
-        .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-        .type = GSR_DBUS_MESSAGE_REQ_START,
-        .start = (gsr_dbus_message_req_start) {}
-    };
-    snprintf(request.start.session_handle, sizeof(request.start.session_handle), "%s", session_handle);
-    write(self->socket_pair[0], &request, sizeof(request));
-
-    gsr_dbus_response_message response = {0};
-    read(self->socket_pair[0], &response, sizeof(response));
-
-    if(response.protocol_version != GSR_DBUS_PROTOCOL_VERSION) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_start: server uses protocol version %d while the client is using protocol version %d", response.protocol_version, GSR_DBUS_PROTOCOL_VERSION);
-        return -1;
-    }
-
-    if(response.type == GSR_DBUS_MESSAGE_RESP_ERROR) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_start: server return error: %s (%d)\n", response.error.message, (int)response.error.error_code);
-        return response.error.error_code;
-    }
-
-    if(response.type != GSR_DBUS_MESSAGE_RESP_START) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_start: received incorrect response type. Expected %d got %d\n", GSR_DBUS_MESSAGE_RESP_START, response.type);
-        return -1;
-    }
-
-    if(self->screencast_restore_token) {
-        free(self->screencast_restore_token);
-        if(response.start.restore_token[0] == '\0')
-            self->screencast_restore_token = NULL;
-        else
-            self->screencast_restore_token = strdup(response.start.restore_token);
-    }
-
-    *pipewire_node = response.start.pipewire_node;
-    return 0;
-}
-
-bool gsr_dbus_client_screencast_open_pipewire_remote(gsr_dbus_client *self, const char *session_handle, int *pipewire_fd) {
-    *pipewire_fd = 0;
-
-    gsr_dbus_request_message request = {
-        .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-        .type = GSR_DBUS_MESSAGE_REQ_OPEN_PIPEWIRE_REMOTE,
-        .open_pipewire_remote = (gsr_dbus_message_req_open_pipewire_remote) {}
-    };
-    snprintf(request.open_pipewire_remote.session_handle, sizeof(request.open_pipewire_remote.session_handle), "%s", session_handle);
-    write(self->socket_pair[0], &request, sizeof(request));
-
-    gsr_dbus_response_message response = {0};
-    struct iovec iov = {
-        .iov_base = &response,
-        .iov_len = sizeof(response)
-    };
-
-    char msg_control[CMSG_SPACE(sizeof(int))];
-
-    struct msghdr message = {
-        .msg_iov = &iov,
-        .msg_iovlen = 1,
-        .msg_control = msg_control,
-        .msg_controllen = sizeof(msg_control)
-    };
-
-    const int bla = recvmsg(self->socket_pair[0], &message, MSG_WAITALL);
-    (void)bla;
-
-    if(response.protocol_version != GSR_DBUS_PROTOCOL_VERSION) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_open_pipewire_remote: server uses protocol version %d while the client is using protocol version %d", response.protocol_version, GSR_DBUS_PROTOCOL_VERSION);
-        return false;
-    }
-
-    if(response.type == GSR_DBUS_MESSAGE_RESP_ERROR) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_open_pipewire_remote: server return error: %s (%d)\n", response.error.message, (int)response.error.error_code);
-        return false;
-    }
-
-    if(response.type != GSR_DBUS_MESSAGE_RESP_OPEN_PIPEWIRE_REMOTE) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_open_pipewire_remote: received incorrect response type. Expected %d got %d\n", GSR_DBUS_MESSAGE_RESP_OPEN_PIPEWIRE_REMOTE, response.type);
-        return false;
-    }
-
-    struct cmsghdr *cmsg = CMSG_FIRSTHDR(&message);
-    if(!cmsg || cmsg->cmsg_type != SCM_RIGHTS) {
-        fprintf(stderr, "gsr error: gsr_dbus_client_screencast_open_pipewire_remote: returned message data is missing file descriptor\n");
-        return false;
-    }
-
-    memcpy(pipewire_fd, CMSG_DATA(cmsg), sizeof(*pipewire_fd));
-    return true;
-}
-
-const char* gsr_dbus_client_screencast_get_restore_token(gsr_dbus_client *self) {
-    return self->screencast_restore_token;
-}

dbus/client/dbus_client.h

@@ -1,36 +0,0 @@
-#ifndef GSR_DBUS_CLIENT_H
-#define GSR_DBUS_CLIENT_H
-
-/*
-    Using a client-server architecture is needed for dbus because cap_sys_nice breaks desktop portal.
-    The main binary has cap_sys_nice and we launch a new child-process without it which uses uses desktop portal.
-*/
-
-#include "../portal.h"
-#include <stdbool.h>
-#include <stdint.h>
-#include <signal.h>
-
-typedef struct {
-    int socket_pair[2];
-    char *screencast_restore_token;
-    pid_t pid;
-} gsr_dbus_client;
-
-/* Blocking. TODO: Make non-blocking */
-bool gsr_dbus_client_init(gsr_dbus_client *self, const char *screencast_restore_token);
-void gsr_dbus_client_deinit(gsr_dbus_client *self);
-
-/* The follow functions should be called in order to setup ScreenCast properly */
-/* These functions that return an int return the response status code */
-int gsr_dbus_client_screencast_create_session(gsr_dbus_client *self, char *session_handle, size_t session_handle_size);
-/*
-    |capture_type| is a bitmask of gsr_portal_capture_type values. gsr_portal_capture_type values that are not supported by the desktop portal will be ignored.
-    |gsr_portal_cursor_mode| is a bitmask of gsr_portal_cursor_mode values. gsr_portal_cursor_mode values that are not supported will be ignored.
-*/
-int gsr_dbus_client_screencast_select_sources(gsr_dbus_client *self, const char *session_handle, uint32_t capture_type, uint32_t cursor_mode);
-int gsr_dbus_client_screencast_start(gsr_dbus_client *self, const char *session_handle, uint32_t *pipewire_node);
-bool gsr_dbus_client_screencast_open_pipewire_remote(gsr_dbus_client *self, const char *session_handle, int *pipewire_fd);
-const char* gsr_dbus_client_screencast_get_restore_token(gsr_dbus_client *self);
-
-#endif /* GSR_DBUS_CLIENT_H */

dbus/portal.h

@@ -1,17 +0,0 @@
-#ifndef GSR_PORTAL_H
-#define GSR_PORTAL_H
-
-typedef enum {
-    GSR_PORTAL_CAPTURE_TYPE_MONITOR = 1 << 0,
-    GSR_PORTAL_CAPTURE_TYPE_WINDOW  = 1 << 1,
-    GSR_PORTAL_CAPTURE_TYPE_VIRTUAL = 1 << 2,
-    GSR_PORTAL_CAPTURE_TYPE_ALL = GSR_PORTAL_CAPTURE_TYPE_MONITOR | GSR_PORTAL_CAPTURE_TYPE_WINDOW | GSR_PORTAL_CAPTURE_TYPE_VIRTUAL
-} gsr_portal_capture_type;
-
-typedef enum {
-    GSR_PORTAL_CURSOR_MODE_HIDDEN   = 1 << 0,
-    GSR_PORTAL_CURSOR_MODE_EMBEDDED = 1 << 1,
-    GSR_PORTAL_CURSOR_MODE_METADATA = 1 << 2
-} gsr_portal_cursor_mode;
-
-#endif /* GSR_PORTAL_H */

dbus/protocol.h

@@ -1,86 +0,0 @@
-#ifndef GSR_DBUS_PROTOCOL_H
-#define GSR_DBUS_PROTOCOL_H
-
-#include <stdint.h>
-
-#define GSR_DBUS_PROTOCOL_VERSION 1
-
-typedef enum {
-    GSR_DBUS_MESSAGE_REQ_CREATE_SESSION,
-    GSR_DBUS_MESSAGE_REQ_SELECT_SOURCES,
-    GSR_DBUS_MESSAGE_REQ_START,
-    GSR_DBUS_MESSAGE_REQ_OPEN_PIPEWIRE_REMOTE
-} gsr_dbus_message_req_type;
-
-typedef struct {
-
-} gsr_dbus_message_req_create_session;
-
-typedef struct {
-    char session_handle[128];
-    uint32_t capture_type;
-    uint32_t cursor_mode;
-} gsr_dbus_message_req_select_sources;
-
-typedef struct {
-    char session_handle[128];
-} gsr_dbus_message_req_start;
-
-typedef struct {
-    char session_handle[128];
-} gsr_dbus_message_req_open_pipewire_remote;
-
-typedef struct {
-    uint8_t protocol_version;
-    gsr_dbus_message_req_type type;
-    union {
-        gsr_dbus_message_req_create_session create_session;
-        gsr_dbus_message_req_select_sources select_sources;
-        gsr_dbus_message_req_start start;
-        gsr_dbus_message_req_open_pipewire_remote open_pipewire_remote;
-    };
-} gsr_dbus_request_message;
-
-typedef enum {
-    GSR_DBUS_MESSAGE_RESP_ERROR,
-    GSR_DBUS_MESSAGE_RESP_CREATE_SESSION,
-    GSR_DBUS_MESSAGE_RESP_SELECT_SOURCES,
-    GSR_DBUS_MESSAGE_RESP_START,
-    GSR_DBUS_MESSAGE_RESP_OPEN_PIPEWIRE_REMOTE
-} gsr_dbus_message_resp_type;
-
-typedef struct {
-    uint32_t error_code;
-    char message[128];
-} gsr_dbus_message_resp_error;
-
-typedef struct {
-    char session_handle[128];
-} gsr_dbus_message_resp_create_session;
-
-typedef struct {
-    
-} gsr_dbus_message_resp_select_sources;
-
-typedef struct {
-    char restore_token[128];
-    uint32_t pipewire_node;
-} gsr_dbus_message_resp_start;
-
-typedef struct {
-    
-} gsr_dbus_message_resp_open_pipewire_remote;
-
-typedef struct {
-    uint8_t protocol_version;
-    gsr_dbus_message_resp_type type;
-    union {
-        gsr_dbus_message_resp_error error;
-        gsr_dbus_message_resp_create_session create_session;
-        gsr_dbus_message_resp_select_sources select_sources;
-        gsr_dbus_message_resp_start start;
-        gsr_dbus_message_resp_open_pipewire_remote open_pipewire_remote;
-    };
-} gsr_dbus_response_message;
-
-#endif /* GSR_DBUS_PROTOCOL_H */

dbus/server/dbus_server.c

@@ -1,175 +0,0 @@
-#include "../dbus_impl.h"
-#include "../protocol.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <unistd.h>
-#include <sys/socket.h>
-
-/* TODO: Error check write/read */
-
-static int handle_create_session(gsr_dbus *dbus, int rpc_fd, const gsr_dbus_message_req_create_session *create_session) {
-    (void)create_session;
-    char *session_handle = NULL;
-    const int status = gsr_dbus_screencast_create_session(dbus, &session_handle);
-    if(status == 0) {
-        gsr_dbus_response_message response = {
-            .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-            .type = GSR_DBUS_MESSAGE_RESP_CREATE_SESSION,
-            .create_session = (gsr_dbus_message_resp_create_session) {}
-        };
-        snprintf(response.create_session.session_handle, sizeof(response.create_session.session_handle), "%s", session_handle);
-        free(session_handle);
-        write(rpc_fd, &response, sizeof(response));
-    }
-    return status;
-}
-
-static int handle_select_sources(gsr_dbus *dbus, int rpc_fd, const gsr_dbus_message_req_select_sources *select_sources) {
-    const int status = gsr_dbus_screencast_select_sources(dbus, select_sources->session_handle, select_sources->capture_type, select_sources->cursor_mode);
-    if(status == 0) {
-        gsr_dbus_response_message response = {
-            .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-            .type = GSR_DBUS_MESSAGE_RESP_SELECT_SOURCES,
-            .select_sources = (gsr_dbus_message_resp_select_sources) {}
-        };
-        write(rpc_fd, &response, sizeof(response));
-    }
-    return status;
-}
-
-static int handle_start(gsr_dbus *dbus, int rpc_fd, const gsr_dbus_message_req_start *start) {
-    uint32_t pipewire_node = 0;
-    const int status = gsr_dbus_screencast_start(dbus, start->session_handle, &pipewire_node);
-    if(status == 0) {
-        const char *screencast_restore_token = gsr_dbus_screencast_get_restore_token(dbus);
-        gsr_dbus_response_message response = {
-            .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-            .type = GSR_DBUS_MESSAGE_RESP_START,
-            .start = (gsr_dbus_message_resp_start) {
-                .pipewire_node = pipewire_node
-            }
-        };
-        snprintf(response.start.restore_token, sizeof(response.start.restore_token), "%s", screencast_restore_token ? screencast_restore_token : "");
-        write(rpc_fd, &response, sizeof(response));
-    }
-    return status;
-}
-
-static bool handle_open_pipewire_remote(gsr_dbus *dbus, int rpc_fd, const gsr_dbus_message_req_open_pipewire_remote *open_pipewire_remote) {
-    int pipewire_fd = 0;
-    const bool success = gsr_dbus_screencast_open_pipewire_remote(dbus, open_pipewire_remote->session_handle, &pipewire_fd);
-    if(success) {
-        gsr_dbus_response_message response = {
-            .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-            .type = GSR_DBUS_MESSAGE_RESP_OPEN_PIPEWIRE_REMOTE,
-            .open_pipewire_remote = (gsr_dbus_message_resp_open_pipewire_remote) {}
-        };
-
-        struct iovec iov = {
-            .iov_base = &response,
-            .iov_len = sizeof(response)
-        };
-
-        char msg_control[CMSG_SPACE(sizeof(int))];
-
-        struct msghdr message = {
-            .msg_iov = &iov,
-            .msg_iovlen = 1,
-            .msg_control = msg_control,
-            .msg_controllen = sizeof(msg_control)
-        };
-
-        struct cmsghdr *cmsg = CMSG_FIRSTHDR(&message);
-        cmsg->cmsg_level = SOL_SOCKET;
-        cmsg->cmsg_type = SCM_RIGHTS;
-        cmsg->cmsg_len = CMSG_LEN(sizeof(int));
-        int *fds = (int*)CMSG_DATA(cmsg);
-        fds[0] = pipewire_fd;
-        message.msg_controllen = cmsg->cmsg_len;
-        sendmsg(rpc_fd, &message, 0);
-    }
-    return success;
-}
-
-int main(int argc, char **argv) {
-    if(argc != 3) {
-        fprintf(stderr, "usage: gsr-dbus-server <rpc-fd> <screencast-restore-token>\n");
-        return 1;
-    }
-
-    const char *rpc_fd_str = argv[1];
-    const char *screencast_restore_token = argv[2];
-
-    int rpc_fd = -1;
-    if(sscanf(rpc_fd_str, "%d", &rpc_fd) != 1) {
-        fprintf(stderr, "gsr-dbus-server error: rpc-fd is not a number: %s\n", rpc_fd_str);
-        return 1;
-    }
-
-    if(screencast_restore_token[0] == '\0')
-        screencast_restore_token = NULL;
-
-    gsr_dbus dbus;
-    if(!gsr_dbus_init(&dbus, screencast_restore_token))
-        return 1;
-
-    /* Tell client we have started up */
-    write(rpc_fd, "S", 1);
-
-    gsr_dbus_request_message request;
-    for(;;) {
-        read(rpc_fd, &request, sizeof(request));
-
-        if(request.protocol_version != GSR_DBUS_PROTOCOL_VERSION) {
-            gsr_dbus_response_message response = {
-                .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-                .type = GSR_DBUS_MESSAGE_RESP_ERROR,
-                .error = (gsr_dbus_message_resp_error) {
-                    .error_code = 1
-                }
-            };
-            snprintf(response.error.message, sizeof(response.error.message), "Client uses protocol version %d while the server is using protocol version %d", request.protocol_version, GSR_DBUS_PROTOCOL_VERSION);
-            fprintf(stderr, "gsr-dbus-server error: %s\n", response.error.message);
-            write(rpc_fd, &response, sizeof(response));
-            continue;
-        }
-
-        int status = 0;
-        switch(request.type) {
-            case GSR_DBUS_MESSAGE_REQ_CREATE_SESSION: {
-                status = handle_create_session(&dbus, rpc_fd, &request.create_session);
-                break;
-            }
-            case GSR_DBUS_MESSAGE_REQ_SELECT_SOURCES: {
-                status = handle_select_sources(&dbus, rpc_fd, &request.select_sources);
-                break;
-            }
-            case GSR_DBUS_MESSAGE_REQ_START: {
-                status = handle_start(&dbus, rpc_fd, &request.start);
-                break;
-            }
-            case GSR_DBUS_MESSAGE_REQ_OPEN_PIPEWIRE_REMOTE: {
-                if(!handle_open_pipewire_remote(&dbus, rpc_fd, &request.open_pipewire_remote))
-                    status = -1;
-                break;
-            }
-        }
-
-        if(status != 0) {
-            gsr_dbus_response_message response = {
-                .protocol_version = GSR_DBUS_PROTOCOL_VERSION,
-                .type = GSR_DBUS_MESSAGE_RESP_ERROR,
-                .error = (gsr_dbus_message_resp_error) {
-                    .error_code = status
-                }
-            };
-            snprintf(response.error.message, sizeof(response.error.message), "%s", "Failed to handle request");
-            write(rpc_fd, &response, sizeof(response));
-        }
-    }
-
-    gsr_dbus_deinit(&dbus);
-    return 0;
-}

extra/meson_post_install.sh

@@ -3,8 +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"
-
-# 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. Recording would also drop to below 60 fps in some games even though they run above 60 fps.
-/usr/sbin/setcap cap_sys_nice+ep ${MESON_INSTALL_DESTDIR_PREFIX}/bin/gpu-screen-recorder

include/args_parser.h

@@ -8,7 +8,7 @@
 
 typedef struct gsr_egl gsr_egl;
 
-#define NUM_ARGS 30
+#define NUM_ARGS 31
 
 typedef enum {
     ARG_TYPE_STRING,

include/capture/capture.h

@@ -17,17 +17,16 @@ typedef struct {
     int width;
     int height;
     int fps;
-    AVCodecContext *video_codec_context; /* can be NULL */
-    AVFrame *frame; /* can be NULL, but will never be NULL if |video_codec_context| is set */
 } gsr_capture_metadata;
 
 struct gsr_capture {
-    /* These methods should not be called manually. Call gsr_capture_* instead */
+    /* 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 */

include/codec_query/codec_query.h

@@ -2,10 +2,12 @@
 #define GSR_CODEC_QUERY_H
 
 #include <stdbool.h>
+#include "../vec2.h"
 
 typedef struct {
     bool supported;
     bool low_power;
+    vec2i max_resolution;
 } gsr_supported_video_codec;
 
 typedef struct {

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);
 

include/dbus.h

@@ -1,13 +1,25 @@
 #ifndef GSR_DBUS_H
 #define GSR_DBUS_H
 
-#include "portal.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <dbus/dbus.h>
 
 #define DBUS_RANDOM_STR_SIZE 16
 
+typedef enum {
+    GSR_PORTAL_CAPTURE_TYPE_MONITOR = 1 << 0,
+    GSR_PORTAL_CAPTURE_TYPE_WINDOW  = 1 << 1,
+    GSR_PORTAL_CAPTURE_TYPE_VIRTUAL = 1 << 2,
+    GSR_PORTAL_CAPTURE_TYPE_ALL = GSR_PORTAL_CAPTURE_TYPE_MONITOR | GSR_PORTAL_CAPTURE_TYPE_WINDOW | GSR_PORTAL_CAPTURE_TYPE_VIRTUAL
+} gsr_portal_capture_type;
+
+typedef enum {
+    GSR_PORTAL_CURSOR_MODE_HIDDEN   = 1 << 0,
+    GSR_PORTAL_CURSOR_MODE_EMBEDDED = 1 << 1,
+    GSR_PORTAL_CURSOR_MODE_METADATA = 1 << 2
+} gsr_portal_cursor_mode;
+
 typedef struct {
     DBusConnection *con;
     DBusError err;

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
 
@@ -106,6 +105,7 @@ typedef void(*__GLXextFuncPtr)(void);
 #define GL_RGBA                                 0x1908
 #define GL_RGB8                                 0x8051
 #define GL_RGBA8                                0x8058
+#define GL_RGBA16                               0x805B
 #define GL_R8                                   0x8229
 #define GL_RG8                                  0x822B
 #define GL_R16                                  0x822A
@@ -131,7 +131,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 +141,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 +263,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);

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);

include/pipewire_video.h

@@ -1,6 +1,7 @@
 #ifndef GSR_PIPEWIRE_VIDEO_H
 #define GSR_PIPEWIRE_VIDEO_H
 
+#include "defs.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <pthread.h>
@@ -9,7 +10,7 @@
 #include <spa/param/video/format.h>
 
 #define GSR_PIPEWIRE_VIDEO_MAX_MODIFIERS 1024
-#define GSR_PIPEWIRE_VIDEO_MAX_VIDEO_FORMATS 12
+#define GSR_PIPEWIRE_VIDEO_MAX_VIDEO_FORMATS 10
 #define GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES 4
 
 typedef struct gsr_egl gsr_egl;
@@ -48,6 +49,17 @@ typedef struct {
     unsigned int cursor_texture_id;
 } gsr_texture_map;
 
+typedef struct {
+    gsr_pipewire_video_region region;
+    gsr_pipewire_video_region cursor_region;
+    gsr_pipewire_video_dmabuf_data dmabuf_data[GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES];
+    int num_dmabuf_data;
+    uint32_t fourcc;
+    uint64_t modifiers;
+    bool using_external_image;
+    gsr_monitor_rotation rotation;
+} gsr_map_texture_output;
+
 typedef struct {
     gsr_egl *egl;
     int fd;
@@ -65,6 +77,7 @@ typedef struct {
     struct spa_video_info format;
     int server_version_sync;
     bool negotiated;
+    bool renegotiated;
     bool damaged;
 
     struct {
@@ -94,6 +107,11 @@ typedef struct {
 
     uint64_t modifiers[GSR_PIPEWIRE_VIDEO_MAX_MODIFIERS];
     size_t num_modifiers;
+
+    bool paused;
+    double paused_start_secs;
+
+    gsr_monitor_rotation rotation;
 } gsr_pipewire_video;
 
 /*
@@ -104,9 +122,9 @@ typedef struct {
 bool gsr_pipewire_video_init(gsr_pipewire_video *self, int pipewire_fd, uint32_t pipewire_node, int fps, bool capture_cursor, gsr_egl *egl);
 void gsr_pipewire_video_deinit(gsr_pipewire_video *self);
 
-/* |dmabuf_data| should be at least GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES in size */
-bool gsr_pipewire_video_map_texture(gsr_pipewire_video *self, gsr_texture_map texture_map, gsr_pipewire_video_region *region, gsr_pipewire_video_region *cursor_region, gsr_pipewire_video_dmabuf_data *dmabuf_data, int *num_dmabuf_data, uint32_t *fourcc, uint64_t *modifiers, bool *using_external_image);
+bool gsr_pipewire_video_map_texture(gsr_pipewire_video *self, gsr_texture_map texture_map, gsr_map_texture_output *output);
 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 */

include/plugins.h

@@ -0,0 +1,38 @@
+#ifndef GSR_PLUGINS_H
+#define GSR_PLUGINS_H
+
+#include "../plugin/plugin.h"
+#include <stdbool.h>
+#include "color_conversion.h"
+
+#define GSR_MAX_PLUGINS 128
+
+typedef bool (*gsr_plugin_init_func)(const gsr_plugin_init_params *params, gsr_plugin_init_return *ret);
+typedef void (*gsr_plugin_deinit_func)(void *userdata);
+
+typedef struct {
+    gsr_plugin_init_return data;
+    void *lib;
+    gsr_plugin_init_func gsr_plugin_init;
+    gsr_plugin_deinit_func gsr_plugin_deinit;
+} gsr_plugin;
+
+typedef struct {
+    gsr_plugin plugins[GSR_MAX_PLUGINS];
+    int num_plugins;
+
+    gsr_plugin_init_params init_params;
+    gsr_egl *egl;
+
+    unsigned int texture;
+    gsr_color_conversion color_conversion;
+} gsr_plugins;
+
+bool gsr_plugins_init(gsr_plugins *self, gsr_plugin_init_params init_params, gsr_egl *egl);
+/* Plugins are unloaded in reverse order */
+void gsr_plugins_deinit(gsr_plugins *self);
+
+bool gsr_plugins_load_plugin(gsr_plugins *self, const char *plugin_filepath);
+void gsr_plugins_draw(gsr_plugins *self);
+
+#endif /* GSR_PLUGINS_H */

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);
 

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,

kms/kms_shared.h

@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include <drm_mode.h>
 
-#define GSR_KMS_PROTOCOL_VERSION 4
+#define GSR_KMS_PROTOCOL_VERSION 5
 
 #define GSR_KMS_MAX_ITEMS 8
 #define GSR_KMS_MAX_DMA_BUFS 4
@@ -39,6 +39,13 @@ struct gsr_kms_response_dma_buf {
     uint32_t offset;
 };
 
+typedef enum {
+    KMS_ROT_0,
+    KMS_ROT_90,
+    KMS_ROT_180,
+    KMS_ROT_270
+} gsr_kms_rotation;
+
 struct gsr_kms_response_item {
     gsr_kms_response_dma_buf dma_buf[GSR_KMS_MAX_DMA_BUFS];
     int num_dma_bufs;
@@ -49,10 +56,11 @@ struct gsr_kms_response_item {
     uint32_t connector_id; /* 0 if unknown */
     bool is_cursor;
     bool has_hdr_metadata;
+    gsr_kms_rotation rotation;
     int x;
     int y;
-    int src_w;
-    int src_h;
+    int crtc_w;
+    int crtc_h;
     struct hdr_output_metadata hdr_metadata;
 };
 

kms/server/kms_server.c

@@ -141,20 +141,22 @@ typedef enum {
     PLANE_PROPERTY_Y          = 1 << 1,
     PLANE_PROPERTY_SRC_X      = 1 << 2,
     PLANE_PROPERTY_SRC_Y      = 1 << 3,
-    PLANE_PROPERTY_SRC_W      = 1 << 4,
-    PLANE_PROPERTY_SRC_H      = 1 << 5,
+    PLANE_PROPERTY_CRTC_W     = 1 << 4,
+    PLANE_PROPERTY_CRTC_H     = 1 << 5,
     PLANE_PROPERTY_IS_CURSOR  = 1 << 6,
     PLANE_PROPERTY_IS_PRIMARY = 1 << 7,
+    PLANE_PROPERTY_ROTATION   = 1 << 8,
 } plane_property_mask;
 
 /* Returns plane_property_mask */
-static uint32_t plane_get_properties(int drmfd, uint32_t plane_id, int *x, int *y, int *src_x, int *src_y, int *src_w, int *src_h) {
+static uint32_t plane_get_properties(int drmfd, uint32_t plane_id, int *x, int *y, int *src_x, int *src_y, int *crtc_w, int *crtc_h, gsr_kms_rotation *rotation) {
     *x = 0;
     *y = 0;
     *src_x = 0;
     *src_y = 0;
-    *src_w = 0;
-    *src_h = 0;
+    *crtc_w = 0;
+    *crtc_h = 0;
+    *rotation = KMS_ROT_0;
 
     plane_property_mask property_mask = 0;
 
@@ -182,12 +184,12 @@ static uint32_t plane_get_properties(int drmfd, uint32_t plane_id, int *x, int *
         } else if((type & DRM_MODE_PROP_RANGE) && strcmp(prop->name, "SRC_Y") == 0) {
             *src_y = (int)(props->prop_values[i] >> 16);
             property_mask |= PLANE_PROPERTY_SRC_Y;
-        } else if((type & DRM_MODE_PROP_RANGE) && strcmp(prop->name, "SRC_W") == 0) {
-            *src_w = (int)(props->prop_values[i] >> 16);
-            property_mask |= PLANE_PROPERTY_SRC_W;
-        } else if((type & DRM_MODE_PROP_RANGE) && strcmp(prop->name, "SRC_H") == 0) {
-            *src_h = (int)(props->prop_values[i] >> 16);
-            property_mask |= PLANE_PROPERTY_SRC_H;
+        } else if((type & DRM_MODE_PROP_RANGE) && strcmp(prop->name, "CRTC_W") == 0) {
+            *crtc_w = props->prop_values[i];
+            property_mask |= PLANE_PROPERTY_CRTC_W;
+        } else if((type & DRM_MODE_PROP_RANGE) && strcmp(prop->name, "CRTC_H") == 0) {
+            *crtc_h = props->prop_values[i];
+            property_mask |= PLANE_PROPERTY_CRTC_H;
         } else if((type & DRM_MODE_PROP_ENUM) && strcmp(prop->name, "type") == 0) {
             const uint64_t current_enum_value = props->prop_values[i];
             for(int j = 0; j < prop->count_enums; ++j) {
@@ -199,6 +201,15 @@ static uint32_t plane_get_properties(int drmfd, uint32_t plane_id, int *x, int *
                     break;
                 }
             }
+        } else if((type & DRM_MODE_PROP_BITMASK) && strcmp(prop->name, "rotation") == 0) {
+            const uint64_t rotation_bitmask = props->prop_values[i];
+            *rotation = KMS_ROT_0;
+            if(rotation_bitmask & 2)
+                *rotation = (*rotation + KMS_ROT_90) % 4;
+            if(rotation_bitmask & 4)
+                *rotation = (*rotation + KMS_ROT_180) % 4;
+            if(rotation_bitmask & 8)
+                *rotation = (*rotation + KMS_ROT_270) % 4;
         }
 
         drmModeFreeProperty(prop);
@@ -340,8 +351,9 @@ static int kms_get_fb(gsr_drm *drm, gsr_kms_response *response) {
         // TODO: Check if dimensions have changed by comparing width and height to previous time this was called.
         // TODO: Support other plane formats than rgb (with multiple planes, such as direct YUV420 on wayland).
 
-        int x = 0, y = 0, src_x = 0, src_y = 0, src_w = 0, src_h = 0;
-        plane_property_mask property_mask = plane_get_properties(drm->drmfd, plane->plane_id, &x, &y, &src_x, &src_y, &src_w, &src_h);
+        int x = 0, y = 0, src_x = 0, src_y = 0, crtc_w = 0, crtc_h = 0;
+        gsr_kms_rotation rotation = KMS_ROT_0;
+        const uint32_t property_mask = plane_get_properties(drm->drmfd, plane->plane_id, &x, &y, &src_x, &src_y, &crtc_w, &crtc_h, &rotation);
         if(!(property_mask & PLANE_PROPERTY_IS_PRIMARY) && !(property_mask & PLANE_PROPERTY_IS_CURSOR))
             continue;
 
@@ -375,17 +387,18 @@ static int kms_get_fb(gsr_drm *drm, gsr_kms_response *response) {
         response->items[item_index].pixel_format = drmfb->pixel_format;
         response->items[item_index].modifier = drmfb->flags & DRM_MODE_FB_MODIFIERS ? drmfb->modifier : DRM_FORMAT_MOD_INVALID;
         response->items[item_index].connector_id = crtc_pair ? crtc_pair->connector_id : 0;
+        response->items[item_index].rotation = rotation;
         response->items[item_index].is_cursor = property_mask & PLANE_PROPERTY_IS_CURSOR;
         if(property_mask & PLANE_PROPERTY_IS_CURSOR) {
             response->items[item_index].x = x;
             response->items[item_index].y = y;
-            response->items[item_index].src_w = 0;
-            response->items[item_index].src_h = 0;
+            response->items[item_index].crtc_w = 0;
+            response->items[item_index].crtc_h = 0;
         } else {
             response->items[item_index].x = src_x;
             response->items[item_index].y = src_y;
-            response->items[item_index].src_w = src_w;
-            response->items[item_index].src_h = src_h;
+            response->items[item_index].crtc_w = crtc_w;
+            response->items[item_index].crtc_h = crtc_h;
         }
         ++response->num_items;
 

meson.build

@@ -1,4 +1,4 @@
-project('gpu-screen-recorder', ['c', 'cpp'], version : '5.5.3', default_options : ['warning_level=2'])
+project('gpu-screen-recorder', ['c', 'cpp'], version : '5.6.7', default_options : ['warning_level=2'])
 
 add_project_arguments('-Wshadow', language : ['c', 'cpp'])
 if get_option('buildtype') == 'debug'
@@ -43,6 +43,7 @@ src = [
     'src/image_writer.c',
     'src/args_parser.c',
     'src/defs.c',
+    'src/plugins.c',
     'src/sound.cpp',
     'src/main.cpp',
 ]
@@ -50,8 +51,12 @@ src = [
 subdir('protocol')
 src += protocol_src
 
+cc = meson.get_compiler('c')
+m_dep = cc.find_library('m', required : true)
+
 dep = [
     dependency('threads'),
+    m_dep,
     dependency('libavcodec'),
     dependency('libavformat'),
     dependency('libavutil'),
@@ -65,18 +70,23 @@ 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
     src += [
         'src/capture/portal.c',
-        'dbus/client/dbus_client.c',
+        'src/dbus.c',
         'src/pipewire_video.c',
     ]
     add_project_arguments('-DGSR_PORTAL', language : ['c', 'cpp'])
@@ -95,6 +105,7 @@ if uses_pipewire == true
     dep += [
         dependency('libpipewire-0.3'),
         dependency('libspa-0.2'),
+        dependency('dbus-1'),
     ]
 endif
 
@@ -103,9 +114,7 @@ add_project_arguments('-DGSR_VERSION="' + meson.project_version() + '"', languag
 executable('gsr-kms-server', 'kms/server/kms_server.c', dependencies : dependency('libdrm'), c_args : '-fstack-protector-all', install : true)
 executable('gpu-screen-recorder', src, dependencies : dep, install : true)
 
-if get_option('portal') == true
-    executable('gsr-dbus-server', ['dbus/server/dbus_server.c', 'dbus/dbus_impl.c'], dependencies : dependency('dbus-1'), install : true)
-endif
+install_headers('plugin/plugin.h', install_dir : 'include/gsr')
 
 if get_option('systemd') == true
     install_data(files('extra/gpu-screen-recorder.service'), install_dir : 'lib/systemd/user')
@@ -118,3 +127,10 @@ endif
 if get_option('nvidia_suspend_fix') == true
     install_data(files('extra/gsr-nvidia.conf'), install_dir : 'lib/modprobe.d')
 endif
+
+if get_option('plugin_examples') == true
+    shared_library('triangle', 'plugin/examples/hello_triangle/triangle.c',
+        dependencies: [dependency('gl'), m_dep],
+        name_prefix : '',
+        name_suffix: 'so')
+endif

meson_options.txt

@@ -1,5 +1,6 @@
 option('systemd', type : 'boolean', value : true, description : 'Install systemd service file')
-option('capabilities', type : 'boolean', value : true, description : 'Set binary admin capability on gsr-kms-server binary to remove password prompt when recording monitor (without desktop portal option) on amd/intel or nvidia wayland. Also sets nice capability on gpu-screen-recorder to allow it to run as a high priority graphics process for better performance')
+option('capabilities', type : 'boolean', value : true, description : 'Set binary admin capability on gsr-kms-server binary to remove password prompt when recording monitor (without desktop portal option) on amd/intel or nvidia wayland')
 option('nvidia_suspend_fix', type : 'boolean', value : true, description : 'Install nvidia modprobe config file to tell nvidia driver to preserve video memory on suspend. This is a workaround for an nvidia driver bug that breaks cuda (and gpu screen recorder) on suspend')
 option('portal', type : 'boolean', value : true, description : 'Build with support for xdg desktop portal ScreenCast capture (wayland only) (-w portal option). Requires pipewire')
 option('app_audio', type : 'boolean', value : true, description : 'Build with support for recording a single audio source (-a app: option). Requires pipewire')
+option('plugin_examples', type : 'boolean', value : false, description : 'Build plugin examples')

plugin/examples/hello_triangle/triangle.c

@@ -0,0 +1,108 @@
+#include <gsr/plugin.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <math.h>
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+
+const char vertex_shader_source[] =
+    "attribute vec4 vertex_pos;   \n"
+    "void main() {                \n"
+    "   gl_Position = vertex_pos; \n"
+    "}";
+
+const char fragment_shader_source[] =
+    "precision mediump float;                    \n"
+    "uniform vec3 color;                         \n"
+    "void main() {                               \n"
+    "   gl_FragColor = vec4(color, 1.0); \n"
+    "}";
+
+typedef struct {
+    GLuint shader_program;
+    GLuint vao;
+    GLuint vbo;
+    GLint color_uniform;
+    unsigned int counter;
+} Triangle;
+
+static GLuint load_shader(const char *shaderSrc, GLenum type) {
+    GLuint shader = glCreateShader(type);
+    glShaderSource(shader, 1, &shaderSrc, NULL);
+    glCompileShader(shader);
+    return shader;
+}
+
+static void draw(const gsr_plugin_draw_params *params, void *userdata) {
+    Triangle *triangle = userdata;
+
+    GLfloat glverts[6];
+
+    glverts[0] = -0.5f;
+    glverts[1] = -0.5f;
+
+    glverts[2] = 0.5f;
+    glverts[3] = -0.5f;
+
+    glverts[4] = 0.0f;
+    glverts[5] = 0.5f;
+
+    glBindVertexArray(triangle->vao);
+    glBindBuffer(GL_ARRAY_BUFFER, triangle->vbo);
+    glBufferSubData(GL_ARRAY_BUFFER, 0, 6 * sizeof(float), glverts);
+
+    glUseProgram(triangle->shader_program);
+    const double pp = triangle->counter * 0.05;
+    glUniform3f(triangle->color_uniform, 0.5 + sin(pp)*0.5, 0.5 + cos(pp)*0.5, 0.5 + sin(0.2 + pp)*0.5);
+    glDrawArrays(GL_TRIANGLES, 0, 3);
+
+    glBindVertexArray(0);
+    glUseProgram(0);
+
+    ++triangle->counter;
+}
+
+bool gsr_plugin_init(const gsr_plugin_init_params *params, gsr_plugin_init_return *ret) {
+    Triangle *triangle = calloc(1, sizeof(Triangle));
+    if(!triangle)
+        return false;
+
+    triangle->shader_program = glCreateProgram();
+
+    const GLuint vertex_shader = load_shader(vertex_shader_source, GL_VERTEX_SHADER);
+    const GLuint fragment_shader = load_shader(fragment_shader_source, GL_FRAGMENT_SHADER);
+
+    glAttachShader(triangle->shader_program, vertex_shader);
+    glAttachShader(triangle->shader_program, fragment_shader);
+    glBindAttribLocation(triangle->shader_program, 0, "vertex_pos");
+    glLinkProgram(triangle->shader_program);
+
+    glGenVertexArrays(1, &triangle->vao);
+    glBindVertexArray(triangle->vao);
+
+    glGenBuffers(1, &triangle->vbo);
+    glBindBuffer(GL_ARRAY_BUFFER, triangle->vbo);
+    glBufferData(GL_ARRAY_BUFFER, 6 * sizeof(float), NULL, GL_DYNAMIC_DRAW);
+
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), (void *)0);
+
+    glBindVertexArray(0);
+
+    glDeleteShader(vertex_shader);
+    glDeleteShader(fragment_shader);
+
+    triangle->color_uniform = glGetUniformLocation(triangle->shader_program, "color");
+
+    ret->name = "hello_triangle";
+    ret->version = 1;
+    ret->userdata = triangle;
+    ret->draw = draw;
+    return true;
+}
+
+void gsr_plugin_deinit(void *userdata) {
+    Triangle *triangle = userdata;
+    glDeleteProgram(triangle->shader_program);
+    free(triangle);
+}

plugin/plugin.h

@@ -0,0 +1,54 @@
+#ifndef GSR_PLUGIN_H
+#define GSR_PLUGIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GSR_PLUGIN_INTERFACE_MAJOR_VERSION 0
+#define GSR_PLUGIN_INTERFACE_MINOR_VERSION 1
+#define GSR_PLUGIN_INTERFACE_VERSION ((GSR_PLUGIN_INTERFACE_MAJOR_VERSION << 16) | GSR_PLUGIN_INTERFACE_MINOR_VERSION)
+
+#include <stdbool.h>
+
+typedef enum {
+    GSR_PLUGIN_GRAPHICS_API_EGL_ES,
+    GSR_PLUGIN_GRAPHICS_API_GLX,
+} gsr_plugin_graphics_api;
+
+typedef enum {
+    GSR_PLUGIN_COLOR_DEPTH_8_BITS,
+    GSR_PLUGIN_COLOR_DEPTH_10_BITS,
+} gsr_plugin_color_depth;
+
+typedef struct {
+    unsigned int width;
+    unsigned int height;
+} gsr_plugin_draw_params;
+
+typedef struct {
+    unsigned int width;
+    unsigned int height;
+    unsigned int fps;
+    gsr_plugin_color_depth color_depth;
+    gsr_plugin_graphics_api graphics_api;
+} gsr_plugin_init_params;
+
+typedef struct {
+    const char *name; /* Mandatory */
+    unsigned int version; /* Mandatory, can't be 0 */
+    void *userdata; /* Optional */
+
+    /* Optional, called when the plugin is expected to draw something to the current framebuffer */
+    void (*draw)(const gsr_plugin_draw_params *params, void *userdata);
+} gsr_plugin_init_return;
+
+/* The plugin is expected to implement these functions and export them: */
+bool gsr_plugin_init(const gsr_plugin_init_params *params, gsr_plugin_init_return *ret);
+void gsr_plugin_deinit(void *userdata);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GSR_PLUGIN_H */

project.conf

@@ -1,11 +1,11 @@
 [package]
 name = "gpu-screen-recorder"
 type = "executable"
-version = "5.5.3"
+version = "5.6.7"
 platforms = ["posix"]
 
 [config]
-ignore_dirs = ["kms/server", "build", "debug-build"]
+ignore_dirs = ["kms/server", "build", "debug-build", "plugin/examples"]
 #error_on_warning = "true"
 
 [define]

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"

src/args_parser.c

@@ -190,11 +190,16 @@ 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>] [-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);
+    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>] [-p <plugin_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";
@@ -253,7 +258,7 @@ static void usage_full() {
     printf("        Required when using '-bm cbr' option.\n");
     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("        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 2 and 86400.\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");
@@ -306,8 +311,11 @@ static void usage_full() {
     printf("\n");
     printf("  -df   Organise replays in folders based on the current date.\n");
     printf("\n");
-    printf("  -sc   Run a script on the saved video file (asynchronously). The first argument to the script is the filepath to the saved video file and the second argument is the recording type (either \"regular\" or \"replay\").\n");
+    printf("  -sc   Run a script on the saved video file (asynchronously). The first argument to the script is the filepath to the saved video/screenshot file and the second argument is the recording type (either \"regular\", \"replay\" or \"screenshot\").\n");
     printf("        Not applicable for live streams.\n");
+    printf("        Note: the script has to be executable.\n");
+    printf("\n");
+    printf("  -p    A plugin (.so) to load. This can be specified multiple times to load multiple plugins.\n");
     printf("\n");
     printf("  -cursor\n");
     printf("        Record cursor. Optional, set to 'yes' by default.\n");
@@ -395,12 +403,14 @@ static void usage_full() {
     printf("  Send signal SIGRTMIN to gpu-screen-recorder (pkill -SIGRTMIN -f gpu-screen-recorder) to start/stop recording a regular video when in replay/streaming mode.\n");
     printf("\n");
     printf("EXAMPLES:\n");
+    printf("  %s -w screen -o video.mp4\n", program_name);
     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 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);
     printf("  %s -w screen -f 60 -a \"app:firefox|app:csgo\" -o video.mp4\n", program_name);
@@ -411,6 +421,7 @@ static void usage_full() {
     printf("  %s -w region -region 640x480+100+100 -o video.mp4\n", program_name);
     printf("  %s -w region -region $(slop) -o video.mp4\n", program_name);
     printf("  %s -w region -region $(slurp -f \"%%wx%%h+%%x+%%y\") -o video.mp4\n", program_name);
+    printf("  %s -w screen -p ./plugin.so -o video.mp4\n", program_name);
     //fprintf(stderr, "  gpu-screen-recorder -w screen -f 60 -q ultra -pixfmt yuv444 -o video.mp4\n");
     fflush(stdout);
 }
@@ -465,7 +476,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;
     }
 
@@ -473,7 +484,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;
         }
     }
@@ -482,13 +493,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;
         }
@@ -500,19 +511,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;
         }
@@ -531,7 +542,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;
         }
@@ -539,7 +550,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;
     }
@@ -547,13 +558,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;
         }
@@ -564,25 +575,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;
         }
@@ -604,7 +615,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 {
@@ -614,20 +625,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;
                 }
@@ -637,13 +648,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;
         }
@@ -656,10 +667,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;
     }
 
@@ -704,7 +715,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;
         }
     }
@@ -745,25 +756,26 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
     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) };
+    self->args[arg_index++] = (Arg){ .key = "-p",                             .optional = true,  .list = true,  .type = ARG_TYPE_STRING };
     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;
         }
@@ -779,7 +791,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;
                 }
@@ -787,7 +799,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();
@@ -797,19 +809,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;
                 }
@@ -817,19 +829,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;
                 }
@@ -838,7 +850,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;
         }
     }
@@ -846,7 +858,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;
         }
@@ -870,45 +882,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);
     }
 

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);
@@ -429,6 +418,19 @@ static gsr_kms_response_item* find_cursor_drm_if_on_monitor(gsr_capture_kms *sel
     return cursor_drm_fd;
 }
 
+static gsr_monitor_rotation kms_rotation_to_gsr_monitor_rotation(gsr_kms_rotation rotation) {
+    // Right now both enums have the same values
+    return (gsr_monitor_rotation)rotation;
+}
+
+static int remainder_int(int a, int b) {
+    return a - (a / b) * b;
+}
+
+static gsr_monitor_rotation sub_rotations(gsr_monitor_rotation rot1, gsr_monitor_rotation rot2) {
+    return remainder_int(rot1 - rot2, 4);
+}
+
 static void render_drm_cursor(gsr_capture_kms *self, gsr_color_conversion *color_conversion, const gsr_kms_response_item *cursor_drm_fd, vec2i target_pos, vec2i output_size, vec2i framebuffer_size) {
     const vec2d scale = {
         self->capture_size.x == 0 ? 0 : (double)output_size.x / (double)self->capture_size.x,
@@ -438,8 +440,11 @@ static void render_drm_cursor(gsr_capture_kms *self, gsr_color_conversion *color
     const bool cursor_texture_id_is_external = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA;
     const vec2i cursor_size = {cursor_drm_fd->width, cursor_drm_fd->height};
 
+    const gsr_monitor_rotation cursor_plane_rotation = kms_rotation_to_gsr_monitor_rotation(cursor_drm_fd->rotation);
+    const gsr_monitor_rotation rotation = sub_rotations(self->monitor_rotation, cursor_plane_rotation);
+
     vec2i cursor_pos = {cursor_drm_fd->x, cursor_drm_fd->y};
-    switch(self->monitor_rotation) {
+    switch(rotation) {
         case GSR_MONITOR_ROT_0:
             break;
         case GSR_MONITOR_ROT_90:
@@ -503,7 +508,7 @@ static void render_drm_cursor(gsr_capture_kms *self, gsr_color_conversion *color
     gsr_color_conversion_draw(color_conversion, self->cursor_texture_id,
         cursor_pos, (vec2i){cursor_size.x * scale.x, cursor_size.y * scale.y},
         (vec2i){0, 0}, cursor_size, cursor_size,
-        gsr_monitor_rotation_to_rotation(self->monitor_rotation), GSR_SOURCE_COLOR_RGB, cursor_texture_id_is_external, true);
+        gsr_monitor_rotation_to_rotation(rotation), GSR_SOURCE_COLOR_RGB, cursor_texture_id_is_external, true);
 
     self->params.egl->glDisable(GL_SCISSOR_TEST);
 }
@@ -537,7 +542,7 @@ static void render_x11_cursor(gsr_capture_kms *self, gsr_color_conversion *color
 }
 
 static void gsr_capture_kms_update_capture_size_change(gsr_capture_kms *self, gsr_color_conversion *color_conversion, vec2i target_pos, const gsr_kms_response_item *drm_fd) {
-    if(target_pos.x != self->prev_target_pos.x || target_pos.y != self->prev_target_pos.y || drm_fd->src_w != self->prev_plane_size.x || drm_fd->src_h != self->prev_plane_size.y) {
+    if(target_pos.x != self->prev_target_pos.x || target_pos.y != self->prev_target_pos.y || drm_fd->crtc_w != self->prev_plane_size.x || drm_fd->crtc_h != self->prev_plane_size.y) {
         self->prev_target_pos = target_pos;
         self->prev_plane_size = self->capture_size;
         gsr_color_conversion_clear(color_conversion);
@@ -616,7 +621,7 @@ static int gsr_capture_kms_capture(gsr_capture *cap, gsr_capture_metadata *captu
     if(drm_fd->has_hdr_metadata && self->params.hdr && hdr_metadata_is_supported_format(&drm_fd->hdr_metadata))
         gsr_kms_set_hdr_metadata(self, drm_fd);
 
-    self->capture_size = rotate_capture_size_if_rotated(self, (vec2i){ drm_fd->src_w, drm_fd->src_h });
+    self->capture_size = rotate_capture_size_if_rotated(self, (vec2i){ drm_fd->crtc_w, drm_fd->crtc_h });
     const vec2i original_frame_size = self->capture_size;
     if(self->params.region_size.x > 0 && self->params.region_size.y > 0)
         self->capture_size = self->params.region_size;
@@ -644,10 +649,13 @@ static int gsr_capture_kms_capture(gsr_capture *cap, gsr_capture_metadata *captu
         self->params.egl->eglDestroyImage(self->params.egl->egl_display, image);
     }
 
+    const gsr_monitor_rotation plane_rotation = kms_rotation_to_gsr_monitor_rotation(drm_fd->rotation);
+    const gsr_monitor_rotation rotation = sub_rotations(self->monitor_rotation, plane_rotation);
+
     gsr_color_conversion_draw(color_conversion, self->external_texture_fallback ? self->external_input_texture_id : self->input_texture_id,
         target_pos, output_size,
         capture_pos, self->capture_size, original_frame_size,
-        gsr_monitor_rotation_to_rotation(self->monitor_rotation), GSR_SOURCE_COLOR_RGB, self->external_texture_fallback, false);
+        gsr_monitor_rotation_to_rotation(rotation), GSR_SOURCE_COLOR_RGB, self->external_texture_fallback, false);
 
     if(self->params.record_cursor) {
         gsr_kms_response_item *cursor_drm_fd = find_cursor_drm_if_on_monitor(self, drm_fd->connector_id, capture_is_combined_plane);
@@ -661,7 +669,7 @@ static int gsr_capture_kms_capture(gsr_capture *cap, gsr_capture_metadata *captu
             cursor_monitor_offset.y += self->params.region_position.y;
             render_x11_cursor(self, color_conversion, cursor_monitor_offset, target_pos, output_size);
         } else if(cursor_drm_fd) {
-            const vec2i framebuffer_size = rotate_capture_size_if_rotated(self, (vec2i){ drm_fd->src_w, drm_fd->src_h });
+            const vec2i framebuffer_size = rotate_capture_size_if_rotated(self, (vec2i){ drm_fd->crtc_w, drm_fd->crtc_h });
             render_drm_cursor(self, color_conversion, cursor_drm_fd, target_pos, output_size, framebuffer_size);
         }
     }

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");
         }
         */
     }

src/capture/portal.c

@@ -2,7 +2,7 @@
 #include "../../include/color_conversion.h"
 #include "../../include/egl.h"
 #include "../../include/utils.h"
-#include "../../dbus/client/dbus_client.h"
+#include "../../include/dbus.h"
 #include "../../include/pipewire_video.h"
 
 #include <stdlib.h>
@@ -11,28 +11,40 @@
 #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;
 
     gsr_texture_map texture_map;
 
-    gsr_dbus_client dbus_client;
-    char session_handle[128];
+    gsr_dbus dbus;
+    char *session_handle;
 
     gsr_pipewire_video pipewire;
     vec2i capture_size;
-    gsr_pipewire_video_dmabuf_data dmabuf_data[GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES];
-    int num_dmabuf_data;
+
+    gsr_map_texture_output pipewire_data;
+
+    bool should_stop;
+    bool stop_is_error;
 } gsr_capture_portal;
 
 static void gsr_capture_portal_cleanup_plane_fds(gsr_capture_portal *self) {
-    for(int i = 0; i < self->num_dmabuf_data; ++i) {
-        if(self->dmabuf_data[i].fd > 0) {
-            close(self->dmabuf_data[i].fd);
-            self->dmabuf_data[i].fd = 0;
+    for(int i = 0; i < self->pipewire_data.num_dmabuf_data; ++i) {
+        if(self->pipewire_data.dmabuf_data[i].fd > 0) {
+            close(self->pipewire_data.dmabuf_data[i].fd);
+            self->pipewire_data.dmabuf_data[i].fd = 0;
         }
     }
-    self->num_dmabuf_data = 0;
+    self->pipewire_data.num_dmabuf_data = 0;
 }
 
 static void gsr_capture_portal_stop(gsr_capture_portal *self) {
@@ -53,35 +65,24 @@ static void gsr_capture_portal_stop(gsr_capture_portal *self) {
 
     gsr_capture_portal_cleanup_plane_fds(self);
     gsr_pipewire_video_deinit(&self->pipewire);
-    gsr_dbus_client_deinit(&self->dbus_client);
+    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);
@@ -188,36 +189,36 @@ static int gsr_capture_portal_setup_dbus(gsr_capture_portal *self, int *pipewire
     if(self->params.restore_portal_session)
         gsr_capture_portal_get_restore_token_from_cache(restore_token, sizeof(restore_token), self->params.portal_session_token_filepath);
 
-    if(!gsr_dbus_client_init(&self->dbus_client, restore_token))
+    if(!gsr_dbus_init(&self->dbus, restore_token))
         return -1;
 
     fprintf(stderr, "gsr info: gsr_capture_portal_setup_dbus: CreateSession\n");
-    response_status = gsr_dbus_client_screencast_create_session(&self->dbus_client, self->session_handle, sizeof(self->session_handle));
+    response_status = gsr_dbus_screencast_create_session(&self->dbus, &self->session_handle);
     if(response_status != 0) {
         fprintf(stderr, "gsr error: gsr_capture_portal_setup_dbus: CreateSession failed\n");
         return response_status;
     }
 
     fprintf(stderr, "gsr info: gsr_capture_portal_setup_dbus: SelectSources\n");
-    response_status = gsr_dbus_client_screencast_select_sources(&self->dbus_client, self->session_handle, GSR_PORTAL_CAPTURE_TYPE_ALL, self->params.record_cursor ? GSR_PORTAL_CURSOR_MODE_EMBEDDED : GSR_PORTAL_CURSOR_MODE_HIDDEN);
+    response_status = gsr_dbus_screencast_select_sources(&self->dbus, self->session_handle, GSR_PORTAL_CAPTURE_TYPE_ALL, self->params.record_cursor ? GSR_PORTAL_CURSOR_MODE_EMBEDDED : GSR_PORTAL_CURSOR_MODE_HIDDEN);
     if(response_status != 0) {
         fprintf(stderr, "gsr error: gsr_capture_portal_setup_dbus: SelectSources failed\n");
         return response_status;
     }
 
     fprintf(stderr, "gsr info: gsr_capture_portal_setup_dbus: Start\n");
-    response_status = gsr_dbus_client_screencast_start(&self->dbus_client, self->session_handle, pipewire_node);
+    response_status = gsr_dbus_screencast_start(&self->dbus, self->session_handle, pipewire_node);
     if(response_status != 0) {
         fprintf(stderr, "gsr error: gsr_capture_portal_setup_dbus: Start failed\n");
         return response_status;
     }
 
-    const char *screencast_restore_token = gsr_dbus_client_screencast_get_restore_token(&self->dbus_client);
+    const char *screencast_restore_token = gsr_dbus_screencast_get_restore_token(&self->dbus);
     if(screencast_restore_token)
         gsr_capture_portal_save_restore_token(screencast_restore_token, self->params.portal_session_token_filepath);
 
     fprintf(stderr, "gsr info: gsr_capture_portal_setup_dbus: OpenPipeWireRemote\n");
-    if(!gsr_dbus_client_screencast_open_pipewire_remote(&self->dbus_client, self->session_handle, pipewire_fd)) {
+    if(!gsr_dbus_screencast_open_pipewire_remote(&self->dbus, self->session_handle, pipewire_fd)) {
         fprintf(stderr, "gsr error: gsr_capture_portal_setup_dbus: OpenPipeWireRemote failed\n");
         return -1;
     }
@@ -227,19 +228,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->pipewire_data)) {
+            self->capture_size.x = self->pipewire_data.region.width;
+            self->capture_size.y = self->pipewire_data.region.height;
             fprintf(stderr, "gsr info: gsr_capture_portal_start: pipewire negotiation finished\n");
             return true;
         }
@@ -250,45 +245,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) {
@@ -307,24 +308,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->pipewire_data.num_dmabuf_data == 0) {
+        if(gsr_pipewire_video_map_texture(&self->pipewire, self->texture_map, &self->pipewire_data)) {
+            if(self->pipewire_data.region.width != self->capture_size.x || self->pipewire_data.region.height != self->capture_size.y) {
+                self->capture_size.x = self->pipewire_data.region.width;
+                self->capture_size.y = self->pipewire_data.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;
@@ -338,28 +364,35 @@ 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_data.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->pipewire_data.using_external_image ? self->texture_map.external_texture_id : self->texture_map.texture_id,
+       target_pos, output_size,
+       (vec2i){self->pipewire_data.region.x, self->pipewire_data.region.y}, self->capture_size, self->capture_size,
+       gsr_monitor_rotation_to_rotation(self->pipewire_data.rotation), GSR_SOURCE_COLOR_RGB, self->pipewire_data.using_external_image, fourcc_alpha);
+
+    if(self->params.record_cursor && self->texture_map.cursor_texture_id > 0 && self->pipewire_data.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->pipewire_data.cursor_region.x * scale.x),
+            target_pos.y + (self->pipewire_data.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},
-            GSR_ROT_0, GSR_SOURCE_COLOR_RGB, false, true);
+            (vec2i){cursor_pos.x, cursor_pos.y},
+            (vec2i){self->pipewire_data.cursor_region.width * scale.x, self->pipewire_data.cursor_region.height * scale.y},
+            (vec2i){0, 0},
+            (vec2i){self->pipewire_data.cursor_region.width, self->pipewire_data.cursor_region.height},
+            (vec2i){self->pipewire_data.cursor_region.width, self->pipewire_data.cursor_region.height},
+            gsr_monitor_rotation_to_rotation(self->pipewire_data.rotation), GSR_SOURCE_COLOR_RGB, false, true);
         self->params.egl->glDisable(GL_SCISSOR_TEST);
     }
 
@@ -376,6 +409,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);
@@ -417,7 +457,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,

src/codec_query/nvenc.c

@@ -6,6 +6,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#define NVENCAPI_MAJOR_VERSION_470 11
+#define NVENCAPI_MINOR_VERSION_470 1
+#define NVENCAPI_VERSION_470 (NVENCAPI_MAJOR_VERSION_470 | (NVENCAPI_MINOR_VERSION_470 << 24))
+#define NVENCAPI_STRUCT_VERSION_CUSTOM(nvenc_api_version, struct_version)  ((uint32_t)(nvenc_api_version) | ((struct_version)<<16) | (0x7 << 28))
+
 static void* open_nvenc_library(void) {
     dlerror(); /* clear */
     void *lib = dlopen("libnvidia-encode.so.1", RTLD_LAZY);
@@ -75,7 +80,28 @@ static bool profile_is_av1(const GUID *profile_guid) {
     return false;
 }
 
-static bool encoder_get_supported_profiles(const NV_ENCODE_API_FUNCTION_LIST *function_list, void *nvenc_encoder, const GUID *encoder_guid, gsr_supported_video_codecs *supported_video_codecs) {
+/* Returns 0 on error */
+static int nvenc_get_encoding_capability(const NV_ENCODE_API_FUNCTION_LIST *function_list, void *nvenc_encoder, const GUID *encode_guid, uint32_t nvenc_api_version, NV_ENC_CAPS cap) {
+    NV_ENC_CAPS_PARAM param = {
+        .version = NVENCAPI_STRUCT_VERSION_CUSTOM(nvenc_api_version, 1),
+        .capsToQuery = cap
+    };
+
+    int value = 0;
+    if(function_list->nvEncGetEncodeCaps(nvenc_encoder, *encode_guid, &param, &value) != NV_ENC_SUCCESS)
+        return 0;
+
+    return value;
+}
+
+static vec2i encoder_get_max_resolution(const NV_ENCODE_API_FUNCTION_LIST *function_list, void *nvenc_encoder, const GUID *encode_guid, uint32_t nvenc_api_version) {
+    return (vec2i){
+        .x = nvenc_get_encoding_capability(function_list, nvenc_encoder, encode_guid, nvenc_api_version, NV_ENC_CAPS_WIDTH_MAX),
+        .y = nvenc_get_encoding_capability(function_list, nvenc_encoder, encode_guid, nvenc_api_version, NV_ENC_CAPS_HEIGHT_MAX),
+    };
+}
+
+static bool encoder_get_supported_profiles(const NV_ENCODE_API_FUNCTION_LIST *function_list, void *nvenc_encoder, const GUID *encoder_guid, gsr_supported_video_codecs *supported_video_codecs, uint32_t nvenc_api_version) {
     bool success = false;
     GUID *profile_guids = NULL;
 
@@ -99,18 +125,19 @@ static bool encoder_get_supported_profiles(const NV_ENCODE_API_FUNCTION_LIST *fu
         goto fail;
     }
 
+    const vec2i max_resolution = encoder_get_max_resolution(function_list, nvenc_encoder, encoder_guid, nvenc_api_version);
     for(uint32_t i = 0; i < profile_guid_count; ++i) {
         if(profile_is_h264(&profile_guids[i])) {
-            supported_video_codecs->h264 = (gsr_supported_video_codec){ true, false };
+            supported_video_codecs->h264 = (gsr_supported_video_codec){ true, false, max_resolution };
         } else if(profile_is_hevc(&profile_guids[i])) {
-            supported_video_codecs->hevc = (gsr_supported_video_codec){ true, false };
+            supported_video_codecs->hevc = (gsr_supported_video_codec){ true, false, max_resolution };
         } else if(profile_is_hevc_10bit(&profile_guids[i])) {
-            supported_video_codecs->hevc_hdr = (gsr_supported_video_codec){ true, false };
-            supported_video_codecs->hevc_10bit = (gsr_supported_video_codec){ true, false };
+            supported_video_codecs->hevc_hdr = (gsr_supported_video_codec){ true, false, max_resolution };
+            supported_video_codecs->hevc_10bit = (gsr_supported_video_codec){ true, false, max_resolution };
         } else if(profile_is_av1(&profile_guids[i])) {
-            supported_video_codecs->av1 = (gsr_supported_video_codec){ true, false };
-            supported_video_codecs->av1_hdr = (gsr_supported_video_codec){ true, false };
-            supported_video_codecs->av1_10bit = (gsr_supported_video_codec){ true, false };
+            supported_video_codecs->av1 = (gsr_supported_video_codec){ true, false, max_resolution };
+            supported_video_codecs->av1_hdr = (gsr_supported_video_codec){ true, false, max_resolution };
+            supported_video_codecs->av1_10bit = (gsr_supported_video_codec){ true, false, max_resolution };
         }
     }
 
@@ -123,7 +150,7 @@ static bool encoder_get_supported_profiles(const NV_ENCODE_API_FUNCTION_LIST *fu
     return success;
 }
 
-static bool get_supported_video_codecs(const NV_ENCODE_API_FUNCTION_LIST *function_list, void *nvenc_encoder, gsr_supported_video_codecs *supported_video_codecs) {
+static bool get_supported_video_codecs(const NV_ENCODE_API_FUNCTION_LIST *function_list, void *nvenc_encoder, gsr_supported_video_codecs *supported_video_codecs, uint32_t nvenc_api_version) {
     bool success = false;
     GUID *encoder_guids = NULL;
     *supported_video_codecs = (gsr_supported_video_codecs){0};
@@ -149,7 +176,7 @@ static bool get_supported_video_codecs(const NV_ENCODE_API_FUNCTION_LIST *functi
     }
 
     for(uint32_t i = 0; i < encode_guid_count; ++i) {
-        encoder_get_supported_profiles(function_list, nvenc_encoder, &encoder_guids[i], supported_video_codecs);
+        encoder_get_supported_profiles(function_list, nvenc_encoder, &encoder_guids[i], supported_video_codecs, nvenc_api_version);
     }
 
     success = true;
@@ -161,9 +188,6 @@ static bool get_supported_video_codecs(const NV_ENCODE_API_FUNCTION_LIST *functi
     return success;
 }
 
-#define NVENCAPI_VERSION_470 (11 | (1 << 24))
-#define NVENCAPI_STRUCT_VERSION_470(ver) ((uint32_t)NVENCAPI_VERSION_470 | ((ver)<<16) | (0x7 << 28))
-
 bool gsr_get_supported_video_codecs_nvenc(gsr_supported_video_codecs *video_codecs, bool cleanup) {
     memset(video_codecs, 0, sizeof(*video_codecs));
 
@@ -206,13 +230,13 @@ bool gsr_get_supported_video_codecs_nvenc(gsr_supported_video_codecs *video_code
     if(function_list.nvEncOpenEncodeSessionEx(&params, &nvenc_encoder) != NV_ENC_SUCCESS) {
         // Old nvidia gpus dont support the new nvenc api (which is required for av1).
         // In such cases fallback to old api version if possible and try again.
-        function_list.version = NVENCAPI_STRUCT_VERSION_470(2);
+        function_list.version = NVENCAPI_STRUCT_VERSION_CUSTOM(NVENCAPI_VERSION_470, 2);
         if(nvEncodeAPICreateInstance(&function_list) != NV_ENC_SUCCESS) {
             fprintf(stderr, "gsr error: gsr_get_supported_video_codecs_nvenc: nvEncodeAPICreateInstance (retry) failed\n");
             goto done;
         }
 
-        params.version = NVENCAPI_STRUCT_VERSION_470(1);
+        params.version = NVENCAPI_STRUCT_VERSION_CUSTOM(NVENCAPI_VERSION_470, 1);
         params.apiVersion = NVENCAPI_VERSION_470;
         if(function_list.nvEncOpenEncodeSessionEx(&params, &nvenc_encoder) != NV_ENC_SUCCESS) {
             fprintf(stderr, "gsr error: gsr_get_supported_video_codecs_nvenc: nvEncOpenEncodeSessionEx (retry) failed\n");
@@ -220,7 +244,7 @@ bool gsr_get_supported_video_codecs_nvenc(gsr_supported_video_codecs *video_code
         }
     }
 
-    success = get_supported_video_codecs(&function_list, nvenc_encoder, video_codecs);
+    success = get_supported_video_codecs(&function_list, nvenc_encoder, video_codecs, params.apiVersion);
 
     done:
     if(cleanup) {

src/codec_query/vaapi.c

@@ -77,32 +77,51 @@ static bool profile_is_vp9(VAProfile profile) {
     }
 }
 
-static bool profile_supports_video_encoding(VADisplay va_dpy, VAProfile profile, bool *low_power) {
-    *low_power = false;
+/* Returns 0, 0 on error */
+static vec2i profile_entrypoint_get_max_resolution(VADisplay va_dpy, VAProfile profile, VAEntrypoint entrypoint) {
+    VAConfigAttrib attribs[2] = {
+        {
+            .type = VAConfigAttribMaxPictureWidth,
+        },
+        {
+            .type = VAConfigAttribMaxPictureHeight,
+        }
+    };
+    if(vaGetConfigAttributes(va_dpy, profile, entrypoint, attribs, 2) != VA_STATUS_SUCCESS)
+        return (vec2i){0, 0};
+
+    return (vec2i){ attribs[0].value, attribs[1].value };
+}
+
+/* Returns 0 on error or if none is supported */
+static VAEntrypoint profile_get_video_encoding_entrypoint(VADisplay va_dpy, VAProfile profile) {
     int num_entrypoints = vaMaxNumEntrypoints(va_dpy);
     if(num_entrypoints <= 0)
-        return false;
+        return 0;
 
     VAEntrypoint *entrypoint_list = calloc(num_entrypoints, sizeof(VAEntrypoint));
     if(!entrypoint_list)
-        return false;
+        return 0;
 
-    bool supports_encoding = false;
-    bool supports_low_power_encoding = false;
+    int encoding_entrypoint_index = -1;
+    int lower_power_entrypoint_index = -1;
     if(vaQueryConfigEntrypoints(va_dpy, profile, entrypoint_list, &num_entrypoints) == VA_STATUS_SUCCESS) {
         for(int i = 0; i < num_entrypoints; ++i) {
             if(entrypoint_list[i] == VAEntrypointEncSlice)
-                supports_encoding = true;
+                encoding_entrypoint_index = i;
             else if(entrypoint_list[i] == VAEntrypointEncSliceLP)
-                supports_low_power_encoding = true;
+                lower_power_entrypoint_index = i;
         }
     }
 
-    if(!supports_encoding && supports_low_power_encoding)
-        *low_power = true;
+    VAEntrypoint encoding_entrypoint = 0;
+    if(encoding_entrypoint_index != -1)
+        encoding_entrypoint = entrypoint_list[encoding_entrypoint_index];
+    else if(lower_power_entrypoint_index != -1)
+        encoding_entrypoint = entrypoint_list[lower_power_entrypoint_index];
 
     free(entrypoint_list);
-    return supports_encoding || supports_low_power_encoding;
+    return encoding_entrypoint;
 }
 
 static bool get_supported_video_codecs(VADisplay va_dpy, gsr_supported_video_codecs *video_codecs, bool cleanup) {
@@ -128,31 +147,45 @@ static bool get_supported_video_codecs(VADisplay va_dpy, gsr_supported_video_cod
         goto fail;
 
     for(int i = 0; i < num_profiles; ++i) {
-        bool low_power = false;
         if(profile_is_h264(profile_list[i])) {
-            if(profile_supports_video_encoding(va_dpy, profile_list[i], &low_power)) {
-                video_codecs->h264 = (gsr_supported_video_codec){ true, low_power };
+            const VAEntrypoint encoding_entrypoint = profile_get_video_encoding_entrypoint(va_dpy, profile_list[i]);
+            if(encoding_entrypoint != 0) {
+                const vec2i max_resolution = profile_entrypoint_get_max_resolution(va_dpy, profile_list[i], encoding_entrypoint);
+                video_codecs->h264 = (gsr_supported_video_codec){ true, encoding_entrypoint == VAEntrypointEncSliceLP, max_resolution };
             }
         } else if(profile_is_hevc_8bit(profile_list[i])) {
-            if(profile_supports_video_encoding(va_dpy, profile_list[i], &low_power))
-                video_codecs->hevc = (gsr_supported_video_codec){ true, low_power };
+            const VAEntrypoint encoding_entrypoint = profile_get_video_encoding_entrypoint(va_dpy, profile_list[i]);
+            if(encoding_entrypoint != 0) {
+                const vec2i max_resolution = profile_entrypoint_get_max_resolution(va_dpy, profile_list[i], encoding_entrypoint);
+                video_codecs->hevc = (gsr_supported_video_codec){ true, encoding_entrypoint == VAEntrypointEncSliceLP, max_resolution };
+            }
         } else if(profile_is_hevc_10bit(profile_list[i])) {
-            if(profile_supports_video_encoding(va_dpy, profile_list[i], &low_power)) {
-                video_codecs->hevc_hdr = (gsr_supported_video_codec){ true, low_power };
-                video_codecs->hevc_10bit = (gsr_supported_video_codec){ true, low_power };
+            const VAEntrypoint encoding_entrypoint = profile_get_video_encoding_entrypoint(va_dpy, profile_list[i]);
+            if(encoding_entrypoint != 0) {
+                const vec2i max_resolution = profile_entrypoint_get_max_resolution(va_dpy, profile_list[i], encoding_entrypoint);
+                video_codecs->hevc_hdr = (gsr_supported_video_codec){ true, encoding_entrypoint == VAEntrypointEncSliceLP, max_resolution };
+                video_codecs->hevc_10bit = (gsr_supported_video_codec){ true, encoding_entrypoint == VAEntrypointEncSliceLP, max_resolution };
             }
         } else if(profile_is_av1(profile_list[i])) {
-            if(profile_supports_video_encoding(va_dpy, profile_list[i], &low_power)) {
-                video_codecs->av1 = (gsr_supported_video_codec){ true, low_power };
-                video_codecs->av1_hdr = (gsr_supported_video_codec){ true, low_power };
-                video_codecs->av1_10bit = (gsr_supported_video_codec){ true, low_power };
+            const VAEntrypoint encoding_entrypoint = profile_get_video_encoding_entrypoint(va_dpy, profile_list[i]);
+            if(encoding_entrypoint != 0) {
+                const vec2i max_resolution = profile_entrypoint_get_max_resolution(va_dpy, profile_list[i], encoding_entrypoint);
+                video_codecs->av1 = (gsr_supported_video_codec){ true, encoding_entrypoint == VAEntrypointEncSliceLP, max_resolution };
+                video_codecs->av1_hdr = (gsr_supported_video_codec){ true, encoding_entrypoint == VAEntrypointEncSliceLP, max_resolution };
+                video_codecs->av1_10bit = (gsr_supported_video_codec){ true, encoding_entrypoint == VAEntrypointEncSliceLP, max_resolution };
             }
         } else if(profile_is_vp8(profile_list[i])) {
-            if(profile_supports_video_encoding(va_dpy, profile_list[i], &low_power))
-                video_codecs->vp8 = (gsr_supported_video_codec){ true, low_power };
+            const VAEntrypoint encoding_entrypoint = profile_get_video_encoding_entrypoint(va_dpy, profile_list[i]);
+            if(encoding_entrypoint != 0) {
+                const vec2i max_resolution = profile_entrypoint_get_max_resolution(va_dpy, profile_list[i], encoding_entrypoint);
+                video_codecs->vp8 = (gsr_supported_video_codec){ true, encoding_entrypoint == VAEntrypointEncSliceLP, max_resolution };
+            }
         } else if(profile_is_vp9(profile_list[i])) {
-            if(profile_supports_video_encoding(va_dpy, profile_list[i], &low_power))
-                video_codecs->vp9 = (gsr_supported_video_codec){ true, low_power };
+            const VAEntrypoint encoding_entrypoint = profile_get_video_encoding_entrypoint(va_dpy, profile_list[i]);
+            if(encoding_entrypoint != 0) {
+                const vec2i max_resolution = profile_entrypoint_get_max_resolution(va_dpy, profile_list[i], encoding_entrypoint);
+                video_codecs->vp9 = (gsr_supported_video_codec){ true, encoding_entrypoint == VAEntrypointEncSliceLP, max_resolution };
+            }
         }
     }
 

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)
@@ -849,7 +870,7 @@ static void gsr_color_conversion_draw_graphics(gsr_color_conversion *self, unsig
     self->params.egl->glViewport(0, 0, dest_texture_size.x, dest_texture_size.y);
 
     /* TODO: this, also cleanup */
-    //self->params.egl->glBindBuffer(GL_ARRAY_BUFFER, self->vertex_buffer_object_id);
+    self->params.egl->glBindBuffer(GL_ARRAY_BUFFER, self->vertex_buffer_object_id);
     self->params.egl->glBufferSubData(GL_ARRAY_BUFFER, 0, 24 * sizeof(float), vertices);
 
     switch(self->params.destination_color) {
@@ -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;
 }

src/cuda.c

@@ -65,6 +65,7 @@ bool gsr_cuda_load(gsr_cuda *self, Display *display, bool do_overclock) {
         goto fail;
     }
 
+    // TODO: Use the device associated with the opengl graphics context
     CUdevice cu_dev;
     res = self->cuDeviceGet(&cu_dev, 0);
     if(res != CUDA_SUCCESS) {

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);
 

src/dbus.c

@@ -1,4 +1,4 @@
-#include "dbus_impl.h"
+#include "../include/dbus.h"
 
 #include <sys/random.h>
 

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,49 +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;
-
-    cap_flag_value_t cap_sys_nice_value = CAP_CLEAR;
-    cap_get_flag(caps, CAP_SYS_NICE, CAP_EFFECTIVE, &cap_sys_nice_value);
-    if(cap_sys_nice_value == CAP_CLEAR) {
-        fprintf(stderr, "gsr warning: cap_sys_nice capability is missing on the gpu-screen-recorder binary, performance might be affected. If you are using the flatpak version of gpu-screen-recorder then the only fix is to use a non-flatpak version of gpu-screen-recorder\n");
-    }
-
-    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[] = {
-        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
+    int32_t ctxattr[] = {
+        EGL_CONTEXT_CLIENT_VERSION, 3,
+        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) {
@@ -106,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,
@@ -306,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" },
@@ -451,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))
@@ -471,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;
@@ -544,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
 }

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();

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);
 

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();

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;

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>
@@ -21,6 +21,29 @@
 #define SPA_POD_PROP_FLAG_DONT_FIXATE (1 << 4)
 #endif
 
+#if !PW_CHECK_VERSION(0, 3, 62)
+enum spa_meta_videotransform_value {
+    SPA_META_TRANSFORMATION_None = 0,    /**< no transform */
+    SPA_META_TRANSFORMATION_90,          /**< 90 degree counter-clockwise */
+    SPA_META_TRANSFORMATION_180,         /**< 180 degree counter-clockwise */
+    SPA_META_TRANSFORMATION_270,         /**< 270 degree counter-clockwise */
+    SPA_META_TRANSFORMATION_Flipped,     /**< 180 degree flipped around the vertical axis. Equivalent
+                                           * to a reflexion through the vertical line splitting the
+                                           * buffer in two equal sized parts */
+    SPA_META_TRANSFORMATION_Flipped90,   /**< flip then rotate around 90 degree counter-clockwise */
+    SPA_META_TRANSFORMATION_Flipped180,  /**< flip then rotate around 180 degree counter-clockwise */
+    SPA_META_TRANSFORMATION_Flipped270,  /**< flip then rotate around 270 degree counter-clockwise */
+};
+
+/** a transformation of the buffer */
+struct spa_meta_videotransform {
+    uint32_t transform;                  /**< orientation transformation that was applied to the buffer,
+                                           *  one of enum spa_meta_videotransform_value */
+};
+
+#define SPA_META_VideoTransform 8
+#endif
+
 #define CURSOR_META_SIZE(width, height)                                    \
     (sizeof(struct spa_meta_cursor) + sizeof(struct spa_meta_bitmap) + \
      width * height * 4)
@@ -93,8 +116,6 @@ static const struct pw_core_events core_events = {
 
 static void on_process_cb(void *user_data) {
     gsr_pipewire_video *self = user_data;
-    struct spa_meta_cursor *cursor = NULL;
-    //struct spa_meta *video_damage = NULL;
 
     /* Find the most recent buffer */
     struct pw_buffer *pw_buf = NULL;
@@ -114,12 +135,11 @@ static void on_process_cb(void *user_data) {
 
     struct spa_buffer *buffer = pw_buf->buffer;
     const bool has_buffer = buffer->datas[0].chunk->size != 0;
-    if(!has_buffer)
-        goto read_metadata;
 
     pthread_mutex_lock(&self->mutex);
 
-    if(buffer->datas[0].type == SPA_DATA_DmaBuf) {
+    bool buffer_updated = false;
+    if(has_buffer && buffer->datas[0].type == SPA_DATA_DmaBuf) {
         for(size_t i = 0; i < self->dmabuf_num_planes; ++i) {
             if(self->dmabuf_data[i].fd > 0) {
                 close(self->dmabuf_data[i].fd);
@@ -137,9 +157,7 @@ static void on_process_cb(void *user_data) {
             self->dmabuf_data[i].stride = buffer->datas[i].chunk->stride;
         }
 
-        self->damaged = true;
-    } else {
-        // TODO:
+        buffer_updated = true;
     }
 
     // TODO: Move down to read_metadata
@@ -157,32 +175,51 @@ static void on_process_cb(void *user_data) {
         self->crop.valid = false;
     }
 
-    pthread_mutex_unlock(&self->mutex);
+    struct spa_meta_videotransform *video_transform = spa_buffer_find_meta_data(buffer, SPA_META_VideoTransform, sizeof(*video_transform));
+    enum spa_meta_videotransform_value transform = SPA_META_TRANSFORMATION_None;
+    if(video_transform)
+        transform = video_transform->transform;
 
-read_metadata:
+    self->rotation = GSR_MONITOR_ROT_0;
+    switch(transform) {
+        case SPA_META_TRANSFORMATION_90:
+            self->rotation = GSR_MONITOR_ROT_90;
+            break;
+        case SPA_META_TRANSFORMATION_180:
+            self->rotation = GSR_MONITOR_ROT_180;
+            break;
+        case SPA_META_TRANSFORMATION_270:
+            self->rotation = GSR_MONITOR_ROT_270;
+            break;
+        default:
+            // TODO: Support other rotations. Wayland compositors dont use them yet so it's ok to not support it now
+            break;
+    }
 
-    // video_damage = spa_buffer_find_meta(buffer, SPA_META_VideoDamage);
-    // if(video_damage) {
-    //     struct spa_meta_region *r = spa_meta_first(video_damage);
-    //     if(spa_meta_check(r, video_damage)) {
-    //         //fprintf(stderr, "damage: %d,%d %ux%u\n", r->region.position.x, r->region.position.y, r->region.size.width, r->region.size.height);
-    //         pthread_mutex_lock(&self->mutex);
-    //         self->damaged = true;
-    //         pthread_mutex_unlock(&self->mutex);
-    //     }
-    // }
+    const struct spa_meta *video_damage = spa_buffer_find_meta(buffer, SPA_META_VideoDamage);
+    if(video_damage) {
+        struct spa_meta_region *meta_region = NULL;
+        spa_meta_for_each(meta_region, video_damage) {
+            if(meta_region->region.size.width == 0 || meta_region->region.size.height == 0)
+                continue;
 
-    cursor = spa_buffer_find_meta_data(buffer, SPA_META_Cursor, sizeof(*cursor));
+            self->damaged = true;
+            break;
+        }
+    } else if(buffer_updated) {
+        self->damaged = true;
+    }
+
+    const struct spa_meta_cursor *cursor = spa_buffer_find_meta_data(buffer, SPA_META_Cursor, sizeof(*cursor));
     self->cursor.valid = cursor && spa_meta_cursor_is_valid(cursor);
     
     if (self->cursor.visible && self->cursor.valid) {
-        pthread_mutex_lock(&self->mutex);
-
         struct spa_meta_bitmap *bitmap = NULL;
         if (cursor->bitmap_offset)
             bitmap = SPA_MEMBER(cursor, cursor->bitmap_offset, struct spa_meta_bitmap);
 
-        if (bitmap && bitmap->size.width > 0 && bitmap->size.height && is_cursor_format_supported(bitmap->format)) {
+        // TODO: Maybe check if the cursor is actually visible by checking if there are visible pixels
+        if (bitmap && bitmap->size.width > 0 && bitmap->size.height > 0 && is_cursor_format_supported(bitmap->format)) {
             const uint8_t *bitmap_data = SPA_MEMBER(bitmap, bitmap->offset, uint8_t);
             fprintf(stderr, "gsr info: pipewire: cursor bitmap update, size: %dx%d, format: %s\n",
                 (int)bitmap->size.width, (int)bitmap->size.height, spa_debug_type_find_name(spa_type_video_format, bitmap->format));
@@ -199,15 +236,19 @@ read_metadata:
             self->cursor.hotspot_y = cursor->hotspot.y;
             self->cursor.width = bitmap->size.width;
             self->cursor.height = bitmap->size.height;
+            self->damaged = true;
         }
 
+        if(cursor->position.x != self->cursor.x || cursor->position.y != self->cursor.y)
+            self->damaged = true;
+
         self->cursor.x = cursor->position.x;
         self->cursor.y = cursor->position.y;
-        pthread_mutex_unlock(&self->mutex);
 
         //fprintf(stderr, "gsr info: pipewire: cursor: %d %d %d %d\n", cursor->hotspot.x, cursor->hotspot.y, cursor->position.x, cursor->position.y);
     }
 
+    pthread_mutex_unlock(&self->mutex);
     pw_stream_queue_buffer(self->stream, pw_buf);
 }
 
@@ -246,17 +287,18 @@ static void on_param_changed_cb(void *user_data, uint32_t id, const struct spa_p
     fprintf(stderr, "gsr info: pipewire:    Size: %dx%d\n", self->format.info.raw.size.width, self->format.info.raw.size.height);
     fprintf(stderr, "gsr info: pipewire:    Framerate: %d/%d\n", self->format.info.raw.framerate.num, self->format.info.raw.framerate.denom);
 
-    uint8_t params_buffer[1024];
+    uint8_t params_buffer[2048];
     struct spa_pod_builder pod_builder = SPA_POD_BUILDER_INIT(params_buffer, sizeof(params_buffer));
-    const struct spa_pod *params[4];
+    const struct spa_pod *params[5];
+    int param_index = 0;
 
-    params[0] = spa_pod_builder_add_object(
+    params[param_index++] = spa_pod_builder_add_object(
         &pod_builder, SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
         SPA_PARAM_META_type, SPA_POD_Id(SPA_META_VideoCrop),
         SPA_PARAM_META_size,
         SPA_POD_Int(sizeof(struct spa_meta_region)));
 
-    params[1] = spa_pod_builder_add_object(
+    params[param_index++] = spa_pod_builder_add_object(
         &pod_builder, SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
         SPA_PARAM_META_type, SPA_POD_Id(SPA_META_VideoDamage),
         SPA_PARAM_META_size, SPA_POD_CHOICE_RANGE_Int(
@@ -264,7 +306,7 @@ static void on_param_changed_cb(void *user_data, uint32_t id, const struct spa_p
                                 sizeof(struct spa_meta_region) * 1,
                                 sizeof(struct spa_meta_region) * 16));
 
-    params[2] = spa_pod_builder_add_object(
+    params[param_index++] = spa_pod_builder_add_object(
         &pod_builder, SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
         SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Cursor),
         SPA_PARAM_META_size,
@@ -272,21 +314,40 @@ static void on_param_changed_cb(void *user_data, uint32_t id, const struct spa_p
                      CURSOR_META_SIZE(1, 1),
                      CURSOR_META_SIZE(1024, 1024)));
 
-    params[3] = spa_pod_builder_add_object(
+    params[param_index++] = spa_pod_builder_add_object(
         &pod_builder, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
         SPA_PARAM_BUFFERS_dataType, SPA_POD_Int(buffer_types));
 
-    pw_stream_update_params(self->stream, params, 4);
+#if PW_CHECK_VERSION(0, 3, 62)
+	if (check_pw_version(&self->server_version, 0, 3, 62)) {
+		/* Video transformation */
+		params[param_index++] = spa_pod_builder_add_object(&pod_builder, SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
+								SPA_PARAM_META_type,
+								SPA_POD_Id(SPA_META_VideoTransform),
+								SPA_PARAM_META_size,
+								SPA_POD_Int(sizeof(struct spa_meta_videotransform)));
+	}
+#endif
+
+    pw_stream_update_params(self->stream, params, param_index);
     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 +411,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;
 }
@@ -366,23 +427,23 @@ static int64_t spa_video_format_to_drm_format(const enum spa_video_format format
 #if PW_CHECK_VERSION(0, 3, 41)
 #define GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS GSR_PIPEWIRE_VIDEO_MAX_VIDEO_FORMATS
 #else
-#define GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS 8
+#define GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS 6
 #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,
+    SPA_VIDEO_FORMAT_RGBA,
+    SPA_VIDEO_FORMAT_BGRA,
+    //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
 };
 
@@ -438,6 +499,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 +515,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 +535,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 +736,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 +788,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 +832,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);
@@ -751,14 +843,15 @@ static void gsr_pipewire_video_update_cursor_texture(gsr_pipewire_video *self, g
     self->cursor.data = NULL;
 }
 
-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_map_texture(gsr_pipewire_video *self, gsr_texture_map texture_map, gsr_map_texture_output *output) {
     for(int i = 0; i < GSR_PIPEWIRE_VIDEO_DMABUF_MAX_PLANES; ++i) {
-        memset(&dmabuf_data[i], 0, sizeof(gsr_pipewire_video_dmabuf_data));
+        memset(&output->dmabuf_data[i], 0, sizeof(gsr_pipewire_video_dmabuf_data));
     }
-    *num_dmabuf_data = 0;
-    *using_external_image = self->external_texture_fallback;
-    *fourcc = 0;
-    *modifiers = 0;
+    output->num_dmabuf_data = 0;
+    output->using_external_image = self->external_texture_fallback;
+    output->fourcc = 0;
+    output->modifiers = 0;
+    output->rotation = GSR_MONITOR_ROT_0;
     pthread_mutex_lock(&self->mutex);
 
     if(!self->negotiated || self->dmabuf_data[0].fd <= 0) {
@@ -767,42 +860,53 @@ 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);
+    output->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;
-    region->y = 0;
+    output->region.x = 0;
+    output->region.y = 0;
 
-    region->width = self->format.info.raw.size.width;
-    region->height = self->format.info.raw.size.height;
+    output->region.width = self->format.info.raw.size.width;
+    output->region.height = self->format.info.raw.size.height;
 
     if(self->crop.valid) {
-        region->x = self->crop.x;
-        region->y = self->crop.y;
+        output->region.x = self->crop.x;
+        output->region.y = self->crop.y;
 
-        region->width = self->crop.width;
-        region->height = self->crop.height;
+        output->region.width = self->crop.width;
+        output->region.height = self->crop.height;
+    }
+
+    // TODO: Test transform + cropping
+    if(self->rotation == GSR_MONITOR_ROT_90 || self->rotation == GSR_MONITOR_ROT_270) {
+        const int temp = output->region.width;
+        output->region.width = output->region.height;
+        output->region.height = temp;
     }
 
     /* TODO: Test if cursor hotspot is correct */
-    cursor_region->x = self->cursor.x - self->cursor.hotspot_x;
-    cursor_region->y = self->cursor.y - self->cursor.hotspot_y;
+    output->cursor_region.x = self->cursor.x - self->cursor.hotspot_x;
+    output->cursor_region.y = self->cursor.y - self->cursor.hotspot_y;
 
-    cursor_region->width = self->cursor.width;
-    cursor_region->height = self->cursor.height;
+    output->cursor_region.width = self->cursor.width;
+    output->cursor_region.height = self->cursor.height;
 
     for(size_t i = 0; i < self->dmabuf_num_planes; ++i) {
-        dmabuf_data[i] = self->dmabuf_data[i];
+        output->dmabuf_data[i] = self->dmabuf_data[i];
         self->dmabuf_data[i].fd = -1;
     }
-    *num_dmabuf_data = self->dmabuf_num_planes;
-    *fourcc = spa_video_format_to_drm_format(self->format.info.raw.format);
-    *modifiers = self->format.info.raw.modifier;
+    output->num_dmabuf_data = self->dmabuf_num_planes;
+    output->fourcc = spa_video_format_to_drm_format(self->format.info.raw.format);
+    output->modifiers = self->format.info.raw.modifier;
+    output->rotation = self->rotation;
     self->dmabuf_num_planes = 0;
 
     pthread_mutex_unlock(&self->mutex);
@@ -810,6 +914,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 +925,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;
+}

src/plugins.c

@@ -0,0 +1,137 @@
+#include "../include/plugins.h"
+#include "../include/utils.h"
+#include <stdio.h>
+#include <string.h>
+#include <dlfcn.h>
+#include <assert.h>
+
+static int color_depth_to_gl_internal_format(gsr_plugin_color_depth color_depth) {
+    switch(color_depth) {
+        case GSR_PLUGIN_COLOR_DEPTH_8_BITS:
+            return GL_RGBA8;
+        case GSR_PLUGIN_COLOR_DEPTH_10_BITS:
+            return GL_RGBA16;
+    }
+    assert(false);
+    return GL_RGBA8;
+}
+
+bool gsr_plugins_init(gsr_plugins *self, gsr_plugin_init_params init_params, gsr_egl *egl) {
+    memset(self, 0, sizeof(*self));
+    self->init_params = init_params;
+    self->egl = egl;
+
+    /* TODO: GL_RGB8? */
+    const unsigned int texture = gl_create_texture(egl, init_params.width, init_params.height, color_depth_to_gl_internal_format(init_params.color_depth), GL_RGBA, GL_LINEAR);
+    if(texture == 0) {
+        fprintf(stderr, "gsr error: gsr_plugins_init failed to create texture\n");
+        return false;
+    }
+    self->texture = texture;
+
+    gsr_color_conversion_params color_conversion_params = {
+        .egl = egl,
+        .destination_color = GSR_DESTINATION_COLOR_RGB8, /* TODO: Support 10-bits, use init_params.color_depth */
+        .destination_textures[0] = self->texture,
+        .num_destination_textures = 1,
+        .color_range = GSR_COLOR_RANGE_FULL,
+        .load_external_image_shader = false,
+        //.force_graphics_shader = false,
+    };
+    color_conversion_params.destination_textures[0] = self->texture;
+
+    if(gsr_color_conversion_init(&self->color_conversion, &color_conversion_params) != 0) {
+        fprintf(stderr, "gsr error: gsr_plugins_init failed to create color conversion\n");
+        gsr_plugins_deinit(self);
+        return false;
+    }
+    gsr_color_conversion_clear(&self->color_conversion);
+
+    return true;
+}
+
+void gsr_plugins_deinit(gsr_plugins *self) {
+    for(int i = self->num_plugins - 1; i >= 0; --i) {
+        gsr_plugin *plugin = &self->plugins[i];
+        plugin->gsr_plugin_deinit(plugin->data.userdata);
+        fprintf(stderr, "gsr info: unloaded plugin: %s\n", plugin->data.name);
+    }
+    self->num_plugins = 0;
+
+    if(self->texture > 0) {
+        self->egl->glDeleteTextures(1, &self->texture);
+        self->texture = 0;
+    }
+
+    gsr_color_conversion_deinit(&self->color_conversion);
+}
+
+bool gsr_plugins_load_plugin(gsr_plugins *self, const char *plugin_filepath) {
+    if(self->num_plugins >= GSR_MAX_PLUGINS) {
+        fprintf(stderr, "gsr error: gsr_plugins_load_plugin failed, more plugins can't load more than %d plugins. Report this as an issue\n", GSR_MAX_PLUGINS);
+        return false;
+    }
+
+    gsr_plugin plugin;
+    memset(&plugin, 0, sizeof(plugin));
+
+    plugin.lib = dlopen(plugin_filepath, RTLD_LAZY);
+    if(!plugin.lib) {
+        fprintf(stderr, "gsr error: gsr_plugins_load_plugin failed to load \"%s\", error: %s\n", plugin_filepath, dlerror());
+        return false;
+    }
+
+    plugin.gsr_plugin_init = dlsym(plugin.lib, "gsr_plugin_init");
+    if(!plugin.gsr_plugin_init) {
+        fprintf(stderr, "gsr error: gsr_plugins_load_plugin failed to find \"gsr_plugin_init\" in plugin \"%s\"\n", plugin_filepath);
+        goto fail;
+    }
+
+    plugin.gsr_plugin_deinit = dlsym(plugin.lib, "gsr_plugin_deinit");
+    if(!plugin.gsr_plugin_deinit) {
+        fprintf(stderr, "gsr error: gsr_plugins_load_plugin failed to find \"gsr_plugin_deinit\" in plugin \"%s\"\n", plugin_filepath);
+        goto fail;
+    }
+
+    if(!plugin.gsr_plugin_init(&self->init_params, &plugin.data)) {
+        fprintf(stderr, "gsr error: gsr_plugins_load_plugin failed to load plugin \"%s\", gsr_plugin_init in the plugin failed\n", plugin_filepath);
+        goto fail;
+    }
+
+    if(!plugin.data.name) {
+        fprintf(stderr, "gsr error: gsr_plugins_load_plugin failed to load plugin \"%s\", the plugin didn't set the name (gsr_plugin_init_return.name)\n", plugin_filepath);
+        goto fail;
+    }
+
+    if(plugin.data.version == 0) {
+        fprintf(stderr, "gsr error: gsr_plugins_load_plugin failed to load plugin \"%s\", the plugin didn't set the version (gsr_plugin_init_return.version)\n", plugin_filepath);
+        goto fail;
+    }
+
+    fprintf(stderr, "gsr info: loaded plugin: %s, name: %s, version: %u\n", plugin_filepath, plugin.data.name, plugin.data.version);
+    self->plugins[self->num_plugins] = plugin;
+    ++self->num_plugins;
+    return true;
+
+    fail:
+    dlclose(plugin.lib);
+    return false;
+}
+
+void gsr_plugins_draw(gsr_plugins *self) {
+    const gsr_plugin_draw_params params = {
+        .width = self->init_params.width,
+        .height = self->init_params.height,
+    };
+
+    self->egl->glBindFramebuffer(GL_FRAMEBUFFER, self->color_conversion.framebuffers[0]);
+    self->egl->glViewport(0, 0, self->init_params.width, self->init_params.height);
+
+    for(int i = 0; i < self->num_plugins; ++i) {
+        const gsr_plugin *plugin = &self->plugins[i];
+        if(plugin->data.draw)
+            plugin->data.draw(&params, plugin->data.userdata);
+    }
+
+    self->egl->glBindFramebuffer(GL_FRAMEBUFFER, 0);
+}

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;
     }
 

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);
             }
@@ -291,13 +285,9 @@ typedef struct {
     bool match_found;
 } get_monitor_by_connector_id_userdata;
 
-static bool vec2i_eql(vec2i a, vec2i b) {
-    return a.x == b.x && a.y == b.y;
-}
-
-static void get_monitor_by_name_and_size_callback(const gsr_monitor *monitor, void *userdata) {
+static void get_monitor_by_name_wayland_callback(const gsr_monitor *monitor, void *userdata) {
     get_monitor_by_connector_id_userdata *data = (get_monitor_by_connector_id_userdata*)userdata;
-    if(monitor->name && data->monitor->name && strcmp(monitor->name, data->monitor->name) == 0 && vec2i_eql(monitor->size, data->monitor->size)) {
+    if(monitor->name && data->monitor->name && strcmp(monitor->name, data->monitor->name) == 0) {
         data->rotation = monitor->rotation;
         data->position = monitor->pos;
         data->match_found = true;
@@ -326,7 +316,7 @@ bool drm_monitor_get_display_server_data(const gsr_window *window, const gsr_mon
             userdata.rotation = GSR_MONITOR_ROT_0;
             userdata.position = (vec2i){0, 0};
             userdata.match_found = false;
-            gsr_window_for_each_active_monitor_output_cached(window, get_monitor_by_name_and_size_callback, &userdata);
+            gsr_window_for_each_active_monitor_output_cached(window, get_monitor_by_name_wayland_callback, &userdata);
             if(userdata.match_found) {
                 *monitor_rotation = userdata.rotation;
                 *monitor_position = userdata.position;
@@ -516,6 +506,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 +552,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 +576,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 +594,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);
 

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);
     }

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);