Automatically choose video codec based on capture resolution

Add error checks for video capture resolution since some users are retarded

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.
@@ -70,6 +70,8 @@ Here are some known unofficial packages:
 * Fedora: [Copr](https://copr.fedorainfracloud.org/coprs/brycensranch/gpu-screen-recorder-git/)
 * OpenMandriva: [gpu-screen-recorder](https://github.com/OpenMandrivaAssociation/gpu-screen-recorder)
 * Solus: [gpu-screen-recorder](https://github.com/getsolus/packages/tree/main/packages/g/gpu-screen-recorder)
+* Nobara: [Nobara wiki](https://wiki.nobaraproject.org/en/general-usage/additional-software/GPU-Screen-Recorder)
+* AppImage [AppImage GitHub releases](https://github.com/pkgforge-dev/gpu-screen-recorder-AppImage/releases)
 
 # Dependencies
 GPU Screen Recorder uses meson build system so you need to install `meson` to build GPU Screen Recorder.
@@ -77,7 +79,6 @@ GPU Screen Recorder uses meson build system so you need to install `meson` to bu
 ## Build dependencies
 These are the dependencies needed to build GPU Screen Recorder:
 
-* libglvnd (which provides libgl, libglx and libegl)
 * vulkan-headers
 * ffmpeg (libavcodec, libavformat, libavutil, libswresample, libavfilter)
 * x11 (libx11, libxcomposite, libxrandr, libxfixes, libxdamage)
@@ -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)
@@ -133,8 +136,11 @@ Run `gpu-screen-recorder` with the `-c mp4` and `-r` option, for example: `gpu-s
 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.\
@@ -169,7 +175,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
@@ -195,7 +201,16 @@ KDE Plasma version 6.2 broke HDR and ICC profiles for screen recorders. This was
 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 a non-flatpak source instead (such as from aur or from source). 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

@@ -302,3 +302,23 @@ Allow medium, high, very_high and ultra quality for -bm cbr. If that is used the
     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.

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 died 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: failed to launch \"gsr-dbus-server\", 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;
-}

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
 
@@ -131,7 +130,7 @@ typedef void(*__GLXextFuncPtr)(void);
 #define GL_BLEND                                0x0BE2
 #define GL_SRC_ALPHA                            0x0302
 #define GL_ONE_MINUS_SRC_ALPHA                  0x0303
-#define GL_DEBUG_OUTPUT                         0x92E0
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS             0x8242
 #define GL_SCISSOR_TEST                         0x0C11
 #define GL_PACK_ALIGNMENT                       0x0D05
 #define GL_UNPACK_ALIGNMENT                     0x0CF5
@@ -141,8 +140,6 @@ typedef void(*__GLXextFuncPtr)(void);
 #define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS  0x90EB
 #define GL_TEXTURE0                             0x84C0
 #define GL_TEXTURE1                             0x84C1
-#define GL_CLAMP_TO_BORDER                      0x812D
-#define GL_TEXTURE_BORDER_COLOR                 0x1004
 #define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT      0x00000020
 #define GL_ALL_BARRIER_BITS                     0xFFFFFFFF
 
@@ -265,6 +262,7 @@ struct gsr_egl {
     void (*glGetTexLevelParameteriv)(unsigned int target, int level, unsigned int pname, int *params);
     void (*glTexImage2D)(unsigned int target, int level, int internalFormat, int width, int height, int border, unsigned int format, unsigned int type, const void *pixels);
     void (*glTexSubImage2D)(unsigned int target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type, const void *pixels);
+    void (*glTexStorage2D)(unsigned int target, int levels, unsigned int internalformat, int width, int height);
     void (*glGetTexImage)(unsigned int target, int level, unsigned int format, unsigned int type, void *pixels);
     void (*glGenFramebuffers)(int n, unsigned int *framebuffers);
     void (*glBindFramebuffer)(unsigned int target, unsigned int framebuffer);

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 */

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) {
@@ -318,6 +346,8 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) {
         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.7', default_options : ['warning_level=2'])
+project('gpu-screen-recorder', ['c', 'cpp'], version : '5.6.5', default_options : ['warning_level=2'])
 
 add_project_arguments('-Wshadow', language : ['c', 'cpp'])
 if get_option('buildtype') == 'debug'
@@ -65,18 +65,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 +100,7 @@ if uses_pipewire == true
     dep += [
         dependency('libpipewire-0.3'),
         dependency('libspa-0.2'),
+        dependency('dbus-1'),
     ]
 endif
 
@@ -103,10 +109,6 @@ 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
-
 if get_option('systemd') == true
     install_data(files('extra/gpu-screen-recorder.service'), install_dir : 'lib/systemd/user')
 endif

project.conf

@@ -1,11 +1,11 @@
 [package]
 name = "gpu-screen-recorder"
 type = "executable"
-version = "5.5.7"
+version = "5.6.5"
 platforms = ["posix"]
 
 [config]
-ignore_dirs = ["kms/server", "build", "debug-build", "dbus/server"]
+ignore_dirs = ["kms/server", "build", "debug-build"]
 #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

@@ -252,7 +252,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");

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/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)
@@ -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/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

@@ -29,24 +29,27 @@
 #define GLX_RGBA_TYPE                      0x8014
 
 // TODO: Create egl context without surface (in other words, x11/wayland agnostic, doesn't require x11/wayland dependency)
-static bool gsr_egl_create_window(gsr_egl *self) {
+static bool gsr_egl_create_window(gsr_egl *self, bool enable_debug) {
     EGLConfig  ecfg;
     int32_t    num_config = 0;
 
-    // TODO: Use EGL_OPENGL_ES_BIT as amd requires that for external texture, but that breaks software encoding
     const int32_t attr[] = {
         EGL_BUFFER_SIZE, 24,
-        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT,
         EGL_NONE, EGL_NONE
     };
 
-    const int32_t ctxattr[] = {
+    int32_t ctxattr[] = {
         EGL_CONTEXT_CLIENT_VERSION, 2,
-        EGL_NONE, EGL_NONE
+        EGL_NONE, EGL_NONE, EGL_NONE
     };
 
-    // TODO: Use EGL_OPENGL_ES_API as amd requires that for external texture, but that breaks software encoding
-    self->eglBindAPI(EGL_OPENGL_API);
+    if(enable_debug) {
+        ctxattr[2] = EGL_CONTEXT_OPENGL_DEBUG;
+        ctxattr[3] = EGL_TRUE;
+    }
+
+    self->eglBindAPI(EGL_OPENGL_ES_API);
 
     self->egl_display = self->eglGetDisplay((EGLNativeDisplayType)gsr_window_get_display(self->window));
     if(!self->egl_display) {
@@ -89,6 +92,7 @@ static bool gsr_egl_create_window(gsr_egl *self) {
 }
 
 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,
@@ -279,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" },
@@ -424,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))
@@ -444,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;

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/main.cpp

@@ -5,7 +5,7 @@ extern "C" {
 #include "../include/capture/kms.h"
 #ifdef GSR_PORTAL
 #include "../include/capture/portal.h"
-#include "../dbus/client/dbus_client.h"
+#include "../include/dbus.h"
 #endif
 #ifdef GSR_APP_AUDIO
 #include "../include/pipewire_audio.h"
@@ -336,7 +336,7 @@ static int vbr_get_quality_parameter(AVCodecContext *codec_context, gsr_video_qu
     return 22 * qp_multiply;
 }
 
-static AVCodecContext *create_video_codec_context(AVPixelFormat pix_fmt, const AVCodec *codec, const gsr_egl &egl, const args_parser &arg_parser) {
+static AVCodecContext *create_video_codec_context(AVPixelFormat pix_fmt, const AVCodec *codec, const gsr_egl &egl, const args_parser &arg_parser, int width, int height) {
     const bool use_software_video_encoder = arg_parser.video_encoder == GSR_VIDEO_ENCODER_HW_CPU;
     const bool hdr = video_codec_is_hdr(arg_parser.video_codec);
     AVCodecContext *codec_context = avcodec_alloc_context3(codec);
@@ -345,6 +345,8 @@ static AVCodecContext *create_video_codec_context(AVPixelFormat pix_fmt, const A
 
     assert(codec->type == AVMEDIA_TYPE_VIDEO);
     codec_context->codec_id = codec->id;
+    codec_context->width = width;
+    codec_context->height = height;
     // Timebase: This is the fundamental unit of time (in seconds) in terms
     // of which frame timestamps are represented. For fixed-fps content,
     // timebase should be 1/framerate and timestamp increments should be
@@ -515,6 +517,9 @@ static AVCodecContext *create_video_codec_context(AVPixelFormat pix_fmt, const A
 
     //av_opt_set(codec_context->priv_data, "bsf", "hevc_metadata=colour_primaries=9:transfer_characteristics=16:matrix_coefficients=9", 0);
 
+    if(arg_parser.tune == GSR_TUNE_QUALITY)
+        codec_context->max_b_frames = 2;
+
     codec_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
     return codec_context;
@@ -663,7 +668,6 @@ static void open_video_software(AVCodecContext *codec_context, const args_parser
 
     av_dict_set(&options, "preset", "veryfast", 0);
     av_dict_set(&options, "tune", "film", 0);
-    av_dict_set(&options, "profile", "high", 0);
 
     if(codec_context->codec_id == AV_CODEC_ID_H264) {
         av_dict_set(&options, "coder", "cabac", 0); // TODO: cavlc is faster than cabac but worse compression. Which to use?
@@ -1612,7 +1616,8 @@ static bool get_supported_video_codecs(gsr_egl *egl, gsr_video_codec video_codec
     memset(video_codecs, 0, sizeof(*video_codecs));
 
     if(use_software_video_encoder) {
-        video_codecs->h264.supported = true;
+        video_codecs->h264.supported = avcodec_find_encoder_by_name("libx264");
+        video_codecs->h264.max_resolution = {4096, 2304};
         return true;
     }
 
@@ -1752,14 +1757,16 @@ static void set_supported_video_codecs_ffmpeg(gsr_supported_video_codecs *suppor
         supported_video_codecs->vp9.supported = false;
     }
 
-    if(!get_ffmpeg_video_codec(GSR_VIDEO_CODEC_H264_VULKAN, vendor)) {
-        supported_video_codecs_vulkan->h264.supported = false;
-    }
+    if(supported_video_codecs_vulkan) {
+        if(!get_ffmpeg_video_codec(GSR_VIDEO_CODEC_H264_VULKAN, vendor)) {
+            supported_video_codecs_vulkan->h264.supported = false;
+        }
 
-    if(!get_ffmpeg_video_codec(GSR_VIDEO_CODEC_HEVC_VULKAN, vendor)) {
-        supported_video_codecs_vulkan->hevc.supported = false;
-        supported_video_codecs_vulkan->hevc_hdr.supported = false;
-        supported_video_codecs_vulkan->hevc_10bit.supported = false;
+        if(!get_ffmpeg_video_codec(GSR_VIDEO_CODEC_HEVC_VULKAN, vendor)) {
+            supported_video_codecs_vulkan->hevc.supported = false;
+            supported_video_codecs_vulkan->hevc_hdr.supported = false;
+            supported_video_codecs_vulkan->hevc_10bit.supported = false;
+        }
     }
 }
 
@@ -1848,15 +1855,15 @@ static void list_supported_capture_options(const gsr_window *window, const char
     if(!wayland)
         return;
 
-    gsr_dbus_client dbus_client;
-    if(!gsr_dbus_client_init(&dbus_client, NULL))
+    gsr_dbus dbus;
+    if(!gsr_dbus_init(&dbus, NULL))
         return;
 
-    char session_handle[128];
-    if(gsr_dbus_client_screencast_create_session(&dbus_client, session_handle, sizeof(session_handle)) == 0)
+    char *session_handle = NULL;
+    if(gsr_dbus_screencast_create_session(&dbus, &session_handle) == 0)
         puts("portal");
 
-    gsr_dbus_client_deinit(&dbus_client);
+    gsr_dbus_deinit(&dbus);
 #endif
 }
 
@@ -2287,8 +2294,6 @@ static void capture_image_to_file(args_parser &arg_parser, gsr_egl *egl, gsr_ima
     capture_metadata.width = 0;
     capture_metadata.height = 0;
     capture_metadata.fps = fps;
-    capture_metadata.video_codec_context = nullptr;
-    capture_metadata.frame = nullptr;
 
     int capture_result = gsr_capture_start(capture, &capture_metadata);
     if(capture_result != 0) {
@@ -2560,85 +2565,149 @@ static bool video_codec_only_supports_low_power_mode(const gsr_supported_video_c
     return false;
 }
 
-static const AVCodec* pick_video_codec(gsr_video_codec *video_codec, gsr_egl *egl, bool use_software_video_encoder, bool video_codec_auto, bool is_flv, bool *low_power) {
-    // TODO: software encoder for hevc, av1, vp8 and vp9
-    *low_power = false;
-
-    gsr_supported_video_codecs supported_video_codecs;
-    if(!get_supported_video_codecs(egl, *video_codec, use_software_video_encoder, true, &supported_video_codecs)) {
-        fprintf(stderr, "gsr error: failed to query for supported video codecs\n");
-        _exit(11);
-    }
-
-    const AVCodec *video_codec_f = nullptr;
-
-    switch(*video_codec) {
+static const AVCodec* get_av_codec_if_supported(gsr_video_codec video_codec, gsr_egl *egl, bool use_software_video_encoder, const gsr_supported_video_codecs *supported_video_codecs) {
+    switch(video_codec) {
         case GSR_VIDEO_CODEC_H264: {
             if(use_software_video_encoder)
-                video_codec_f = avcodec_find_encoder_by_name("libx264");
-            else if(supported_video_codecs.h264.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+                return avcodec_find_encoder_by_name("libx264");
+            else if(supported_video_codecs->h264.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_HEVC: {
-            if(supported_video_codecs.hevc.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->hevc.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_HEVC_HDR: {
-            if(supported_video_codecs.hevc_hdr.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->hevc_hdr.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_HEVC_10BIT: {
-            if(supported_video_codecs.hevc_10bit.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->hevc_10bit.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_AV1: {
-            if(supported_video_codecs.av1.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->av1.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_AV1_HDR: {
-            if(supported_video_codecs.av1_hdr.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->av1_hdr.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_AV1_10BIT: {
-            if(supported_video_codecs.av1_10bit.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->av1_10bit.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_VP8: {
-            if(supported_video_codecs.vp8.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->vp8.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_VP9: {
-            if(supported_video_codecs.vp9.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->vp9.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_H264_VULKAN: {
-            if(supported_video_codecs.h264.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->h264.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
         case GSR_VIDEO_CODEC_HEVC_VULKAN: {
             // TODO: hdr, 10 bit
-            if(supported_video_codecs.hevc.supported)
-                video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+            if(supported_video_codecs->hevc.supported)
+                return get_ffmpeg_video_codec(video_codec, egl->gpu_info.vendor);
             break;
         }
     }
+    return nullptr;
+}
+
+static vec2i codec_get_max_resolution(gsr_video_codec video_codec, bool use_software_video_encoder, const gsr_supported_video_codecs *supported_video_codecs) {
+    switch(video_codec) {
+        case GSR_VIDEO_CODEC_H264: {
+            if(use_software_video_encoder)
+                return {4096, 2304};
+            else if(supported_video_codecs->h264.supported)
+                return supported_video_codecs->h264.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_HEVC: {
+            if(supported_video_codecs->hevc.supported)
+                return supported_video_codecs->hevc.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_HEVC_HDR: {
+            if(supported_video_codecs->hevc_hdr.supported)
+                return supported_video_codecs->hevc_hdr.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_HEVC_10BIT: {
+            if(supported_video_codecs->hevc_10bit.supported)
+                return supported_video_codecs->hevc_10bit.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_AV1: {
+            if(supported_video_codecs->av1.supported)
+                return supported_video_codecs->av1.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_AV1_HDR: {
+            if(supported_video_codecs->av1_hdr.supported)
+                return supported_video_codecs->av1_hdr.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_AV1_10BIT: {
+            if(supported_video_codecs->av1_10bit.supported)
+                return supported_video_codecs->av1_10bit.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_VP8: {
+            if(supported_video_codecs->vp8.supported)
+                return supported_video_codecs->vp8.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_VP9: {
+            if(supported_video_codecs->vp9.supported)
+                return supported_video_codecs->vp9.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_H264_VULKAN: {
+            if(supported_video_codecs->h264.supported)
+                return supported_video_codecs->h264.max_resolution;
+            break;
+        }
+        case GSR_VIDEO_CODEC_HEVC_VULKAN: {
+            // TODO: hdr, 10 bit
+            if(supported_video_codecs->hevc.supported)
+                return supported_video_codecs->hevc.max_resolution;
+            break;
+        }
+    }
+    return {0, 0};
+}
+
+static bool codec_supports_resolution(vec2i codec_max_resolution, vec2i capture_resolution) {
+    return codec_max_resolution.x >= capture_resolution.x && codec_max_resolution.y >= capture_resolution.y;
+}
+
+static const AVCodec* pick_video_codec(gsr_video_codec *video_codec, gsr_egl *egl, bool use_software_video_encoder, bool video_codec_auto, bool is_flv, bool *low_power, gsr_supported_video_codecs *supported_video_codecs) {
+    // TODO: software encoder for hevc, av1, vp8 and vp9
+    *low_power = false;
+    const AVCodec *video_codec_f = get_av_codec_if_supported(*video_codec, egl, use_software_video_encoder, supported_video_codecs);
 
     if(!video_codec_auto && !video_codec_f && !is_flv) {
         switch(*video_codec) {
             case GSR_VIDEO_CODEC_H264: {
                 fprintf(stderr, "gsr warning: selected video codec h264 is not supported, trying hevc instead\n");
                 *video_codec = GSR_VIDEO_CODEC_HEVC;
-                if(supported_video_codecs.hevc.supported)
+                if(supported_video_codecs->hevc.supported)
                     video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
                 break;
             }
@@ -2647,7 +2716,7 @@ static const AVCodec* pick_video_codec(gsr_video_codec *video_codec, gsr_egl *eg
             case GSR_VIDEO_CODEC_HEVC_10BIT: {
                 fprintf(stderr, "gsr warning: selected video codec hevc is not supported, trying h264 instead\n");
                 *video_codec = GSR_VIDEO_CODEC_H264;
-                if(supported_video_codecs.h264.supported)
+                if(supported_video_codecs->h264.supported)
                     video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
                 break;
             }
@@ -2656,7 +2725,7 @@ static const AVCodec* pick_video_codec(gsr_video_codec *video_codec, gsr_egl *eg
             case GSR_VIDEO_CODEC_AV1_10BIT: {
                 fprintf(stderr, "gsr warning: selected video codec av1 is not supported, trying h264 instead\n");
                 *video_codec = GSR_VIDEO_CODEC_H264;
-                if(supported_video_codecs.h264.supported)
+                if(supported_video_codecs->h264.supported)
                     video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
                 break;
             }
@@ -2668,11 +2737,11 @@ static const AVCodec* pick_video_codec(gsr_video_codec *video_codec, gsr_egl *eg
                 fprintf(stderr, "gsr warning: selected video codec h264_vulkan is not supported, trying h264 instead\n");
                 *video_codec = GSR_VIDEO_CODEC_H264;
                 // Need to do a query again because this time it's without vulkan
-                if(!get_supported_video_codecs(egl, *video_codec, use_software_video_encoder, true, &supported_video_codecs)) {
+                if(!get_supported_video_codecs(egl, *video_codec, use_software_video_encoder, true, supported_video_codecs)) {
                     fprintf(stderr, "gsr error: failed to query for supported video codecs\n");
                     _exit(11);
                 }
-                if(supported_video_codecs.h264.supported)
+                if(supported_video_codecs->h264.supported)
                     video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
                 break;
             }
@@ -2680,11 +2749,11 @@ static const AVCodec* pick_video_codec(gsr_video_codec *video_codec, gsr_egl *eg
                 fprintf(stderr, "gsr warning: selected video codec hevc_vulkan is not supported, trying hevc instead\n");
                 *video_codec = GSR_VIDEO_CODEC_HEVC;
                 // Need to do a query again because this time it's without vulkan
-                if(!get_supported_video_codecs(egl, *video_codec, use_software_video_encoder, true, &supported_video_codecs)) {
+                if(!get_supported_video_codecs(egl, *video_codec, use_software_video_encoder, true, supported_video_codecs)) {
                     fprintf(stderr, "gsr error: failed to query for supported video codecs\n");
                     _exit(11);
                 }
-                if(supported_video_codecs.hevc.supported)
+                if(supported_video_codecs->hevc.supported)
                     video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
                 break;
             }
@@ -2703,23 +2772,57 @@ static const AVCodec* pick_video_codec(gsr_video_codec *video_codec, gsr_egl *eg
             "  Make sure you have mesa-extra freedesktop runtime installed when using the flatpak (this should be the default), which can be installed with this command:\n"
             "  flatpak install --system org.freedesktop.Platform.GL.default//23.08-extra\n"
             "  If your GPU doesn't support hardware accelerated video encoding then you can use '-encoder cpu' option to encode with your cpu instead.\n", video_codec_name, video_codec_name, video_codec_name);
-        _exit(2);
+        _exit(54);
     }
 
-    *low_power = video_codec_only_supports_low_power_mode(supported_video_codecs, *video_codec);
+    *low_power = video_codec_only_supports_low_power_mode(*supported_video_codecs, *video_codec);
 
     return video_codec_f;
 }
 
-static const AVCodec* select_video_codec_with_fallback(gsr_video_codec *video_codec, const char *file_extension, bool use_software_video_encoder, gsr_egl *egl, bool *low_power) {
+/* Returns -1 if none is available */
+static gsr_video_codec select_appropriate_video_codec_automatically(gsr_capture_metadata capture_metadata, const gsr_supported_video_codecs *supported_video_codecs) {
+    const vec2i capture_size = {capture_metadata.width, capture_metadata.height};
+    if(supported_video_codecs->h264.supported && codec_supports_resolution(supported_video_codecs->h264.max_resolution, capture_size)) {
+        fprintf(stderr, "gsr info: using h264 encoder because a codec was not specified\n");
+        return GSR_VIDEO_CODEC_H264;
+    } else if(supported_video_codecs->hevc.supported && codec_supports_resolution(supported_video_codecs->hevc.max_resolution, capture_size)) {
+        fprintf(stderr, "gsr info: using hevc encoder because a codec was not specified and h264 supported max resolution (%dx%d) is less than capture resolution (%dx%d)\n",
+            supported_video_codecs->h264.max_resolution.x, supported_video_codecs->h264.max_resolution.y,
+            capture_size.x, capture_size.y);
+        return GSR_VIDEO_CODEC_HEVC;
+    } else if(supported_video_codecs->av1.supported && codec_supports_resolution(supported_video_codecs->av1.max_resolution, capture_size)) {
+        fprintf(stderr, "gsr info: using av1 encoder because a codec was not specified and hevc supported max resolution (%dx%d) is less than capture resolution (%dx%d)\n",
+            supported_video_codecs->hevc.max_resolution.x, supported_video_codecs->hevc.max_resolution.y,
+            capture_size.x, capture_size.y);
+        return GSR_VIDEO_CODEC_AV1;
+    } else {
+        return (gsr_video_codec)-1;
+    }
+}
+
+static const AVCodec* select_video_codec_with_fallback(gsr_capture_metadata capture_metadata, gsr_video_codec *video_codec, const char *file_extension, bool use_software_video_encoder, gsr_egl *egl, bool *low_power) {
+    gsr_supported_video_codecs supported_video_codecs;
+    if(!get_supported_video_codecs(egl, *video_codec, use_software_video_encoder, true, &supported_video_codecs)) {
+        fprintf(stderr, "gsr error: failed to query for supported video codecs\n");
+        _exit(11);
+    }
+    set_supported_video_codecs_ffmpeg(&supported_video_codecs, nullptr, egl->gpu_info.vendor);
+
     const bool video_codec_auto = *video_codec == (gsr_video_codec)GSR_VIDEO_CODEC_AUTO;
     if(video_codec_auto) {
         if(strcmp(file_extension, "webm") == 0) {
             fprintf(stderr, "gsr info: using vp8 encoder because a codec was not specified and the file extension is .webm\n");
             *video_codec = GSR_VIDEO_CODEC_VP8;
-        } else {
+        } else if(use_software_video_encoder) {
             fprintf(stderr, "gsr info: using h264 encoder because a codec was not specified\n");
             *video_codec = GSR_VIDEO_CODEC_H264;
+        } else {
+            *video_codec = select_appropriate_video_codec_automatically(capture_metadata, &supported_video_codecs);
+            if(*video_codec == (gsr_video_codec)-1) {
+                fprintf(stderr, "gsr error: no video encoder was specified and neither h264, hevc nor av1 are supported on your system or you are trying to capture at a resolution higher than your system supports for each codec\n");
+                _exit(52);
+            }
         }
     }
 
@@ -2758,7 +2861,18 @@ static const AVCodec* select_video_codec_with_fallback(gsr_video_codec *video_co
         _exit(1);
     }
 
-    return pick_video_codec(video_codec, egl, use_software_video_encoder, video_codec_auto, is_flv, low_power);
+    const AVCodec *codec = pick_video_codec(video_codec, egl, use_software_video_encoder, video_codec_auto, is_flv, low_power, &supported_video_codecs);
+
+    const vec2i codec_max_resolution = codec_get_max_resolution(*video_codec, use_software_video_encoder, &supported_video_codecs);
+    const vec2i capture_size = {capture_metadata.width, capture_metadata.height};
+    if(!codec_supports_resolution(codec_max_resolution, capture_size)) {
+        const char *video_codec_name = video_codec_to_string(*video_codec);
+        fprintf(stderr, "gsr error: The max resolution for video codec %s is %dx%d while you are trying to capture at resolution %dx%d. Change capture resolution or video codec and try again\n",
+            video_codec_name, codec_max_resolution.x, codec_max_resolution.y, capture_size.x, capture_size.y);
+        _exit(53);
+    }
+
+    return codec;
 }
 
 static std::vector<AudioDeviceData> create_device_audio_inputs(const std::vector<AudioInput> &audio_inputs, AVCodecContext *audio_codec_context, int num_channels, double num_audio_frames_shift, std::vector<AVFilterContext*> &src_filter_ctx, bool use_amix) {
@@ -2932,7 +3046,9 @@ static void set_display_server_environment_variables() {
 
 int main(int argc, char **argv) {
     setlocale(LC_ALL, "C"); // Sigh... stupid C
+#ifdef __linux__
     mallopt(M_MMAP_THRESHOLD, 65536);
+#endif
 
     signal(SIGINT, stop_handler);
     signal(SIGTERM, stop_handler);
@@ -3125,10 +3241,19 @@ int main(int argc, char **argv) {
 
     const bool uses_amix = merged_audio_inputs_should_use_amix(requested_audio_inputs);
     arg_parser.audio_codec = select_audio_codec_with_fallback(arg_parser.audio_codec, file_extension, uses_amix);
-    bool low_power = false;
-    const AVCodec *video_codec_f = select_video_codec_with_fallback(&arg_parser.video_codec, file_extension.c_str(), arg_parser.video_encoder == GSR_VIDEO_ENCODER_HW_CPU, &egl, &low_power);
 
     gsr_capture *capture = create_capture_impl(arg_parser, &egl, false);
+    
+    gsr_capture_metadata capture_metadata;
+    capture_metadata.width = 0;
+    capture_metadata.height = 0;
+    capture_metadata.fps = arg_parser.fps;
+
+    int capture_result = gsr_capture_start(capture, &capture_metadata);
+    if(capture_result != 0) {
+        fprintf(stderr, "gsr error: gsr_capture_start failed\n");
+        _exit(capture_result);
+    }
 
     // (Some?) livestreaming services require at least one audio track to work.
     // If not audio is provided then create one silent audio track.
@@ -3142,46 +3267,28 @@ int main(int argc, char **argv) {
     AVStream *video_stream = nullptr;
     std::vector<AudioTrack> audio_tracks;
 
+    bool low_power = false;
+    const AVCodec *video_codec_f = select_video_codec_with_fallback(capture_metadata, &arg_parser.video_codec, file_extension.c_str(), arg_parser.video_encoder == GSR_VIDEO_ENCODER_HW_CPU, &egl, &low_power);
+
     const enum AVPixelFormat video_pix_fmt = get_pixel_format(arg_parser.video_codec, egl.gpu_info.vendor, arg_parser.video_encoder == GSR_VIDEO_ENCODER_HW_CPU);
-    AVCodecContext *video_codec_context = create_video_codec_context(video_pix_fmt, video_codec_f, egl, arg_parser);
+    AVCodecContext *video_codec_context = create_video_codec_context(video_pix_fmt, video_codec_f, egl, arg_parser, capture_metadata.width, capture_metadata.height);
     if(!is_replaying)
         video_stream = create_stream(av_format_context, video_codec_context);
 
-    if(arg_parser.tune == GSR_TUNE_QUALITY)
-        video_codec_context->max_b_frames = 2;
-
     AVFrame *video_frame = av_frame_alloc();
     if(!video_frame) {
         fprintf(stderr, "gsr error: Failed to allocate video frame\n");
         _exit(1);
     }
     video_frame->format = video_codec_context->pix_fmt;
-    video_frame->width = 0;
-    video_frame->height = 0;
+    video_frame->width = capture_metadata.width;
+    video_frame->height = capture_metadata.height;
     video_frame->color_range = video_codec_context->color_range;
     video_frame->color_primaries = video_codec_context->color_primaries;
     video_frame->color_trc = video_codec_context->color_trc;
     video_frame->colorspace = video_codec_context->colorspace;
     video_frame->chroma_location = video_codec_context->chroma_sample_location;
 
-    gsr_capture_metadata capture_metadata;
-    capture_metadata.width = 0;
-    capture_metadata.height = 0;
-    capture_metadata.fps = arg_parser.fps;
-    capture_metadata.video_codec_context = video_codec_context;
-    capture_metadata.frame = video_frame;
-
-    int capture_result = gsr_capture_start(capture, &capture_metadata);
-    if(capture_result != 0) {
-        fprintf(stderr, "gsr error: gsr_capture_start failed\n");
-        _exit(capture_result);
-    }
-
-    video_codec_context->width = capture_metadata.width;
-    video_codec_context->height = capture_metadata.height;
-    video_frame->width = capture_metadata.width;
-    video_frame->height = capture_metadata.height;
-
     const size_t estimated_replay_buffer_packets = calculate_estimated_replay_buffer_packets(arg_parser.replay_buffer_size_secs, arg_parser.fps, arg_parser.audio_codec, requested_audio_inputs);
     gsr_encoder encoder;
     if(!gsr_encoder_init(&encoder, arg_parser.replay_storage, estimated_replay_buffer_packets, arg_parser.replay_buffer_size_secs, arg_parser.filename)) {
@@ -3200,6 +3307,7 @@ int main(int argc, char **argv) {
         _exit(1);
     }
 
+    // TODO: What if this updated resolution is above max resolution?
     capture_metadata.width = video_codec_context->width;
     capture_metadata.height = video_codec_context->height;
 
@@ -3313,7 +3421,7 @@ int main(int argc, char **argv) {
     int damage_fps_counter = 0;
 
     bool paused = false;
-    double paused_time_offset = 0.0;
+    std::atomic<double> paused_time_offset(0.0);
     double paused_time_start = 0.0;
     bool replay_recording = false;
     RecordingStartResult replay_recording_start_result;
@@ -3401,7 +3509,7 @@ int main(int argc, char **argv) {
                     }
 
                     // TODO: Is this |received_audio_time| really correct?
-                    const int64_t num_expected_frames = std::round((this_audio_frame_time - record_start_time) / timeout_sec);
+                    const int64_t num_expected_frames = std::floor((this_audio_frame_time - record_start_time) / timeout_sec);
                     int64_t num_missing_frames = std::max((int64_t)0LL, num_expected_frames - num_received_frames);
 
                     if(got_audio_data)
@@ -3548,12 +3656,7 @@ int main(int argc, char **argv) {
     if(is_monitor_capture)
         gsr_damage_set_target_monitor(&damage, arg_parser.window);
 
-    double last_capture_seconds = record_start_time;
-    bool wait_until_frame_time_elapsed = false;
-
     while(running) {
-        const double frame_start = clock_get_monotonic_seconds();
-
         while(gsr_window_process_event(window)) {
             gsr_damage_on_event(&damage, gsr_window_get_event_data(window));
             gsr_capture_on_event(capture, &egl);
@@ -3605,40 +3708,39 @@ int main(int argc, char **argv) {
         }
 
         const double this_video_frame_time = clock_get_monotonic_seconds() - paused_time_offset;
-        const double time_since_last_frame_captured_seconds = this_video_frame_time - last_capture_seconds;
-        double frame_time_overflow = time_since_last_frame_captured_seconds - target_fps;
-        const bool frame_timeout = frame_time_overflow >= 0.0;
-
-        bool force_frame_capture = wait_until_frame_time_elapsed && frame_timeout;
-        bool allow_capture = !wait_until_frame_time_elapsed || force_frame_capture;
-        if(arg_parser.framerate_mode == GSR_FRAMERATE_MODE_CONTENT) {
-            force_frame_capture = false;
-            allow_capture = frame_timeout;
-        }
-
-        bool frame_captured = false;
-        if((damaged || force_frame_capture) && allow_capture && !paused) {
-            frame_captured = true;
-            frame_time_overflow = std::min(std::max(0.0, frame_time_overflow), target_fps);
-            last_capture_seconds = this_video_frame_time - frame_time_overflow;
-            wait_until_frame_time_elapsed = false;
+        const int64_t expected_frames = std::floor((this_video_frame_time - record_start_time) / target_fps);
+        const int64_t num_missed_frames = expected_frames - video_pts_counter;
 
+        if(damaged && num_missed_frames >= 1 && !paused) {
             gsr_damage_clear(&damage);
             if(capture->clear_damage)
                 capture->clear_damage(capture);
 
             // TODO: Dont do this if no damage?
             egl.glClear(0);
+
+            bool capture_has_synchronous_task = false;
+            if(capture->capture_has_synchronous_task) {
+                capture_has_synchronous_task = capture->capture_has_synchronous_task(capture);
+                if(capture_has_synchronous_task) {
+                    paused_time_start = clock_get_monotonic_seconds();
+                    paused = true;
+                }
+            }
+
             gsr_capture_capture(capture, &capture_metadata, &color_conversion);
+
+            if(capture_has_synchronous_task) {
+                paused_time_offset = paused_time_offset + (clock_get_monotonic_seconds() - paused_time_start);
+                paused = false;
+            }
+
             gsr_egl_swap_buffers(&egl);
             gsr_video_encoder_copy_textures_to_frame(video_encoder, video_frame, &color_conversion);
 
             if(hdr && !hdr_metadata_set && !is_replaying && add_hdr_metadata_to_video_stream(capture, video_stream))
                 hdr_metadata_set = true;
 
-            const int64_t expected_frames = std::round((this_video_frame_time - record_start_time) / target_fps);
-            const int num_missed_frames = std::max((int64_t)1LL, expected_frames - video_pts_counter);
-
             // TODO: Check if duplicate frame can be saved just by writing it with a different pts instead of sending it again
             const int num_frames_to_encode = arg_parser.framerate_mode == GSR_FRAMERATE_MODE_CONSTANT ? num_missed_frames : 1;
             for(int i = 0; i < num_frames_to_encode; ++i) {
@@ -3670,7 +3772,7 @@ int main(int argc, char **argv) {
                 }
             }
 
-            video_pts_counter += num_frames_to_encode;
+            video_pts_counter += num_missed_frames;
         }
 
         if(toggle_pause == 1 && !is_replaying) {
@@ -3679,7 +3781,7 @@ int main(int argc, char **argv) {
                 paused_time_start = clock_get_monotonic_seconds();
                 fprintf(stderr, "Paused\n");
             } else {
-                paused_time_offset += (clock_get_monotonic_seconds() - paused_time_start);
+                paused_time_offset = paused_time_offset + (clock_get_monotonic_seconds() - paused_time_start);
                 fprintf(stderr, "Unpaused\n");
             }
 
@@ -3768,29 +3870,22 @@ int main(int argc, char **argv) {
                 gsr_replay_buffer_clear(encoder.replay_buffer);
         }
 
-        const double frame_end = clock_get_monotonic_seconds();
-        const double time_at_frame_end = frame_end - paused_time_offset;
+        const double time_at_frame_end = clock_get_monotonic_seconds() - paused_time_offset;
         const double time_elapsed_total = time_at_frame_end - record_start_time;
-        const int64_t frames_elapsed = (int64_t)(time_elapsed_total / target_fps);
+        const int64_t frames_elapsed = std::floor(time_elapsed_total / target_fps);
         const double time_at_next_frame = (frames_elapsed + 1) * target_fps;
         double time_to_next_frame = time_at_next_frame - time_elapsed_total;
-        if(time_to_next_frame > target_fps*1.1)
+        if(time_to_next_frame > target_fps)
             time_to_next_frame = target_fps;
+        const int64_t end_num_missed_frames = frames_elapsed - video_pts_counter;
 
-        const double frame_time = frame_end - frame_start;
-        const bool frame_deadline_missed = frame_time > target_fps;
-        if(time_to_next_frame >= 0.0 && !frame_deadline_missed && frame_captured)
+        if(time_to_next_frame > 0.0 && end_num_missed_frames <= 0)
             av_usleep(time_to_next_frame * 1000.0 * 1000.0);
         else {
             if(paused)
                 av_usleep(20.0 * 1000.0); // 20 milliseconds
-            else if(frame_deadline_missed)
-            {}
-            else if(arg_parser.framerate_mode == GSR_FRAMERATE_MODE_CONTENT || !frame_captured)
+            else if(arg_parser.framerate_mode == GSR_FRAMERATE_MODE_CONTENT)
                 av_usleep(2.8 * 1000.0); // 2.8 milliseconds
-            else if(!frame_captured)
-                av_usleep(1.0 * 1000.0); // 1 milliseconds
-            wait_until_frame_time_elapsed = true;
         }
     }
 

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)
@@ -157,6 +180,27 @@ static void on_process_cb(void *user_data) {
         self->crop.valid = false;
     }
 
+    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;
+
+    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;
+    }
+
     pthread_mutex_unlock(&self->mutex);
 
 read_metadata:
@@ -246,17 +290,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 +309,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 +317,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 +414,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 +430,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 +502,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 +518,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 +538,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 +739,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 +791,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 +835,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 +846,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 +863,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 +917,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 +928,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/utils.c

@@ -285,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;
@@ -320,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;
@@ -598,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_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);