5.5.2

This reverts commit ce3203ebc7.

.gitignore

@@ -12,6 +12,7 @@ tests/compile_commands.json
 .vscode/
 
 build/
+debug-build/
 
 *.o
 gpu-screen-recorder

README.md

@@ -26,7 +26,7 @@ Supported image formats:
 * JPEG
 * PNG
 
-This software works on X11 and Wayland on AMD, Intel and NVIDIA. Replay data is stored in RAM, not disk.
+This software works on X11 and Wayland on AMD, Intel and NVIDIA. Replay data is stored in RAM by default but there is an option to store it on disk instead.
 ### TEMPORARY ISSUES
 1) Videos are in variable framerate format. Use MPV to play such videos, otherwise you might experience stuttering in the video if you are using a buggy video player. You can try saving the video into a .mkv file instead as some software may have better support for .mkv files (such as kdenlive). You can use the "-fm cfr" option to to use constant framerate mode.
 2) FLAC audio codec is disabled at the moment because of temporary issues.
@@ -85,9 +85,7 @@ These are the dependencies needed to build GPU Screen Recorder:
 * libva (and libva-drm)
 * libdrm
 * libcap
-* wayland-client
-* wayland-egl
-* wayland-scanner
+* wayland (wayland-client, wayland-egl, wayland-scanner)
 
 ## Runtime dependencies
 There are also additional dependencies needed at runtime depending on your GPU vendor:
@@ -137,7 +135,8 @@ This can be used for example to show a notification when a replay has been saved
 The replay buffer is stored in ram (as encoded video), so don't use a too large replay time and/or video quality unless you have enough ram to store it.
 ## Recording while using replay/streaming
 You can record a regular video while using replay/streaming by launching GPU Screen Recorder with the `-ro` option to specify a directory where to save the recording.\
-To start/stop (and save) recording use the SIGRTMIN signal, for example `pkill -SIGRTMIN -f gpu-screen-recorder`. The name of the video will be displayed in stdout when saving the video.
+To start/stop (and save) recording use the SIGRTMIN signal, for example `pkill -SIGRTMIN -f gpu-screen-recorder`. The name of the video will be displayed in stdout when saving the video.\
+This way of recording while using replay/streaming is more efficient than running GPU Screen Recorder multiple times since this way it only records the screen and encodes the video once.
 ## Controlling GPU Screen Recorder remotely
 To save a video in replay mode, you need to send signal SIGUSR1 to gpu screen recorder. You can do this by running `pkill -SIGUSR1 -f gpu-screen-recorder`.\
 To stop recording send SIGINT to gpu screen recorder. You can do this by running `pkill -SIGINT -f gpu-screen-recorder` or pressing `Ctrl-C` in the terminal that runs gpu screen recorder. When recording a regular non-replay video this will also save the video.\

TODO

@@ -278,3 +278,8 @@ Fix constant framerate not working properly on amd/intel because capture framera
     It also appears to skip audio frames on nvidia wayland? why? that should be fine, but it causes video stuttering because of audio/video sync.
 
 Add option to pass a fd (from socketpair) to use for rpc. In the rpc have a common header, with protocol version, data type and data in an enum.
+
+Add the option to set audio track name, for example with -a "track-name:blabla|device:default_output|app:firefox"
+
+Maybe disable qp/vbr for replay. In that case we can preallocate all replay data (for both ram and disk) and write to that directly when receiving packet (dont do that when also recording at the same time).
+    That could improve performance/disk write optimization and maybe even reduce ram usage because of less blocks/fragmentation.

dbus/client/dbus_client.c

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

dbus/client/dbus_client.h

@@ -0,0 +1,36 @@
+#ifndef GSR_DBUS_CLIENT_H
+#define GSR_DBUS_CLIENT_H
+
+/*
+    Using a client-server architecture is needed for dbus because cap_sys_nice doesn't work with 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/dbus_impl.c

@@ -1,5 +1,6 @@
-#include "../include/dbus.h"
-#include "../include/utils.h"
+#include "dbus_impl.h"
+
+#include <sys/random.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -28,6 +29,25 @@ typedef struct {
     };
 } dict_entry;
 
+static bool generate_random_characters(char *buffer, int buffer_size, const char *alphabet, size_t alphabet_size) {
+    /* TODO: Use other functions on other platforms than linux */
+    if(getrandom(buffer, buffer_size, 0) < buffer_size) {
+        fprintf(stderr, "Failed to get random bytes, error: %s\n", strerror(errno));
+        return false;
+    }
+
+    for(int i = 0; i < buffer_size; ++i) {
+        unsigned char c = *(unsigned char*)&buffer[i];
+        buffer[i] = alphabet[c % alphabet_size];
+    }
+
+    return true;
+}
+
+static bool generate_random_characters_standard_alphabet(char *buffer, int buffer_size) {
+    return generate_random_characters(buffer, buffer_size, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 62);
+}
+
 static const char* dict_value_type_to_string(dict_value_type type) {
     switch(type) {
         case DICT_TYPE_STRING: return "string";

dbus/dbus_impl.h

@@ -1,6 +1,7 @@
 #ifndef GSR_DBUS_H
 #define GSR_DBUS_H
 
+#include "portal.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <dbus/dbus.h>
@@ -17,19 +18,6 @@ typedef struct {
     char *screencast_restore_token;
 } gsr_dbus;
 
-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;
-
 /* Blocking. TODO: Make non-blocking */
 bool gsr_dbus_init(gsr_dbus *self, const char *screencast_restore_token);
 void gsr_dbus_deinit(gsr_dbus *self);

dbus/portal.h

@@ -0,0 +1,17 @@
+#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

@@ -0,0 +1,86 @@
+#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

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

extra/meson_post_install.sh

@@ -4,14 +4,7 @@
 /usr/sbin/setcap cap_sys_admin+ep ${MESON_INSTALL_DESTDIR_PREFIX}/bin/gsr-kms-server \
     || echo "\n!!! Please re-run install as root\n"
 
-# Cant do this because it breaks desktop portal (create session)!!!.
-# For some reason the desktop portal tries to access /proc/gpu-screen-recorder-pid/root from the portal process
-# which doesn't work because for some reason CAP_SYS_NICE on a program makes /proc/self/root not readable by other processes.
-# The reason portal reads that file might be because portal seems to have a security feature where its able to identify the
-# process and if the session token is stolen by another application then it will ignore the session token as it wasn't that
-# application that created the session token.
-# ---
 # This is needed (for EGL_CONTEXT_PRIORITY_HIGH_IMG) to allow gpu screen recorder to run faster than the heaviest application on AMD.
 # For example when trying to record a game at 60 fps and the game drops to 45 fps in some place that would also make gpu screen recorder
-# drop to 45 fps unless this setcap is used.
-#/usr/sbin/setcap cap_sys_nice+ep ${MESON_INSTALL_DESTDIR_PREFIX}/bin/gpu-screen-recorder
+# drop to 45 fps unless this setcap is used. Recording would also drop to below 60 fps in some games even though they run above 60 fps.
+/usr/sbin/setcap cap_sys_nice+ep ${MESON_INSTALL_DESTDIR_PREFIX}/bin/gpu-screen-recorder

include/args_parser.h

@@ -8,8 +8,7 @@
 
 typedef struct gsr_egl gsr_egl;
 
-#define NUM_ARGS 29
-#define WINDOW_STR_MAX_SIZE 128
+#define NUM_ARGS 30
 
 typedef enum {
     ARG_TYPE_STRING,
@@ -68,7 +67,8 @@ typedef struct {
     gsr_audio_codec audio_codec;
     gsr_bitrate_mode bitrate_mode;
     gsr_video_quality video_quality;
-    char window[WINDOW_STR_MAX_SIZE];
+    gsr_replay_storage replay_storage;
+    char window[64];
     const char *container_format;
     const char *filename;
     const char *replay_recording_directory;

include/defs.h

@@ -10,7 +10,7 @@ typedef enum {
     GSR_GPU_VENDOR_AMD,
     GSR_GPU_VENDOR_INTEL,
     GSR_GPU_VENDOR_NVIDIA,
-    GSR_GPU_VENDOR_BROADCOM
+    GSR_GPU_VENDOR_BROADCOM,
 } gsr_gpu_vendor;
 
 typedef struct {
@@ -23,13 +23,13 @@ typedef enum {
     GSR_MONITOR_ROT_0,
     GSR_MONITOR_ROT_90,
     GSR_MONITOR_ROT_180,
-    GSR_MONITOR_ROT_270
+    GSR_MONITOR_ROT_270,
 } gsr_monitor_rotation;
 
 typedef enum {
     GSR_CONNECTION_X11,
     GSR_CONNECTION_WAYLAND,
-    GSR_CONNECTION_DRM
+    GSR_CONNECTION_DRM,
 } gsr_connection_type;
 
 typedef enum {
@@ -88,14 +88,19 @@ typedef enum {
 
 typedef enum {
     GSR_COLOR_RANGE_LIMITED,
-    GSR_COLOR_RANGE_FULL
+    GSR_COLOR_RANGE_FULL,
 } gsr_color_range;
 
 typedef enum {
     GSR_COLOR_DEPTH_8_BITS,
-    GSR_COLOR_DEPTH_10_BITS
+    GSR_COLOR_DEPTH_10_BITS,
 } gsr_color_depth;
 
+typedef enum {
+    GSR_REPLAY_STORAGE_RAM,
+    GSR_REPLAY_STORAGE_DISK,
+} gsr_replay_storage;
+
 bool video_codec_is_hdr(gsr_video_codec video_codec);
 gsr_video_codec hdr_video_codec_to_sdr_video_codec(gsr_video_codec video_codec);
 gsr_color_depth video_codec_to_bit_depth(gsr_video_codec video_codec);

include/encoder/encoder.h

@@ -1,7 +1,7 @@
 #ifndef GSR_ENCODER_H
 #define GSR_ENCODER_H
 
-#include "../replay_buffer.h"
+#include "../replay_buffer/replay_buffer.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
@@ -23,8 +23,7 @@ typedef struct {
 } gsr_encoder_recording_destination;
 
 typedef struct {
-    gsr_replay_buffer replay_buffer;
-    bool has_replay_buffer;
+    gsr_replay_buffer *replay_buffer;
     pthread_mutex_t file_write_mutex;
     bool mutex_created;
 
@@ -33,7 +32,7 @@ typedef struct {
     size_t recording_destination_id_counter;
 } gsr_encoder;
 
-bool gsr_encoder_init(gsr_encoder *self, size_t replay_buffer_num_packets);
+bool gsr_encoder_init(gsr_encoder *self, gsr_replay_storage replay_storage, size_t replay_buffer_num_packets, double replay_buffer_time, const char *replay_directory);
 void gsr_encoder_deinit(gsr_encoder *self);
 
 void gsr_encoder_receive_packets(gsr_encoder *self, AVCodecContext *codec_context, int64_t pts, int stream_index);

include/replay_buffer.h

@@ -1,41 +0,0 @@
-#ifndef GSR_REPLAY_BUFFER_H
-#define GSR_REPLAY_BUFFER_H
-
-#include <pthread.h>
-#include <stdbool.h>
-#include <libavcodec/packet.h>
-
-typedef struct {
-    AVPacket packet;
-    int ref_counter;
-    double timestamp;
-} gsr_av_packet;
-
-gsr_av_packet* gsr_av_packet_create(const AVPacket *av_packet, double timestamp);
-gsr_av_packet* gsr_av_packet_ref(gsr_av_packet *self);
-void gsr_av_packet_unref(gsr_av_packet *self);
-
-typedef struct {
-    gsr_av_packet **packets;
-    size_t capacity_num_packets;
-    size_t num_packets;
-    size_t index;
-    pthread_mutex_t mutex;
-    bool mutex_initialized;
-    bool owns_mutex;
-} gsr_replay_buffer;
-
-bool gsr_replay_buffer_init(gsr_replay_buffer *self, size_t replay_buffer_num_packets);
-void gsr_replay_buffer_deinit(gsr_replay_buffer *self);
-
-bool gsr_replay_buffer_append(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp);
-void gsr_replay_buffer_clear(gsr_replay_buffer *self);
-gsr_av_packet* gsr_replay_buffer_get_packet_at_index(gsr_replay_buffer *self, size_t index);
-/* The clone has to be deinitialized before the replay buffer it clones */
-bool gsr_replay_buffer_clone(const gsr_replay_buffer *self, gsr_replay_buffer *destination);
-/* Returns 0 if replay buffer is empty */
-size_t gsr_replay_buffer_find_packet_index_by_time_passed(gsr_replay_buffer *self, int seconds);
-/* Returns -1 if not found */
-size_t gsr_replay_buffer_find_keyframe(gsr_replay_buffer *self, size_t start_index, int stream_index, bool invert_stream_index);
-
-#endif /* GSR_REPLAY_BUFFER_H */

include/replay_buffer/replay_buffer.h

@@ -0,0 +1,54 @@
+#ifndef GSR_REPLAY_BUFFER_H
+#define GSR_REPLAY_BUFFER_H
+
+#include "../defs.h"
+#include <pthread.h>
+#include <stdbool.h>
+#include <libavcodec/packet.h>
+
+typedef struct gsr_replay_buffer gsr_replay_buffer;
+
+typedef struct {
+    size_t packet_index;
+    size_t file_index;
+} gsr_replay_buffer_iterator;
+
+struct gsr_replay_buffer {
+    void (*destroy)(gsr_replay_buffer *self);
+    bool (*append)(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp);
+    void (*clear)(gsr_replay_buffer *self);
+    AVPacket* (*iterator_get_packet)(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator);
+    /* The returned data should be free'd with free */
+    uint8_t* (*iterator_get_packet_data)(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator);
+    /* The clone has to be destroyed before the replay buffer it clones is destroyed */
+    gsr_replay_buffer* (*clone)(gsr_replay_buffer *self);
+    /* Returns {0, 0} if replay buffer is empty */
+    gsr_replay_buffer_iterator (*find_packet_index_by_time_passed)(gsr_replay_buffer *self, int seconds);
+    /* Returns {-1, 0} if not found */
+    gsr_replay_buffer_iterator (*find_keyframe)(gsr_replay_buffer *self, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index);
+    bool (*iterator_next)(gsr_replay_buffer *self, gsr_replay_buffer_iterator *iterator);
+
+    pthread_mutex_t mutex;
+    bool mutex_initialized;
+    gsr_replay_buffer *original_replay_buffer;
+};
+
+gsr_replay_buffer* gsr_replay_buffer_create(gsr_replay_storage replay_storage, const char *replay_directory, double replay_buffer_time, size_t replay_buffer_num_packets);
+void gsr_replay_buffer_destroy(gsr_replay_buffer *self);
+
+void gsr_replay_buffer_lock(gsr_replay_buffer *self);
+void gsr_replay_buffer_unlock(gsr_replay_buffer *self);
+bool gsr_replay_buffer_append(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp);
+void gsr_replay_buffer_clear(gsr_replay_buffer *self);
+AVPacket* gsr_replay_buffer_iterator_get_packet(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator);
+/* The returned data should be free'd with free */
+uint8_t* gsr_replay_buffer_iterator_get_packet_data(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator);
+/* The clone has to be destroyed before the replay buffer it clones is destroyed */
+gsr_replay_buffer* gsr_replay_buffer_clone(gsr_replay_buffer *self);
+/* Returns {0, 0} if replay buffer is empty */
+gsr_replay_buffer_iterator gsr_replay_buffer_find_packet_index_by_time_passed(gsr_replay_buffer *self, int seconds);
+/* Returns {-1, 0} if not found */
+gsr_replay_buffer_iterator gsr_replay_buffer_find_keyframe(gsr_replay_buffer *self, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index);
+bool gsr_replay_buffer_iterator_next(gsr_replay_buffer *self, gsr_replay_buffer_iterator *iterator);
+
+#endif /* GSR_REPLAY_BUFFER_H */

include/replay_buffer/replay_buffer_disk.h

@@ -0,0 +1,44 @@
+#ifndef GSR_REPLAY_BUFFER_DISK_H
+#define GSR_REPLAY_BUFFER_DISK_H
+
+#include "replay_buffer.h"
+#include <limits.h>
+
+#define GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES 1024
+
+typedef struct {
+    AVPacket packet;
+    size_t data_index;
+    double timestamp;
+} gsr_av_packet_disk;
+
+typedef struct {
+    size_t id;
+    double start_timestamp;
+    double end_timestamp;
+    int ref_counter;
+    int fd;
+    
+    gsr_av_packet_disk *packets;
+    size_t capacity_num_packets;
+    size_t num_packets;
+} gsr_replay_buffer_file;
+
+typedef struct {
+    gsr_replay_buffer replay_buffer;
+    double replay_buffer_time;
+
+    size_t storage_counter;
+    size_t storage_num_bytes_written;
+    int storage_fd;
+    gsr_replay_buffer_file *files[GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES]; // GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES * REPLAY_BUFFER_FILE_SIZE_BYTES = 256gb, should be enough for everybody
+    size_t num_files;
+
+    char replay_directory[PATH_MAX];
+
+    bool owns_directory;
+} gsr_replay_buffer_disk;
+
+gsr_replay_buffer* gsr_replay_buffer_disk_create(const char *replay_directory, double replay_buffer_time);
+
+#endif /* GSR_REPLAY_BUFFER_DISK_H */

include/replay_buffer/replay_buffer_ram.h

@@ -0,0 +1,22 @@
+#ifndef GSR_REPLAY_BUFFER_RAM_H
+#define GSR_REPLAY_BUFFER_RAM_H
+
+#include "replay_buffer.h"
+
+typedef struct {
+    AVPacket packet;
+    int ref_counter;
+    double timestamp;
+} gsr_av_packet_ram;
+
+typedef struct {
+    gsr_replay_buffer replay_buffer;
+    gsr_av_packet_ram **packets;
+    size_t capacity_num_packets;
+    size_t num_packets;
+    size_t index;
+} gsr_replay_buffer_ram;
+
+gsr_replay_buffer* gsr_replay_buffer_ram_create(size_t replay_buffer_num_packets);
+
+#endif /* GSR_REPLAY_BUFFER_RAM_H */

kms/client/kms_client.c

@@ -387,6 +387,7 @@ void cleanup_socket(gsr_kms_client *self, bool kill_server) {
 
     if(kill_server && self->kms_server_pid > 0) {
         kill(self->kms_server_pid, SIGKILL);
+        // TODO:
         //int status;
         //waitpid(self->kms_server_pid, &status, 0);
         self->kms_server_pid = -1;

kms/server/kms_server.c

@@ -8,6 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <locale.h>
 
 #include <unistd.h>
 #include <limits.h>
@@ -434,6 +435,8 @@ static double clock_get_monotonic_seconds(void) {
 }
 
 int main(int argc, char **argv) {
+    setlocale(LC_ALL, "C"); // Sigh... stupid C
+
     int res = 0;
     int socket_fd = 0;
     gsr_drm drm;

meson.build

@@ -1,4 +1,4 @@
-project('gpu-screen-recorder', ['c', 'cpp'], version : '5.4.0', default_options : ['warning_level=2'])
+project('gpu-screen-recorder', ['c', 'cpp'], version : '5.5.2', default_options : ['warning_level=2'])
 
 add_project_arguments('-Wshadow', language : ['c', 'cpp'])
 if get_option('buildtype') == 'debug'
@@ -26,6 +26,9 @@ src = [
     'src/window/window.c',
     'src/window/x11.c',
     'src/window/wayland.c',
+    'src/replay_buffer/replay_buffer.c',
+    'src/replay_buffer/replay_buffer_ram.c',
+    'src/replay_buffer/replay_buffer_disk.c',
     'src/egl.c',
     'src/cuda.c',
     'src/xnvctrl.c',
@@ -40,7 +43,6 @@ src = [
     'src/image_writer.c',
     'src/args_parser.c',
     'src/defs.c',
-    'src/replay_buffer.c',
     'src/sound.cpp',
     'src/main.cpp',
 ]
@@ -74,10 +76,9 @@ uses_pipewire = false
 if get_option('portal') == true
     src += [
         'src/capture/portal.c',
-        'src/dbus.c',
+        'dbus/client/dbus_client.c',
         'src/pipewire_video.c',
     ]
-    dep += dependency('dbus-1')
     add_project_arguments('-DGSR_PORTAL', language : ['c', 'cpp'])
     uses_pipewire = true
 endif
@@ -102,6 +103,10 @@ 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

meson_options.txt

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

project.conf

@@ -1,7 +1,7 @@
 [package]
 name = "gpu-screen-recorder"
 type = "executable"
-version = "5.4.0"
+version = "5.5.2"
 platforms = ["posix"]
 
 [config]

protocol/xdg-output-unstable-v1.xml

@@ -151,7 +151,7 @@
 	   summary="height in global compositor space"/>
     </event>
 
-    <event name="done" deprecated-since="3">
+    <event name="done">
       <description summary="all information about the output have been sent">
 	This event is sent after all other properties of an xdg_output
 	have been sent.

scripts/replay-application-name.sh

@@ -3,4 +3,4 @@
 window=$(xdotool selectwindow)
 window_name=$(xdotool getwindowname "$window" || xdotool getwindowclassname "$window" || echo "Game")
 window_name="$(echo "$window_name" | tr '/\\' '_')"
-gpu-screen-recorder -w "$window" -f 60 -c mkv -a default_output -bm cbr -q 45000 -r 60 -o "$HOME/Videos/Replays/$window_name"
+gpu-screen-recorder -w "$window" -f 60 -c mkv -a default_output -bm cbr -q 40000 -r 60 -o "$HOME/Videos/Replays/$window_name"

scripts/start-replay.sh

@@ -3,4 +3,4 @@
 pidof -q gpu-screen-recorder && exit 0
 video_path="$HOME/Videos"
 mkdir -p "$video_path"
-gpu-screen-recorder -w screen -f 60 -a default_output -c mkv -bm cbr -q 45000 -r 30 -o "$video_path"
+gpu-screen-recorder -w screen -f 60 -a default_output -c mkv -bm cbr -q 40000 -r 30 -o "$video_path"

src/args_parser.c

@@ -69,6 +69,11 @@ static const ArgEnum tune_enums[] = {
     { .name = "quality",     .value = GSR_TUNE_QUALITY     },
 };
 
+static const ArgEnum replay_storage_enums[] = {
+    { .name = "ram",  .value = GSR_REPLAY_STORAGE_RAM  },
+    { .name = "disk", .value = GSR_REPLAY_STORAGE_DISK },
+};
+
 static void arg_deinit(Arg *arg) {
     if(arg->values) {
         free(arg->values);
@@ -185,7 +190,7 @@ static double args_get_double_by_key(Arg *args, int num_args, const char *key, d
 static void usage_header() {
     const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
     const char *program_name = inside_flatpak ? "flatpak run --command=gpu-screen-recorder com.dec05eba.gpu_screen_recorder" : "gpu-screen-recorder";
-    printf("usage: %s -w <window_id|monitor|focused|portal|region> [-c <container_format>] [-s WxH] [-region WxH+X+Y] [-f <fps>] [-a <audio_input>] [-q <quality>] [-r <replay_buffer_size_sec>] [-restart-replay-on-save yes|no] [-k h264|hevc|av1|vp8|vp9|hevc_hdr|av1_hdr|hevc_10bit|av1_10bit] [-ac aac|opus|flac] [-ab <bitrate>] [-oc yes|no] [-fm cfr|vfr|content] [-bm auto|qp|vbr|cbr] [-cr limited|full] [-tune performance|quality] [-df yes|no] [-sc <script_path>] [-cursor yes|no] [-keyint <value>] [-restore-portal-session yes|no] [-portal-session-token-filepath filepath] [-encoder gpu|cpu] [-o <output_file>] [-ro <output_directory>] [--list-capture-options [card_path]] [--list-audio-devices] [--list-application-audio] [-v yes|no] [-gl-debug yes|no] [--version] [-h|--help]\n", program_name);
+    printf("usage: %s -w <window_id|monitor|focused|portal|region> [-c <container_format>] [-s WxH] [-region WxH+X+Y] [-f <fps>] [-a <audio_input>] [-q <quality>] [-r <replay_buffer_size_sec>] [-replay-storage ram|disk] [-restart-replay-on-save yes|no] [-k h264|hevc|av1|vp8|vp9|hevc_hdr|av1_hdr|hevc_10bit|av1_10bit] [-ac aac|opus|flac] [-ab <bitrate>] [-oc yes|no] [-fm cfr|vfr|content] [-bm auto|qp|vbr|cbr] [-cr limited|full] [-tune performance|quality] [-df yes|no] [-sc <script_path>] [-cursor yes|no] [-keyint <value>] [-restore-portal-session yes|no] [-portal-session-token-filepath filepath] [-encoder gpu|cpu] [-o <output_file>] [-ro <output_directory>] [--list-capture-options [card_path]] [--list-audio-devices] [--list-application-audio] [-v yes|no] [-gl-debug yes|no] [--version] [-h|--help]\n", program_name);
     fflush(stdout);
 }
 
@@ -229,7 +234,6 @@ static void usage_full() {
     printf("  -a    Audio device or application to record from (pulse audio device). Can be specified multiple times. Each time this is specified a new audio track is added for the specified audio device or application.\n");
     printf("        The audio device can also be \"default_output\" in which case the default output device is used, or \"default_input\" in which case the default input device is used.\n");
     printf("        Multiple audio sources can be merged into one audio track by using \"|\" as a separator into one -a argument, for example: -a \"default_output|default_input\".\n");
-    printf("        A name can be given to the audio track by prefixing the audio with <name>/, for example \"track name/default_output\" or \"track name/default_output|default_input\".\n");
     printf("        The audio name can also be prefixed with \"device:\", for example: -a \"device:default_output\".\n");
     printf("        To record audio from an application then prefix the audio name with \"app:\", for example: -a \"app:Brave\". The application name is case-insensitive.\n");
     printf("        To record audio from all applications except the provided ones prefix the audio name with \"app-inverse:\", for example: -a \"app-inverse:Brave\".\n");
@@ -250,9 +254,14 @@ static void usage_full() {
     printf("\n");
     printf("  -r    Replay buffer time in seconds. If this is set, then only the last seconds as set by this option will be stored\n");
     printf("        and the video will only be saved when the gpu-screen-recorder is closed. This feature is similar to Nvidia's instant replay feature This option has be between 5 and 1200.\n");
-    printf("        Note that the video data is stored in RAM, so don't use too long replay buffer time and use constant bitrate option (-bm cbr) to prevent RAM usage from going too high in busy scenes.\n");
+    printf("        Note that the video data is stored in RAM (unless -replay-storage disk is used), so don't use too long replay buffer time and use constant bitrate option (-bm cbr) to prevent RAM usage from going too high in busy scenes.\n");
     printf("        Optional, disabled by default.\n");
     printf("\n");
+    printf("  -replay-storage\n");
+    printf("        Specify where temporary replay is stored. Should be either 'ram' or 'disk'. If set to 'disk' then replay data is stored in temporary files in the same directory as -o.\n");
+    printf("        Preferably avoid setting this to 'disk' unless -o is set to a HDD, as constant writes to a SSD can reduce the life-time of the SSD.\n");
+    printf("        Optional, set to 'ram' by default.\n");
+    printf("\n");
     printf("  -restart-replay-on-save\n");
     printf("        Restart replay on save. For example if this is set to 'no' and replay time (-r) is set to 60 seconds and a replay is saved once then the first replay video is 60 seconds long\n");
     printf("        and if a replay is saved 10 seconds later then the second replay video will also be 60 seconds long and contain 50 seconds of the previous video as well.\n");
@@ -390,6 +399,7 @@ static void usage_full() {
     printf("  %s -w screen -f 60 -a default_output -a default_input -o video.mp4\n", program_name);
     printf("  %s -w screen -f 60 -a \"default_output|default_input\" -o video.mp4\n", program_name);
     printf("  %s -w screen -f 60 -a default_output -c mkv -r 60 -o \"$HOME/Videos\"\n", program_name);
+    printf("  %s -w screen -f 60 -a default_output -c mkv -r 1800 -replay-storage disk -bm cbr -q 40000 -o \"$HOME/Videos\"\n", program_name);
     printf("  %s -w screen -f 60 -a default_output -c mkv -sc script.sh -r 60 -o \"$HOME/Videos\"\n", program_name);
     printf("  %s -w portal -f 60 -a default_output -restore-portal-session yes -o video.mp4\n", program_name);
     printf("  %s -w screen -f 60 -a default_output -bm cbr -q 15000 -o video.mp4\n", program_name);
@@ -437,6 +447,7 @@ static bool args_parser_set_values(args_parser *self) {
     self->video_codec = (gsr_video_codec)args_get_enum_by_key(self->args, NUM_ARGS, "-k", GSR_VIDEO_CODEC_AUTO);
     self->audio_codec = (gsr_audio_codec)args_get_enum_by_key(self->args, NUM_ARGS, "-ac", GSR_AUDIO_CODEC_OPUS);
     self->bitrate_mode = (gsr_bitrate_mode)args_get_enum_by_key(self->args, NUM_ARGS, "-bm", GSR_BITRATE_MODE_AUTO);
+    self->replay_storage = (gsr_replay_storage)args_get_enum_by_key(self->args, NUM_ARGS, "-replay-storage", GSR_REPLAY_STORAGE_RAM);
 
     const char *window = args_get_value_by_key(self->args, NUM_ARGS, "-w");
     snprintf(self->window, sizeof(self->window), "%s", window);
@@ -713,7 +724,7 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
     self->args[arg_index++] = (Arg){ .key = "-q",                             .optional = true,  .list = false, .type = ARG_TYPE_STRING  };
     self->args[arg_index++] = (Arg){ .key = "-o",                             .optional = true,  .list = false, .type = ARG_TYPE_STRING  };
     self->args[arg_index++] = (Arg){ .key = "-ro",                            .optional = true,  .list = false, .type = ARG_TYPE_STRING  };
-    self->args[arg_index++] = (Arg){ .key = "-r",                             .optional = true,  .list = false, .type = ARG_TYPE_I64, .integer_value_min = 2, .integer_value_max = 10800 };
+    self->args[arg_index++] = (Arg){ .key = "-r",                             .optional = true,  .list = false, .type = ARG_TYPE_I64, .integer_value_min = 2, .integer_value_max = 86400 };
     self->args[arg_index++] = (Arg){ .key = "-restart-replay-on-save",        .optional = true,  .list = false, .type = ARG_TYPE_BOOLEAN };
     self->args[arg_index++] = (Arg){ .key = "-k",                             .optional = true,  .list = false, .type = ARG_TYPE_ENUM, .enum_values = video_codec_enums, .num_enum_values = sizeof(video_codec_enums)/sizeof(ArgEnum) };
     self->args[arg_index++] = (Arg){ .key = "-ac",                            .optional = true,  .list = false, .type = ARG_TYPE_ENUM, .enum_values = audio_codec_enums, .num_enum_values = sizeof(audio_codec_enums)/sizeof(ArgEnum) };
@@ -733,6 +744,7 @@ bool args_parser_parse(args_parser *self, int argc, char **argv, const args_hand
     self->args[arg_index++] = (Arg){ .key = "-restore-portal-session",        .optional = true,  .list = false, .type = ARG_TYPE_BOOLEAN };
     self->args[arg_index++] = (Arg){ .key = "-portal-session-token-filepath", .optional = true,  .list = false, .type = ARG_TYPE_STRING  };
     self->args[arg_index++] = (Arg){ .key = "-encoder",                       .optional = true,  .list = false, .type = ARG_TYPE_ENUM, .enum_values = video_encoder_enums, .num_enum_values = sizeof(video_encoder_enums)/sizeof(ArgEnum) };
+    self->args[arg_index++] = (Arg){ .key = "-replay-storage",                .optional = true,  .list = false, .type = ARG_TYPE_ENUM, .enum_values = replay_storage_enums, .num_enum_values = sizeof(replay_storage_enums)/sizeof(ArgEnum) };
     assert(arg_index == NUM_ARGS);
 
     for(int i = 1; i < argc; i += 2) {

src/capture/portal.c

@@ -2,7 +2,7 @@
 #include "../../include/color_conversion.h"
 #include "../../include/egl.h"
 #include "../../include/utils.h"
-#include "../../include/dbus.h"
+#include "../../dbus/client/dbus_client.h"
 #include "../../include/pipewire_video.h"
 
 #include <stdlib.h>
@@ -16,8 +16,8 @@ typedef struct {
 
     gsr_texture_map texture_map;
 
-    gsr_dbus dbus;
-    char *session_handle;
+    gsr_dbus_client dbus_client;
+    char session_handle[128];
 
     gsr_pipewire_video pipewire;
     vec2i capture_size;
@@ -52,15 +52,8 @@ static void gsr_capture_portal_stop(gsr_capture_portal *self) {
     }
 
     gsr_capture_portal_cleanup_plane_fds(self);
-
     gsr_pipewire_video_deinit(&self->pipewire);
-
-    if(self->session_handle) {
-        free(self->session_handle);
-        self->session_handle = NULL;
-    }
-
-    gsr_dbus_deinit(&self->dbus);
+    gsr_dbus_client_deinit(&self->dbus_client);
 }
 
 static void gsr_capture_portal_create_input_textures(gsr_capture_portal *self) {
@@ -195,36 +188,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_init(&self->dbus, restore_token))
+    if(!gsr_dbus_client_init(&self->dbus_client, restore_token))
         return -1;
 
     fprintf(stderr, "gsr info: gsr_capture_portal_setup_dbus: CreateSession\n");
-    response_status = gsr_dbus_screencast_create_session(&self->dbus, &self->session_handle);
+    response_status = gsr_dbus_client_screencast_create_session(&self->dbus_client, self->session_handle, sizeof(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_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);
+    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);
     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_screencast_start(&self->dbus, self->session_handle, pipewire_node);
+    response_status = gsr_dbus_client_screencast_start(&self->dbus_client, 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_screencast_get_restore_token(&self->dbus);
+    const char *screencast_restore_token = gsr_dbus_client_screencast_get_restore_token(&self->dbus_client);
     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_screencast_open_pipewire_remote(&self->dbus, self->session_handle, pipewire_fd)) {
+    if(!gsr_dbus_client_screencast_open_pipewire_remote(&self->dbus_client, self->session_handle, pipewire_fd)) {
         fprintf(stderr, "gsr error: gsr_capture_portal_setup_dbus: OpenPipeWireRemote failed\n");
         return -1;
     }

src/codec_query/vaapi.c

@@ -116,7 +116,7 @@ static bool get_supported_video_codecs(VADisplay va_dpy, gsr_supported_video_cod
     int va_minor = 0;
     if(vaInitialize(va_dpy, &va_major, &va_minor) != VA_STATUS_SUCCESS) {
         fprintf(stderr, "gsr error: gsr_get_supported_video_codecs_vaapi: vaInitialize failed\n");
-        goto fail;
+        return false;
     }
 
     int num_profiles = vaMaxNumProfiles(va_dpy);

src/egl.c

@@ -60,7 +60,7 @@ static bool gsr_egl_create_window(gsr_egl *self) {
 
     const int32_t ctxattr[] = {
         EGL_CONTEXT_CLIENT_VERSION, 2,
-        //EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_HIGH_IMG, /* requires cap_sys_nice, ignored otherwise */
+        EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_HIGH_IMG, /* requires cap_sys_nice, ignored otherwise */
         EGL_NONE, EGL_NONE
     };
 

src/encoder/encoder.c

@@ -7,7 +7,7 @@
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 
-bool gsr_encoder_init(gsr_encoder *self, size_t replay_buffer_num_packets) {
+bool gsr_encoder_init(gsr_encoder *self, gsr_replay_storage replay_storage, size_t replay_buffer_num_packets, double replay_buffer_time, const char *replay_directory) {
     memset(self, 0, sizeof(*self));
     self->num_recording_destinations = 0;
     self->recording_destination_id_counter = 0;
@@ -19,12 +19,12 @@ bool gsr_encoder_init(gsr_encoder *self, size_t replay_buffer_num_packets) {
     self->mutex_created = true;
 
     if(replay_buffer_num_packets > 0) {
-        if(!gsr_replay_buffer_init(&self->replay_buffer, replay_buffer_num_packets)) {
+        self->replay_buffer = gsr_replay_buffer_create(replay_storage, replay_directory, replay_buffer_time, replay_buffer_num_packets);
+        if(!self->replay_buffer) {
             fprintf(stderr, "gsr error: gsr_encoder_init: failed to create replay buffer\n");
             gsr_encoder_deinit(self);
             return false;
         }
-        self->has_replay_buffer = true;
     }
 
     return true;
@@ -36,8 +36,11 @@ void gsr_encoder_deinit(gsr_encoder *self)  {
         pthread_mutex_destroy(&self->file_write_mutex);
     }
 
-    gsr_replay_buffer_deinit(&self->replay_buffer);
-    self->has_replay_buffer = false;
+    if(self->replay_buffer) {
+        gsr_replay_buffer_destroy(self->replay_buffer);
+        self->replay_buffer = NULL;
+    }
+
     self->num_recording_destinations = 0;
     self->recording_destination_id_counter = 0;
 }
@@ -56,9 +59,9 @@ void gsr_encoder_receive_packets(gsr_encoder *self, AVCodecContext *codec_contex
             av_packet->pts = pts;
             av_packet->dts = pts;
 
-            if(self->has_replay_buffer) {
+            if(self->replay_buffer) {
                 const double time_now = clock_get_monotonic_seconds();
-                if(!gsr_replay_buffer_append(&self->replay_buffer, av_packet, time_now))
+                if(!gsr_replay_buffer_append(self->replay_buffer, av_packet, time_now))
                     fprintf(stderr, "gsr error: gsr_encoder_receive_packets: failed to add replay buffer data\n");
             }
 

src/encoder/video/vulkan.c

@@ -23,7 +23,7 @@ static bool gsr_video_encoder_vulkan_setup_context(gsr_video_encoder_vulkan *sel
     AVDictionary *options = NULL;
     //av_dict_set(&options, "linear_images", "1", 0);
     //av_dict_set(&options, "disable_multiplane", "1", 0);
-
+#if 0
     // TODO: Use correct device
     if(av_hwdevice_ctx_create(&self->device_ctx, AV_HWDEVICE_TYPE_VULKAN, NULL, options, 0) < 0) {
         fprintf(stderr, "gsr error: gsr_video_encoder_vulkan_setup_context: failed to create hardware device context\n");
@@ -57,6 +57,7 @@ static bool gsr_video_encoder_vulkan_setup_context(gsr_video_encoder_vulkan *sel
 
     video_codec_context->hw_frames_ctx = av_buffer_ref(frame_context);
     av_buffer_unref(&frame_context);
+#endif
     return true;
 }
 
@@ -99,7 +100,7 @@ static bool gsr_video_encoder_vulkan_setup_textures(gsr_video_encoder_vulkan *se
     }
 
     while(self->params.egl->glGetError()) {}
-
+#if 0
     AVVkFrame *target_surface_id = (AVVkFrame*)frame->data[0];
     AVVulkanDeviceContext* vv = video_codec_context_get_vulkan_data(video_codec_context);
     const size_t luma_size = frame->width * frame->height;
@@ -224,7 +225,7 @@ static bool gsr_video_encoder_vulkan_setup_textures(gsr_video_encoder_vulkan *se
         fprintf(stderr, "3 gl error: %d\n", self->params.egl->glGetError());
         self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
      }
-
+#endif
     return true;
 }
 

src/main.cpp

@@ -5,7 +5,7 @@ extern "C" {
 #include "../include/capture/kms.h"
 #ifdef GSR_PORTAL
 #include "../include/capture/portal.h"
-#include "../include/dbus.h"
+#include "../dbus/client/dbus_client.h"
 #endif
 #ifdef GSR_APP_AUDIO
 #include "../include/pipewire_audio.h"
@@ -32,7 +32,6 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
-#include <vector>
 #include <thread>
 #include <mutex>
 #include <signal.h>
@@ -41,6 +40,7 @@ extern "C" {
 #include <sys/wait.h>
 #include <inttypes.h>
 #include <libgen.h>
+#include <malloc.h>
 
 #include "../include/sound.hpp"
 
@@ -658,7 +658,7 @@ 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);
-    dict_set_profile(codec_context, GSR_GPU_VENDOR_INTEL, color_depth, GSR_VIDEO_CODEC_H264, &options);
+    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?
@@ -1262,24 +1262,24 @@ static void save_replay_async(AVCodecContext *video_codec_context, int video_str
     if(save_replay_thread.valid())
         return;
 
-    const size_t search_start_index = current_save_replay_seconds == save_replay_seconds_full ? 0 : gsr_replay_buffer_find_packet_index_by_time_passed(replay_buffer, current_save_replay_seconds);
-    const size_t video_start_index = gsr_replay_buffer_find_keyframe(replay_buffer, search_start_index, video_stream_index, false);
-    if(video_start_index == (size_t)-1) {
+    const gsr_replay_buffer_iterator search_start_iterator = current_save_replay_seconds == save_replay_seconds_full ? gsr_replay_buffer_iterator{0, 0} : gsr_replay_buffer_find_packet_index_by_time_passed(replay_buffer, current_save_replay_seconds);
+    const gsr_replay_buffer_iterator video_start_iterator = gsr_replay_buffer_find_keyframe(replay_buffer, search_start_iterator, video_stream_index, false);
+    if(video_start_iterator.packet_index == (size_t)-1) {
         fprintf(stderr, "gsr error: failed to save replay: failed to find a video keyframe. perhaps replay was saved too fast, before anything has been recorded\n");
         return;
     }
 
-    const size_t audio_start_index = gsr_replay_buffer_find_keyframe(replay_buffer, video_start_index, video_stream_index, true);
-    if(audio_start_index == (size_t)-1) {
-        fprintf(stderr, "gsr error: failed to save replay: failed to find an audio keyframe. perhaps replay was saved too fast, before anything has been recorded\n");
-        return;
-    }
+    const gsr_replay_buffer_iterator audio_start_iterator = gsr_replay_buffer_find_keyframe(replay_buffer, video_start_iterator, video_stream_index, true);
+    // if(audio_start_index == (size_t)-1) {
+    //     fprintf(stderr, "gsr error: failed to save replay: failed to find an audio keyframe. perhaps replay was saved too fast, before anything has been recorded\n");
+    //     return;
+    // }
 
-    const int64_t video_pts_offset = gsr_replay_buffer_get_packet_at_index(replay_buffer, video_start_index)->packet.pts;
-    const int64_t audio_pts_offset = gsr_replay_buffer_get_packet_at_index(replay_buffer, audio_start_index)->packet.pts;
+    const int64_t video_pts_offset = gsr_replay_buffer_iterator_get_packet(replay_buffer, video_start_iterator)->pts;
+    const int64_t audio_pts_offset = audio_start_iterator.packet_index == (size_t)-1 ? 0 : gsr_replay_buffer_iterator_get_packet(replay_buffer, audio_start_iterator)->pts;
 
-    gsr_replay_buffer cloned_replay_buffer;
-    if(!gsr_replay_buffer_clone(replay_buffer, &cloned_replay_buffer)) {
+    gsr_replay_buffer *cloned_replay_buffer = gsr_replay_buffer_clone(replay_buffer);
+    if(!cloned_replay_buffer) {
         // TODO: Return this error to mark the replay as failed
         fprintf(stderr, "gsr error: failed to save replay: failed to clone replay buffer\n");
         return;
@@ -1292,20 +1292,35 @@ static void save_replay_async(AVCodecContext *video_codec_context, int video_str
 
     save_replay_output_filepath = std::move(output_filepath);
 
-    save_replay_thread = std::async(std::launch::async, [video_stream_index, recording_start_result, video_start_index, video_pts_offset, audio_pts_offset, video_codec_context, cloned_replay_buffer]() mutable {
-        for(size_t i = video_start_index; i < cloned_replay_buffer.num_packets; ++i) {
-            const gsr_av_packet *packet = gsr_replay_buffer_get_packet_at_index(&cloned_replay_buffer, i);
+    save_replay_thread = std::async(std::launch::async, [video_stream_index, recording_start_result, video_start_iterator, video_pts_offset, audio_pts_offset, video_codec_context, cloned_replay_buffer]() mutable {
+        gsr_replay_buffer_iterator replay_iterator = video_start_iterator;
+        for(;;) {
+            AVPacket *replay_packet = gsr_replay_buffer_iterator_get_packet(cloned_replay_buffer, replay_iterator);
+            uint8_t *replay_packet_data = NULL;
+            if(replay_packet)
+                replay_packet_data = gsr_replay_buffer_iterator_get_packet_data(cloned_replay_buffer, replay_iterator);
+
+            if(!replay_packet) {
+                fprintf(stderr, "gsr error: save_replay_async: no replay packet\n");
+                break;
+            }
+
+            if(!replay_packet->data && !replay_packet_data) {
+                fprintf(stderr, "gsr error: save_replay_async: no replay packet data\n");
+                break;
+            }
+
             // TODO: Check if successful
             AVPacket av_packet;
             memset(&av_packet, 0, sizeof(av_packet));
-            //av_packet_from_data(av_packet, packet->packet.data, packet->packet.size);
-            av_packet.data = packet->packet.data;
-            av_packet.size = packet->packet.size;
-            av_packet.stream_index = packet->packet.stream_index;
-            av_packet.pts = packet->packet.pts;
-            av_packet.dts = packet->packet.pts;
-            av_packet.flags = packet->packet.flags;
-            //av_packet.duration = packet->packet.duration;
+            //av_packet_from_data(av_packet, replay_packet->data, replay_packet->size);
+            av_packet.data = replay_packet->data ? replay_packet->data : replay_packet_data;
+            av_packet.size = replay_packet->size;
+            av_packet.stream_index = replay_packet->stream_index;
+            av_packet.pts = replay_packet->pts;
+            av_packet.dts = replay_packet->pts;
+            av_packet.flags = replay_packet->flags;
+            //av_packet.duration = replay_packet->duration;
 
             AVStream *stream = recording_start_result.video_stream;
             AVCodecContext *codec_context = video_codec_context;
@@ -1317,8 +1332,10 @@ static void save_replay_async(AVCodecContext *video_codec_context, int video_str
                 RecordingStartAudio *recording_start_audio = get_recording_start_item_by_stream_index(recording_start_result, av_packet.stream_index);
                 if(!recording_start_audio) {
                     fprintf(stderr, "gsr error: save_replay_async: failed to find audio stream by index: %d\n", av_packet.stream_index);
+                    free(replay_packet_data);
                     continue;
                 }
+
                 const AudioTrack *audio_track = recording_start_audio->audio_track;
                 stream = recording_start_audio->stream;
                 codec_context = audio_track->codec_context;
@@ -1332,13 +1349,17 @@ static void save_replay_async(AVCodecContext *video_codec_context, int video_str
 
             const int ret = av_write_frame(recording_start_result.av_format_context, &av_packet);
             if(ret < 0)
-                fprintf(stderr, "Error: Failed to write frame index %d to muxer, reason: %s (%d)\n", packet->packet.stream_index, av_error_to_string(ret), ret);
+                fprintf(stderr, "Error: Failed to write frame index %d to muxer, reason: %s (%d)\n", av_packet.stream_index, av_error_to_string(ret), ret);
+
+            free(replay_packet_data);
 
             //av_packet_free(&av_packet);
+            if(!gsr_replay_buffer_iterator_next(cloned_replay_buffer, &replay_iterator))
+                break;
         }
 
         stop_recording_close_streams(recording_start_result.av_format_context);
-        gsr_replay_buffer_deinit(&cloned_replay_buffer);
+        gsr_replay_buffer_destroy(cloned_replay_buffer);
     });
 }
 
@@ -1375,19 +1396,8 @@ static const AudioDevice* get_audio_device_by_name(const std::vector<AudioDevice
     return nullptr;
 }
 
-static MergedAudioInputs parse_audio_input_arg(const char *str, const AudioDevices &audio_devices) {
+static MergedAudioInputs parse_audio_input_arg(const char *str) {
     MergedAudioInputs result;
-    const bool name_is_existing_audio_device = get_audio_device_by_name(audio_devices.audio_inputs, str) != nullptr;
-    if(name_is_existing_audio_device) {
-        result.audio_inputs.push_back({str, AudioInputType::DEVICE, false});
-        return result;
-    }
-
-    const char *track_name_sep_ptr = strchr(str, '/');
-    if(track_name_sep_ptr) {
-        result.track_name.assign(str, track_name_sep_ptr - str);
-        str = track_name_sep_ptr + 1;
-    }
 
     split_string(str, '|', [&](const char *sub, size_t size) {
         AudioInput audio_input;
@@ -1790,10 +1800,11 @@ static bool monitor_capture_use_drm(const gsr_window *window, gsr_gpu_vendor ven
 
 typedef struct {
     const gsr_window *window;
+    int num_monitors;
 } capture_options_callback;
 
 static void output_monitor_info(const gsr_monitor *monitor, void *userdata) {
-    const capture_options_callback *options = (capture_options_callback*)userdata;
+    capture_options_callback *options = (capture_options_callback*)userdata;
     if(gsr_window_get_display_server(options->window) == GSR_DISPLAY_SERVER_WAYLAND) {
         vec2i monitor_size = monitor->size;
         gsr_monitor_rotation monitor_rotation = GSR_MONITOR_ROT_0;
@@ -1805,6 +1816,7 @@ static void output_monitor_info(const gsr_monitor *monitor, void *userdata) {
     } else {
         printf("%.*s|%dx%d\n", monitor->name_len, monitor->name, monitor->size.x, monitor->size.y);
     }
+    ++options->num_monitors;
 }
 
 static void list_supported_capture_options(const gsr_window *window, const char *card_path, bool list_monitors) {
@@ -1813,31 +1825,33 @@ static void list_supported_capture_options(const gsr_window *window, const char
         puts("window");
         puts("focused");
     }
-    puts("region");
 
+    capture_options_callback options;
+    options.window = window;
+    options.num_monitors = 0;
     if(list_monitors) {
-        capture_options_callback options;
-        options.window = window;
         const bool is_x11 = gsr_window_get_display_server(window) == GSR_DISPLAY_SERVER_X11;
         const gsr_connection_type connection_type = is_x11 ? GSR_CONNECTION_X11 : GSR_CONNECTION_DRM;
         for_each_active_monitor_output(window, card_path, connection_type, output_monitor_info, &options);
     }
 
+    if(options.num_monitors > 0)
+        puts("region");
+
 #ifdef GSR_PORTAL
     // Desktop portal capture on x11 doesn't seem to be hardware accelerated
     if(!wayland)
         return;
 
-    gsr_dbus dbus;
-    if(!gsr_dbus_init(&dbus, NULL))
+    gsr_dbus_client dbus_client;
+    if(!gsr_dbus_client_init(&dbus_client, NULL))
         return;
 
-    char *session_handle = NULL;
-    if(gsr_dbus_screencast_create_session(&dbus, &session_handle) == 0) {
-        free(session_handle);
+    char session_handle[128];
+    if(gsr_dbus_client_screencast_create_session(&dbus_client, session_handle, sizeof(session_handle)) == 0)
         puts("portal");
-    }
-    gsr_dbus_deinit(&dbus);
+
+    gsr_dbus_client_deinit(&dbus_client);
 #endif
 }
 
@@ -2379,7 +2393,7 @@ static std::vector<MergedAudioInputs> parse_audio_inputs(const AudioDevices &aud
         if(!audio_input || audio_input[0] == '\0')
             continue;
 
-        requested_audio_inputs.push_back(parse_audio_input_arg(audio_input, audio_devices));
+        requested_audio_inputs.push_back(parse_audio_input_arg(audio_input));
         for(AudioInput &request_audio_input : requested_audio_inputs.back().audio_inputs) {
             if(request_audio_input.type != AudioInputType::DEVICE)
                 continue;
@@ -2896,8 +2910,24 @@ static size_t calculate_estimated_replay_buffer_packets(int64_t replay_buffer_si
     return replay_buffer_size_secs * (fps + audio_fps * audio_inputs.size());
 }
 
+static void set_display_server_environment_variables() {
+    // Some users dont have properly setup environments (no display manager that does systemctl --user import-environment DISPLAY WAYLAND_DISPLAY)
+    const char *display = getenv("DISPLAY");
+    if(!display) {
+        display = ":0";
+        setenv("DISPLAY", display, true);
+    }
+
+    const char *wayland_display = getenv("WAYLAND_DISPLAY");
+    if(!wayland_display) {
+        wayland_display = "wayland-1";
+        setenv("WAYLAND_DISPLAY", wayland_display, true);
+    }
+}
+
 int main(int argc, char **argv) {
     setlocale(LC_ALL, "C"); // Sigh... stupid C
+    mallopt(M_MMAP_THRESHOLD, 65536);
 
     signal(SIGINT, stop_handler);
     signal(SIGTERM, stop_handler);
@@ -2911,6 +2941,8 @@ int main(int argc, char **argv) {
     signal(SIGRTMIN+5, save_replay_10_minutes_handler);
     signal(SIGRTMIN+6, save_replay_30_minutes_handler);
 
+    set_display_server_environment_variables();
+
     // Stop nvidia driver from buffering frames
     setenv("__GL_MaxFramesAllowed", "1", true);
     // If this is set to 1 then cuGraphicsGLRegisterImage will fail for egl context with error: invalid OpenGL or DirectX context,
@@ -3147,7 +3179,7 @@ int main(int argc, char **argv) {
 
     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, estimated_replay_buffer_packets)) {
+    if(!gsr_encoder_init(&encoder, arg_parser.replay_storage, estimated_replay_buffer_packets, arg_parser.replay_buffer_size_secs, arg_parser.filename)) {
         fprintf(stderr, "Error: failed to create encoder\n");
         _exit(1);
     }
@@ -3287,7 +3319,6 @@ int main(int argc, char **argv) {
     std::mutex audio_filter_mutex;
 
     const double record_start_time = clock_get_monotonic_seconds();
-    std::atomic<double> replay_start_time(record_start_time);
 
     const size_t audio_buffer_size = audio_max_frame_size * 4 * 2; // max 4 bytes/sample, 2 channels
     uint8_t *empty_audio = (uint8_t*)malloc(audio_buffer_size);
@@ -3618,7 +3649,6 @@ int main(int argc, char **argv) {
 
                 if(force_iframe_frame) {
                     video_frame->pict_type = AV_PICTURE_TYPE_I;
-                    video_frame->flags |= AV_FRAME_FLAG_KEY;
                 }
 
                 int ret = avcodec_send_frame(video_codec_context, video_frame);
@@ -3632,7 +3662,6 @@ int main(int argc, char **argv) {
                 if(force_iframe_frame) {
                     force_iframe_frame = false;
                     video_frame->pict_type = AV_PICTURE_TYPE_NONE;
-                    video_frame->flags &= ~AV_FRAME_FLAG_KEY;
                 }
             }
 
@@ -3728,12 +3757,10 @@ int main(int argc, char **argv) {
 
             save_replay_seconds = 0;
             save_replay_output_filepath.clear();
-            save_replay_async(video_codec_context, VIDEO_STREAM_INDEX, audio_tracks, &encoder.replay_buffer, arg_parser.filename, arg_parser.container_format, file_extension, arg_parser.date_folders, hdr, capture, current_save_replay_seconds);
+            save_replay_async(video_codec_context, VIDEO_STREAM_INDEX, audio_tracks, encoder.replay_buffer, arg_parser.filename, arg_parser.container_format, file_extension, arg_parser.date_folders, hdr, capture, current_save_replay_seconds);
 
-            if(arg_parser.restart_replay_on_save && current_save_replay_seconds == save_replay_seconds_full) {
-                gsr_replay_buffer_clear(&encoder.replay_buffer);
-                replay_start_time = clock_get_monotonic_seconds() - paused_time_offset;
-            }
+            if(arg_parser.restart_replay_on_save && current_save_replay_seconds == save_replay_seconds_full)
+                gsr_replay_buffer_clear(encoder.replay_buffer);
         }
 
         const double frame_end = clock_get_monotonic_seconds();

src/replay_buffer.c

@@ -1,219 +0,0 @@
-#include "../include/replay_buffer.h"
-#include "../include/utils.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include <libavutil/mem.h>
-
-gsr_av_packet* gsr_av_packet_create(const AVPacket *av_packet, double timestamp) {
-    gsr_av_packet *self = malloc(sizeof(gsr_av_packet));
-    if(!self)
-        return NULL;
-
-    self->ref_counter = 1;
-    self->packet = *av_packet;
-    // Why are we doing this you ask? there is a new ffmpeg bug that causes cpu usage to increase over time when you have
-    // packets that are not being free'd until later. So we copy the packet data, free the packet and then reconstruct
-    // the packet later on when we need it, to keep packets alive only for a short period.
-    self->packet.data = av_memdup(av_packet->data, av_packet->size);
-    self->timestamp = timestamp;
-    if(!self->packet.data) {
-        free(self);
-        return NULL;
-    }
-
-    return self;
-}
-
-gsr_av_packet* gsr_av_packet_ref(gsr_av_packet *self) {
-    if(self->ref_counter >= 1)
-        ++self->ref_counter;
-    return self;
-}
-
-static void gsr_av_packet_free(gsr_av_packet *self) {
-    self->ref_counter = 0;
-    if(self->packet.data) {
-        av_free(self->packet.data);
-        self->packet.data = NULL;
-    }
-    free(self);
-}
-
-void gsr_av_packet_unref(gsr_av_packet *self) {
-    if(self->ref_counter >= 1)
-        --self->ref_counter;
-
-    if(self->ref_counter <= 0)
-        gsr_av_packet_free(self);
-}
-
-bool gsr_replay_buffer_init(gsr_replay_buffer *self, size_t replay_buffer_num_packets) {
-    assert(replay_buffer_num_packets > 0);
-    memset(self, 0, sizeof(*self));
-    self->mutex_initialized = false;
-    self->owns_mutex = true;
-    if(pthread_mutex_init(&self->mutex, NULL) != 0)
-        return false;
-
-    self->mutex_initialized = true;
-    self->capacity_num_packets = replay_buffer_num_packets;
-    self->num_packets = 0;
-    self->index = 0;
-    self->packets = calloc(self->capacity_num_packets, sizeof(gsr_av_packet*));
-    if(!self->packets) {
-        gsr_replay_buffer_deinit(self);
-        return false;
-    }
-    return true;
-}
-
-void gsr_replay_buffer_deinit(gsr_replay_buffer *self) {
-    if(self->mutex_initialized)
-        pthread_mutex_lock(&self->mutex);
-
-    for(size_t i = 0; i < self->num_packets; ++i) {
-        if(self->packets[i]) {
-            gsr_av_packet_unref(self->packets[i]);
-            self->packets[i] = NULL;
-        }
-    }
-    self->num_packets = 0;
-
-    if(self->mutex_initialized)
-        pthread_mutex_unlock(&self->mutex);
-
-    if(self->packets) {
-        free(self->packets);
-        self->packets = NULL;
-    }
-
-    self->capacity_num_packets = 0;
-    self->index = 0;
-
-    if(self->mutex_initialized && self->owns_mutex) {
-        pthread_mutex_destroy(&self->mutex);
-        self->mutex_initialized = false;
-    }
-}
-
-bool gsr_replay_buffer_append(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp) {
-    pthread_mutex_lock(&self->mutex);
-    gsr_av_packet *packet = gsr_av_packet_create(av_packet, timestamp);
-    if(!packet) {
-        pthread_mutex_unlock(&self->mutex);
-        return false;
-    }
-
-    if(self->packets[self->index]) {
-        gsr_av_packet_unref(self->packets[self->index]);
-        self->packets[self->index] = NULL;
-    }
-    self->packets[self->index] = packet;
-
-    self->index = (self->index + 1) % self->capacity_num_packets;
-    ++self->num_packets;
-    if(self->num_packets > self->capacity_num_packets)
-        self->num_packets = self->capacity_num_packets;
-
-    pthread_mutex_unlock(&self->mutex);
-    return true;
-}
-
-void gsr_replay_buffer_clear(gsr_replay_buffer *self) {
-    pthread_mutex_lock(&self->mutex);
-    for(size_t i = 0; i < self->num_packets; ++i) {
-        if(self->packets[i]) {
-            gsr_av_packet_unref(self->packets[i]);
-            self->packets[i] = NULL;
-        }
-    }
-    self->num_packets = 0;
-    self->index = 0;
-    pthread_mutex_unlock(&self->mutex);
-}
-
-gsr_av_packet* gsr_replay_buffer_get_packet_at_index(gsr_replay_buffer *self, size_t index) {
-    assert(index < self->num_packets);
-    size_t start_index = 0;
-    if(self->num_packets < self->capacity_num_packets)
-        start_index = self->num_packets - self->index;
-    else
-        start_index = self->index;
-
-    const size_t offset = (start_index + index) % self->capacity_num_packets;
-    return self->packets[offset];
-}
-
-bool gsr_replay_buffer_clone(const gsr_replay_buffer *self, gsr_replay_buffer *destination) {
-    pthread_mutex_lock(&destination->mutex);
-    memset(destination, 0, sizeof(*destination));
-    destination->owns_mutex = false;
-    destination->mutex = self->mutex;
-    destination->capacity_num_packets = self->capacity_num_packets;
-    destination->mutex_initialized = self->mutex_initialized;
-    destination->index = self->index;
-    destination->packets = calloc(destination->capacity_num_packets, sizeof(gsr_av_packet*));
-    if(!destination->packets) {
-        pthread_mutex_unlock(&destination->mutex);
-        return false;
-    }
-
-    destination->num_packets = self->num_packets;
-    for(size_t i = 0; i < destination->num_packets; ++i) {
-        destination->packets[i] = gsr_av_packet_ref(self->packets[i]);
-    }
-
-    pthread_mutex_unlock(&destination->mutex);
-    return true;
-}
-
-/* Binary search */
-size_t gsr_replay_buffer_find_packet_index_by_time_passed(gsr_replay_buffer *self, int seconds) {
-    pthread_mutex_lock(&self->mutex);
-
-    const double now = clock_get_monotonic_seconds();
-    if(self->num_packets == 0) {
-        pthread_mutex_unlock(&self->mutex);
-        return 0;
-    }
-
-    size_t lower_bound = 0;
-    size_t upper_bound = self->num_packets;
-    size_t index = 0;
-
-    for(;;) {
-        index = lower_bound + (upper_bound - lower_bound) / 2;
-        const gsr_av_packet *packet = gsr_replay_buffer_get_packet_at_index(self, index);
-        const double time_passed_since_packet = now - packet->timestamp;
-        if(time_passed_since_packet >= seconds) {
-            if(lower_bound == index)
-                break;
-            lower_bound = index;
-        } else {
-            if(upper_bound == index)
-                break;
-            upper_bound = index;
-        }
-    }
-
-    pthread_mutex_unlock(&self->mutex);
-    return index;
-}
-
-size_t gsr_replay_buffer_find_keyframe(gsr_replay_buffer *self, size_t start_index, int stream_index, bool invert_stream_index) {
-    assert(start_index < self->num_packets);
-    size_t keyframe_index = (size_t)-1;
-    pthread_mutex_lock(&self->mutex);
-    for(size_t i = start_index; i < self->num_packets; ++i) {
-        const gsr_av_packet *packet = gsr_replay_buffer_get_packet_at_index(self, i);
-        if((packet->packet.flags & AV_PKT_FLAG_KEY) && (invert_stream_index ? packet->packet.stream_index != stream_index : packet->packet.stream_index == stream_index)) {
-            keyframe_index = i;
-            break;
-        }
-    }
-    pthread_mutex_unlock(&self->mutex);
-    return keyframe_index;
-}

src/replay_buffer/replay_buffer.c

@@ -0,0 +1,91 @@
+#include "../../include/replay_buffer/replay_buffer.h"
+#include "../../include/replay_buffer/replay_buffer_ram.h"
+#include "../../include/replay_buffer/replay_buffer_disk.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+gsr_replay_buffer* gsr_replay_buffer_create(gsr_replay_storage replay_storage, const char *replay_directory, double replay_buffer_time, size_t replay_buffer_num_packets) {
+    gsr_replay_buffer *replay_buffer = NULL;
+    switch(replay_storage) {
+        case GSR_REPLAY_STORAGE_RAM:
+            replay_buffer = gsr_replay_buffer_ram_create(replay_buffer_num_packets);
+            break;
+        case GSR_REPLAY_STORAGE_DISK:
+            replay_buffer = gsr_replay_buffer_disk_create(replay_directory, replay_buffer_time);
+            break;
+    }
+
+    replay_buffer->mutex_initialized = false;
+    replay_buffer->original_replay_buffer = NULL;
+    if(pthread_mutex_init(&replay_buffer->mutex, NULL) != 0) {
+        gsr_replay_buffer_destroy(replay_buffer);
+        return NULL;
+    }
+
+    replay_buffer->mutex_initialized = true;
+    return replay_buffer;
+}
+
+void gsr_replay_buffer_destroy(gsr_replay_buffer *self) {
+    self->destroy(self);
+    if(self->mutex_initialized && !self->original_replay_buffer) {
+        pthread_mutex_destroy(&self->mutex);
+        self->mutex_initialized = false;
+    }
+    self->original_replay_buffer = NULL;
+    free(self);
+}
+
+void gsr_replay_buffer_lock(gsr_replay_buffer *self) {
+    if(self->original_replay_buffer) {
+        gsr_replay_buffer_lock(self->original_replay_buffer);
+        return;
+    }
+
+    if(self->mutex_initialized)
+        pthread_mutex_lock(&self->mutex);
+}
+
+void gsr_replay_buffer_unlock(gsr_replay_buffer *self) {
+    if(self->original_replay_buffer) {
+        gsr_replay_buffer_unlock(self->original_replay_buffer);
+        return;
+    }
+
+    if(self->mutex_initialized)
+        pthread_mutex_unlock(&self->mutex);
+}
+
+bool gsr_replay_buffer_append(gsr_replay_buffer *self, const AVPacket *av_packet, double timestamp) {
+    return self->append(self, av_packet, timestamp);
+}
+
+void gsr_replay_buffer_clear(gsr_replay_buffer *self) {
+    self->clear(self);
+}
+
+AVPacket* gsr_replay_buffer_iterator_get_packet(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator) {
+    return self->iterator_get_packet(self, iterator);
+}
+
+uint8_t* gsr_replay_buffer_iterator_get_packet_data(gsr_replay_buffer *self, gsr_replay_buffer_iterator iterator) {
+    return self->iterator_get_packet_data(self, iterator);
+}
+
+gsr_replay_buffer* gsr_replay_buffer_clone(gsr_replay_buffer *self) {
+    return self->clone(self);
+}
+
+gsr_replay_buffer_iterator gsr_replay_buffer_find_packet_index_by_time_passed(gsr_replay_buffer *self, int seconds) {
+    return self->find_packet_index_by_time_passed(self, seconds);
+}
+
+gsr_replay_buffer_iterator gsr_replay_buffer_find_keyframe(gsr_replay_buffer *self, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index) {
+    return self->find_keyframe(self, start_iterator, stream_index, invert_stream_index);
+}
+
+bool gsr_replay_buffer_iterator_next(gsr_replay_buffer *self, gsr_replay_buffer_iterator *iterator) {
+    return self->iterator_next(self, iterator);
+}

src/replay_buffer/replay_buffer_disk.c

@@ -0,0 +1,437 @@
+#include "../../include/replay_buffer/replay_buffer_disk.h"
+#include "../../include/utils.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <time.h>
+#include <errno.h>
+#include <assert.h>
+
+#define REPLAY_BUFFER_FILE_SIZE_BYTES 1024 * 1024 * 256 /* 256MB */
+#define FILE_PREFIX "Replay"
+
+static void gsr_replay_buffer_disk_set_impl_funcs(gsr_replay_buffer_disk *self);
+
+static void gsr_av_packet_disk_init(gsr_av_packet_disk *self, const AVPacket *av_packet, size_t data_index, double timestamp) {
+    self->packet = *av_packet;
+    self->packet.data = NULL;
+    self->data_index = data_index;
+    self->timestamp = timestamp;
+}
+
+static gsr_replay_buffer_file* gsr_replay_buffer_file_create(char *replay_directory, size_t replay_storage_counter, double timestamp, int *replay_storage_fd) {
+    gsr_replay_buffer_file *self = calloc(1, sizeof(gsr_replay_buffer_file));
+    if(!self) {
+        fprintf(stderr, "gsr error: gsr_av_packet_file_init: failed to create buffer file\n");
+        return NULL;
+    }
+
+    if(create_directory_recursive(replay_directory) != 0) {
+        fprintf(stderr, "gsr error: gsr_av_packet_file_init: failed to create replay directory: %s\n", replay_directory);
+        free(self);
+        return NULL;
+    }
+
+    char filename[PATH_MAX];
+    snprintf(filename, sizeof(filename), "%s/%s_%d.gsr", replay_directory, FILE_PREFIX, (int)replay_storage_counter);
+    *replay_storage_fd = creat(filename, 0700);
+    if(*replay_storage_fd <= 0) {
+        fprintf(stderr, "gsr error: gsr_av_packet_file_init: failed to create replay file: %s\n", filename);
+        free(self);
+        return NULL;
+    }
+
+    self->id = replay_storage_counter;
+    self->start_timestamp = timestamp;
+    self->end_timestamp = timestamp;
+    self->ref_counter = 1;
+    self->fd = -1;
+
+    self->packets = NULL;
+    self->capacity_num_packets = 0;
+    self->num_packets = 0;
+    return self;
+}
+
+static gsr_replay_buffer_file* gsr_replay_buffer_file_ref(gsr_replay_buffer_file *self) {
+    if(self->ref_counter >= 1)
+        ++self->ref_counter;
+    return self;
+}
+
+static void gsr_replay_buffer_file_free(gsr_replay_buffer_file *self, const char *replay_directory) {
+    self->ref_counter = 0;
+
+    if(self->fd > 0) {
+        close(self->fd);
+        self->fd = -1;
+    }
+
+    char filename[PATH_MAX];
+    snprintf(filename, sizeof(filename), "%s/%s_%d.gsr", replay_directory, FILE_PREFIX, (int)self->id);
+    remove(filename);
+
+    if(self->packets) {
+        free(self->packets);
+        self->packets = NULL;
+    }
+    self->num_packets = 0;
+    self->capacity_num_packets = 0;
+
+    free(self);
+}
+
+static void gsr_replay_buffer_file_unref(gsr_replay_buffer_file *self, const char *replay_directory) {
+    if(self->ref_counter > 0)
+        --self->ref_counter;
+
+    if(self->ref_counter <= 0)
+        gsr_replay_buffer_file_free(self, replay_directory);
+}
+
+static void gsr_replay_buffer_disk_clear(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    for(size_t i = 0; i < self->num_files; ++i) {
+        gsr_replay_buffer_file_unref(self->files[i], self->replay_directory);
+    }
+    self->num_files = 0;
+
+    if(self->storage_fd > 0) {
+        close(self->storage_fd);
+        self->storage_fd = 0;
+    }
+
+    self->storage_num_bytes_written = 0;
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+}
+
+static void gsr_replay_buffer_disk_destroy(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_disk_clear(replay_buffer);
+
+    if(self->owns_directory) {
+        remove(self->replay_directory);
+        self->owns_directory = false;
+    }
+}
+
+static bool file_write_all(int fd, const uint8_t *data, size_t size, size_t *bytes_written_total) {
+    *bytes_written_total = 0;
+    while(*bytes_written_total < size) {
+        const ssize_t bytes_written = write(fd, data + *bytes_written_total, size - *bytes_written_total);
+        if(bytes_written == -1) {
+            if(errno == EAGAIN)
+                continue;
+            else
+                return false;
+        }
+        *bytes_written_total += bytes_written;
+    }
+    return true;
+}
+
+static bool gsr_replay_buffer_disk_create_next_file(gsr_replay_buffer_disk *self, double timestamp) {
+    if(self->num_files + 1 >= GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES) {
+        fprintf(stderr, "gsr error: gsr_replay_buffer_disk_create_next_file: too many replay buffer files created! (> %d), either reduce the replay buffer time or report this as a bug\n", (int)GSR_REPLAY_BUFFER_CAPACITY_NUM_FILES);
+        return false;
+    }
+
+    gsr_replay_buffer_file *replay_buffer_file = gsr_replay_buffer_file_create(self->replay_directory, self->storage_counter, timestamp, &self->storage_fd);
+    if(!replay_buffer_file)
+        return false;
+
+    self->files[self->num_files] = replay_buffer_file;
+    ++self->num_files;
+    ++self->storage_counter;
+    return true;
+}
+
+static bool gsr_replay_buffer_disk_append_to_current_file(gsr_replay_buffer_disk *self, const AVPacket *av_packet, double timestamp) {
+    gsr_replay_buffer_file *replay_buffer_file = self->files[self->num_files - 1];
+    replay_buffer_file->end_timestamp = timestamp;
+
+    if(replay_buffer_file->num_packets + 1 >= replay_buffer_file->capacity_num_packets) {
+        size_t new_capacity_num_packets = replay_buffer_file->capacity_num_packets * 2;
+        if(new_capacity_num_packets == 0)
+            new_capacity_num_packets = 256;
+
+        void *new_packets = realloc(replay_buffer_file->packets, new_capacity_num_packets * sizeof(gsr_av_packet_disk));
+        if(!new_packets) {
+            fprintf(stderr, "gsr error: gsr_replay_buffer_disk_append_to_current_file: failed to reallocate replay buffer file packets\n");
+            return false;
+        }
+
+        replay_buffer_file->capacity_num_packets = new_capacity_num_packets;
+        replay_buffer_file->packets = new_packets;
+    }
+
+    gsr_av_packet_disk *packet = &replay_buffer_file->packets[replay_buffer_file->num_packets];
+    gsr_av_packet_disk_init(packet, av_packet, self->storage_num_bytes_written, timestamp);
+    ++replay_buffer_file->num_packets;
+
+    size_t bytes_written = 0;
+    const bool file_written = file_write_all(self->storage_fd, av_packet->data, av_packet->size, &bytes_written);
+    self->storage_num_bytes_written += bytes_written;
+    if(self->storage_num_bytes_written >= REPLAY_BUFFER_FILE_SIZE_BYTES) {
+        self->storage_num_bytes_written = 0;
+        close(self->storage_fd);
+        self->storage_fd = 0;
+    }
+
+    return file_written;
+}
+
+static void gsr_replay_buffer_disk_remove_first_file(gsr_replay_buffer_disk *self) {
+    gsr_replay_buffer_file_unref(self->files[0], self->replay_directory);
+    for(size_t i = 1; i < self->num_files; ++i) {
+        self->files[i - 1] = self->files[i];
+    }
+    --self->num_files;
+}
+
+static bool gsr_replay_buffer_disk_append(gsr_replay_buffer *replay_buffer, const AVPacket *av_packet, double timestamp) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    bool success = false;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    if(self->storage_fd <= 0) {
+        if(!gsr_replay_buffer_disk_create_next_file(self, timestamp))
+            goto done;
+    }
+
+    const bool data_written = gsr_replay_buffer_disk_append_to_current_file(self, av_packet, timestamp);
+
+    if(self->num_files > 1) {
+        const double buffer_time_accumulated = timestamp - self->files[1]->start_timestamp;
+        if(buffer_time_accumulated >= self->replay_buffer_time)
+            gsr_replay_buffer_disk_remove_first_file(self);
+    }
+
+    success = data_written;
+
+    done:
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return success;
+}
+
+static AVPacket* gsr_replay_buffer_disk_iterator_get_packet(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator iterator) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    assert(iterator.file_index < self->num_files);
+    assert(iterator.packet_index < self->files[iterator.file_index]->num_packets);
+    return &self->files[iterator.file_index]->packets[iterator.packet_index].packet;
+}
+
+static uint8_t* gsr_replay_buffer_disk_iterator_get_packet_data(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator iterator) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    assert(iterator.file_index < self->num_files);
+    gsr_replay_buffer_file *file = self->files[iterator.file_index];
+    assert(iterator.packet_index < file->num_packets);
+
+    if(file->fd <= 0) {
+        char filename[PATH_MAX];
+        snprintf(filename, sizeof(filename), "%s/%s_%d.gsr", self->replay_directory, FILE_PREFIX, (int)file->id);
+        file->fd = open(filename, O_RDONLY);
+        if(file->fd <= 0) {
+            fprintf(stderr, "gsr error: gsr_replay_buffer_disk_iterator_get_packet_data: failed to open file\n");
+            return NULL;
+        }
+    }
+
+    const gsr_av_packet_disk *packet = &self->files[iterator.file_index]->packets[iterator.packet_index];
+    if(lseek(file->fd, packet->data_index, SEEK_SET) == -1) {
+        fprintf(stderr, "gsr error: gsr_replay_buffer_disk_iterator_get_packet_data: failed to seek\n");
+        return NULL;
+    }
+
+    uint8_t *packet_data = malloc(packet->packet.size);
+    if(read(file->fd, packet_data, packet->packet.size) != packet->packet.size) {
+        fprintf(stderr, "gsr error: gsr_replay_buffer_disk_iterator_get_packet_data: failed to read data from file\n");
+        free(packet_data);
+        return NULL;
+    }
+
+    return packet_data;
+}
+
+static gsr_replay_buffer* gsr_replay_buffer_disk_clone(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_disk *destination = calloc(1, sizeof(gsr_replay_buffer_disk));
+    if(!destination)
+        return NULL;
+
+    gsr_replay_buffer_disk_set_impl_funcs(destination);
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    destination->replay_buffer.original_replay_buffer = replay_buffer;
+    destination->replay_buffer.mutex = self->replay_buffer.mutex;
+    destination->replay_buffer.mutex_initialized = self->replay_buffer.mutex_initialized;
+    destination->replay_buffer_time = self->replay_buffer_time;
+    destination->storage_counter = self->storage_counter;
+    destination->storage_num_bytes_written = self->storage_num_bytes_written;
+    destination->storage_fd = 0; // We only want to read from the clone. If there is a need to write to it in the future then TODO change this
+
+    for(size_t i = 0; i < self->num_files; ++i) {
+        destination->files[i] = gsr_replay_buffer_file_ref(self->files[i]);
+    }
+    destination->num_files = self->num_files;
+
+    snprintf(destination->replay_directory, sizeof(destination->replay_directory), "%s", self->replay_directory);
+    destination->owns_directory = false;
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer*)destination;
+}
+
+/* Binary search */
+static size_t gsr_replay_buffer_file_find_packet_index_by_time_passed(const gsr_replay_buffer_file *self, int seconds) {
+    const double now = clock_get_monotonic_seconds();
+    if(self->num_packets == 0) {
+        return 0;
+    }
+
+    size_t lower_bound = 0;
+    size_t upper_bound = self->num_packets;
+    size_t index = 0;
+
+    for(;;) {
+        index = lower_bound + (upper_bound - lower_bound) / 2;
+        const gsr_av_packet_disk *packet = &self->packets[index];
+        const double time_passed_since_packet = now - packet->timestamp;
+        if(time_passed_since_packet >= seconds) {
+            if(lower_bound == index)
+                break;
+            lower_bound = index;
+        } else {
+            if(upper_bound == index)
+                break;
+            upper_bound = index;
+        }
+    }
+
+    return index;
+}
+
+/* Binary search */
+static gsr_replay_buffer_iterator gsr_replay_buffer_disk_find_file_index_by_time_passed(gsr_replay_buffer *replay_buffer, int seconds) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    const double now = clock_get_monotonic_seconds();
+    if(self->num_files == 0) {
+        gsr_replay_buffer_unlock(&self->replay_buffer);
+        return (gsr_replay_buffer_iterator){0, 0};
+    }
+
+    size_t lower_bound = 0;
+    size_t upper_bound = self->num_files;
+    size_t file_index = 0;
+
+    for(;;) {
+        file_index = lower_bound + (upper_bound - lower_bound) / 2;
+        const gsr_replay_buffer_file *file = self->files[file_index];
+        const double time_passed_since_file_start = now - file->start_timestamp;
+        const double time_passed_since_file_end = now - file->end_timestamp;
+        if(time_passed_since_file_start >= seconds && time_passed_since_file_end <= seconds) {
+            break;
+        } else if(time_passed_since_file_start >= seconds) {
+            if(lower_bound == file_index)
+                break;
+            lower_bound = file_index;
+        } else {
+            if(upper_bound == file_index)
+                break;
+            upper_bound = file_index;
+        }
+    }
+
+    const gsr_replay_buffer_file *file = self->files[file_index];
+    const size_t packet_index = gsr_replay_buffer_file_find_packet_index_by_time_passed(file, seconds);
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer_iterator){packet_index, file_index};
+}
+
+static gsr_replay_buffer_iterator gsr_replay_buffer_disk_find_keyframe(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    gsr_replay_buffer_iterator keyframe_iterator = {(size_t)-1, 0};
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    size_t packet_index = start_iterator.packet_index;
+    for(size_t file_index = start_iterator.file_index; file_index < self->num_files; ++file_index) {
+        const gsr_replay_buffer_file *file = self->files[file_index];
+        for(; packet_index < file->num_packets; ++packet_index) {
+            const gsr_av_packet_disk *packet = &file->packets[packet_index];
+            if((packet->packet.flags & AV_PKT_FLAG_KEY) && (invert_stream_index ? packet->packet.stream_index != stream_index : packet->packet.stream_index == stream_index)) {
+                keyframe_iterator.packet_index = packet_index;
+                keyframe_iterator.file_index = file_index;
+                goto done;
+            }
+        }
+        packet_index = 0;
+    }
+    done:
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return keyframe_iterator;
+}
+
+static bool gsr_replay_buffer_disk_iterator_next(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator *iterator) {
+    gsr_replay_buffer_disk *self = (gsr_replay_buffer_disk*)replay_buffer;
+    if(iterator->file_index >= self->num_files)
+        return false;
+
+    if(iterator->packet_index + 1 >= self->files[iterator->file_index]->num_packets) {
+        if(iterator->file_index + 1 >= self->num_files)
+            return false;
+
+        if(self->files[iterator->file_index + 1]->num_packets == 0)
+            return false;
+
+        ++iterator->file_index;
+        iterator->packet_index = 0;
+        return true;
+    } else {
+        ++iterator->packet_index;
+        return true;
+    }
+}
+
+static void get_current_time(char *time_str, size_t time_str_size) {
+    time_t now = time(NULL);
+    struct tm *t = localtime(&now);
+    strftime(time_str, time_str_size - 1, "%Y-%m-%d_%H-%M-%S", t);
+}
+
+static void gsr_replay_buffer_disk_set_impl_funcs(gsr_replay_buffer_disk *self) {
+    self->replay_buffer.destroy = gsr_replay_buffer_disk_destroy;
+    self->replay_buffer.append = gsr_replay_buffer_disk_append;
+    self->replay_buffer.clear = gsr_replay_buffer_disk_clear;
+    self->replay_buffer.iterator_get_packet = gsr_replay_buffer_disk_iterator_get_packet;
+    self->replay_buffer.iterator_get_packet_data = gsr_replay_buffer_disk_iterator_get_packet_data;
+    self->replay_buffer.clone = gsr_replay_buffer_disk_clone;
+    self->replay_buffer.find_packet_index_by_time_passed = gsr_replay_buffer_disk_find_file_index_by_time_passed;
+    self->replay_buffer.find_keyframe = gsr_replay_buffer_disk_find_keyframe;
+    self->replay_buffer.iterator_next = gsr_replay_buffer_disk_iterator_next;
+}
+
+gsr_replay_buffer* gsr_replay_buffer_disk_create(const char *replay_directory, double replay_buffer_time) {
+    assert(replay_buffer_time > 0);
+    gsr_replay_buffer_disk *replay_buffer = calloc(1, sizeof(gsr_replay_buffer_disk));
+    if(!replay_buffer)
+        return NULL;
+
+    char time_str[128];
+    get_current_time(time_str, sizeof(time_str));
+
+    replay_buffer->num_files = 0;
+    replay_buffer->storage_counter = 0;
+    replay_buffer->replay_buffer_time = replay_buffer_time;
+    snprintf(replay_buffer->replay_directory, sizeof(replay_buffer->replay_directory), "%s/gsr-replay-%s.gsr", replay_directory, time_str);
+    replay_buffer->owns_directory = true;
+
+    gsr_replay_buffer_disk_set_impl_funcs(replay_buffer);
+    return (gsr_replay_buffer*)replay_buffer;
+}

src/replay_buffer/replay_buffer_ram.c

@@ -0,0 +1,256 @@
+#include "../../include/replay_buffer/replay_buffer_ram.h"
+#include "../../include/utils.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include <libavutil/mem.h>
+
+static void gsr_replay_buffer_ram_set_impl_funcs(gsr_replay_buffer_ram *self);
+
+static gsr_av_packet_ram* gsr_av_packet_ram_create(const AVPacket *av_packet, double timestamp) {
+    gsr_av_packet_ram *self = malloc(sizeof(gsr_av_packet_ram));
+    if(!self)
+        return NULL;
+
+    self->ref_counter = 1;
+    self->packet = *av_packet;
+    self->timestamp = timestamp;
+    // Why are we doing this you ask? there is a ffmpeg bug that causes cpu usage to increase over time when you have
+    // packets that are not being free'd until later. So we copy the packet data, free the packet and then reconstruct
+    // the packet later on when we need it, to keep packets alive only for a short period.
+    self->packet.data = av_memdup(av_packet->data, av_packet->size);
+    if(!self->packet.data) {
+        free(self);
+        return NULL;
+    }
+
+    return self;
+}
+
+static gsr_av_packet_ram* gsr_av_packet_ram_ref(gsr_av_packet_ram *self) {
+    if(self->ref_counter >= 1)
+        ++self->ref_counter;
+    return self;
+}
+
+static void gsr_av_packet_ram_free(gsr_av_packet_ram *self) {
+    self->ref_counter = 0;
+    if(self->packet.data) {
+        av_free(self->packet.data);
+        self->packet.data = NULL;
+    }
+    free(self);
+}
+
+static void gsr_av_packet_ram_unref(gsr_av_packet_ram *self) {
+    if(self->ref_counter >= 1)
+        --self->ref_counter;
+
+    if(self->ref_counter <= 0)
+        gsr_av_packet_ram_free(self);
+}
+
+static void gsr_replay_buffer_ram_destroy(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    for(size_t i = 0; i < self->num_packets; ++i) {
+        if(self->packets[i]) {
+            gsr_av_packet_ram_unref(self->packets[i]);
+            self->packets[i] = NULL;
+        }
+    }
+    self->num_packets = 0;
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+
+    if(self->packets) {
+        free(self->packets);
+        self->packets = NULL;
+    }
+
+    self->capacity_num_packets = 0;
+    self->index = 0;
+}
+
+static bool gsr_replay_buffer_ram_append(gsr_replay_buffer *replay_buffer, const AVPacket *av_packet, double timestamp) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    gsr_av_packet_ram *packet = gsr_av_packet_ram_create(av_packet, timestamp);
+    if(!packet) {
+        gsr_replay_buffer_unlock(&self->replay_buffer);
+        return false;
+    }
+
+    if(self->packets[self->index]) {
+        gsr_av_packet_ram_unref(self->packets[self->index]);
+        self->packets[self->index] = NULL;
+    }
+    self->packets[self->index] = packet;
+
+    self->index = (self->index + 1) % self->capacity_num_packets;
+    ++self->num_packets;
+    if(self->num_packets > self->capacity_num_packets)
+        self->num_packets = self->capacity_num_packets;
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return true;
+}
+
+static void gsr_replay_buffer_ram_clear(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    for(size_t i = 0; i < self->num_packets; ++i) {
+        if(self->packets[i]) {
+            gsr_av_packet_ram_unref(self->packets[i]);
+            self->packets[i] = NULL;
+        }
+    }
+    self->num_packets = 0;
+    self->index = 0;
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+}
+
+static gsr_av_packet_ram* gsr_replay_buffer_ram_get_packet_at_index(gsr_replay_buffer *replay_buffer, size_t index) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    assert(index < self->num_packets);
+    size_t start_index = 0;
+    if(self->num_packets < self->capacity_num_packets)
+        start_index = self->num_packets - self->index;
+    else
+        start_index = self->index;
+
+    const size_t offset = (start_index + index) % self->capacity_num_packets;
+    return self->packets[offset];
+}
+
+static AVPacket* gsr_replay_buffer_ram_iterator_get_packet(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator iterator) {
+    return &gsr_replay_buffer_ram_get_packet_at_index(replay_buffer, iterator.packet_index)->packet;
+}
+
+static uint8_t* gsr_replay_buffer_ram_iterator_get_packet_data(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator iterator) {
+    (void)replay_buffer;
+    (void)iterator;
+    return NULL;
+}
+
+static gsr_replay_buffer* gsr_replay_buffer_ram_clone(gsr_replay_buffer *replay_buffer) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_ram *destination = calloc(1, sizeof(gsr_replay_buffer_ram));
+    if(!destination)
+        return NULL;
+
+    gsr_replay_buffer_ram_set_impl_funcs(destination);
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    destination->replay_buffer.original_replay_buffer = replay_buffer;
+    destination->replay_buffer.mutex = self->replay_buffer.mutex;
+    destination->replay_buffer.mutex_initialized = self->replay_buffer.mutex_initialized;
+    destination->capacity_num_packets = self->capacity_num_packets;
+    destination->index = self->index;
+    destination->packets = calloc(destination->capacity_num_packets, sizeof(gsr_av_packet_ram*));
+    if(!destination->packets) {
+        free(destination);
+        gsr_replay_buffer_unlock(&self->replay_buffer);
+        return NULL;
+    }
+
+    destination->num_packets = self->num_packets;
+    for(size_t i = 0; i < destination->num_packets; ++i) {
+        destination->packets[i] = gsr_av_packet_ram_ref(self->packets[i]);
+    }
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer*)destination;
+}
+
+/* Binary search */
+static gsr_replay_buffer_iterator gsr_replay_buffer_ram_find_packet_index_by_time_passed(gsr_replay_buffer *replay_buffer, int seconds) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+
+    const double now = clock_get_monotonic_seconds();
+    if(self->num_packets == 0) {
+        gsr_replay_buffer_unlock(&self->replay_buffer);
+        return (gsr_replay_buffer_iterator){0, 0};
+    }
+
+    size_t lower_bound = 0;
+    size_t upper_bound = self->num_packets;
+    size_t index = 0;
+
+    for(;;) {
+        index = lower_bound + (upper_bound - lower_bound) / 2;
+        const gsr_av_packet_ram *packet = gsr_replay_buffer_ram_get_packet_at_index(replay_buffer, index);
+        const double time_passed_since_packet = now - packet->timestamp;
+        if(time_passed_since_packet >= seconds) {
+            if(lower_bound == index)
+                break;
+            lower_bound = index;
+        } else {
+            if(upper_bound == index)
+                break;
+            upper_bound = index;
+        }
+    }
+
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer_iterator){index, 0};
+}
+
+static gsr_replay_buffer_iterator gsr_replay_buffer_ram_find_keyframe(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator start_iterator, int stream_index, bool invert_stream_index) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    size_t keyframe_index = (size_t)-1;
+    gsr_replay_buffer_lock(&self->replay_buffer);
+    for(size_t i = start_iterator.packet_index; i < self->num_packets; ++i) {
+        const gsr_av_packet_ram *packet = gsr_replay_buffer_ram_get_packet_at_index(replay_buffer, i);
+        if((packet->packet.flags & AV_PKT_FLAG_KEY) && (invert_stream_index ? packet->packet.stream_index != stream_index : packet->packet.stream_index == stream_index)) {
+            keyframe_index = i;
+            break;
+        }
+    }
+    gsr_replay_buffer_unlock(&self->replay_buffer);
+    return (gsr_replay_buffer_iterator){keyframe_index, 0};
+}
+
+static bool gsr_replay_buffer_ram_iterator_next(gsr_replay_buffer *replay_buffer, gsr_replay_buffer_iterator *iterator) {
+    gsr_replay_buffer_ram *self = (gsr_replay_buffer_ram*)replay_buffer;
+    if(iterator->packet_index + 1 < self->num_packets) {
+        ++iterator->packet_index;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static void gsr_replay_buffer_ram_set_impl_funcs(gsr_replay_buffer_ram *self) {
+    self->replay_buffer.destroy = gsr_replay_buffer_ram_destroy;
+    self->replay_buffer.append = gsr_replay_buffer_ram_append;
+    self->replay_buffer.clear = gsr_replay_buffer_ram_clear;
+    self->replay_buffer.iterator_get_packet = gsr_replay_buffer_ram_iterator_get_packet;
+    self->replay_buffer.iterator_get_packet_data = gsr_replay_buffer_ram_iterator_get_packet_data;
+    self->replay_buffer.clone = gsr_replay_buffer_ram_clone;
+    self->replay_buffer.find_packet_index_by_time_passed = gsr_replay_buffer_ram_find_packet_index_by_time_passed;
+    self->replay_buffer.find_keyframe = gsr_replay_buffer_ram_find_keyframe;
+    self->replay_buffer.iterator_next = gsr_replay_buffer_ram_iterator_next;
+}
+
+gsr_replay_buffer* gsr_replay_buffer_ram_create(size_t replay_buffer_num_packets) {
+    assert(replay_buffer_num_packets > 0);
+    gsr_replay_buffer_ram *replay_buffer = calloc(1, sizeof(gsr_replay_buffer_ram));
+    if(!replay_buffer)
+        return NULL;
+
+    replay_buffer->capacity_num_packets = replay_buffer_num_packets;
+    replay_buffer->num_packets = 0;
+    replay_buffer->index = 0;
+    replay_buffer->packets = calloc(replay_buffer->capacity_num_packets, sizeof(gsr_av_packet_ram*));
+    if(!replay_buffer->packets) {
+        gsr_replay_buffer_ram_destroy(&replay_buffer->replay_buffer);
+        free(replay_buffer);
+        return NULL;
+    }
+
+    gsr_replay_buffer_ram_set_impl_funcs(replay_buffer);
+    return (gsr_replay_buffer*)replay_buffer;
+}