aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/capture/kms.c97
-rw-r--r--src/capture/nvfbc.c14
-rw-r--r--src/capture/portal.c17
-rw-r--r--src/capture/xcomposite.c33
-rw-r--r--src/color_conversion.c131
-rw-r--r--src/damage.c56
-rw-r--r--src/egl.c427
-rw-r--r--src/encoder/video/image.c130
-rw-r--r--src/encoder/video/nvenc.c7
-rw-r--r--src/main.cpp1228
-rw-r--r--src/pipewire_audio.c74
-rw-r--r--src/pipewire_video.c71
-rw-r--r--src/sound.cpp68
-rw-r--r--src/utils.c139
-rw-r--r--src/window/window.c30
-rw-r--r--src/window/window_wayland.c321
-rw-r--r--src/window/window_x11.c162
17 files changed, 1860 insertions, 1145 deletions
diff --git a/src/capture/kms.c b/src/capture/kms.c
index fcf3b85..ae0c36f 100644
--- a/src/capture/kms.c
+++ b/src/capture/kms.c
@@ -2,6 +2,7 @@
#include "../../include/utils.h"
#include "../../include/color_conversion.h"
#include "../../include/cursor.h"
+#include "../../include/window/window.h"
#include "../../kms/client/kms_client.h"
#include <stdlib.h>
@@ -17,6 +18,8 @@
#include <libavutil/mastering_display_metadata.h>
#include <libavformat/avformat.h>
+#define FIND_CRTC_BY_NAME_TIMEOUT_SECONDS 2.0
+
#define HDMI_STATIC_METADATA_TYPE1 0
#define HDMI_EOTF_SMPTE_ST2084 2
@@ -55,6 +58,7 @@ typedef struct {
AVCodecContext *video_codec_context;
bool performance_error_shown;
bool fast_path_failed;
+ bool mesa_supports_compute_only_vaapi_copy;
//int drm_fd;
//uint64_t prev_sequence;
@@ -62,6 +66,8 @@ typedef struct {
vec2i prev_target_pos;
vec2i prev_plane_size;
+
+ double last_time_monitor_check;
} gsr_capture_kms;
static void gsr_capture_kms_cleanup_kms_fds(gsr_capture_kms *self) {
@@ -183,17 +189,19 @@ static int gsr_capture_kms_start(gsr_capture *cap, AVCodecContext *video_codec_c
if(kms_init_res != 0)
return kms_init_res;
- self->is_x11 = gsr_egl_get_display_server(self->params.egl) == GSR_DISPLAY_SERVER_X11;
+ self->is_x11 = gsr_window_get_display_server(self->params.egl->window) == GSR_DISPLAY_SERVER_X11;
const gsr_connection_type connection_type = self->is_x11 ? GSR_CONNECTION_X11 : GSR_CONNECTION_DRM;
- if(self->is_x11)
- gsr_cursor_init(&self->x11_cursor, self->params.egl, self->params.egl->x11.dpy);
+ if(self->is_x11) {
+ Display *display = gsr_window_get_display(self->params.egl->window);
+ gsr_cursor_init(&self->x11_cursor, self->params.egl, display);
+ }
MonitorCallbackUserdata monitor_callback_userdata = {
&self->monitor_id,
self->params.display_to_capture, strlen(self->params.display_to_capture),
0,
};
- for_each_active_monitor_output(self->params.egl, connection_type, monitor_callback, &monitor_callback_userdata);
+ for_each_active_monitor_output(self->params.egl->window, self->params.egl->card_path, connection_type, monitor_callback, &monitor_callback_userdata);
if(!get_monitor_by_name(self->params.egl, connection_type, self->params.display_to_capture, &monitor)) {
fprintf(stderr, "gsr error: gsr_capture_kms_start: failed to find monitor by name \"%s\"\n", self->params.display_to_capture);
@@ -202,7 +210,7 @@ static int gsr_capture_kms_start(gsr_capture *cap, AVCodecContext *video_codec_c
}
monitor.name = self->params.display_to_capture;
- self->monitor_rotation = drm_monitor_get_display_server_rotation(self->params.egl, &monitor);
+ self->monitor_rotation = drm_monitor_get_display_server_rotation(self->params.egl->window, &monitor);
self->capture_pos = monitor.pos;
/* Monitor size is already rotated on x11 when the monitor is rotated, no need to apply it ourselves */
@@ -224,14 +232,22 @@ static int gsr_capture_kms_start(gsr_capture *cap, AVCodecContext *video_codec_c
video_codec_context->height = FFALIGN(self->params.output_resolution.y, 2);
}
- self->fast_path_failed = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !gl_driver_version_greater_than(self->params.egl, 24, 0, 9);
+ self->fast_path_failed = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 0, 9);
if(self->fast_path_failed)
fprintf(stderr, "gsr warning: gsr_capture_kms_start: your amd driver (mesa) version is known to be buggy (<= version 24.0.9), falling back to opengl copy\n");
+ //if(self->params.hdr) {
+ // self->fast_path_failed = true;
+ // fprintf(stderr, "gsr warning: gsr_capture_kms_start: recording with hdr requires shader color conversion which might be slow. If this is an issue record with -w portal instead (which converts HDR to SDR)\n");
+ //}
+
+ self->mesa_supports_compute_only_vaapi_copy = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 3, 6);
+
frame->width = video_codec_context->width;
frame->height = video_codec_context->height;
self->video_codec_context = video_codec_context;
+ self->last_time_monitor_check = clock_get_monotonic_seconds();
return 0;
}
@@ -240,7 +256,7 @@ static void gsr_capture_kms_on_event(gsr_capture *cap, gsr_egl *egl) {
if(!self->is_x11)
return;
- XEvent *xev = gsr_egl_get_event_data(egl);
+ XEvent *xev = gsr_window_get_event_data(egl->window);
gsr_cursor_on_event(&self->x11_cursor, xev);
}
@@ -425,7 +441,7 @@ static gsr_kms_response_item* find_monitor_drm(gsr_capture_kms *self, bool *capt
}
// Will never happen on wayland unless the target monitor has been disconnected
- if(!drm_fd) {
+ if(!drm_fd && self->is_x11) {
drm_fd = find_largest_drm(&self->kms_response);
*capture_is_combined_plane = true;
}
@@ -525,7 +541,8 @@ static void render_x11_cursor(gsr_capture_kms *self, gsr_color_conversion *color
self->capture_size.y == 0 ? 0 : (double)output_size.y / (double)self->capture_size.y
};
- gsr_cursor_tick(&self->x11_cursor, DefaultRootWindow(self->params.egl->x11.dpy));
+ Display *display = gsr_window_get_display(self->params.egl->window);
+ gsr_cursor_tick(&self->x11_cursor, DefaultRootWindow(display));
const vec2i cursor_pos = {
target_pos.x + (self->x11_cursor.position.x - self->x11_cursor.hotspot.x - capture_pos.x) * scale.x,
@@ -551,6 +568,55 @@ static void gsr_capture_kms_update_capture_size_change(gsr_capture_kms *self, gs
}
}
+static void gsr_capture_kms_update_connector_ids(gsr_capture_kms *self) {
+ const double now = clock_get_monotonic_seconds();
+ if(now - self->last_time_monitor_check < FIND_CRTC_BY_NAME_TIMEOUT_SECONDS)
+ return;
+
+ self->last_time_monitor_check = now;
+ /* TODO: Assume for now that there is only 1 framebuffer for all monitors and it doesn't change */
+ if(self->is_x11)
+ return;
+
+ self->monitor_id.num_connector_ids = 0;
+ const gsr_connection_type connection_type = self->is_x11 ? GSR_CONNECTION_X11 : GSR_CONNECTION_DRM;
+ // MonitorCallbackUserdata monitor_callback_userdata = {
+ // &self->monitor_id,
+ // self->params.display_to_capture, strlen(self->params.display_to_capture),
+ // 0,
+ // };
+ // for_each_active_monitor_output(self->params.egl->window, self->params.egl->card_path, connection_type, monitor_callback, &monitor_callback_userdata);
+
+ gsr_monitor monitor;
+ if(!get_monitor_by_name(self->params.egl, connection_type, self->params.display_to_capture, &monitor)) {
+ fprintf(stderr, "gsr error: gsr_capture_kms_update_connector_ids: failed to find monitor by name \"%s\"\n", self->params.display_to_capture);
+ return;
+ }
+
+ self->monitor_id.num_connector_ids = 1;
+ self->monitor_id.connector_ids[0] = monitor.connector_id;
+
+ monitor.name = self->params.display_to_capture;
+ self->monitor_rotation = drm_monitor_get_display_server_rotation(self->params.egl->window, &monitor);
+
+ self->capture_pos = monitor.pos;
+ /* Monitor size is already rotated on x11 when the monitor is rotated, no need to apply it ourselves */
+ if(self->is_x11)
+ self->capture_size = monitor.size;
+ else
+ self->capture_size = rotate_capture_size_if_rotated(self, monitor.size);
+}
+
+static void gsr_capture_kms_fail_fast_path_if_not_fast(gsr_capture_kms *self, uint32_t pixel_format) {
+ const uint8_t pixel_format_color_depth_1 = (pixel_format >> 16) & 0xFF;
+ if(!self->fast_path_failed && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !self->mesa_supports_compute_only_vaapi_copy && (pixel_format_color_depth_1 == '3' || pixel_format_color_depth_1 == '4')) {
+ self->fast_path_failed = true;
+ fprintf(stderr, "gsr warning: gsr_capture_kms_capture: the monitor you are recording is in 10/12-bit color format and your mesa version is <= 24.3.6, composition will be used."
+ " If you experience performance problems in the video then record on a single window on X11 or use portal capture option instead or disable 10/12-bit color option in your desktop environment settings,"
+ " or try to record the monitor on X11 instead (if you aren't already doing that) or update your mesa version.\n");
+ }
+}
+
static int gsr_capture_kms_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion) {
gsr_capture_kms *self = cap->priv;
@@ -570,6 +636,8 @@ static int gsr_capture_kms_capture(gsr_capture *cap, AVFrame *frame, gsr_color_c
return -1;
}
+ gsr_capture_kms_update_connector_ids(self);
+
bool capture_is_combined_plane = false;
const gsr_kms_response_item *drm_fd = find_monitor_drm(self, &capture_is_combined_plane);
if(!drm_fd) {
@@ -582,10 +650,13 @@ static int gsr_capture_kms_capture(gsr_capture *cap, AVFrame *frame, gsr_color_c
if(!self->performance_error_shown && self->monitor_rotation != GSR_MONITOR_ROT_0 && video_codec_context_is_vaapi(self->video_codec_context) && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD) {
self->performance_error_shown = true;
- fprintf(stderr,"gsr warning: gsr_capture_kms_capture: the monitor you are recording is rotated, composition will have to be used."
- " If you are experience performance problems in the video then record a single window on X11 or use portal capture option instead\n");
+ self->fast_path_failed = true;
+ fprintf(stderr, "gsr warning: gsr_capture_kms_capture: the monitor you are recording is rotated, composition will have to be used."
+ " If you experience performance problems in the video then record a single window on X11 or use portal capture option instead\n");
}
+ gsr_capture_kms_fail_fast_path_if_not_fast(self, drm_fd->pixel_format);
+
self->capture_size = rotate_capture_size_if_rotated(self, (vec2i){ drm_fd->src_w, drm_fd->src_h });
const bool is_scaled = self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0;
@@ -690,8 +761,8 @@ static bool gsr_capture_kms_set_hdr_metadata(gsr_capture *cap, AVMasteringDispla
mastering_display_metadata->min_luminance = av_make_q(self->hdr_metadata.hdmi_metadata_type1.min_display_mastering_luminance, 10000);
mastering_display_metadata->max_luminance = av_make_q(self->hdr_metadata.hdmi_metadata_type1.max_display_mastering_luminance, 1);
- mastering_display_metadata->has_primaries = mastering_display_metadata->display_primaries[0][0].num > 0;
- mastering_display_metadata->has_luminance = mastering_display_metadata->max_luminance.num > 0;
+ mastering_display_metadata->has_primaries = true;
+ mastering_display_metadata->has_luminance = true;
return true;
}
diff --git a/src/capture/nvfbc.c b/src/capture/nvfbc.c
index d5a270e..676d269 100644
--- a/src/capture/nvfbc.c
+++ b/src/capture/nvfbc.c
@@ -3,12 +3,14 @@
#include "../../include/egl.h"
#include "../../include/utils.h"
#include "../../include/color_conversion.h"
+#include "../../include/window/window.h"
#include <dlfcn.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <math.h>
+#include <assert.h>
#include <X11/Xlib.h>
#include <libavcodec/avcodec.h>
@@ -136,7 +138,10 @@ static void set_vertical_sync_enabled(gsr_egl *egl, int enabled) {
int result = 0;
if(egl->glXSwapIntervalEXT) {
- egl->glXSwapIntervalEXT(egl->x11.dpy, egl->x11.window, enabled ? 1 : 0);
+ assert(gsr_window_get_display_server(egl->window) == GSR_DISPLAY_SERVER_X11);
+ Display *display = gsr_window_get_display(egl->window);
+ const Window window = (Window)gsr_window_get_window(egl->window);
+ egl->glXSwapIntervalEXT(display, window, enabled ? 1 : 0);
} else if(egl->glXSwapIntervalMESA) {
result = egl->glXSwapIntervalMESA(enabled ? 1 : 0);
} else if(egl->glXSwapIntervalSGI) {
@@ -219,8 +224,11 @@ static int gsr_capture_nvfbc_setup_handle(gsr_capture_nvfbc *self) {
goto error_cleanup;
}
- self->tracking_width = XWidthOfScreen(DefaultScreenOfDisplay(self->params.egl->x11.dpy));
- self->tracking_height = XHeightOfScreen(DefaultScreenOfDisplay(self->params.egl->x11.dpy));
+ assert(gsr_window_get_display_server(self->params.egl->window) == GSR_DISPLAY_SERVER_X11);
+ Display *display = gsr_window_get_display(self->params.egl->window);
+
+ self->tracking_width = XWidthOfScreen(DefaultScreenOfDisplay(display));
+ self->tracking_height = XHeightOfScreen(DefaultScreenOfDisplay(display));
self->tracking_type = strcmp(self->params.display_to_capture, "screen") == 0 ? NVFBC_TRACKING_SCREEN : NVFBC_TRACKING_OUTPUT;
if(self->tracking_type == NVFBC_TRACKING_OUTPUT) {
if(!status_params.bXRandRAvailable) {
diff --git a/src/capture/portal.c b/src/capture/portal.c
index a441299..27486fd 100644
--- a/src/capture/portal.c
+++ b/src/capture/portal.c
@@ -27,6 +27,7 @@ typedef struct {
AVCodecContext *video_codec_context;
bool fast_path_failed;
+ bool mesa_supports_compute_only_vaapi_copy;
} gsr_capture_portal;
static void gsr_capture_portal_cleanup_plane_fds(gsr_capture_portal *self) {
@@ -310,10 +311,12 @@ static int gsr_capture_portal_start(gsr_capture *cap, AVCodecContext *video_code
video_codec_context->height = FFALIGN(self->params.output_resolution.y, 2);
}
- self->fast_path_failed = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !gl_driver_version_greater_than(self->params.egl, 24, 0, 9);
+ self->fast_path_failed = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 0, 9);
if(self->fast_path_failed)
fprintf(stderr, "gsr warning: gsr_capture_kms_start: your amd driver (mesa) version is known to be buggy (<= version 24.0.9), falling back to opengl copy\n");
+ self->mesa_supports_compute_only_vaapi_copy = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 3, 6);
+
frame->width = video_codec_context->width;
frame->height = video_codec_context->height;
@@ -325,6 +328,16 @@ static int max_int(int a, int b) {
return a > b ? a : b;
}
+static void gsr_capture_portal_fail_fast_path_if_not_fast(gsr_capture_portal *self, uint32_t pixel_format) {
+ const uint8_t pixel_format_color_depth_1 = (pixel_format >> 16) & 0xFF;
+ if(!self->fast_path_failed && self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !self->mesa_supports_compute_only_vaapi_copy && (pixel_format_color_depth_1 == '3' || pixel_format_color_depth_1 == '4')) {
+ self->fast_path_failed = true;
+ fprintf(stderr, "gsr warning: gsr_capture_kms_capture: the monitor you are recording is in 10/12-bit color format and your mesa version is <= 24.3.6, composition will be used."
+ " If you experience performance problems in the video then record on a single window on X11 instead or disable 10/12-bit color option in your desktop environment settings,"
+ " or try to record the monitor on X11 instead (if you aren't already doing that) or update your mesa version.\n");
+ }
+}
+
static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion) {
(void)frame;
(void)color_conversion;
@@ -346,6 +359,8 @@ static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_colo
return 0;
}
+ gsr_capture_portal_fail_fast_path_if_not_fast(self, pipewire_fourcc);
+
const bool is_scaled = self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0;
vec2i output_size = is_scaled ? self->params.output_resolution : self->capture_size;
output_size = scale_keep_aspect_ratio(self->capture_size, output_size);
diff --git a/src/capture/xcomposite.c b/src/capture/xcomposite.c
index 79cd60a..5cef71d 100644
--- a/src/capture/xcomposite.c
+++ b/src/capture/xcomposite.c
@@ -3,6 +3,7 @@
#include "../../include/utils.h"
#include "../../include/cursor.h"
#include "../../include/color_conversion.h"
+#include "../../include/window/window.h"
#include <stdlib.h>
#include <stdio.h>
@@ -16,6 +17,7 @@
typedef struct {
gsr_capture_xcomposite_params params;
+ Display *display;
bool should_stop;
bool stop_is_error;
@@ -66,12 +68,12 @@ static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_
gsr_capture_xcomposite *self = cap->priv;
if(self->params.follow_focused) {
- self->net_active_window_atom = XInternAtom(self->params.egl->x11.dpy, "_NET_ACTIVE_WINDOW", False);
+ self->net_active_window_atom = XInternAtom(self->display, "_NET_ACTIVE_WINDOW", False);
if(!self->net_active_window_atom) {
fprintf(stderr, "gsr error: gsr_capture_xcomposite_start failed: failed to get _NET_ACTIVE_WINDOW atom\n");
return -1;
}
- self->window = get_focused_window(self->params.egl->x11.dpy, self->net_active_window_atom);
+ self->window = get_focused_window(self->display, self->net_active_window_atom);
} else {
self->window = self->params.window;
}
@@ -79,7 +81,7 @@ static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_
/* TODO: Do these in tick, and allow error if follow_focused */
XWindowAttributes attr;
- if(!XGetWindowAttributes(self->params.egl->x11.dpy, self->window, &attr) && !self->params.follow_focused) {
+ if(!XGetWindowAttributes(self->display, self->window, &attr) && !self->params.follow_focused) {
fprintf(stderr, "gsr error: gsr_capture_xcomposite_start failed: invalid window id: %lu\n", self->window);
return -1;
}
@@ -88,19 +90,19 @@ static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_
self->window_size.y = max_int(attr.height, 0);
if(self->params.follow_focused)
- XSelectInput(self->params.egl->x11.dpy, DefaultRootWindow(self->params.egl->x11.dpy), PropertyChangeMask);
+ XSelectInput(self->display, DefaultRootWindow(self->display), PropertyChangeMask);
// TODO: Get select and add these on top of it and then restore at the end. Also do the same in other xcomposite
- XSelectInput(self->params.egl->x11.dpy, self->window, StructureNotifyMask | ExposureMask);
+ XSelectInput(self->display, self->window, StructureNotifyMask | ExposureMask);
/* Disable vsync */
self->params.egl->eglSwapInterval(self->params.egl->egl_display, 0);
- if(window_texture_init(&self->window_texture, self->params.egl->x11.dpy, self->window, self->params.egl) != 0 && !self->params.follow_focused) {
- fprintf(stderr, "gsr error: gsr_capture_xcomposite_start: failed to get window texture for window %ld\n", self->window);
+ if(window_texture_init(&self->window_texture, self->display, self->window, self->params.egl) != 0 && !self->params.follow_focused) {
+ fprintf(stderr, "gsr error: gsr_capture_xcomposite_start: failed to get window texture for window %ld\n", (long)self->window);
return -1;
}
- if(gsr_cursor_init(&self->cursor, self->params.egl, self->params.egl->x11.dpy) != 0) {
+ if(gsr_cursor_init(&self->cursor, self->params.egl, self->display) != 0) {
gsr_capture_xcomposite_stop(self);
return -1;
}
@@ -122,7 +124,7 @@ static int gsr_capture_xcomposite_start(gsr_capture *cap, AVCodecContext *video_
video_codec_context->height = FFALIGN(self->params.output_resolution.y, 2);
}
- self->fast_path_failed = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !gl_driver_version_greater_than(self->params.egl, 24, 0, 9);
+ self->fast_path_failed = self->params.egl->gpu_info.vendor == GSR_GPU_VENDOR_AMD && !gl_driver_version_greater_than(&self->params.egl->gpu_info, 24, 0, 9);
if(self->fast_path_failed)
fprintf(stderr, "gsr warning: gsr_capture_kms_start: your amd driver (mesa) version is known to be buggy (<= version 24.0.9), falling back to opengl copy\n");
@@ -143,24 +145,24 @@ static void gsr_capture_xcomposite_tick(gsr_capture *cap) {
if(self->init_new_window) {
self->init_new_window = false;
- Window focused_window = get_focused_window(self->params.egl->x11.dpy, self->net_active_window_atom);
+ Window focused_window = get_focused_window(self->display, self->net_active_window_atom);
if(focused_window != self->window || !self->follow_focused_initialized) {
self->follow_focused_initialized = true;
- XSelectInput(self->params.egl->x11.dpy, self->window, 0);
+ XSelectInput(self->display, self->window, 0);
self->window = focused_window;
- XSelectInput(self->params.egl->x11.dpy, self->window, StructureNotifyMask | ExposureMask);
+ XSelectInput(self->display, self->window, StructureNotifyMask | ExposureMask);
XWindowAttributes attr;
attr.width = 0;
attr.height = 0;
- if(!XGetWindowAttributes(self->params.egl->x11.dpy, self->window, &attr))
+ if(!XGetWindowAttributes(self->display, self->window, &attr))
fprintf(stderr, "gsr error: gsr_capture_xcomposite_tick failed: invalid window id: %lu\n", self->window);
self->window_size.x = max_int(attr.width, 0);
self->window_size.y = max_int(attr.height, 0);
window_texture_deinit(&self->window_texture);
- window_texture_init(&self->window_texture, self->params.egl->x11.dpy, self->window, self->params.egl); // TODO: Do not do the below window_texture_on_resize after this
+ window_texture_init(&self->window_texture, self->display, self->window, self->params.egl); // TODO: Do not do the below window_texture_on_resize after this
self->texture_size.x = 0;
self->texture_size.y = 0;
@@ -200,7 +202,7 @@ static void gsr_capture_xcomposite_tick(gsr_capture *cap) {
static void gsr_capture_xcomposite_on_event(gsr_capture *cap, gsr_egl *egl) {
gsr_capture_xcomposite *self = cap->priv;
- XEvent *xev = gsr_egl_get_event_data(egl);
+ XEvent *xev = gsr_window_get_event_data(egl->window);
switch(xev->type) {
case DestroyNotify: {
/* Window died (when not following focused window), so we stop recording */
@@ -350,6 +352,7 @@ gsr_capture* gsr_capture_xcomposite_create(const gsr_capture_xcomposite_params *
}
cap_xcomp->params = *params;
+ cap_xcomp->display = gsr_window_get_display(params->egl->window);
*cap = (gsr_capture) {
.start = gsr_capture_xcomposite_start,
diff --git a/src/color_conversion.c b/src/color_conversion.c
index 65f3775..4d2c063 100644
--- a/src/color_conversion.c
+++ b/src/color_conversion.c
@@ -9,6 +9,7 @@
#define MAX_SHADERS 4
#define MAX_FRAMEBUFFERS 2
+#define EXTERNAL_TEXTURE_SHADER_OFFSET 2
static float abs_f(float v) {
return v >= 0.0f ? v : -v;
@@ -69,6 +70,8 @@ static const char* color_format_range_get_transform_matrix(gsr_destination_color
}
break;
}
+ case GSR_DESTINATION_COLOR_RGB8:
+ return "";
default:
return NULL;
}
@@ -93,6 +96,12 @@ static int load_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_uniforms *u
" gl_Position = vec4(offset.x, offset.y, 0.0, 0.0) + vec4(pos.x, pos.y, 0.0, 1.0); \n"
"} \n");
+ const char *main_code =
+ main_code =
+ " vec4 pixel = texture(tex1, texcoords_out); \n"
+ " FragColor.x = (RGBtoYUV * vec4(pixel.rgb, 1.0)).x; \n"
+ " FragColor.w = pixel.a; \n";
+
char fragment_shader[2048];
if(external_texture) {
snprintf(fragment_shader, sizeof(fragment_shader),
@@ -106,10 +115,8 @@ static int load_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_uniforms *u
"%s"
"void main() \n"
"{ \n"
- " vec4 pixel = texture(tex1, texcoords_out); \n"
- " FragColor.x = (RGBtoYUV * vec4(pixel.rgb, 1.0)).x; \n"
- " FragColor.w = pixel.a; \n"
- "} \n", color_transform_matrix);
+ "%s"
+ "} \n", color_transform_matrix, main_code);
} else {
snprintf(fragment_shader, sizeof(fragment_shader),
"#version 300 es \n"
@@ -120,10 +127,8 @@ static int load_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_uniforms *u
"%s"
"void main() \n"
"{ \n"
- " vec4 pixel = texture(tex1, texcoords_out); \n"
- " FragColor.x = (RGBtoYUV * vec4(pixel.rgb, 1.0)).x; \n"
- " FragColor.w = pixel.a; \n"
- "} \n", color_transform_matrix);
+ "%s"
+ "} \n", color_transform_matrix, main_code);
}
if(gsr_shader_init(shader, egl, vertex_shader, fragment_shader) != 0)
@@ -145,7 +150,7 @@ static unsigned int load_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_u
"in vec2 pos; \n"
"in vec2 texcoords; \n"
"out vec2 texcoords_out; \n"
- "uniform vec2 offset; \n"
+ "uniform vec2 offset; \n"
"uniform float rotation; \n"
ROTATE_Z
"void main() \n"
@@ -154,6 +159,12 @@ static unsigned int load_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_u
" gl_Position = (vec4(offset.x, offset.y, 0.0, 0.0) + vec4(pos.x, pos.y, 0.0, 1.0)) * vec4(0.5, 0.5, 1.0, 1.0) - vec4(0.5, 0.5, 0.0, 0.0); \n"
"} \n");
+ const char *main_code =
+ main_code =
+ " vec4 pixel = texture(tex1, texcoords_out); \n"
+ " FragColor.xy = (RGBtoYUV * vec4(pixel.rgb, 1.0)).yz; \n"
+ " FragColor.w = pixel.a; \n";
+
char fragment_shader[2048];
if(external_texture) {
snprintf(fragment_shader, sizeof(fragment_shader),
@@ -167,10 +178,8 @@ static unsigned int load_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_u
"%s"
"void main() \n"
"{ \n"
- " vec4 pixel = texture(tex1, texcoords_out); \n"
- " FragColor.xy = (RGBtoYUV * vec4(pixel.rgb, 1.0)).yz; \n"
- " FragColor.w = pixel.a; \n"
- "} \n", color_transform_matrix);
+ "%s"
+ "} \n", color_transform_matrix, main_code);
} else {
snprintf(fragment_shader, sizeof(fragment_shader),
"#version 300 es \n"
@@ -181,10 +190,66 @@ static unsigned int load_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_u
"%s"
"void main() \n"
"{ \n"
+ "%s"
+ "} \n", color_transform_matrix, main_code);
+ }
+
+ if(gsr_shader_init(shader, egl, vertex_shader, fragment_shader) != 0)
+ return -1;
+
+ gsr_shader_bind_attribute_location(shader, "pos", 0);
+ gsr_shader_bind_attribute_location(shader, "texcoords", 1);
+ uniforms->offset = egl->glGetUniformLocation(shader->program_id, "offset");
+ uniforms->rotation = egl->glGetUniformLocation(shader->program_id, "rotation");
+ return 0;
+}
+
+static unsigned int load_shader_rgb(gsr_shader *shader, gsr_egl *egl, gsr_color_uniforms *uniforms, bool external_texture) {
+ char vertex_shader[2048];
+ snprintf(vertex_shader, sizeof(vertex_shader),
+ "#version 300 es \n"
+ "in vec2 pos; \n"
+ "in vec2 texcoords; \n"
+ "out vec2 texcoords_out; \n"
+ "uniform vec2 offset; \n"
+ "uniform float rotation; \n"
+ ROTATE_Z
+ "void main() \n"
+ "{ \n"
+ " texcoords_out = (vec4(texcoords.x - 0.5, texcoords.y - 0.5, 0.0, 0.0) * rotate_z(rotation)).xy + vec2(0.5, 0.5); \n"
+ " gl_Position = vec4(offset.x, offset.y, 0.0, 0.0) + vec4(pos.x, pos.y, 0.0, 1.0); \n"
+ "} \n");
+
+ const char *main_code =
+ main_code =
" vec4 pixel = texture(tex1, texcoords_out); \n"
- " FragColor.xy = (RGBtoYUV * vec4(pixel.rgb, 1.0)).yz; \n"
- " FragColor.w = pixel.a; \n"
- "} \n", color_transform_matrix);
+ " FragColor = pixel; \n";
+
+ char fragment_shader[2048];
+ if(external_texture) {
+ snprintf(fragment_shader, sizeof(fragment_shader),
+ "#version 300 es \n"
+ "#extension GL_OES_EGL_image_external : enable \n"
+ "#extension GL_OES_EGL_image_external_essl3 : require \n"
+ "precision mediump float; \n"
+ "in vec2 texcoords_out; \n"
+ "uniform samplerExternalOES tex1; \n"
+ "out vec4 FragColor; \n"
+ "void main() \n"
+ "{ \n"
+ "%s"
+ "} \n", main_code);
+ } else {
+ snprintf(fragment_shader, sizeof(fragment_shader),
+ "#version 300 es \n"
+ "precision mediump float; \n"
+ "in vec2 texcoords_out; \n"
+ "uniform sampler2D tex1; \n"
+ "out vec4 FragColor; \n"
+ "void main() \n"
+ "{ \n"
+ "%s"
+ "} \n", main_code);
}
if(gsr_shader_init(shader, egl, vertex_shader, fragment_shader) != 0)
@@ -272,18 +337,37 @@ int gsr_color_conversion_init(gsr_color_conversion *self, const gsr_color_conver
}
if(self->params.load_external_image_shader) {
- if(load_shader_y(&self->shaders[2], self->params.egl, &self->uniforms[2], params->destination_color, params->color_range, true) != 0) {
+ if(load_shader_y(&self->shaders[EXTERNAL_TEXTURE_SHADER_OFFSET], self->params.egl, &self->uniforms[EXTERNAL_TEXTURE_SHADER_OFFSET], params->destination_color, params->color_range, true) != 0) {
fprintf(stderr, "gsr error: gsr_color_conversion_init: failed to load Y shader\n");
goto err;
}
- if(load_shader_uv(&self->shaders[3], self->params.egl, &self->uniforms[3], params->destination_color, params->color_range, true) != 0) {
+ if(load_shader_uv(&self->shaders[EXTERNAL_TEXTURE_SHADER_OFFSET + 1], self->params.egl, &self->uniforms[EXTERNAL_TEXTURE_SHADER_OFFSET + 1], params->destination_color, params->color_range, true) != 0) {
fprintf(stderr, "gsr error: gsr_color_conversion_init: failed to load UV shader\n");
goto err;
}
}
break;
}
+ case GSR_DESTINATION_COLOR_RGB8: {
+ if(self->params.num_destination_textures != 1) {
+ fprintf(stderr, "gsr error: gsr_color_conversion_init: expected 1 destination textures for destination color RGB8, got %d destination texture(s)\n", self->params.num_destination_textures);
+ return -1;
+ }
+
+ if(load_shader_rgb(&self->shaders[0], self->params.egl, &self->uniforms[0], false) != 0) {
+ fprintf(stderr, "gsr error: gsr_color_conversion_init: failed to load Y shader\n");
+ goto err;
+ }
+
+ if(self->params.load_external_image_shader) {
+ if(load_shader_rgb(&self->shaders[EXTERNAL_TEXTURE_SHADER_OFFSET], self->params.egl, &self->uniforms[EXTERNAL_TEXTURE_SHADER_OFFSET], true) != 0) {
+ fprintf(stderr, "gsr error: gsr_color_conversion_init: failed to load Y shader\n");
+ goto err;
+ }
+ }
+ break;
+ }
}
if(load_framebuffers(self) != 0)
@@ -415,7 +499,7 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, self->framebuffers[0]);
//cap_xcomp->params.egl->glClear(GL_COLOR_BUFFER_BIT); // TODO: Do this in a separate clear_ function. We want to do that when using multiple drm to create the final image (multiple monitors for example)
- const int shader_index = external_texture ? 2 : 0;
+ const int shader_index = external_texture ? EXTERNAL_TEXTURE_SHADER_OFFSET : 0;
gsr_shader_use(&self->shaders[shader_index]);
self->params.egl->glUniform1f(self->uniforms[shader_index].rotation, rotation);
self->params.egl->glUniform2f(self->uniforms[shader_index].offset, pos_norm.x, pos_norm.y);
@@ -426,7 +510,7 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, self->framebuffers[1]);
//cap_xcomp->params.egl->glClear(GL_COLOR_BUFFER_BIT);
- const int shader_index = external_texture ? 3 : 1;
+ const int shader_index = external_texture ? EXTERNAL_TEXTURE_SHADER_OFFSET + 1 : 1;
gsr_shader_use(&self->shaders[shader_index]);
self->params.egl->glUniform1f(self->uniforms[shader_index].rotation, rotation);
self->params.egl->glUniform2f(self->uniforms[shader_index].offset, pos_norm.x, pos_norm.y);
@@ -454,6 +538,13 @@ void gsr_color_conversion_clear(gsr_color_conversion *self) {
color2[3] = 1.0f;
break;
}
+ case GSR_DESTINATION_COLOR_RGB8: {
+ color2[0] = 0.0f;
+ color2[1] = 0.0f;
+ color2[2] = 0.0f;
+ color2[3] = 1.0f;
+ break;
+ }
}
self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, self->framebuffers[0]);
diff --git a/src/damage.c b/src/damage.c
index 10f4ccd..25a2225 100644
--- a/src/damage.c
+++ b/src/damage.c
@@ -1,5 +1,6 @@
#include "../include/damage.h"
#include "../include/utils.h"
+#include "../include/window/window.h"
#include <stdio.h>
#include <string.h>
@@ -30,33 +31,34 @@ bool gsr_damage_init(gsr_damage *self, gsr_egl *egl, bool track_cursor) {
self->egl = egl;
self->track_cursor = track_cursor;
- if(gsr_egl_get_display_server(egl) != GSR_DISPLAY_SERVER_X11) {
+ if(gsr_window_get_display_server(egl->window) != GSR_DISPLAY_SERVER_X11) {
fprintf(stderr, "gsr warning: gsr_damage_init: damage tracking is not supported on wayland\n");
return false;
}
+ self->display = gsr_window_get_display(egl->window);
- if(!XDamageQueryExtension(self->egl->x11.dpy, &self->damage_event, &self->damage_error)) {
+ if(!XDamageQueryExtension(self->display, &self->damage_event, &self->damage_error)) {
fprintf(stderr, "gsr warning: gsr_damage_init: XDamage is not supported by your X11 server\n");
gsr_damage_deinit(self);
return false;
}
- if(!XRRQueryExtension(self->egl->x11.dpy, &self->randr_event, &self->randr_error)) {
+ if(!XRRQueryExtension(self->display, &self->randr_event, &self->randr_error)) {
fprintf(stderr, "gsr warning: gsr_damage_init: XRandr is not supported by your X11 server\n");
gsr_damage_deinit(self);
return false;
}
- if(!xrandr_is_supported(self->egl->x11.dpy)) {
+ if(!xrandr_is_supported(self->display)) {
fprintf(stderr, "gsr warning: gsr_damage_init: your X11 randr version is too old\n");
gsr_damage_deinit(self);
return false;
}
if(self->track_cursor)
- self->track_cursor = gsr_cursor_init(&self->cursor, self->egl, self->egl->x11.dpy) == 0;
+ self->track_cursor = gsr_cursor_init(&self->cursor, self->egl, self->display) == 0;
- XRRSelectInput(self->egl->x11.dpy, DefaultRootWindow(self->egl->x11.dpy), RRScreenChangeNotifyMask | RRCrtcChangeNotifyMask | RROutputChangeNotifyMask);
+ XRRSelectInput(self->display, DefaultRootWindow(self->display), RRScreenChangeNotifyMask | RRCrtcChangeNotifyMask | RROutputChangeNotifyMask);
self->damaged = true;
return true;
@@ -64,7 +66,7 @@ bool gsr_damage_init(gsr_damage *self, gsr_egl *egl, bool track_cursor) {
void gsr_damage_deinit(gsr_damage *self) {
if(self->damage) {
- XDamageDestroy(self->egl->x11.dpy, self->damage);
+ XDamageDestroy(self->display, self->damage);
self->damage = None;
}
@@ -85,22 +87,22 @@ bool gsr_damage_set_target_window(gsr_damage *self, uint64_t window) {
return true;
if(self->damage) {
- XDamageDestroy(self->egl->x11.dpy, self->damage);
+ XDamageDestroy(self->display, self->damage);
self->damage = None;
}
if(self->window)
- XSelectInput(self->egl->x11.dpy, self->window, 0);
+ XSelectInput(self->display, self->window, 0);
self->window = window;
- XSelectInput(self->egl->x11.dpy, self->window, StructureNotifyMask | ExposureMask);
+ XSelectInput(self->display, self->window, StructureNotifyMask | ExposureMask);
XWindowAttributes win_attr;
win_attr.x = 0;
win_attr.y = 0;
win_attr.width = 0;
win_attr.height = 0;
- if(!XGetWindowAttributes(self->egl->x11.dpy, self->window, &win_attr))
+ if(!XGetWindowAttributes(self->display, self->window, &win_attr))
fprintf(stderr, "gsr warning: gsr_damage_set_target_window failed: failed to get window attributes: %ld\n", (long)self->window);
//self->window_pos.x = win_attr.x;
@@ -109,9 +111,9 @@ bool gsr_damage_set_target_window(gsr_damage *self, uint64_t window) {
self->window_size.x = win_attr.width;
self->window_size.y = win_attr.height;
- self->damage = XDamageCreate(self->egl->x11.dpy, window, XDamageReportNonEmpty);
+ self->damage = XDamageCreate(self->display, window, XDamageReportNonEmpty);
if(self->damage) {
- XDamageSubtract(self->egl->x11.dpy, self->damage, None, None);
+ XDamageSubtract(self->display, self->damage, None, None);
self->damaged = true;
self->track_type = GSR_DAMAGE_TRACK_WINDOW;
return true;
@@ -130,23 +132,23 @@ bool gsr_damage_set_target_monitor(gsr_damage *self, const char *monitor_name) {
return true;
if(self->damage) {
- XDamageDestroy(self->egl->x11.dpy, self->damage);
+ XDamageDestroy(self->display, self->damage);
self->damage = None;
}
memset(&self->monitor, 0, sizeof(self->monitor));
- if(strcmp(monitor_name, "screen") != 0 && strcmp(monitor_name, "screen-direct") != 0 && strcmp(monitor_name, "screen-direct-force") != 0) {
+ if(strcmp(monitor_name, "screen-direct") != 0 && strcmp(monitor_name, "screen-direct-force") != 0) {
if(!get_monitor_by_name(self->egl, GSR_CONNECTION_X11, monitor_name, &self->monitor))
fprintf(stderr, "gsr warning: gsr_damage_set_target_monitor: failed to find monitor: %s\n", monitor_name);
}
if(self->window)
- XSelectInput(self->egl->x11.dpy, self->window, 0);
+ XSelectInput(self->display, self->window, 0);
- self->window = DefaultRootWindow(self->egl->x11.dpy);
- self->damage = XDamageCreate(self->egl->x11.dpy, self->window, XDamageReportNonEmpty);
+ self->window = DefaultRootWindow(self->display);
+ self->damage = XDamageCreate(self->display, self->window, XDamageReportNonEmpty);
if(self->damage) {
- XDamageSubtract(self->egl->x11.dpy, self->damage, None, None);
+ XDamageSubtract(self->display, self->damage, None, None);
self->damaged = true;
snprintf(self->monitor_name, sizeof(self->monitor_name), "%s", monitor_name);
self->track_type = GSR_DAMAGE_TRACK_MONITOR;
@@ -184,14 +186,14 @@ static void gsr_damage_on_output_change(gsr_damage *self, XEvent *xev) {
if(!rr_output_change_event->output || self->monitor.monitor_identifier == 0)
return;
- XRRScreenResources *screen_res = XRRGetScreenResources(self->egl->x11.dpy, DefaultRootWindow(self->egl->x11.dpy));
+ XRRScreenResources *screen_res = XRRGetScreenResources(self->display, DefaultRootWindow(self->display));
if(!screen_res)
return;
// TODO: What about scaled output? look at for_each_active_monitor_output_x11_not_cached
- XRROutputInfo *out_info = XRRGetOutputInfo(self->egl->x11.dpy, screen_res, rr_output_change_event->output);
+ XRROutputInfo *out_info = XRRGetOutputInfo(self->display, screen_res, rr_output_change_event->output);
if(out_info && out_info->crtc && out_info->crtc == self->monitor.monitor_identifier) {
- XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(self->egl->x11.dpy, screen_res, out_info->crtc);
+ XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(self->display, screen_res, out_info->crtc);
if(crtc_info && (crtc_info->x != self->monitor.pos.x || crtc_info->y != self->monitor.pos.y ||
(int)crtc_info->width != self->monitor.size.x || (int)crtc_info->height != self->monitor.size.y))
{
@@ -226,15 +228,15 @@ static void gsr_damage_on_randr_event(gsr_damage *self, XEvent *xev) {
static void gsr_damage_on_damage_event(gsr_damage *self, XEvent *xev) {
const XDamageNotifyEvent *de = (XDamageNotifyEvent*)xev;
- XserverRegion region = XFixesCreateRegion(self->egl->x11.dpy, NULL, 0);
+ XserverRegion region = XFixesCreateRegion(self->display, NULL, 0);
/* Subtract all the damage, repairing the window */
- XDamageSubtract(self->egl->x11.dpy, de->damage, None, region);
+ XDamageSubtract(self->display, de->damage, None, region);
if(self->track_type == GSR_DAMAGE_TRACK_WINDOW || (self->track_type == GSR_DAMAGE_TRACK_MONITOR && self->monitor.connector_id == 0)) {
self->damaged = true;
} else {
int num_rectangles = 0;
- XRectangle *rectangles = XFixesFetchRegion(self->egl->x11.dpy, region, &num_rectangles);
+ XRectangle *rectangles = XFixesFetchRegion(self->display, region, &num_rectangles);
if(rectangles) {
const gsr_rectangle monitor_region = { self->monitor.pos, self->monitor.size };
for(int i = 0; i < num_rectangles; ++i) {
@@ -247,8 +249,8 @@ static void gsr_damage_on_damage_event(gsr_damage *self, XEvent *xev) {
}
}
- XFixesDestroyRegion(self->egl->x11.dpy, region);
- XFlush(self->egl->x11.dpy);
+ XFixesDestroyRegion(self->display, region);
+ XFlush(self->display);
}
static void gsr_damage_on_tick_cursor(gsr_damage *self) {
diff --git a/src/egl.c b/src/egl.c
index 315cbab..682810d 100644
--- a/src/egl.c
+++ b/src/egl.c
@@ -1,4 +1,5 @@
#include "../include/egl.h"
+#include "../include/window/window.h"
#include "../include/library_loader.h"
#include "../include/utils.h"
@@ -10,118 +11,28 @@
#include <unistd.h>
#include <sys/capability.h>
-#include <wayland-client.h>
-#include <wayland-egl.h>
-
// TODO: rename gsr_egl to something else since this includes both egl and glx and in the future maybe vulkan too
-// TODO: Move this shit to a separate wayland file, and have a separate file for x11.
-
-static void output_handle_geometry(void *data, struct wl_output *wl_output,
- int32_t x, int32_t y, int32_t phys_width, int32_t phys_height,
- int32_t subpixel, const char *make, const char *model,
- int32_t transform) {
- (void)wl_output;
- (void)phys_width;
- (void)phys_height;
- (void)subpixel;
- (void)make;
- (void)model;
- gsr_wayland_output *gsr_output = data;
- gsr_output->pos.x = x;
- gsr_output->pos.y = y;
- gsr_output->transform = transform;
-}
-
-static void output_handle_mode(void *data, struct wl_output *wl_output, uint32_t flags, int32_t width, int32_t height, int32_t refresh) {
- (void)wl_output;
- (void)flags;
- (void)refresh;
- gsr_wayland_output *gsr_output = data;
- gsr_output->size.x = width;
- gsr_output->size.y = height;
-}
-
-static void output_handle_done(void *data, struct wl_output *wl_output) {
- (void)data;
- (void)wl_output;
-}
-
-static void output_handle_scale(void* data, struct wl_output *wl_output, int32_t factor) {
- (void)data;
- (void)wl_output;
- (void)factor;
-}
-
-static void output_handle_name(void *data, struct wl_output *wl_output, const char *name) {
- (void)wl_output;
- gsr_wayland_output *gsr_output = data;
- if(gsr_output->name) {
- free(gsr_output->name);
- gsr_output->name = NULL;
- }
- gsr_output->name = strdup(name);
-}
-
-static void output_handle_description(void *data, struct wl_output *wl_output, const char *description) {
- (void)data;
- (void)wl_output;
- (void)description;
-}
-
-static const struct wl_output_listener output_listener = {
- .geometry = output_handle_geometry,
- .mode = output_handle_mode,
- .done = output_handle_done,
- .scale = output_handle_scale,
- .name = output_handle_name,
- .description = output_handle_description,
-};
-
-static void registry_add_object(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) {
- (void)version;
- gsr_egl *egl = data;
- if (strcmp(interface, "wl_compositor") == 0) {
- if(egl->wayland.compositor) {
- wl_compositor_destroy(egl->wayland.compositor);
- egl->wayland.compositor = NULL;
- }
- egl->wayland.compositor = wl_registry_bind(registry, name, &wl_compositor_interface, 1);
- } else if(strcmp(interface, wl_output_interface.name) == 0) {
- if(version < 4) {
- fprintf(stderr, "gsr warning: wl output interface version is < 4, expected >= 4 to capture a monitor. Using KMS capture instead\n");
- return;
- }
-
- if(egl->wayland.num_outputs == GSR_MAX_OUTPUTS) {
- fprintf(stderr, "gsr warning: reached maximum outputs (%d), ignoring output %u\n", GSR_MAX_OUTPUTS, name);
- return;
- }
-
- gsr_wayland_output *gsr_output = &egl->wayland.outputs[egl->wayland.num_outputs];
- egl->wayland.num_outputs++;
- *gsr_output = (gsr_wayland_output) {
- .wl_name = name,
- .output = wl_registry_bind(registry, name, &wl_output_interface, 4),
- .pos = { .x = 0, .y = 0 },
- .size = { .x = 0, .y = 0 },
- .transform = 0,
- .name = NULL,
- };
- wl_output_add_listener(gsr_output->output, &output_listener, gsr_output);
- }
-}
-
-static void registry_remove_object(void *data, struct wl_registry *registry, uint32_t name) {
- (void)data;
- (void)registry;
- (void)name;
-}
+#define GLX_DRAWABLE_TYPE 0x8010
+#define GLX_RENDER_TYPE 0x8011
+#define GLX_RGBA_BIT 0x00000001
+#define GLX_WINDOW_BIT 0x00000001
+#define GLX_PIXMAP_BIT 0x00000002
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
+#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
+#define GLX_DOUBLEBUFFER 5
+#define GLX_RED_SIZE 8
+#define GLX_GREEN_SIZE 9
+#define GLX_BLUE_SIZE 10
+#define GLX_ALPHA_SIZE 11
+#define GLX_DEPTH_SIZE 12
+#define GLX_RGBA_TYPE 0x8014
-static struct wl_registry_listener registry_listener = {
- .global = registry_add_object,
- .global_remove = registry_remove_object,
-};
+#define GLX_CONTEXT_PRIORITY_LEVEL_EXT 0x3100
+#define GLX_CONTEXT_PRIORITY_HIGH_EXT 0x3101
+#define GLX_CONTEXT_PRIORITY_MEDIUM_EXT 0x3102
+#define GLX_CONTEXT_PRIORITY_LOW_EXT 0x3103
static void reset_cap_nice(void) {
cap_t caps = cap_get_proc();
@@ -135,75 +46,8 @@ static void reset_cap_nice(void) {
cap_free(caps);
}
-static void store_x11_monitor(const gsr_monitor *monitor, void *userdata) {
- gsr_egl *egl = userdata;
- if(egl->x11.num_outputs == GSR_MAX_OUTPUTS) {
- fprintf(stderr, "gsr warning: reached maximum outputs (%d), ignoring output %s\n", GSR_MAX_OUTPUTS, monitor->name);
- return;
- }
-
- char *monitor_name = strdup(monitor->name);
- if(!monitor_name)
- return;
-
- const int index = egl->x11.num_outputs;
- egl->x11.outputs[index].name = monitor_name;
- egl->x11.outputs[index].pos = monitor->pos;
- egl->x11.outputs[index].size = monitor->size;
- egl->x11.outputs[index].connector_id = monitor->connector_id;
- egl->x11.outputs[index].rotation = monitor->rotation;
- egl->x11.outputs[index].monitor_identifier = monitor->monitor_identifier;
- ++egl->x11.num_outputs;
-}
-
-#define GLX_DRAWABLE_TYPE 0x8010
-#define GLX_RENDER_TYPE 0x8011
-#define GLX_RGBA_BIT 0x00000001
-#define GLX_WINDOW_BIT 0x00000001
-#define GLX_PIXMAP_BIT 0x00000002
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
-#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
-#define GLX_DOUBLEBUFFER 5
-#define GLX_RED_SIZE 8
-#define GLX_GREEN_SIZE 9
-#define GLX_BLUE_SIZE 10
-#define GLX_ALPHA_SIZE 11
-#define GLX_DEPTH_SIZE 12
-#define GLX_RGBA_TYPE 0x8014
-
-#define GLX_CONTEXT_PRIORITY_LEVEL_EXT 0x3100
-#define GLX_CONTEXT_PRIORITY_HIGH_EXT 0x3101
-#define GLX_CONTEXT_PRIORITY_MEDIUM_EXT 0x3102
-#define GLX_CONTEXT_PRIORITY_LOW_EXT 0x3103
-
-static GLXFBConfig glx_fb_config_choose(gsr_egl *self) {
- const int glx_visual_attribs[] = {
- GLX_RENDER_TYPE, GLX_RGBA_BIT,
- GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
- // TODO:
- //GLX_BIND_TO_TEXTURE_RGBA_EXT, 1,
- //GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT,
- GLX_DOUBLEBUFFER, True,
- GLX_RED_SIZE, 8,
- GLX_GREEN_SIZE, 8,
- GLX_BLUE_SIZE, 8,
- GLX_ALPHA_SIZE, 0,
- GLX_DEPTH_SIZE, 0,
- None, None
- };
-
- // TODO: Cleanup
- int c = 0;
- GLXFBConfig *fb_configs = self->glXChooseFBConfig(self->x11.dpy, DefaultScreen(self->x11.dpy), glx_visual_attribs, &c);
- if(c == 0 || !fb_configs)
- return NULL;
-
- return fb_configs[0];
-}
-
// TODO: Create egl context without surface (in other words, x11/wayland agnostic, doesn't require x11/wayland dependency)
-static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
+static bool gsr_egl_create_window(gsr_egl *self) {
EGLConfig ecfg;
int32_t num_config = 0;
@@ -216,43 +60,14 @@ static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
const int32_t ctxattr[] = {
EGL_CONTEXT_CLIENT_VERSION, 2,
- EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_HIGH_IMG, /* requires cap_sys_nice, ignored otherwise */
+ //EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_HIGH_IMG, /* requires cap_sys_nice, ignored otherwise */
EGL_NONE, EGL_NONE
};
- if(wayland) {
- self->wayland.dpy = wl_display_connect(NULL);
- if(!self->wayland.dpy) {
- fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to connect to the Wayland server\n");
- goto fail;
- }
-
- self->wayland.registry = wl_display_get_registry(self->wayland.dpy); // TODO: Error checking
- wl_registry_add_listener(self->wayland.registry, &registry_listener, self); // TODO: Error checking
-
- // Fetch globals
- wl_display_roundtrip(self->wayland.dpy);
-
- // Fetch wl_output
- wl_display_roundtrip(self->wayland.dpy);
-
- if(!self->wayland.compositor) {
- fprintf(stderr, "gsr error: gsr_gl_create_window failed: failed to find compositor\n");
- goto fail;
- }
- } else {
- self->x11.window = XCreateWindow(self->x11.dpy, DefaultRootWindow(self->x11.dpy), 0, 0, 16, 16, 0, CopyFromParent, InputOutput, CopyFromParent, 0, NULL);
-
- if(!self->x11.window) {
- fprintf(stderr, "gsr error: gsr_gl_create_window failed: failed to create gl window\n");
- goto fail;
- }
- }
-
// TODO: Use EGL_OPENGL_ES_API as amd requires that for external texture, but that breaks software encoding
self->eglBindAPI(EGL_OPENGL_API);
- self->egl_display = self->eglGetDisplay(self->wayland.dpy ? (EGLNativeDisplayType)self->wayland.dpy : (EGLNativeDisplayType)self->x11.dpy);
+ self->egl_display = self->eglGetDisplay((EGLNativeDisplayType)gsr_window_get_display(self->window));
if(!self->egl_display) {
fprintf(stderr, "gsr error: gsr_egl_create_window failed: eglGetDisplay failed\n");
goto fail;
@@ -274,15 +89,7 @@ static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
goto fail;
}
- if(wayland) {
- // TODO: Error check?
- self->wayland.surface = wl_compositor_create_surface(self->wayland.compositor);
- self->wayland.window = wl_egl_window_create(self->wayland.surface, 16, 16);
- self->egl_surface = self->eglCreateWindowSurface(self->egl_display, ecfg, (EGLNativeWindowType)self->wayland.window, NULL);
- } else {
- self->egl_surface = self->eglCreateWindowSurface(self->egl_display, ecfg, (EGLNativeWindowType)self->x11.window, NULL);
- }
-
+ self->egl_surface = self->eglCreateWindowSurface(self->egl_display, ecfg, (EGLNativeWindowType)gsr_window_get_window(self->window), NULL);
if(!self->egl_surface) {
fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to create window surface\n");
goto fail;
@@ -293,11 +100,6 @@ static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
goto fail;
}
- if(!wayland) {
- self->x11.num_outputs = 0;
- for_each_active_monitor_output_x11_not_cached(self->x11.dpy, store_x11_monitor, self);
- }
-
reset_cap_nice();
return true;
@@ -307,8 +109,36 @@ static bool gsr_egl_create_window(gsr_egl *self, bool wayland) {
return false;
}
+static GLXFBConfig glx_fb_config_choose(gsr_egl *self, Display *display) {
+ const int glx_visual_attribs[] = {
+ GLX_RENDER_TYPE, GLX_RGBA_BIT,
+ GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+ // TODO:
+ //GLX_BIND_TO_TEXTURE_RGBA_EXT, 1,
+ //GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT,
+ GLX_DOUBLEBUFFER, True,
+ GLX_RED_SIZE, 8,
+ GLX_GREEN_SIZE, 8,
+ GLX_BLUE_SIZE, 8,
+ GLX_ALPHA_SIZE, 0,
+ GLX_DEPTH_SIZE, 0,
+ None, None
+ };
+
+ // TODO: Cleanup
+ int c = 0;
+ GLXFBConfig *fb_configs = self->glXChooseFBConfig(display, DefaultScreen(display), glx_visual_attribs, &c);
+ if(c == 0 || !fb_configs)
+ return NULL;
+
+ return fb_configs[0];
+}
+
static bool gsr_egl_switch_to_glx_context(gsr_egl *self) {
// TODO: Cleanup
+ assert(gsr_window_get_display_server(self->window) == GSR_DISPLAY_SERVER_X11);
+ Display *display = gsr_window_get_display(self->window);
+ const Window window = (Window)gsr_window_get_window(self->window);
if(self->egl_context) {
self->eglMakeCurrent(self->egl_display, NULL, NULL, NULL);
@@ -326,21 +156,21 @@ static bool gsr_egl_switch_to_glx_context(gsr_egl *self) {
self->egl_display = NULL;
}
- self->glx_fb_config = glx_fb_config_choose(self);
+ self->glx_fb_config = glx_fb_config_choose(self, display);
if(!self->glx_fb_config) {
fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to find a suitable fb config\n");
goto fail;
}
// TODO:
- //self->glx_context = self->glXCreateContextAttribsARB(self->x11.dpy, self->glx_fb_config, NULL, True, context_attrib_list);
- self->glx_context = self->glXCreateNewContext(self->x11.dpy, self->glx_fb_config, GLX_RGBA_TYPE, NULL, True);
+ //self->glx_context = self->glXCreateContextAttribsARB(display, self->glx_fb_config, NULL, True, context_attrib_list);
+ self->glx_context = self->glXCreateNewContext(display, self->glx_fb_config, GLX_RGBA_TYPE, NULL, True);
if(!self->glx_context) {
fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to create glx context\n");
goto fail;
}
- if(!self->glXMakeContextCurrent(self->x11.dpy, self->x11.window, self->x11.window, self->glx_context)) {
+ if(!self->glXMakeContextCurrent(display, window, window, self->glx_context)) {
fprintf(stderr, "gsr error: gsr_egl_create_window failed: failed to make glx context current\n");
goto fail;
}
@@ -349,8 +179,8 @@ static bool gsr_egl_switch_to_glx_context(gsr_egl *self) {
fail:
if(self->glx_context) {
- self->glXMakeContextCurrent(self->x11.dpy, None, None, NULL);
- self->glXDestroyContext(self->x11.dpy, self->glx_context);
+ self->glXMakeContextCurrent(display, None, None, NULL);
+ self->glXDestroyContext(display, self->glx_context);
self->glx_context = NULL;
self->glx_fb_config = NULL;
}
@@ -514,28 +344,21 @@ static bool gsr_egl_load_gl(gsr_egl *self, void *library) {
return true;
}
-// #define GL_DEBUG_TYPE_ERROR 0x824C
-// static void debug_callback( unsigned int source,
-// unsigned int type,
-// unsigned int id,
-// unsigned int severity,
-// int length,
-// const char* message,
-// const void* userParam )
-// {
-// (void)source;
-// (void)id;
-// (void)length;
-// (void)userParam;
-// fprintf( stderr, "GL CALLBACK: %s type = 0x%x, severity = 0x%x, message = %s\n",
-// ( type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : "" ),
-// type, severity, message );
-// }
-
-bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_capture) {
+#define GL_DEBUG_TYPE_ERROR 0x824C
+#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B
+static void debug_callback(unsigned int source, unsigned int type, unsigned int id, unsigned int severity, int length, const char* message, const void* userParam) {
+ (void)source;
+ (void)id;
+ (void)length;
+ (void)userParam;
+ if(severity != GL_DEBUG_SEVERITY_NOTIFICATION)
+ fprintf(stderr, "gsr info: gl callback: %s type = 0x%x, severity = 0x%x, message = %s\n", type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : "", type, severity, message);
+}
+
+bool gsr_egl_load(gsr_egl *self, gsr_window *window, bool is_monitor_capture, bool enable_debug) {
memset(self, 0, sizeof(gsr_egl));
- self->x11.dpy = dpy;
self->context_type = GSR_GL_CONTEXT_TYPE_EGL;
+ self->window = window;
dlerror(); /* clear */
self->egl_library = dlopen("libEGL.so.1", RTLD_LAZY);
@@ -547,7 +370,7 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_cap
self->glx_library = dlopen("libGLX.so.0", RTLD_LAZY);
self->gl_library = dlopen("libGL.so.1", RTLD_LAZY);
- if(!self->egl_library) {
+ if(!self->gl_library) {
fprintf(stderr, "gsr error: gsr_egl_load: failed to load libGL.so.1, error: %s\n", dlerror());
goto fail;
}
@@ -565,7 +388,7 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_cap
if(!gsr_egl_proc_load_egl(self))
goto fail;
- if(!gsr_egl_create_window(self, wayland))
+ if(!gsr_egl_create_window(self))
goto fail;
if(!gl_get_gpu_info(self, &self->gpu_info))
@@ -578,7 +401,7 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_cap
}
/* Nvfbc requires glx */
- if(!wayland && is_monitor_capture && self->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA) {
+ if(gsr_window_get_display_server(self->window) == GSR_DISPLAY_SERVER_X11 && is_monitor_capture && self->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA) {
self->context_type = GSR_GL_CONTEXT_TYPE_GLX;
self->dri_card_path = NULL;
if(!gsr_egl_switch_to_glx_context(self))
@@ -588,8 +411,10 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_cap
self->glEnable(GL_BLEND);
self->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- //self->glEnable(GL_DEBUG_OUTPUT);
- //self->glDebugMessageCallback(debug_callback, NULL);
+ if(enable_debug) {
+ self->glEnable(GL_DEBUG_OUTPUT);
+ self->glDebugMessageCallback(debug_callback, NULL);
+ }
return true;
@@ -616,63 +441,14 @@ void gsr_egl_unload(gsr_egl *self) {
}
if(self->glx_context) {
- self->glXMakeContextCurrent(self->x11.dpy, None, None, NULL);
- self->glXDestroyContext(self->x11.dpy, self->glx_context);
+ assert(gsr_window_get_display_server(self->window) == GSR_DISPLAY_SERVER_X11);
+ Display *display = gsr_window_get_display(self->window);
+ self->glXMakeContextCurrent(display, None, None, NULL);
+ self->glXDestroyContext(display, self->glx_context);
self->glx_context = NULL;
self->glx_fb_config = NULL;
}
- if(self->x11.window) {
- XDestroyWindow(self->x11.dpy, self->x11.window);
- self->x11.window = None;
- }
-
- for(int i = 0; i < self->x11.num_outputs; ++i) {
- if(self->x11.outputs[i].name) {
- free(self->x11.outputs[i].name);
- self->x11.outputs[i].name = NULL;
- }
- }
- self->x11.num_outputs = 0;
-
- if(self->wayland.window) {
- wl_egl_window_destroy(self->wayland.window);
- self->wayland.window = NULL;
- }
-
- if(self->wayland.surface) {
- wl_surface_destroy(self->wayland.surface);
- self->wayland.surface = NULL;
- }
-
- for(int i = 0; i < self->wayland.num_outputs; ++i) {
- if(self->wayland.outputs[i].output) {
- wl_output_destroy(self->wayland.outputs[i].output);
- self->wayland.outputs[i].output = NULL;
- }
-
- if(self->wayland.outputs[i].name) {
- free(self->wayland.outputs[i].name);
- self->wayland.outputs[i].name = NULL;
- }
- }
- self->wayland.num_outputs = 0;
-
- if(self->wayland.compositor) {
- wl_compositor_destroy(self->wayland.compositor);
- self->wayland.compositor = NULL;
- }
-
- if(self->wayland.registry) {
- wl_registry_destroy(self->wayland.registry);
- self->wayland.registry = NULL;
- }
-
- if(self->wayland.dpy) {
- wl_display_disconnect(self->wayland.dpy);
- self->wayland.dpy = NULL;
- }
-
if(self->egl_library) {
dlclose(self->egl_library);
self->egl_library = NULL;
@@ -691,25 +467,6 @@ void gsr_egl_unload(gsr_egl *self) {
memset(self, 0, sizeof(gsr_egl));
}
-bool gsr_egl_process_event(gsr_egl *self) {
- switch(gsr_egl_get_display_server(self)) {
- case GSR_DISPLAY_SERVER_X11: {
- if(XPending(self->x11.dpy)) {
- XNextEvent(self->x11.dpy, &self->x11.xev);
- return true;
- }
- return false;
- }
- case GSR_DISPLAY_SERVER_WAYLAND: {
- // TODO: pselect on wl_display_get_fd before doing dispatch
- const bool events_available = wl_display_dispatch_pending(self->wayland.dpy) > 0;
- wl_display_flush(self->wayland.dpy);
- return events_available;
- }
- }
- return false;
-}
-
void gsr_egl_swap_buffers(gsr_egl *self) {
/* This uses less cpu than swap buffer on nvidia */
// TODO: Do these and remove swap
@@ -717,21 +474,9 @@ void gsr_egl_swap_buffers(gsr_egl *self) {
//self->glFinish();
if(self->egl_display) {
self->eglSwapBuffers(self->egl_display, self->egl_surface);
- } else if(self->x11.window) {
- self->glXSwapBuffers(self->x11.dpy, self->x11.window);
+ } else if(gsr_window_get_display_server(self->window) == GSR_DISPLAY_SERVER_X11) {
+ Display *display = gsr_window_get_display(self->window);
+ const Window window = (Window)gsr_window_get_window(self->window);
+ self->glXSwapBuffers(display, window);
}
}
-
-gsr_display_server gsr_egl_get_display_server(const gsr_egl *self) {
- if(self->wayland.dpy)
- return GSR_DISPLAY_SERVER_WAYLAND;
- else
- return GSR_DISPLAY_SERVER_X11;
-}
-
-XEvent* gsr_egl_get_event_data(gsr_egl *self) {
- if(gsr_egl_get_display_server(self) == GSR_DISPLAY_SERVER_X11)
- return &self->x11.xev;
- else
- return NULL;
-}
diff --git a/src/encoder/video/image.c b/src/encoder/video/image.c
new file mode 100644
index 0000000..5f48b7b
--- /dev/null
+++ b/src/encoder/video/image.c
@@ -0,0 +1,130 @@
+#include "../../../include/encoder/video/image.h"
+#include "../../../include/egl.h"
+
+#include <libavcodec/avcodec.h>
+#include <libavutil/frame.h>
+
+#include <stdlib.h>
+
+#define LINESIZE_ALIGNMENT 4
+
+typedef struct {
+ gsr_video_encoder_image_params params;
+
+ unsigned int target_texture;
+} gsr_video_encoder_image;
+
+static unsigned int gl_create_texture(gsr_egl *egl, int width, int height, int internal_format, unsigned int format) {
+ unsigned int texture_id = 0;
+ egl->glGenTextures(1, &texture_id);
+ egl->glBindTexture(GL_TEXTURE_2D, texture_id);
+ egl->glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
+
+ egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+
+ egl->glBindTexture(GL_TEXTURE_2D, 0);
+ return texture_id;
+}
+
+static bool gsr_video_encoder_image_setup_textures(gsr_video_encoder_image *self, AVCodecContext *video_codec_context, AVFrame *frame) {
+ int res = av_frame_get_buffer(frame, LINESIZE_ALIGNMENT);
+ if(res < 0) {
+ fprintf(stderr, "gsr error: gsr_video_encoder_image_setup_textures: av_frame_get_buffer failed: %d\n", res);
+ return false;
+ }
+
+ res = av_frame_make_writable(frame);
+ if(res < 0) {
+ fprintf(stderr, "gsr error: gsr_video_encoder_image_setup_textures: av_frame_make_writable failed: %d\n", res);
+ return false;
+ }
+
+ self->target_texture = gl_create_texture(self->params.egl, video_codec_context->width, video_codec_context->height, self->params.color_depth == GSR_COLOR_DEPTH_8_BITS ? GL_RGB8 : GL_RGB16, GL_RGB);
+ if(self->target_texture == 0) {
+ fprintf(stderr, "gsr error: gsr_capture_kms_setup_cuda_textures: failed to create opengl texture\n");
+ return false;
+ }
+
+ return true;
+}
+
+static void gsr_video_encoder_image_stop(gsr_video_encoder_image *self, AVCodecContext *video_codec_context);
+
+static bool gsr_video_encoder_image_start(gsr_video_encoder *encoder, AVCodecContext *video_codec_context, AVFrame *frame) {
+ gsr_video_encoder_image *self = encoder->priv;
+
+ video_codec_context->width = FFALIGN(video_codec_context->width, LINESIZE_ALIGNMENT);
+ video_codec_context->height = FFALIGN(video_codec_context->height, 2);
+
+ frame->width = video_codec_context->width;
+ frame->height = video_codec_context->height;
+
+ if(!gsr_video_encoder_image_setup_textures(self, video_codec_context, frame)) {
+ gsr_video_encoder_image_stop(self, video_codec_context);
+ return false;
+ }
+
+ return true;
+}
+
+void gsr_video_encoder_image_stop(gsr_video_encoder_image *self, AVCodecContext *video_codec_context) {
+ (void)video_codec_context;
+ self->params.egl->glDeleteTextures(1, &self->target_texture);
+ self->target_texture = 0;
+}
+
+static void gsr_video_encoder_image_copy_textures_to_frame(gsr_video_encoder *encoder, AVFrame *frame, gsr_color_conversion *color_conversion) {
+ gsr_video_encoder_image *self = encoder->priv;
+ // TODO: hdr support
+ self->params.egl->glBindTexture(GL_TEXTURE_2D, self->target_texture);
+ // We could use glGetTexSubImage and then we wouldn't have to use a specific linesize (LINESIZE_ALIGNMENT) that adds padding,
+ // but glGetTexSubImage is only available starting from opengl 4.5.
+ self->params.egl->glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, frame->data[0]);
+ self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
+ // cap_kms->kms.base.egl->eglSwapBuffers(cap_kms->kms.base.egl->egl_display, cap_kms->kms.base.egl->egl_surface);
+
+ self->params.egl->glFlush();
+ self->params.egl->glFinish();
+}
+
+static void gsr_video_encoder_image_get_textures(gsr_video_encoder *encoder, unsigned int *textures, int *num_textures, gsr_destination_color *destination_color) {
+ gsr_video_encoder_image *self = encoder->priv;
+ textures[0] = self->target_texture;
+ *num_textures = 1;
+ // TODO: 10-bit support
+ //*destination_color = self->params.color_depth == GSR_COLOR_DEPTH_10_BITS ? GSR_DESTINATION_COLOR_P010 : GSR_DESTINATION_COLOR_NV12;
+ *destination_color = GSR_DESTINATION_COLOR_RGB8;
+}
+
+static void gsr_video_encoder_image_destroy(gsr_video_encoder *encoder, AVCodecContext *video_codec_context) {
+ gsr_video_encoder_image_stop(encoder->priv, video_codec_context);
+ free(encoder->priv);
+ free(encoder);
+}
+
+gsr_video_encoder* gsr_video_encoder_image_create(const gsr_video_encoder_image_params *params) {
+ gsr_video_encoder *encoder = calloc(1, sizeof(gsr_video_encoder));
+ if(!encoder)
+ return NULL;
+
+ gsr_video_encoder_image *encoder_image = calloc(1, sizeof(gsr_video_encoder_image));
+ if(!encoder_image) {
+ free(encoder);
+ return NULL;
+ }
+
+ encoder_image->params = *params;
+
+ *encoder = (gsr_video_encoder) {
+ .start = gsr_video_encoder_image_start,
+ .copy_textures_to_frame = gsr_video_encoder_image_copy_textures_to_frame,
+ .get_textures = gsr_video_encoder_image_get_textures,
+ .destroy = gsr_video_encoder_image_destroy,
+ .priv = encoder_image
+ };
+
+ return encoder;
+}
diff --git a/src/encoder/video/nvenc.c b/src/encoder/video/nvenc.c
index 718560d..e83d0e8 100644
--- a/src/encoder/video/nvenc.c
+++ b/src/encoder/video/nvenc.c
@@ -1,6 +1,7 @@
#include "../../../include/encoder/video/nvenc.h"
#include "../../../include/egl.h"
#include "../../../include/cuda.h"
+#include "../../../include/window/window.h"
#include <libavcodec/avcodec.h>
#include <libavutil/hwcontext_cuda.h>
@@ -128,8 +129,10 @@ static void gsr_video_encoder_nvenc_stop(gsr_video_encoder_nvenc *self, AVCodecC
static bool gsr_video_encoder_nvenc_start(gsr_video_encoder *encoder, AVCodecContext *video_codec_context, AVFrame *frame) {
gsr_video_encoder_nvenc *self = encoder->priv;
- const bool overclock = gsr_egl_get_display_server(self->params.egl) == GSR_DISPLAY_SERVER_X11 ? self->params.overclock : false;
- if(!gsr_cuda_load(&self->cuda, self->params.egl->x11.dpy, overclock)) {
+ const bool is_x11 = gsr_window_get_display_server(self->params.egl->window) == GSR_DISPLAY_SERVER_X11;
+ const bool overclock = is_x11 ? self->params.overclock : false;
+ Display *display = is_x11 ? gsr_window_get_display(self->params.egl->window) : NULL;
+ if(!gsr_cuda_load(&self->cuda, display, overclock)) {
fprintf(stderr, "gsr error: gsr_video_encoder_nvenc_start: failed to load cuda\n");
gsr_video_encoder_nvenc_stop(self, video_codec_context);
return false;
diff --git a/src/main.cpp b/src/main.cpp
index 583d9e5..7d4a47e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,9 +13,12 @@ extern "C" {
#include "../include/encoder/video/vaapi.h"
#include "../include/encoder/video/vulkan.h"
#include "../include/encoder/video/software.h"
+#include "../include/encoder/video/image.h"
#include "../include/codec_query/nvenc.h"
#include "../include/codec_query/vaapi.h"
#include "../include/codec_query/vulkan.h"
+#include "../include/window/window_x11.h"
+#include "../include/window/window_wayland.h"
#include "../include/egl.h"
#include "../include/utils.h"
#include "../include/damage.h"
@@ -110,7 +113,9 @@ enum class VideoCodec {
VP8,
VP9,
H264_VULKAN,
- HEVC_VULKAN
+ HEVC_VULKAN,
+ JPEG,
+ PNG
};
enum class AudioCodec {
@@ -214,6 +219,16 @@ static bool video_codec_is_vulkan(VideoCodec video_codec) {
}
}
+static bool video_codec_is_image(VideoCodec video_codec) {
+ switch(video_codec) {
+ case VideoCodec::JPEG:
+ case VideoCodec::PNG:
+ return true;
+ default:
+ return false;
+ }
+}
+
struct PacketData {
PacketData() {}
PacketData(const PacketData&) = delete;
@@ -578,7 +593,22 @@ static AVCodecContext *create_video_codec_context(AVPixelFormat pix_fmt,
if (codec_context->codec_id == AV_CODEC_ID_MPEG1VIDEO)
codec_context->mb_decision = 2;
- if(!use_software_video_encoder && vendor != GSR_GPU_VENDOR_NVIDIA && bitrate_mode != BitrateMode::CBR) {
+ if(video_codec_is_image(video_codec)) {
+ switch(video_quality) {
+ case VideoQuality::MEDIUM:
+ codec_context->compression_level = 8;
+ break;
+ case VideoQuality::HIGH:
+ codec_context->compression_level = 6;
+ break;
+ case VideoQuality::VERY_HIGH:
+ codec_context->compression_level = 4;
+ break;
+ case VideoQuality::ULTRA:
+ codec_context->compression_level = 2;
+ break;
+ }
+ } else if(!use_software_video_encoder && vendor != GSR_GPU_VENDOR_NVIDIA && bitrate_mode != BitrateMode::CBR) {
// 8 bit / 10 bit = 80%, and increase it even more
const float quality_multiply = hdr ? (8.0f/10.0f * 0.7f) : 1.0f;
if(codec_context->codec_id == AV_CODEC_ID_AV1 || codec_context->codec_id == AV_CODEC_ID_H264 || codec_context->codec_id == AV_CODEC_ID_HEVC) {
@@ -713,6 +743,15 @@ static AVFrame* create_audio_frame(AVCodecContext *audio_codec_context) {
return frame;
}
+static void open_video_image(AVCodecContext *codec_context) {
+ AVDictionary *options = nullptr;
+ int ret = avcodec_open2(codec_context, codec_context->codec, &options);
+ if (ret < 0) {
+ fprintf(stderr, "Error: Could not open video codec: %s\n", av_error_to_string(ret));
+ _exit(1);
+ }
+}
+
static void dict_set_profile(AVCodecContext *codec_context, gsr_gpu_vendor vendor, gsr_color_depth color_depth, AVDictionary **options) {
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 17, 100)
if(codec_context->codec_id == AV_CODEC_ID_H264) {
@@ -1067,7 +1106,8 @@ static void open_video_hardware(AVCodecContext *codec_context, VideoQuality vide
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";
- fprintf(stderr, "usage: %s -w <window_id|monitor|focused|portal> [-c <container_format>] [-s WxH] -f <fps> [-a <audio_input>] [-q <quality>] [-r <replay_buffer_size_sec>] [-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] [-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>] [-v yes|no] [--version] [-h|--help]\n", program_name);
+ printf("usage: %s -w <window_id|monitor|focused|portal> [-c <container_format>] [-s WxH] -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] [-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>] [--list-capture-options [card_path] [vendor]] [--list-audio-devices] [--list-application-audio] [-v yes|no] [-gl-debug yes|no] [--version] [-h|--help]\n", program_name);
+ fflush(stdout);
}
// TODO: Update with portal info
@@ -1075,176 +1115,188 @@ static void usage_full() {
const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
const char *program_name = inside_flatpak ? "flatpak run --command=gpu-screen-recorder com.dec05eba.gpu_screen_recorder" : "gpu-screen-recorder";
usage_header();
- fprintf(stderr, "\n");
- fprintf(stderr, "OPTIONS:\n");
- fprintf(stderr, " -w Window id to record, a display (monitor name), \"screen\", \"screen-direct-force\", \"focused\" or \"portal\".\n");
- fprintf(stderr, " If this is \"portal\" then xdg desktop screencast portal with PipeWire will be used. Portal option is only available on Wayland.\n");
- fprintf(stderr, " If you select to save the session (token) in the desktop portal capture popup then the session will be saved for the next time you use \"portal\",\n");
- fprintf(stderr, " but the session will be ignored unless you run GPU Screen Recorder with the '-restore-portal-session yes' option.\n");
- fprintf(stderr, " If this is \"screen\" or \"screen-direct-force\" then all monitors are recorded on Nvidia X11.\n");
- fprintf(stderr, " On AMD/Intel or wayland \"screen\" will record the first monitor found.\n");
- fprintf(stderr, " \"screen-direct-force\" is not recommended unless you use a VRR (G-SYNC) monitor on Nvidia X11 and you are aware that using this option can cause\n");
- fprintf(stderr, " games to freeze/crash or other issues because of Nvidia driver issues.\n");
- fprintf(stderr, " \"screen-direct-force\" option is only available on Nvidia X11. VRR works without this option on other systems.\n");
- fprintf(stderr, " Run GPU Screen Recorder with the --list-capture-options option to list valid values for this option.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -c Container format for output file, for example mp4, or flv. Only required if no output file is specified or if recording in replay buffer mode.\n");
- fprintf(stderr, " If an output file is specified and -c is not used then the container format is determined from the output filename extension.\n");
- fprintf(stderr, " Only containers that support h264, hevc, av1, vp8 or vp9 are supported, which means that only mp4, mkv, flv, webm (and some others) are supported.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -s The output resolution limit of the video in the format WxH, for example 1920x1080. If this is 0x0 then the original resolution is used. Optional, except when -w is \"focused\".\n");
- fprintf(stderr, " Note: the captured content is scaled to this size. The output resolution might not be exactly as specified by this option. The original aspect ratio is respected so the resolution will match that.\n");
- fprintf(stderr, " The video encoder might also need to add padding, which will result in black bars on the sides of the video. This is especially an issue on AMD.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -f Frame rate to record at. Recording will only capture frames at this target frame rate.\n");
- fprintf(stderr, " For constant frame rate mode this option is the frame rate every frame will be captured at and if the capture frame rate is below this target frame rate then the frames will be duplicated.\n");
- fprintf(stderr, " For variable frame rate mode this option is the max frame rate and if the capture frame rate is below this target frame rate then frames will not be duplicated.\n");
- fprintf(stderr, " Content frame rate is similar to variable frame rate mode, except the frame rate will match the frame rate of the captured content when possible, but not capturing above the frame rate set in this -f option.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -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");
- fprintf(stderr, " A name can be given to the audio input device by prefixing the audio input with <name>/, for example \"dummy/alsa_output.pci-0000_00_1b.0.analog-stereo.monitor\".\n");
- fprintf(stderr, " Multiple audio sources can be merged into one audio track by using \"|\" as a separator into one -a argument, for example: -a \"alsa_output1|alsa_output2\".\n");
- fprintf(stderr, " 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");
- fprintf(stderr, " The audio name can also be prefixed with \"device:\", for example: -a \"device:alsa_output.pci-0000_00_1b.0.analog-stereo.monitor\".\n");
- fprintf(stderr, " To record audio from an application then prefix the audio name with \"app:\", for example: -a \"app:Brave\".\n");
- fprintf(stderr, " To record audio from all applications except the provided use prefix the audio name with \"app-inverse:\", for example: -a \"app-inverse:Brave\".\n");
- fprintf(stderr, " \"app:\" and \"app-inverse:\" can't be mixed in one audio track.\n");
- fprintf(stderr, " One audio track can contain both audio devices and application audio, for example: -a \"default_output|device:alsa_output.pci-0000_00_1b.0.analog-stereo.monitor|app:Brave\".\n");
- fprintf(stderr, " Recording application audio is only possible when the sound server on the system is PipeWire.\n");
- fprintf(stderr, " If the audio name is an empty string then the argument is ignored.\n");
- fprintf(stderr, " Optional, no audio track is added by default.\n");
- fprintf(stderr, " Run GPU Screen Recorder with the --list-audio-devices option to list valid audio device names.\n");
- fprintf(stderr, " Run GPU Screen Recorder with the --list-application-audio option to list valid application names. It's possible to use an application name that is not listed in --list-application-audio,\n");
- fprintf(stderr, " for example when trying to record audio from an application that hasn't started yet.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -q Video quality. Should be either 'medium', 'high', 'very_high' or 'ultra' when using '-bm qp' or '-bm vbr' options, and '-bm qp' is the default option used.\n");
- fprintf(stderr, " 'high' is the recommended option when live streaming or when you have a slower harddrive.\n");
- fprintf(stderr, " When using '-bm cbr' option then this is option is instead used to specify the video bitrate in kbps.\n");
- fprintf(stderr, " Optional when using '-bm qp' or '-bm vbr' options, set to 'very_high' be default.\n");
- fprintf(stderr, " Required when using '-bm cbr' option.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -r Replay buffer size in seconds. If this is set, then only the last seconds as set by this option will be stored\n");
- fprintf(stderr, " and the video will only be saved when the gpu-screen-recorder is closed. This feature is similar to Nvidia's instant replay feature.\n");
- fprintf(stderr, " This option has be between 5 and 1200. Note that the replay buffer size will not always be precise, because of keyframes. Optional, disabled by default.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -k Video codec to use. Should be either 'auto', 'h264', 'hevc', 'av1', 'vp8', 'vp9', 'hevc_hdr', 'av1_hdr', 'hevc_10bit' or 'av1_10bit'.\n");
- fprintf(stderr, " Optional, set to 'auto' by default which defaults to 'h264'. Forcefully set to 'h264' if the file container type is 'flv'.\n");
- fprintf(stderr, " 'hevc_hdr' and 'av1_hdr' option is not available on X11 nor when using the portal capture option.\n");
- fprintf(stderr, " 'hevc_10bit' and 'av1_10bit' options allow you to select 10 bit color depth which can reduce banding and improve quality in darker areas, but not all video players support 10 bit color depth\n");
- fprintf(stderr, " and if you upload the video to a website the website might reduce 10 bit to 8 bit.\n");
- fprintf(stderr, " Note that when using 'hevc_hdr' or 'av1_hdr' the color depth is also 10 bits.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -ac Audio codec to use. Should be either 'aac', 'opus' or 'flac'. Optional, set to 'opus' for .mp4/.mkv files, otherwise set to 'aac'.\n");
- fprintf(stderr, " 'opus' and 'flac' is only supported by .mp4/.mkv files. 'opus' is recommended for best performance and smallest audio size.\n");
- fprintf(stderr, " Flac audio codec is option is disable at the moment because of a temporary issue.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -ab Audio bitrate in kbps. If this is set to 0 then it's the same as if it's absent, in which case the bitrate is determined automatically depending on the audio codec.\n");
- fprintf(stderr, " Optional, by default the bitrate is 128kbps for opus and flac and 160kbps for aac.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -oc Overclock memory transfer rate to the maximum performance level. This only applies to NVIDIA on X11 and exists to overcome a bug in NVIDIA driver where performance level\n");
- fprintf(stderr, " is dropped when you record a game. Only needed if you are recording a game that is bottlenecked by GPU. The same issue exists on Wayland but overclocking is not possible on Wayland.\n");
- fprintf(stderr, " Works only if your have \"Coolbits\" set to \"12\" in NVIDIA X settings, see README for more information. Note! use at your own risk! Optional, disabled by default.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -fm Framerate mode. Should be either 'cfr' (constant frame rate), 'vfr' (variable frame rate) or 'content'. Optional, set to 'vfr' by default.\n");
- fprintf(stderr, " 'vfr' is recommended for recording for less issue with very high system load but some applications such as video editors may not support it properly.\n");
- fprintf(stderr, " 'content' is currently only supported on X11 or when using portal capture option. The 'content' option matches the recording frame rate to the captured content.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -bm Bitrate mode. Should be either 'auto', 'qp' (constant quality), 'vbr' (variable bitrate) or 'cbr' (constant bitrate). Optional, set to 'auto' by default which defaults to 'qp' on all devices\n");
- fprintf(stderr, " except steam deck that has broken drivers and doesn't support qp.\n");
- fprintf(stderr, " Note: 'vbr' option is not supported when using '-encoder cpu' option.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -cr Color range. Should be either 'limited' (aka mpeg) or 'full' (aka jpeg). Optional, set to 'limited' by default.\n");
- fprintf(stderr, " Limited color range means that colors are in range 16-235 (4112-60395 for hdr) while full color range means that colors are in range 0-255 (0-65535 for hdr).\n");
- fprintf(stderr, " Note that some buggy video players (such as vlc) are unable to correctly display videos in full color range and when upload the video to websites the website\n");
- fprintf(stderr, " might re-encoder the video to make the video limited color range.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -df Organise replays in folders based on the current date.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -sc Run a script on the saved video file (asynchronously). The first argument to the script is the filepath to the saved video file and the second argument is the recording type (either \"regular\" or \"replay\").\n");
- fprintf(stderr, " Not applicable for live streams.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -cursor\n");
- fprintf(stderr, " Record cursor. Optional, set to 'yes' by default.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -keyint\n");
- fprintf(stderr, " Specifies the keyframe interval in seconds, the max amount of time to wait to generate a keyframe. Keyframes can be generated more often than this.\n");
- fprintf(stderr, " This also affects seeking in the video and may affect how the replay video is cut. If this is set to 10 for example then you can only seek in 10-second chunks in the video.\n");
- fprintf(stderr, " Setting this to a higher value reduces the video file size if you are ok with the previously described downside. This option is expected to be a floating point number.\n");
- fprintf(stderr, " By default this value is set to 2.0.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -restore-portal-session\n");
- fprintf(stderr, " If GPU Screen Recorder should use the same capture option as the last time. Using this option removes the popup asking what you want to record the next time you record with '-w portal' if you selected the option to save session (token) in the desktop portal screencast popup.\n");
- fprintf(stderr, " This option may not have any effect on your Wayland compositor and your systems desktop portal needs to support ScreenCast version 5 or later. Optional, set to 'no' by default.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -portal-session-token-filepath\n");
- fprintf(stderr, " This option is used together with -restore-portal-session option to specify the file path to save/restore the portal session token to/from.\n");
- fprintf(stderr, " This can be used to remember different portal capture options depending on different recording option (such as recording/replay).\n");
- fprintf(stderr, " Optional, set to \"$XDG_CONFIG_HOME/gpu-screen-recorder/restore_token\" by default ($XDG_CONFIG_HOME defaults to \"$HOME/.config\").\n");
- fprintf(stderr, " Note: the directory to the portal session token file is created automatically if it doesn't exist.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -encoder\n");
- fprintf(stderr, " Which device should be used for video encoding. Should either be 'gpu' or 'cpu'. 'cpu' option currently only work with h264 codec option (-k).\n");
- fprintf(stderr, " Optional, set to 'gpu' by default.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " --info\n");
- fprintf(stderr, " List info about the system. Lists the following information (prints them to stdout and exits):\n");
- fprintf(stderr, " Supported video codecs (h264, h264_software, hevc, hevc_hdr, hevc_10bit, av1, av1_hdr, av1_10bit, vp8, vp9 (if supported)).\n");
- fprintf(stderr, " Supported capture options (window, focused, screen, monitors and portal, if supported by the system).\n");
- fprintf(stderr, " If opengl initialization fails then the program exits with 22, if no usable drm device is found then it exits with 23. On success it exits with 0.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " --list-capture-options\n");
- fprintf(stderr, " List available capture options. Lists capture options in the following format (prints them to stdout and exits):\n");
- fprintf(stderr, " <option>\n");
- fprintf(stderr, " <monitor_name>|<resolution>\n");
- fprintf(stderr, " For example:\n");
- fprintf(stderr, " window\n");
- fprintf(stderr, " DP-1|1920x1080\n");
- fprintf(stderr, " The <option> and <monitor_name> is the name that can be passed to GPU Screen Recorder with the -w option.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " --list-audio-devices\n");
- fprintf(stderr, " List audio devices. Lists audio devices in the following format (prints them to stdout and exits):\n");
- fprintf(stderr, " <audio_device_name>|<audio_device_name_in_human_readable_format>\n");
- fprintf(stderr, " For example:\n");
- fprintf(stderr, " bluez_input.88:C9:E8:66:A2:27|WH-1000XM4\n");
- fprintf(stderr, " alsa_output.pci-0000_0c_00.4.iec958-stereo|Monitor of Starship/Matisse HD Audio Controller Digital Stereo (IEC958)\n");
- fprintf(stderr, " The <audio_device_name> is the name that can be passed to GPU Screen Recorder with the -a option.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " --list-application-audio\n");
- fprintf(stderr, " Lists application that you can record from (with the -aa or -aai option) (prints them to stdout and exits), for example:\n");
- fprintf(stderr, " firefox\n");
- fprintf(stderr, " csgo\n");
- fprintf(stderr, " These names are the application audio names that can be passed to GPU Screen Recorder with the -aa option.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " --version\n");
- fprintf(stderr, " Print version (%s) and exit\n", GSR_VERSION);
- fprintf(stderr, "\n");
+ printf("\n");
+ printf("OPTIONS:\n");
+ printf(" -w Window id to record, a display (monitor name), \"screen\", \"screen-direct\", \"focused\" or \"portal\".\n");
+ printf(" If this is \"portal\" then xdg desktop screencast portal with PipeWire will be used. Portal option is only available on Wayland.\n");
+ printf(" If you select to save the session (token) in the desktop portal capture popup then the session will be saved for the next time you use \"portal\",\n");
+ printf(" but the session will be ignored unless you run GPU Screen Recorder with the '-restore-portal-session yes' option.\n");
+ printf(" If this is \"screen\" then the first monitor found is recorded.\n");
+ printf(" \"screen-direct\" can only be used on Nvidia X11, to allow recording without breaking VRR (G-SYNC). This also records all of your monitors.\n");
+ printf(" Using this \"screen-direct\" option is not recommended unless you use VRR (G-SYNC) as there are Nvidia driver issues that can cause your system or games to freeze/crash.\n");
+ printf(" The \"screen-direct\" option is not needed on AMD, Intel nor Nvidia on Wayland as VRR works properly in those cases.\n");
+ printf(" Run GPU Screen Recorder with the --list-capture-options option to list valid values for this option.\n");
+ printf("\n");
+ printf(" -c Container format for output file, for example mp4, or flv. Only required if no output file is specified or if recording in replay buffer mode.\n");
+ printf(" If an output file is specified and -c is not used then the container format is determined from the output filename extension.\n");
+ printf(" Only containers that support h264, hevc, av1, vp8 or vp9 are supported, which means that only mp4, mkv, flv, webm (and some others) are supported.\n");
+ printf("\n");
+ printf(" -s The output resolution limit of the video in the format WxH, for example 1920x1080. If this is 0x0 then the original resolution is used. Optional, except when -w is \"focused\".\n");
+ printf(" Note: the captured content is scaled to this size. The output resolution might not be exactly as specified by this option. The original aspect ratio is respected so the resolution will match that.\n");
+ printf(" The video encoder might also need to add padding, which will result in black bars on the sides of the video. This is especially an issue on AMD.\n");
+ printf("\n");
+ printf(" -f Frame rate to record at. Recording will only capture frames at this target frame rate.\n");
+ printf(" For constant frame rate mode this option is the frame rate every frame will be captured at and if the capture frame rate is below this target frame rate then the frames will be duplicated.\n");
+ printf(" For variable frame rate mode this option is the max frame rate and if the capture frame rate is below this target frame rate then frames will not be duplicated.\n");
+ printf(" Content frame rate is similar to variable frame rate mode, except the frame rate will match the frame rate of the captured content when possible, but not capturing above the frame rate set in this -f option.\n");
+ printf("\n");
+ 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");
+ printf(" \"app:\" and \"app-inverse:\" can't be mixed in one audio track.\n");
+ printf(" One audio track can contain both audio devices and application audio, for example: -a \"default_output|device:alsa_output.pci-0000_00_1b.0.analog-stereo.monitor|app:Brave\".\n");
+ printf(" Recording application audio is only possible when the sound server on the system is PipeWire.\n");
+ printf(" If the audio name is an empty string then the argument is ignored.\n");
+ printf(" Optional, no audio track is added by default.\n");
+ printf(" Run GPU Screen Recorder with the --list-audio-devices option to list valid audio device names.\n");
+ printf(" Run GPU Screen Recorder with the --list-application-audio option to list valid application names. It's possible to use an application name that is not listed in --list-application-audio,\n");
+ printf(" for example when trying to record audio from an application that hasn't started yet.\n");
+ printf("\n");
+ printf(" -q Video quality. Should be either 'medium', 'high', 'very_high' or 'ultra' when using '-bm qp' or '-bm vbr' options, and '-bm qp' is the default option used.\n");
+ printf(" 'high' is the recommended option when live streaming or when you have a slower harddrive.\n");
+ printf(" When using '-bm cbr' option then this is option is instead used to specify the video bitrate in kbps.\n");
+ printf(" Optional when using '-bm qp' or '-bm vbr' options, set to 'very_high' be default.\n");
+ printf(" Required when using '-bm cbr' option.\n");
+ printf("\n");
+ printf(" -r Replay buffer time in seconds. If this is set, then only the last seconds as set by this option will be stored\n");
+ printf(" and the video will only be saved when the gpu-screen-recorder is closed. This feature is similar to Nvidia's instant replay feature This option has be between 5 and 1200.\n");
+ printf(" 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(" Optional, disabled 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");
+ printf(" If this is set to 'yes' then after a replay is saved the replay buffer data is cleared and the second replay will start from that point onward.\n");
+ printf(" Optional, set to 'no' by default.\n");
+ printf("\n");
+ printf(" -k Video codec to use. Should be either 'auto', 'h264', 'hevc', 'av1', 'vp8', 'vp9', 'hevc_hdr', 'av1_hdr', 'hevc_10bit' or 'av1_10bit'.\n");
+ printf(" Optional, set to 'auto' by default which defaults to 'h264'. Forcefully set to 'h264' if the file container type is 'flv'.\n");
+ printf(" 'hevc_hdr' and 'av1_hdr' option is not available on X11 nor when using the portal capture option.\n");
+ printf(" 'hevc_10bit' and 'av1_10bit' options allow you to select 10 bit color depth which can reduce banding and improve quality in darker areas, but not all video players support 10 bit color depth\n");
+ printf(" and if you upload the video to a website the website might reduce 10 bit to 8 bit.\n");
+ printf(" Note that when using 'hevc_hdr' or 'av1_hdr' the color depth is also 10 bits.\n");
+ printf("\n");
+ printf(" -ac Audio codec to use. Should be either 'aac', 'opus' or 'flac'. Optional, set to 'opus' for .mp4/.mkv files, otherwise set to 'aac'.\n");
+ printf(" 'opus' and 'flac' is only supported by .mp4/.mkv files. 'opus' is recommended for best performance and smallest audio size.\n");
+ printf(" Flac audio codec is option is disable at the moment because of a temporary issue.\n");
+ printf("\n");
+ printf(" -ab Audio bitrate in kbps. If this is set to 0 then it's the same as if it's absent, in which case the bitrate is determined automatically depending on the audio codec.\n");
+ printf(" Optional, by default the bitrate is 128kbps for opus and flac and 160kbps for aac.\n");
+ printf("\n");
+ printf(" -oc Overclock memory transfer rate to the maximum performance level. This only applies to NVIDIA on X11 and exists to overcome a bug in NVIDIA driver where performance level\n");
+ printf(" is dropped when you record a game. Only needed if you are recording a game that is bottlenecked by GPU. The same issue exists on Wayland but overclocking is not possible on Wayland.\n");
+ printf(" Works only if your have \"Coolbits\" set to \"12\" in NVIDIA X settings, see README for more information. Note! use at your own risk! Optional, disabled by default.\n");
+ printf("\n");
+ printf(" -fm Framerate mode. Should be either 'cfr' (constant frame rate), 'vfr' (variable frame rate) or 'content'. Optional, set to 'vfr' by default.\n");
+ printf(" 'vfr' is recommended for recording for less issue with very high system load but some applications such as video editors may not support it properly.\n");
+ printf(" 'content' is currently only supported on X11 or when using portal capture option. The 'content' option matches the recording frame rate to the captured content.\n");
+ printf("\n");
+ printf(" -bm Bitrate mode. Should be either 'auto', 'qp' (constant quality), 'vbr' (variable bitrate) or 'cbr' (constant bitrate). Optional, set to 'auto' by default which defaults to 'qp' on all devices\n");
+ printf(" except steam deck that has broken drivers and doesn't support qp.\n");
+ printf(" Note: 'vbr' option is not supported when using '-encoder cpu' option.\n");
+ printf("\n");
+ printf(" -cr Color range. Should be either 'limited' (aka mpeg) or 'full' (aka jpeg). Optional, set to 'limited' by default.\n");
+ printf(" Limited color range means that colors are in range 16-235 (4112-60395 for hdr) while full color range means that colors are in range 0-255 (0-65535 for hdr).\n");
+ printf(" Note that some buggy video players (such as vlc) are unable to correctly display videos in full color range and when upload the video to websites the website\n");
+ printf(" might re-encoder the video to make the video limited color range.\n");
+ printf("\n");
+ printf(" -df Organise replays in folders based on the current date.\n");
+ printf("\n");
+ printf(" -sc Run a script on the saved video file (asynchronously). The first argument to the script is the filepath to the saved video file and the second argument is the recording type (either \"regular\" or \"replay\").\n");
+ printf(" Not applicable for live streams.\n");
+ printf("\n");
+ printf(" -cursor\n");
+ printf(" Record cursor. Optional, set to 'yes' by default.\n");
+ printf("\n");
+ printf(" -keyint\n");
+ printf(" Specifies the keyframe interval in seconds, the max amount of time to wait to generate a keyframe. Keyframes can be generated more often than this.\n");
+ printf(" This also affects seeking in the video and may affect how the replay video is cut. If this is set to 10 for example then you can only seek in 10-second chunks in the video.\n");
+ printf(" Setting this to a higher value reduces the video file size if you are ok with the previously described downside. This option is expected to be a floating point number.\n");
+ printf(" By default this value is set to 2.0.\n");
+ printf("\n");
+ printf(" -restore-portal-session\n");
+ printf(" If GPU Screen Recorder should use the same capture option as the last time. Using this option removes the popup asking what you want to record the next time you record with '-w portal' if you selected the option to save session (token) in the desktop portal screencast popup.\n");
+ printf(" This option may not have any effect on your Wayland compositor and your systems desktop portal needs to support ScreenCast version 5 or later. Optional, set to 'no' by default.\n");
+ printf("\n");
+ printf(" -portal-session-token-filepath\n");
+ printf(" This option is used together with -restore-portal-session option to specify the file path to save/restore the portal session token to/from.\n");
+ printf(" This can be used to remember different portal capture options depending on different recording option (such as recording/replay).\n");
+ printf(" Optional, set to \"$XDG_CONFIG_HOME/gpu-screen-recorder/restore_token\" by default ($XDG_CONFIG_HOME defaults to \"$HOME/.config\").\n");
+ printf(" Note: the directory to the portal session token file is created automatically if it doesn't exist.\n");
+ printf("\n");
+ printf(" -encoder\n");
+ printf(" Which device should be used for video encoding. Should either be 'gpu' or 'cpu'. 'cpu' option currently only work with h264 codec option (-k).\n");
+ printf(" Optional, set to 'gpu' by default.\n");
+ printf("\n");
+ printf(" --info\n");
+ printf(" List info about the system. Lists the following information (prints them to stdout and exits):\n");
+ printf(" Supported video codecs (h264, h264_software, hevc, hevc_hdr, hevc_10bit, av1, av1_hdr, av1_10bit, vp8, vp9) and image codecs (jpeg, png) (if supported).\n");
+ printf(" Supported capture options (window, focused, screen, monitors and portal, if supported by the system).\n");
+ printf(" If opengl initialization fails then the program exits with 22, if no usable drm device is found then it exits with 23. On success it exits with 0.\n");
+ printf("\n");
+ printf(" --list-capture-options\n");
+ printf(" List available capture options. Lists capture options in the following format (prints them to stdout and exits):\n");
+ printf(" <option>\n");
+ printf(" <monitor_name>|<resolution>\n");
+ printf(" For example:\n");
+ printf(" window\n");
+ printf(" DP-1|1920x1080\n");
+ printf(" The <option> and <monitor_name> is the name that can be passed to GPU Screen Recorder with the -w option.\n");
+ printf(" --list-capture-options optionally accepts a card path (\"/dev/dri/cardN\") and vendor (\"amd\", \"intel\" or \"nvidia\") which can improve the performance of running this command.\n");
+ printf("\n");
+ printf(" --list-audio-devices\n");
+ printf(" List audio devices. Lists audio devices in the following format (prints them to stdout and exits):\n");
+ printf(" <audio_device_name>|<audio_device_name_in_human_readable_format>\n");
+ printf(" For example:\n");
+ printf(" bluez_input.88:C9:E8:66:A2:27|WH-1000XM4\n");
+ printf(" alsa_output.pci-0000_0c_00.4.iec958-stereo|Monitor of Starship/Matisse HD Audio Controller Digital Stereo (IEC958)\n");
+ printf(" The <audio_device_name> is the name that can be passed to GPU Screen Recorder with the -a option.\n");
+ printf("\n");
+ printf(" --list-application-audio\n");
+ printf(" Lists applications that you can record from (prints them to stdout and exits), for example:\n");
+ printf(" firefox\n");
+ printf(" csgo\n");
+ printf(" These names are the application audio names that can be passed to GPU Screen Recorder with the -a option.\n");
+ printf("\n");
+ printf(" --version\n");
+ printf(" Print version (%s) and exit\n", GSR_VERSION);
+ printf("\n");
//fprintf(stderr, " -pixfmt The pixel format to use for the output video. yuv420 is the most common format and is best supported, but the color is compressed, so colors can look washed out and certain colors of text can look bad. Use yuv444 for no color compression, but the video may not work everywhere and it may not work with hardware video decoding. Optional, set to 'yuv420' by default\n");
- fprintf(stderr, " -o The output file path. If omitted then the encoded data is sent to stdout. Required in replay mode (when using -r).\n");
- fprintf(stderr, " In replay mode this has to be a directory instead of a file.\n");
- fprintf(stderr, " Note: the directory to the file is created automatically if it doesn't already exist.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -v Prints fps and damage info once per second. Optional, set to 'yes' by default.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, " -h, --help\n");
- fprintf(stderr, " Show this help.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, "NOTES:\n");
- fprintf(stderr, " Send signal SIGINT to gpu-screen-recorder (Ctrl+C, or killall -SIGINT gpu-screen-recorder) to stop and save the recording. When in replay mode this stops recording without saving.\n");
- fprintf(stderr, " Send signal SIGUSR1 to gpu-screen-recorder (killall -SIGUSR1 gpu-screen-recorder) to save a replay (when in replay mode).\n");
- fprintf(stderr, " Send signal SIGUSR2 to gpu-screen-recorder (killall -SIGUSR2 gpu-screen-recorder) to pause/unpause recording. Only applicable and useful when recording (not streaming nor replay).\n");
- fprintf(stderr, "\n");
- fprintf(stderr, "EXAMPLES:\n");
- fprintf(stderr, " %s -w screen -f 60 -a default_output -o \"$HOME/Videos/video.mp4\"\n", program_name);
- fprintf(stderr, " %s -w screen -f 60 -a default_output -a default_input -o \"$HOME/Videos/video.mp4\"\n", program_name);
- fprintf(stderr, " %s -w screen -f 60 -a \"default_output|default_input\" -o \"$HOME/Videos/video.mp4\"\n", program_name);
- fprintf(stderr, " %s -w screen -f 60 -a default_output -c mkv -r 60 -o \"$HOME/Videos\"\n", program_name);
- fprintf(stderr, " %s -w screen -f 60 -a default_output -c mkv -sc script.sh -r 60 -o \"$HOME/Videos\"\n", program_name);
- fprintf(stderr, " %s -w portal -f 60 -a default_output -restore-portal-session yes -o \"$HOME/Videos/video.mp4\"\n", program_name);
- fprintf(stderr, " %s -w screen -f 60 -a default_output -bm cbr -q 15000 -o \"$HOME/Videos/video.mp4\"\n", program_name);
- fprintf(stderr, " %s -w screen -f 60 -a \"app:firefox|app:csgo\" -o \"$HOME/Videos/video.mp4\"\n", program_name);
- fprintf(stderr, " %s -w screen -f 60 -a \"app-inverse:firefox|app-inverse:csgo\" -o \"$HOME/Videos/video.mp4\"\n", program_name);
- fprintf(stderr, " %s -w screen -f 60 -a \"default-input|app-inverse:Brave\" -o \"$HOME/Videos/video.mp4\"\n", program_name);
+ printf(" -o The output file path. If omitted then the encoded data is sent to stdout. Required in replay mode (when using -r).\n");
+ printf(" In replay mode this has to be a directory instead of a file.\n");
+ printf(" Note: the directory to the file is created automatically if it doesn't already exist.\n");
+ printf("\n");
+ printf(" -v Prints fps and damage info once per second. Optional, set to 'yes' by default.\n");
+ printf("\n");
+ printf(" -gl-debug\n");
+ printf(" Print opengl debug output. Optional, set to 'no' by default.\n");
+ printf("\n");
+ printf(" -h, --help\n");
+ printf(" Show this help.\n");
+ printf("\n");
+ printf("NOTES:\n");
+ printf(" Send signal SIGINT to gpu-screen-recorder (Ctrl+C, or killall -SIGINT gpu-screen-recorder) to stop and save the recording. When in replay mode this stops recording without saving.\n");
+ printf(" Send signal SIGUSR1 to gpu-screen-recorder (killall -SIGUSR1 gpu-screen-recorder) to save a replay (when in replay mode).\n");
+ printf(" Send signal SIGUSR2 to gpu-screen-recorder (killall -SIGUSR2 gpu-screen-recorder) to pause/unpause recording. Only applicable and useful when recording (not streaming nor replay).\n");
+ printf("\n");
+ printf("EXAMPLES:\n");
+ printf(" %s -w screen -f 60 -a default_output -o \"$HOME/Videos/video.mp4\"\n", program_name);
+ printf(" %s -w screen -f 60 -a default_output -a default_input -o \"$HOME/Videos/video.mp4\"\n", program_name);
+ printf(" %s -w screen -f 60 -a \"default_output|default_input\" -o \"$HOME/Videos/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 -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 \"$HOME/Videos/video.mp4\"\n", program_name);
+ printf(" %s -w screen -f 60 -a default_output -bm cbr -q 15000 -o \"$HOME/Videos/video.mp4\"\n", program_name);
+ printf(" %s -w screen -f 60 -a \"app:firefox|app:csgo\" -o \"$HOME/Videos/video.mp4\"\n", program_name);
+ printf(" %s -w screen -f 60 -a \"app-inverse:firefox|app-inverse:csgo\" -o \"$HOME/Videos/video.mp4\"\n", program_name);
+ printf(" %s -w screen -f 60 -a \"default-input|app-inverse:Brave\" -o \"$HOME/Videos/video.mp4\"\n", program_name);
+ printf(" %s -w screen -f 60 -o \"$HOME/Pictures/image.jpg\"\n", program_name);
//fprintf(stderr, " gpu-screen-recorder -w screen -f 60 -q ultra -pixfmt yuv444 -o video.mp4\n");
+ fflush(stdout);
_exit(1);
}
@@ -1301,7 +1353,7 @@ static std::string get_date_str() {
time_t now = time(NULL);
struct tm *t = localtime(&now);
strftime(str, sizeof(str)-1, "%Y-%m-%d_%H-%M-%S", t);
- return str;
+ return str;
}
static std::string get_date_only_str() {
@@ -1340,16 +1392,17 @@ static void run_recording_saved_script_async(const char *script_file, const char
return;
}
- const char *args[6];
+ const char *args[7];
const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
if(inside_flatpak) {
args[0] = "flatpak-spawn";
args[1] = "--host";
- args[2] = script_file_full;
- args[3] = video_file;
- args[4] = type;
- args[5] = NULL;
+ args[2] = "--";
+ args[3] = script_file_full;
+ args[4] = video_file;
+ args[5] = type;
+ args[6] = NULL;
} else {
args[0] = script_file_full;
args[1] = video_file;
@@ -1394,21 +1447,21 @@ static double audio_codec_get_desired_delay(AudioCodec audio_codec, int fps) {
return std::max(0.0, base - fps_inv);
}
-struct AudioDevice {
+struct AudioDeviceData {
SoundDevice sound_device;
AudioInput audio_input;
AVFilterContext *src_filter_ctx = nullptr;
AVFrame *frame = nullptr;
std::thread thread; // TODO: Instead of having a thread for each track, have one thread for all threads and read the data with non-blocking read
- std::string combined_sink_name;
};
// TODO: Cleanup
struct AudioTrack {
+ std::string name;
AVCodecContext *codec_context = nullptr;
AVStream *stream = nullptr;
- std::vector<AudioDevice> audio_devices;
+ std::vector<AudioDeviceData> audio_devices;
AVFilterGraph *graph = nullptr;
AVFilterContext *sink = nullptr;
int stream_index = 0;
@@ -1428,17 +1481,17 @@ static bool add_hdr_metadata_to_video_stream(gsr_capture *cap, AVStream *video_s
if(!light_metadata || !mastering_display_metadata) {
if(light_metadata)
- av_freep(light_metadata);
+ av_freep(&light_metadata);
if(mastering_display_metadata)
- av_freep(mastering_display_metadata);
+ av_freep(&mastering_display_metadata);
return false;
}
if(!gsr_capture_set_hdr_metadata(cap, mastering_display_metadata, light_metadata)) {
- av_freep(light_metadata);
- av_freep(mastering_display_metadata);
+ av_freep(&light_metadata);
+ av_freep(&mastering_display_metadata);
return false;
}
@@ -1457,10 +1510,10 @@ static bool add_hdr_metadata_to_video_stream(gsr_capture *cap, AVStream *video_s
#endif
if(!content_light_level_added)
- av_freep(light_metadata);
+ av_freep(&light_metadata);
if(!mastering_display_metadata_added)
- av_freep(mastering_display_metadata);
+ av_freep(&mastering_display_metadata);
// Return true even on failure because we dont want to retry adding hdr metadata on failure
return true;
@@ -1473,7 +1526,7 @@ static std::string save_replay_output_filepath;
static void save_replay_async(AVCodecContext *video_codec_context, int video_stream_index, std::vector<AudioTrack> &audio_tracks, std::deque<std::shared_ptr<PacketData>> &frame_data_queue, bool frames_erased, std::string output_dir, const char *container_format, const std::string &file_extension, std::mutex &write_output_mutex, bool date_folders, bool hdr, gsr_capture *capture) {
if(save_replay_thread.valid())
return;
-
+
size_t start_index = (size_t)-1;
int64_t video_pts_offset = 0;
int64_t audio_pts_offset = 0;
@@ -1494,7 +1547,7 @@ static void save_replay_async(AVCodecContext *video_codec_context, int video_str
if(frames_erased) {
video_pts_offset = frame_data_queue[start_index]->data.pts;
-
+
// Find the next audio packet to use as audio pts offset
for(size_t i = start_index; i < frame_data_queue.size(); ++i) {
const AVPacket &av_packet = frame_data_queue[i]->data;
@@ -1532,6 +1585,8 @@ static void save_replay_async(AVCodecContext *video_codec_context, int video_str
for(AudioTrack &audio_track : audio_tracks) {
stream_index_to_audio_track_map[audio_track.stream_index] = &audio_track;
AVStream *audio_stream = create_stream(av_format_context, audio_track.codec_context);
+ if(!audio_track.name.empty())
+ av_dict_set(&audio_stream->metadata, "title", audio_track.name.c_str(), 0);
avcodec_parameters_from_context(audio_stream->codecpar, audio_track.codec_context);
audio_track.stream = audio_stream;
}
@@ -1628,65 +1683,63 @@ static bool string_starts_with(const std::string &str, const char *substr) {
return (int)str.size() >= len && memcmp(str.data(), substr, len) == 0;
}
-static const AudioInput* get_audio_device_by_name(const std::vector<AudioInput> &audio_inputs, const std::string &name) {
- for(const auto &audio_input : audio_inputs) {
- if(audio_input.name == name)
- return &audio_input;
+static bool string_ends_with(const char *str, const char *substr) {
+ int str_len = strlen(str);
+ int substr_len = strlen(substr);
+ return str_len >= substr_len && memcmp(str + str_len - substr_len, substr, substr_len) == 0;
+}
+
+static const AudioDevice* get_audio_device_by_name(const std::vector<AudioDevice> &audio_devices, const char *name) {
+ for(const auto &audio_device : audio_devices) {
+ if(strcmp(audio_device.name.c_str(), name) == 0)
+ return &audio_device;
}
return nullptr;
}
-static std::vector<AudioInput> parse_audio_input_arg(const char *str, const AudioDevices &audio_devices) {
- std::vector<AudioInput> audio_inputs;
+static MergedAudioInputs parse_audio_input_arg(const char *str, const AudioDevices &audio_devices) {
+ 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;
audio_input.name.assign(sub, size);
if(string_starts_with(audio_input.name.c_str(), "app:")) {
audio_input.name.erase(audio_input.name.begin(), audio_input.name.begin() + 4);
- audio_input.description = audio_input.name;
audio_input.type = AudioInputType::APPLICATION;
audio_input.inverted = false;
- audio_inputs.push_back(std::move(audio_input));
+ result.audio_inputs.push_back(std::move(audio_input));
return true;
} else if(string_starts_with(audio_input.name.c_str(), "app-inverse:")) {
audio_input.name.erase(audio_input.name.begin(), audio_input.name.begin() + 12);
- audio_input.description = audio_input.name;
audio_input.type = AudioInputType::APPLICATION;
audio_input.inverted = true;
- audio_inputs.push_back(std::move(audio_input));
+ result.audio_inputs.push_back(std::move(audio_input));
return true;
} else if(string_starts_with(audio_input.name.c_str(), "device:")) {
audio_input.name.erase(audio_input.name.begin(), audio_input.name.begin() + 7);
audio_input.type = AudioInputType::DEVICE;
- audio_inputs.push_back(std::move(audio_input));
+ result.audio_inputs.push_back(std::move(audio_input));
return true;
} else {
- const bool name_is_existing_audio_device = get_audio_device_by_name(audio_devices.audio_inputs, audio_input.name);
- const size_t index = audio_input.name.find('/');
- if(!name_is_existing_audio_device && index != std::string::npos) {
- audio_input.description = audio_input.name.substr(0, index);
- audio_input.name.erase(audio_input.name.begin(), audio_input.name.begin() + index + 1);
- }
audio_input.type = AudioInputType::DEVICE;
- audio_inputs.push_back(std::move(audio_input));
+ result.audio_inputs.push_back(std::move(audio_input));
return true;
}
});
- return audio_inputs;
-}
-static std::vector<AudioInput> parse_app_audio_input_arg(const char *str) {
- std::vector<AudioInput> audio_inputs;
- split_string(str, '|', [&](const char *sub, size_t size) {
- AudioInput audio_input;
- audio_input.name.assign(sub, size);
- audio_input.description = audio_input.name;
- audio_input.type = AudioInputType::APPLICATION;
- audio_inputs.push_back(std::move(audio_input));
- return true;
- });
- return audio_inputs;
+ return result;
}
// TODO: Does this match all livestreaming cases?
@@ -1708,31 +1761,46 @@ static bool is_livestream_path(const char *str) {
return false;
}
-// TODO: Proper cleanup
-static int init_filter_graph(AVCodecContext *audio_codec_context, AVFilterGraph **graph, AVFilterContext **sink, std::vector<AVFilterContext*> &src_filter_ctx, size_t num_sources) {
+static int init_filter_graph(AVCodecContext* audio_codec_context, AVFilterGraph** graph, AVFilterContext** sink, std::vector<AVFilterContext*>& src_filter_ctx, size_t num_sources) {
char ch_layout[64];
int err = 0;
ch_layout[0] = '\0';
-
- AVFilterGraph *filter_graph = avfilter_graph_alloc();
+
+ // C89-style variable declaration to
+ // avoid problems because of goto
+ AVFilterGraph* filter_graph = nullptr;
+ AVFilterContext* mix_ctx = nullptr;
+
+ const AVFilter* mix_filter = nullptr;
+ const AVFilter* abuffersink = nullptr;
+ AVFilterContext* abuffersink_ctx = nullptr;
+ char args[512] = { 0 };
+#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7, 107, 100)
+ bool normalize = false;
+#endif
+
+ filter_graph = avfilter_graph_alloc();
if (!filter_graph) {
fprintf(stderr, "Unable to create filter graph.\n");
- return AVERROR(ENOMEM);
+ err = AVERROR(ENOMEM);
+ goto fail;
}
-
+
for(size_t i = 0; i < num_sources; ++i) {
const AVFilter *abuffer = avfilter_get_by_name("abuffer");
if (!abuffer) {
fprintf(stderr, "Could not find the abuffer filter.\n");
- return AVERROR_FILTER_NOT_FOUND;
+ err = AVERROR_FILTER_NOT_FOUND;
+ goto fail;
}
-
+
AVFilterContext *abuffer_ctx = avfilter_graph_alloc_filter(filter_graph, abuffer, NULL);
if (!abuffer_ctx) {
fprintf(stderr, "Could not allocate the abuffer instance.\n");
- return AVERROR(ENOMEM);
+ err = AVERROR(ENOMEM);
+ goto fail;
}
-
+
#if LIBAVCODEC_VERSION_MAJOR < 60
av_get_channel_layout_string(ch_layout, sizeof(ch_layout), 0, AV_CH_LAYOUT_STEREO);
#else
@@ -1743,50 +1811,56 @@ static int init_filter_graph(AVCodecContext *audio_codec_context, AVFilterGraph
av_opt_set_q (abuffer_ctx, "time_base", audio_codec_context->time_base, AV_OPT_SEARCH_CHILDREN);
av_opt_set_int(abuffer_ctx, "sample_rate", audio_codec_context->sample_rate, AV_OPT_SEARCH_CHILDREN);
av_opt_set_int(abuffer_ctx, "bit_rate", audio_codec_context->bit_rate, AV_OPT_SEARCH_CHILDREN);
-
+
err = avfilter_init_str(abuffer_ctx, NULL);
if (err < 0) {
fprintf(stderr, "Could not initialize the abuffer filter.\n");
- return err;
+ goto fail;
}
src_filter_ctx.push_back(abuffer_ctx);
}
- const AVFilter *mix_filter = avfilter_get_by_name("amix");
+ mix_filter = avfilter_get_by_name("amix");
if (!mix_filter) {
av_log(NULL, AV_LOG_ERROR, "Could not find the mix filter.\n");
- return AVERROR_FILTER_NOT_FOUND;
+ err = AVERROR_FILTER_NOT_FOUND;
+ goto fail;
}
-
- char args[512];
+
+#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7, 107, 100)
+ snprintf(args, sizeof(args), "inputs=%d:normalize=%s", (int)num_sources, normalize ? "true" : "false");
+#else
snprintf(args, sizeof(args), "inputs=%d", (int)num_sources);
-
- AVFilterContext *mix_ctx;
+ fprintf(stderr, "Warning: your ffmpeg version doesn't support disabling normalizing of mixed audio. Volume might be lower than expected\n");
+#endif
+
err = avfilter_graph_create_filter(&mix_ctx, mix_filter, "amix", args, NULL, filter_graph);
if (err < 0) {
av_log(NULL, AV_LOG_ERROR, "Cannot create audio amix filter\n");
- return err;
+ goto fail;
}
-
- const AVFilter *abuffersink = avfilter_get_by_name("abuffersink");
+
+ abuffersink = avfilter_get_by_name("abuffersink");
if (!abuffersink) {
fprintf(stderr, "Could not find the abuffersink filter.\n");
- return AVERROR_FILTER_NOT_FOUND;
+ err = AVERROR_FILTER_NOT_FOUND;
+ goto fail;
}
-
- AVFilterContext *abuffersink_ctx = avfilter_graph_alloc_filter(filter_graph, abuffersink, "sink");
+
+ abuffersink_ctx = avfilter_graph_alloc_filter(filter_graph, abuffersink, "sink");
if (!abuffersink_ctx) {
fprintf(stderr, "Could not allocate the abuffersink instance.\n");
- return AVERROR(ENOMEM);
+ err = AVERROR(ENOMEM);
+ goto fail;
}
-
+
err = avfilter_init_str(abuffersink_ctx, NULL);
if (err < 0) {
fprintf(stderr, "Could not initialize the abuffersink instance.\n");
- return err;
+ goto fail;
}
-
+
err = 0;
for(size_t i = 0; i < src_filter_ctx.size(); ++i) {
AVFilterContext *src_ctx = src_filter_ctx[i];
@@ -1797,24 +1871,37 @@ static int init_filter_graph(AVCodecContext *audio_codec_context, AVFilterGraph
err = avfilter_link(mix_ctx, 0, abuffersink_ctx, 0);
if (err < 0) {
av_log(NULL, AV_LOG_ERROR, "Error connecting filters\n");
- return err;
+ goto fail;
}
-
+
err = avfilter_graph_config(filter_graph, NULL);
if (err < 0) {
av_log(NULL, AV_LOG_ERROR, "Error configuring the filter graph\n");
- return err;
+ goto fail;
}
-
+
*graph = filter_graph;
- *sink = abuffersink_ctx;
-
+ *sink = abuffersink_ctx;
+
return 0;
+
+fail:
+ avfilter_graph_free(&filter_graph);
+ src_filter_ctx.clear(); // possibly unnecessary?
+ return err;
}
static gsr_video_encoder* create_video_encoder(gsr_egl *egl, bool overclock, gsr_color_depth color_depth, bool use_software_video_encoder, VideoCodec video_codec) {
gsr_video_encoder *video_encoder = nullptr;
+ if(video_codec_is_image(video_codec)) {
+ gsr_video_encoder_image_params params;
+ params.egl = egl;
+ params.color_depth = color_depth;
+ video_encoder = gsr_video_encoder_image_create(&params);
+ return video_encoder;
+ }
+
if(use_software_video_encoder) {
gsr_video_encoder_software_params params;
params.egl = egl;
@@ -1895,7 +1982,7 @@ static bool is_xwayland(Display *display) {
static bool is_using_prime_run() {
const char *prime_render_offload = getenv("__NV_PRIME_RENDER_OFFLOAD");
- return prime_render_offload && strcmp(prime_render_offload, "1") == 0;
+ return (prime_render_offload && strcmp(prime_render_offload, "1") == 0) || getenv("DRI_PRIME");
}
static void disable_prime_run() {
@@ -1903,6 +1990,14 @@ static void disable_prime_run() {
unsetenv("__NV_PRIME_RENDER_OFFLOAD_PROVIDER");
unsetenv("__GLX_VENDOR_LIBRARY_NAME");
unsetenv("__VK_LAYER_NV_optimus");
+ unsetenv("DRI_PRIME");
+}
+
+static gsr_window* gsr_window_create(Display *display, bool wayland) {
+ if(wayland)
+ return gsr_window_wayland_create();
+ else
+ return gsr_window_x11_create(display);
}
static void list_system_info(bool wayland) {
@@ -1933,6 +2028,7 @@ static void list_gpu_info(gsr_egl *egl) {
printf("vendor|nvidia\n");
break;
}
+ printf("card_path|%s\n", egl->card_path);
}
static const AVCodec* get_ffmpeg_video_codec(VideoCodec video_codec, gsr_gpu_vendor vendor) {
@@ -1955,6 +2051,10 @@ static const AVCodec* get_ffmpeg_video_codec(VideoCodec video_codec, gsr_gpu_ven
return avcodec_find_encoder_by_name("h264_vulkan");
case VideoCodec::HEVC_VULKAN:
return avcodec_find_encoder_by_name("hevc_vulkan");
+ case VideoCodec::JPEG:
+ return avcodec_find_encoder_by_name("libopenjpeg");
+ case VideoCodec::PNG:
+ return avcodec_find_encoder_by_name("png");
}
return nullptr;
}
@@ -2025,26 +2125,29 @@ static void list_supported_video_codecs(gsr_egl *egl, bool wayland) {
puts("vp8");
if(supported_video_codecs.vp9.supported)
puts("vp9");
+ if(avcodec_find_encoder_by_name("libopenjpeg"))
+ puts("jpeg");
+ if(avcodec_find_encoder_by_name("png"))
+ puts("png");
//if(supported_video_codecs_vulkan.h264.supported)
// puts("h264_vulkan");
//if(supported_video_codecs_vulkan.hevc.supported)
// puts("hevc_vulkan"); // TODO: hdr, 10 bit
}
-static bool monitor_capture_use_drm(gsr_egl *egl, bool wayland) {
- return wayland || egl->gpu_info.vendor != GSR_GPU_VENDOR_NVIDIA;
+static bool monitor_capture_use_drm(const gsr_window *window, gsr_gpu_vendor vendor) {
+ return gsr_window_get_display_server(window) == GSR_DISPLAY_SERVER_WAYLAND || vendor != GSR_GPU_VENDOR_NVIDIA;
}
typedef struct {
- bool wayland;
- gsr_egl *egl;
+ const gsr_window *window;
} capture_options_callback;
static void output_monitor_info(const gsr_monitor *monitor, void *userdata) {
const capture_options_callback *options = (capture_options_callback*)userdata;
- if(options->wayland && monitor_capture_use_drm(options->egl, options->wayland)) {
+ if(gsr_window_get_display_server(options->window) == GSR_DISPLAY_SERVER_WAYLAND) {
vec2i monitor_size = monitor->size;
- const gsr_monitor_rotation rot = drm_monitor_get_display_server_rotation(options->egl, monitor);
+ const gsr_monitor_rotation rot = drm_monitor_get_display_server_rotation(options->window, monitor);
if(rot == GSR_MONITOR_ROT_90 || rot == GSR_MONITOR_ROT_270)
std::swap(monitor_size.x, monitor_size.y);
printf("%.*s|%dx%d\n", monitor->name_len, monitor->name, monitor_size.x, monitor_size.y);
@@ -2053,7 +2156,8 @@ static void output_monitor_info(const gsr_monitor *monitor, void *userdata) {
}
}
-static void list_supported_capture_options(gsr_egl *egl, bool wayland, bool list_monitors) {
+static void list_supported_capture_options(const gsr_window *window, const char *card_path, bool list_monitors) {
+ const bool wayland = gsr_window_get_display_server(window) == GSR_DISPLAY_SERVER_WAYLAND;
if(!wayland) {
puts("window");
puts("focused");
@@ -2061,16 +2165,10 @@ static void list_supported_capture_options(gsr_egl *egl, bool wayland, bool list
if(list_monitors) {
capture_options_callback options;
- options.wayland = wayland;
- options.egl = egl;
- if(monitor_capture_use_drm(egl, wayland)) {
- const bool is_x11 = gsr_egl_get_display_server(egl) == GSR_DISPLAY_SERVER_X11;
- const gsr_connection_type connection_type = is_x11 ? GSR_CONNECTION_X11 : GSR_CONNECTION_DRM;
- for_each_active_monitor_output(egl, connection_type, output_monitor_info, &options);
- } else {
- puts("screen"); // All monitors in one, only available on Nvidia X11
- for_each_active_monitor_output(egl, GSR_CONNECTION_X11, output_monitor_info, &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);
}
#ifdef GSR_PORTAL
@@ -2113,15 +2211,21 @@ static void info_command() {
disable_prime_run();
}
+ gsr_window *window = gsr_window_create(dpy, wayland);
+ if(!window) {
+ fprintf(stderr, "Error: failed to create window\n");
+ _exit(1);
+ }
+
gsr_egl egl;
- if(!gsr_egl_load(&egl, dpy, wayland, false)) {
+ if(!gsr_egl_load(&egl, window, false, false)) {
fprintf(stderr, "gsr error: failed to load opengl\n");
_exit(22);
}
bool list_monitors = true;
egl.card_path[0] = '\0';
- if(monitor_capture_use_drm(&egl, wayland)) {
+ if(monitor_capture_use_drm(window, egl.gpu_info.vendor)) {
// TODO: Allow specifying another card, and in other places
if(!gsr_get_valid_card_path(&egl, egl.card_path, true)) {
fprintf(stderr, "Error: no /dev/dri/cardX device found. Make sure that you have at least one monitor connected\n");
@@ -2137,17 +2241,19 @@ static void info_command() {
puts("is_steam_deck|yes");
else
puts("is_steam_deck|no");
+ printf("gsr_version|%s\n", GSR_VERSION);
puts("section=gpu_info");
list_gpu_info(&egl);
puts("section=video_codecs");
list_supported_video_codecs(&egl, wayland);
puts("section=capture_options");
- list_supported_capture_options(&egl, wayland, list_monitors);
+ list_supported_capture_options(window, egl.card_path, list_monitors);
fflush(stdout);
// Not needed as this will just slow down shutdown
//gsr_egl_unload(&egl);
+ //gsr_window_destroy(&window);
//if(dpy)
// XCloseDisplay(dpy);
@@ -2191,7 +2297,9 @@ static void list_application_audio_command() {
_exit(0);
}
-static void list_capture_options_command() {
+// |card_path| can be NULL. If not NULL then |vendor| has to be valid
+static void list_capture_options_command(const char *card_path, gsr_gpu_vendor vendor) {
+ (void)vendor;
bool wayland = false;
Display *dpy = XOpenDisplay(nullptr);
if (!dpy) {
@@ -2213,37 +2321,90 @@ static void list_capture_options_command() {
disable_prime_run();
}
- gsr_egl egl;
- if(!gsr_egl_load(&egl, dpy, wayland, false)) {
- fprintf(stderr, "gsr error: failed to load opengl\n");
+ gsr_window *window = gsr_window_create(dpy, wayland);
+ if(!window) {
+ fprintf(stderr, "Error: failed to create window\n");
_exit(1);
}
- bool list_monitors = true;
- egl.card_path[0] = '\0';
- if(monitor_capture_use_drm(&egl, wayland)) {
- // TODO: Allow specifying another card, and in other places
- if(!gsr_get_valid_card_path(&egl, egl.card_path, true)) {
- fprintf(stderr, "Error: no /dev/dri/cardX device found. Make sure that you have at least one monitor connected\n");
- list_monitors = false;
+ if(card_path) {
+ list_supported_capture_options(window, card_path, true);
+ } else {
+ gsr_egl egl;
+ if(!gsr_egl_load(&egl, window, false, false)) {
+ fprintf(stderr, "gsr error: failed to load opengl\n");
+ _exit(1);
}
- }
- av_log_set_level(AV_LOG_FATAL);
- list_supported_capture_options(&egl, wayland, list_monitors);
+ bool list_monitors = true;
+ egl.card_path[0] = '\0';
+ if(monitor_capture_use_drm(window, egl.gpu_info.vendor)) {
+ // TODO: Allow specifying another card, and in other places
+ if(!gsr_get_valid_card_path(&egl, egl.card_path, true)) {
+ fprintf(stderr, "Error: no /dev/dri/cardX device found. Make sure that you have at least one monitor connected\n");
+ list_monitors = false;
+ }
+ }
+ list_supported_capture_options(window, egl.card_path, list_monitors);
+ }
fflush(stdout);
// Not needed as this will just slow down shutdown
//gsr_egl_unload(&egl);
+ //gsr_window_destroy(&window);
//if(dpy)
// XCloseDisplay(dpy);
_exit(0);
}
+static bool gpu_vendor_from_string(const char *vendor_str, gsr_gpu_vendor *vendor) {
+ if(strcmp(vendor_str, "amd") == 0) {
+ *vendor = GSR_GPU_VENDOR_AMD;
+ return true;
+ } else if(strcmp(vendor_str, "intel") == 0) {
+ *vendor = GSR_GPU_VENDOR_INTEL;
+ return true;
+ } else if(strcmp(vendor_str, "nvidia") == 0) {
+ *vendor = GSR_GPU_VENDOR_NVIDIA;
+ return true;
+ } else {
+ return false;
+ }
+}
+
+static void validate_monitor_get_valid(const gsr_egl *egl, std::string &window_str) {
+ const bool is_x11 = gsr_window_get_display_server(egl->window) == GSR_DISPLAY_SERVER_X11;
+ const gsr_connection_type connection_type = is_x11 ? GSR_CONNECTION_X11 : GSR_CONNECTION_DRM;
+ const bool capture_use_drm = monitor_capture_use_drm(egl->window, egl->gpu_info.vendor);
+
+ if(strcmp(window_str.c_str(), "screen") == 0) {
+ FirstOutputCallback first_output;
+ first_output.output_name = NULL;
+ for_each_active_monitor_output(egl->window, egl->card_path, connection_type, get_first_output, &first_output);
+
+ if(first_output.output_name) {
+ window_str = first_output.output_name;
+ } else {
+ fprintf(stderr, "Error: no usable output found\n");
+ _exit(51);
+ }
+ } else if(capture_use_drm || (strcmp(window_str.c_str(), "screen-direct") != 0 && strcmp(window_str.c_str(), "screen-direct-force") != 0)) {
+ gsr_monitor gmon;
+ if(!get_monitor_by_name(egl, connection_type, window_str.c_str(), &gmon)) {
+ fprintf(stderr, "gsr error: display \"%s\" not found, expected one of:\n", window_str.c_str());
+ fprintf(stderr, " \"screen\"\n");
+ if(!capture_use_drm)
+ fprintf(stderr, " \"screen-direct\"\n");
+ for_each_active_monitor_output(egl->window, egl->card_path, connection_type, monitor_output_callback_print, NULL);
+ _exit(51);
+ }
+ }
+}
+
static gsr_capture* create_capture_impl(std::string &window_str, vec2i output_resolution, bool wayland, gsr_egl *egl, int fps, VideoCodec video_codec, gsr_color_range color_range,
- bool record_cursor, bool use_software_video_encoder, bool restore_portal_session, const char *portal_session_token_filepath,
+ bool record_cursor, bool restore_portal_session, const char *portal_session_token_filepath,
gsr_color_depth color_depth)
{
Window src_window_id = None;
@@ -2286,59 +2447,13 @@ static gsr_capture* create_capture_impl(std::string &window_str, vec2i output_re
_exit(2);
#endif
} else if(contains_non_hex_number(window_str.c_str())) {
- if(monitor_capture_use_drm(egl, wayland)) {
- const bool is_x11 = gsr_egl_get_display_server(egl) == GSR_DISPLAY_SERVER_X11;
- const gsr_connection_type connection_type = is_x11 ? GSR_CONNECTION_X11 : GSR_CONNECTION_DRM;
-
- if(strcmp(window_str.c_str(), "screen") == 0) {
- FirstOutputCallback first_output;
- first_output.output_name = NULL;
- for_each_active_monitor_output(egl, connection_type, get_first_output, &first_output);
-
- if(first_output.output_name) {
- window_str = first_output.output_name;
- } else {
- fprintf(stderr, "Error: no usable output found\n");
- _exit(1);
- }
- } else {
- gsr_monitor gmon;
- if(!get_monitor_by_name(egl, connection_type, window_str.c_str(), &gmon)) {
- fprintf(stderr, "gsr error: display \"%s\" not found, expected one of:\n", window_str.c_str());
- fprintf(stderr, " \"screen\"\n");
- for_each_active_monitor_output(egl, connection_type, monitor_output_callback_print, NULL);
- _exit(1);
- }
- }
- } else {
- if(strcmp(window_str.c_str(), "screen") != 0 && strcmp(window_str.c_str(), "screen-direct") != 0 && strcmp(window_str.c_str(), "screen-direct-force") != 0) {
- gsr_monitor gmon;
- if(!get_monitor_by_name(egl, GSR_CONNECTION_X11, window_str.c_str(), &gmon)) {
- const int screens_width = XWidthOfScreen(DefaultScreenOfDisplay(egl->x11.dpy));
- const int screens_height = XWidthOfScreen(DefaultScreenOfDisplay(egl->x11.dpy));
- fprintf(stderr, "gsr error: display \"%s\" not found, expected one of:\n", window_str.c_str());
- fprintf(stderr, " \"screen\" (%dx%d+%d+%d)\n", screens_width, screens_height, 0, 0);
- fprintf(stderr, " \"screen-direct\" (%dx%d+%d+%d)\n", screens_width, screens_height, 0, 0);
- fprintf(stderr, " \"screen-direct-force\" (%dx%d+%d+%d)\n", screens_width, screens_height, 0, 0);
- for_each_active_monitor_output(egl, GSR_CONNECTION_X11, monitor_output_callback_print, NULL);
- _exit(1);
- }
- }
- }
-
- if(egl->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA && !wayland) {
+ validate_monitor_get_valid(egl, window_str);
+ if(!monitor_capture_use_drm(egl->window, egl->gpu_info.vendor)) {
const char *capture_target = window_str.c_str();
- bool direct_capture = strcmp(window_str.c_str(), "screen-direct") == 0;
+ const bool direct_capture = strcmp(window_str.c_str(), "screen-direct") == 0 || strcmp(window_str.c_str(), "screen-direct-force") == 0;
if(direct_capture) {
capture_target = "screen";
- // TODO: Temporary disable direct capture because push model causes stuttering when it's direct capturing. This might be a nvfbc bug. This does not happen when using a compositor.
- direct_capture = false;
- fprintf(stderr, "Warning: screen-direct has temporary been disabled as it causes stuttering. This is likely a NvFBC bug. Falling back to \"screen\".\n");
- }
-
- if(strcmp(window_str.c_str(), "screen-direct-force") == 0) {
- direct_capture = true;
- capture_target = "screen";
+ fprintf(stderr, "Warning: %s capture option is not recommended unless you use G-SYNC as Nvidia has driver issues that can cause your system or games to freeze/crash.\n", window_str.c_str());
}
gsr_capture_nvfbc_params nvfbc_params;
@@ -2351,7 +2466,6 @@ static gsr_capture* create_capture_impl(std::string &window_str, vec2i output_re
nvfbc_params.color_depth = color_depth;
nvfbc_params.color_range = color_range;
nvfbc_params.record_cursor = record_cursor;
- nvfbc_params.use_software_video_encoder = use_software_video_encoder;
nvfbc_params.output_resolution = output_resolution;
capture = gsr_capture_nvfbc_create(&nvfbc_params);
if(!capture)
@@ -2372,7 +2486,7 @@ static gsr_capture* create_capture_impl(std::string &window_str, vec2i output_re
}
} else {
if(wayland) {
- fprintf(stderr, "Error: GPU Screen Recorder window capture only works in a pure X11 session. Xwayland is not supported. You can record a monitor instead on wayland\n");
+ fprintf(stderr, "Error: GPU Screen Recorder window capture only works in a pure X11 session. Xwayland is not supported. You can record a monitor instead on wayland or use -w portal option which supports window capture if your wayland compositor supports window capture\n");
_exit(2);
}
@@ -2402,7 +2516,10 @@ static gsr_capture* create_capture_impl(std::string &window_str, vec2i output_re
}
static AVPixelFormat get_pixel_format(VideoCodec video_codec, gsr_gpu_vendor vendor, bool use_software_video_encoder) {
- if(use_software_video_encoder) {
+ if(video_codec_is_image(video_codec)) {
+ // TODO: hdr
+ return AV_PIX_FMT_RGB24;
+ } else if(use_software_video_encoder) {
return AV_PIX_FMT_NV12;
} else {
if(video_codec_is_vulkan(video_codec))
@@ -2412,10 +2529,19 @@ static AVPixelFormat get_pixel_format(VideoCodec video_codec, gsr_gpu_vendor ven
}
}
+enum class ArgType {
+ STRING,
+ BOOLEAN
+};
+
struct Arg {
std::vector<const char*> values;
bool optional = false;
bool list = false;
+ ArgType arg_type = ArgType::STRING;
+ union {
+ bool boolean = false;
+ } typed_value;
const char* value() const {
if(values.empty())
@@ -2450,43 +2576,42 @@ static void match_app_audio_input_to_available_apps(const std::vector<AudioInput
// Manually check if the audio inputs we give exist. This is only needed for pipewire, not pulseaudio.
// Pipewire instead DEFAULTS TO THE DEFAULT AUDIO INPUT. THAT'S RETARDED.
// OH, YOU MISSPELLED THE AUDIO INPUT? FUCK YOU
-static std::vector<MergedAudioInputs> parse_audio_inputs(const AudioDevices &audio_devices, const Arg &audio_input_arg, const Arg &app_audio_input_arg, const Arg &app_audio_input_inverted_arg) {
+static std::vector<MergedAudioInputs> parse_audio_inputs(const AudioDevices &audio_devices, const Arg &audio_input_arg) {
std::vector<MergedAudioInputs> requested_audio_inputs;
for(const char *audio_input : audio_input_arg.values) {
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, audio_devices));
for(AudioInput &request_audio_input : requested_audio_inputs.back().audio_inputs) {
if(request_audio_input.type != AudioInputType::DEVICE)
continue;
bool match = false;
- if(!audio_devices.default_output.empty() && request_audio_input.name == "default_output") {
+ if(request_audio_input.name == "default_output") {
+ if(audio_devices.default_output.empty()) {
+ fprintf(stderr, "Error: -a default_output was specified but no default audio output is specified in the audio server\n");
+ _exit(2);
+ }
request_audio_input.name = audio_devices.default_output;
- if(request_audio_input.description.empty())
- request_audio_input.description = "gsr-Default output";
match = true;
- }
-
- if(!audio_devices.default_input.empty() && request_audio_input.name == "default_input") {
+ } else if(request_audio_input.name == "default_input") {
+ if(audio_devices.default_input.empty()) {
+ fprintf(stderr, "Error: -a default_input was specified but no default audio input is specified in the audio server\n");
+ _exit(2);
+ }
request_audio_input.name = audio_devices.default_input;
- if(request_audio_input.description.empty())
- request_audio_input.description = "gsr-Default input";
- match = true;
- }
-
- const AudioInput* existing_audio_input = get_audio_device_by_name(audio_devices.audio_inputs, request_audio_input.name);
- if(existing_audio_input) {
- if(request_audio_input.description.empty())
- request_audio_input.description = "gsr-" + existing_audio_input->description;
match = true;
+ } else {
+ const bool name_is_existing_audio_device = get_audio_device_by_name(audio_devices.audio_inputs, request_audio_input.name.c_str()) != nullptr;
+ if(name_is_existing_audio_device)
+ match = true;
}
if(!match) {
- fprintf(stderr, "Error: Audio input device '%s' is not a valid audio device, expected one of:\n", request_audio_input.name.c_str());
+ fprintf(stderr, "Error: Audio device '%s' is not a valid audio device, expected one of:\n", request_audio_input.name.c_str());
if(!audio_devices.default_output.empty())
fprintf(stderr, " default_output (Default output)\n");
if(!audio_devices.default_input.empty())
@@ -2494,28 +2619,11 @@ static std::vector<MergedAudioInputs> parse_audio_inputs(const AudioDevices &aud
for(const auto &audio_device_input : audio_devices.audio_inputs) {
fprintf(stderr, " %s (%s)\n", audio_device_input.name.c_str(), audio_device_input.description.c_str());
}
- _exit(2);
+ _exit(50);
}
}
}
- for(const char *app_audio_input : app_audio_input_arg.values) {
- if(!app_audio_input || app_audio_input[0] == '\0')
- continue;
-
- requested_audio_inputs.push_back({parse_app_audio_input_arg(app_audio_input)});
- }
-
- for(const char *app_audio_input : app_audio_input_inverted_arg.values) {
- if(!app_audio_input || app_audio_input[0] == '\0')
- continue;
-
- requested_audio_inputs.push_back({parse_app_audio_input_arg(app_audio_input)});
- for(auto &audio_input : requested_audio_inputs.back().audio_inputs) {
- audio_input.inverted = true;
- }
- }
-
return requested_audio_inputs;
}
@@ -2623,7 +2731,7 @@ static AudioCodec select_audio_codec_with_fallback(AudioCodec audio_codec, const
}
static const char* video_codec_to_string(VideoCodec video_codec) {
- switch(video_codec) {
+ switch(video_codec) {
case VideoCodec::H264: return "h264";
case VideoCodec::HEVC: return "hevc";
case VideoCodec::HEVC_HDR: return "hevc_hdr";
@@ -2635,12 +2743,14 @@ static const char* video_codec_to_string(VideoCodec video_codec) {
case VideoCodec::VP9: return "vp9";
case VideoCodec::H264_VULKAN: return "h264_vulkan";
case VideoCodec::HEVC_VULKAN: return "hevc_vulkan";
+ case VideoCodec::JPEG: return "jpeg";
+ case VideoCodec::PNG: return "png";
}
return "";
}
static bool video_codec_only_supports_low_power_mode(const gsr_supported_video_codecs &supported_video_codecs, VideoCodec video_codec) {
- switch(video_codec) {
+ switch(video_codec) {
case VideoCodec::H264: return supported_video_codecs.h264.low_power;
case VideoCodec::HEVC: return supported_video_codecs.hevc.low_power;
case VideoCodec::HEVC_HDR: return supported_video_codecs.hevc_hdr.low_power;
@@ -2652,6 +2762,8 @@ static bool video_codec_only_supports_low_power_mode(const gsr_supported_video_c
case VideoCodec::VP9: return supported_video_codecs.vp9.low_power;
case VideoCodec::H264_VULKAN: return supported_video_codecs.h264.low_power;
case VideoCodec::HEVC_VULKAN: return supported_video_codecs.hevc.low_power; // TODO: hdr, 10 bit
+ case VideoCodec::JPEG: return false;
+ case VideoCodec::PNG: return false;
}
return false;
}
@@ -2727,6 +2839,11 @@ static const AVCodec* pick_video_codec(VideoCodec *video_codec, gsr_egl *egl, bo
video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
break;
}
+ case VideoCodec::JPEG:
+ case VideoCodec::PNG: {
+ video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
+ break;
+ }
}
if(!video_codec_auto && !video_codec_f && !is_flv) {
@@ -2788,6 +2905,12 @@ static const AVCodec* pick_video_codec(VideoCodec *video_codec, gsr_egl *egl, bo
video_codec_f = get_ffmpeg_video_codec(*video_codec, egl->gpu_info.vendor);
break;
}
+ case VideoCodec::JPEG:
+ case VideoCodec::PNG: {
+ // TODO:
+ //assert(false);
+ break;
+ }
}
}
@@ -2866,15 +2989,15 @@ static const AVCodec* select_video_codec_with_fallback(VideoCodec *video_codec,
return pick_video_codec(video_codec, egl, use_software_video_encoder, video_codec_auto, video_codec_to_use, is_flv, low_power);
}
-static std::vector<AudioDevice> create_device_audio_inputs(const std::vector<AudioInput> &audio_inputs, AVCodecContext *audio_codec_context, int num_channels, double num_audio_frames_shift, std::vector<AVFilterContext*> &src_filter_ctx, bool use_amix) {
- std::vector<AudioDevice> audio_track_audio_devices;
+static std::vector<AudioDeviceData> create_device_audio_inputs(const std::vector<AudioInput> &audio_inputs, AVCodecContext *audio_codec_context, int num_channels, double num_audio_frames_shift, std::vector<AVFilterContext*> &src_filter_ctx, bool use_amix) {
+ std::vector<AudioDeviceData> audio_track_audio_devices;
for(size_t i = 0; i < audio_inputs.size(); ++i) {
const auto &audio_input = audio_inputs[i];
AVFilterContext *src_ctx = nullptr;
if(use_amix)
src_ctx = src_filter_ctx[i];
- AudioDevice audio_device;
+ AudioDeviceData audio_device;
audio_device.audio_input = audio_input;
audio_device.src_filter_ctx = src_ctx;
@@ -2882,7 +3005,8 @@ static std::vector<AudioDevice> create_device_audio_inputs(const std::vector<Aud
audio_device.sound_device.handle = NULL;
audio_device.sound_device.frames = 0;
} else {
- if(sound_device_get_by_name(&audio_device.sound_device, audio_input.name.c_str(), audio_input.description.c_str(), num_channels, audio_codec_context->frame_size, audio_codec_context_get_audio_format(audio_codec_context)) != 0) {
+ const std::string description = "gsr-" + audio_input.name;
+ if(sound_device_get_by_name(&audio_device.sound_device, audio_input.name.c_str(), description.c_str(), num_channels, audio_codec_context->frame_size, audio_codec_context_get_audio_format(audio_codec_context)) != 0) {
fprintf(stderr, "Error: failed to get \"%s\" audio device\n", audio_input.name.c_str());
_exit(1);
}
@@ -2897,28 +3021,35 @@ static std::vector<AudioDevice> create_device_audio_inputs(const std::vector<Aud
}
#ifdef GSR_APP_AUDIO
-static AudioDevice create_application_audio_audio_input(const MergedAudioInputs &merged_audio_inputs, AVCodecContext *audio_codec_context, int num_channels, double num_audio_frames_shift, gsr_pipewire_audio *pipewire_audio) {
- AudioDevice audio_device;
+static AudioDeviceData create_application_audio_audio_input(const MergedAudioInputs &merged_audio_inputs, AVCodecContext *audio_codec_context, int num_channels, double num_audio_frames_shift, gsr_pipewire_audio *pipewire_audio) {
+ AudioDeviceData audio_device;
audio_device.frame = create_audio_frame(audio_codec_context);
audio_device.frame->pts = -audio_codec_context->frame_size * num_audio_frames_shift;
char random_str[8];
if(!generate_random_characters_standard_alphabet(random_str, sizeof(random_str))) {
- fprintf(stderr, "gsr error: ailed to generate random string\n");
+ fprintf(stderr, "gsr error: failed to generate random string\n");
+ _exit(1);
+ }
+ std::string combined_sink_name = "gsr-combined-";
+ combined_sink_name.append(random_str, sizeof(random_str));
+
+ if(!gsr_pipewire_audio_create_virtual_sink(pipewire_audio, combined_sink_name.c_str())) {
+ fprintf(stderr, "gsr error: failed to create virtual sink for application audio\n");
_exit(1);
}
- audio_device.combined_sink_name = "gsr-combined-";
- audio_device.combined_sink_name.append(random_str, sizeof(random_str));
- if(sound_device_create_combined_sink_connect(&audio_device.sound_device, audio_device.combined_sink_name.c_str(), num_channels, audio_codec_context->frame_size, audio_codec_context_get_audio_format(audio_codec_context)) != 0) {
+ combined_sink_name += ".monitor";
+
+ if(sound_device_get_by_name(&audio_device.sound_device, combined_sink_name.c_str(), "gpu-screen-recorder", num_channels, audio_codec_context->frame_size, audio_codec_context_get_audio_format(audio_codec_context)) != 0) {
fprintf(stderr, "Error: failed to setup audio recording to combined sink\n");
_exit(1);
}
- std::vector<const char*> audio_sources;
+ std::vector<const char*> audio_devices_sources;
for(const auto &audio_input : merged_audio_inputs.audio_inputs) {
if(audio_input.type == AudioInputType::DEVICE)
- audio_sources.push_back(audio_input.name.c_str());
+ audio_devices_sources.push_back(audio_input.name.c_str());
}
bool app_audio_inverted = false;
@@ -2930,20 +3061,20 @@ static AudioDevice create_application_audio_audio_input(const MergedAudioInputs
}
}
- if(!audio_sources.empty()) {
- if(!gsr_pipewire_audio_add_link_from_sources_to_sink(pipewire_audio, audio_sources.data(), audio_sources.size(), audio_device.combined_sink_name.c_str())) {
+ if(!audio_devices_sources.empty()) {
+ if(!gsr_pipewire_audio_add_link_from_sources_to_sink(pipewire_audio, audio_devices_sources.data(), audio_devices_sources.size(), combined_sink_name.c_str())) {
fprintf(stderr, "gsr error: failed to add application audio link\n");
_exit(1);
}
}
if(app_audio_inverted) {
- if(!gsr_pipewire_audio_add_link_from_apps_to_sink_inverted(pipewire_audio, app_names.data(), app_names.size(), audio_device.combined_sink_name.c_str())) {
+ if(!gsr_pipewire_audio_add_link_from_apps_to_sink_inverted(pipewire_audio, app_names.data(), app_names.size(), combined_sink_name.c_str())) {
fprintf(stderr, "gsr error: failed to add application audio link\n");
_exit(1);
}
} else {
- if(!gsr_pipewire_audio_add_link_from_apps_to_sink(pipewire_audio, app_names.data(), app_names.size(), audio_device.combined_sink_name.c_str())) {
+ if(!gsr_pipewire_audio_add_link_from_apps_to_sink(pipewire_audio, app_names.data(), app_names.size(), combined_sink_name.c_str())) {
fprintf(stderr, "gsr error: failed to add application audio link\n");
_exit(1);
}
@@ -2953,6 +3084,31 @@ static AudioDevice create_application_audio_audio_input(const MergedAudioInputs
}
#endif
+static void set_video_codec_for_image_output(const char *filename, VideoCodec *video_codec, const char **video_codec_to_use) {
+ const bool video_codec_auto = strcmp(*video_codec_to_use, "auto") == 0;
+ if(string_ends_with(filename, ".jpg") || string_ends_with(filename, ".jpeg")) {
+ if(!video_codec_auto)
+ fprintf(stderr, "Warning: expected -k option to be set to 'auto' (or not specified) for jpeg output\n");
+ *video_codec = VideoCodec::JPEG;
+ *video_codec_to_use = "jpeg";
+ } else if(string_ends_with(filename, ".png")) {
+ if(!video_codec_auto)
+ fprintf(stderr, "Warning: expected -k option to be set to 'auto' (or not specified) for png output\n");
+ *video_codec = VideoCodec::PNG;
+ *video_codec_to_use = "png";
+ }
+}
+
+static bool arg_get_boolean_value(std::map<std::string, Arg> &args, const char *arg_name, bool default_value) {
+ auto it = args.find(arg_name);
+ if(it == args.end() || !it->second.value()) {
+ return default_value;
+ } else {
+ assert(it->second.arg_type == ArgType::BOOLEAN);
+ return it->second.typed_value.boolean;
+ }
+}
+
int main(int argc, char **argv) {
setlocale(LC_ALL, "C"); // Sigh... stupid C
@@ -2981,6 +3137,11 @@ int main(int argc, char **argv) {
// Same as above, but for amd/intel
unsetenv("vblank_mode");
+ if(geteuid() == 0) {
+ fprintf(stderr, "Error: don't run gpu-screen-recorder as the root user\n");
+ _exit(1);
+ }
+
if(argc <= 1)
usage_full();
@@ -3002,9 +3163,25 @@ int main(int argc, char **argv) {
_exit(0);
}
- if(argc == 2 && strcmp(argv[1], "--list-capture-options") == 0) {
- list_capture_options_command();
- _exit(0);
+ if(strcmp(argv[1], "--list-capture-options") == 0) {
+ if(argc == 2) {
+ list_capture_options_command(nullptr, GSR_GPU_VENDOR_AMD);
+ _exit(0);
+ } else if(argc == 4) {
+ const char *card_path = argv[2];
+ const char *vendor_str = argv[3];
+ gsr_gpu_vendor vendor;
+ if(!gpu_vendor_from_string(vendor_str, &vendor)) {
+ fprintf(stderr, "Error: \"%s\" is not a valid vendor, expected \"amd\", \"intel\" or \"nvidia\"\n", vendor_str);
+ _exit(1);
+ }
+
+ list_capture_options_command(card_path, vendor);
+ _exit(0);
+ } else {
+ fprintf(stderr, "Error: expected --list-capture-options to be called with either no extra arguments or 2 extra arguments (card path and vendor)\n");
+ _exit(1);
+ }
}
if(argc == 2 && strcmp(argv[1], "--version") == 0) {
@@ -3014,58 +3191,73 @@ int main(int argc, char **argv) {
//av_log_set_level(AV_LOG_TRACE);
+ const bool is_optional = true;
+ const bool is_list = true;
std::map<std::string, Arg> args = {
- { "-w", Arg { {}, false, false } },
- { "-c", Arg { {}, true, false } },
- { "-f", Arg { {}, false, false } },
- { "-s", Arg { {}, true, false } },
- { "-a", Arg { {}, true, true } },
- { "-aa", Arg { {}, true, true } }, // TODO: Remove soon since this is deprecated. User should use -a with app: instead
- { "-aai", Arg { {}, true, true } }, // TODO: Remove soon since this is deprecated. User should use -a with app-inverse: instead
- { "-q", Arg { {}, true, false } },
- { "-o", Arg { {}, true, false } },
- { "-r", Arg { {}, true, false } },
- { "-k", Arg { {}, true, false } },
- { "-ac", Arg { {}, true, false } },
- { "-ab", Arg { {}, true, false } },
- { "-oc", Arg { {}, true, false } },
- { "-fm", Arg { {}, true, false } },
- { "-bm", Arg { {}, true, false } },
- { "-pixfmt", Arg { {}, true, false } },
- { "-v", Arg { {}, true, false } },
- { "-df", Arg { {}, true, false } },
- { "-sc", Arg { {}, true, false } },
- { "-cr", Arg { {}, true, false } },
- { "-cursor", Arg { {}, true, false } },
- { "-keyint", Arg { {}, true, false } },
- { "-restore-portal-session", Arg { {}, true, false } },
- { "-portal-session-token-filepath", Arg { {}, true, false } },
- { "-encoder", Arg { {}, true, false } },
+ { "-w", Arg { {}, !is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-c", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-f", Arg { {}, !is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-s", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-a", Arg { {}, is_optional, is_list, ArgType::STRING, {false} } },
+ { "-q", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-o", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-r", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-restart-replay-on-save", Arg { {}, is_optional, !is_list, ArgType::BOOLEAN, {false} } },
+ { "-k", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-ac", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-ab", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-oc", Arg { {}, is_optional, !is_list, ArgType::BOOLEAN, {false} } },
+ { "-fm", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-bm", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-pixfmt", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-v", Arg { {}, is_optional, !is_list, ArgType::BOOLEAN, {false} } },
+ { "-gl-debug", Arg { {}, is_optional, !is_list, ArgType::BOOLEAN, {false} } },
+ { "-df", Arg { {}, is_optional, !is_list, ArgType::BOOLEAN, {false} } },
+ { "-sc", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-cr", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-cursor", Arg { {}, is_optional, !is_list, ArgType::BOOLEAN, {false} } },
+ { "-keyint", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
+ { "-restore-portal-session", Arg { {}, is_optional, !is_list, ArgType::BOOLEAN, {false} } },
+ { "-portal-session-token-filepath", Arg { {}, is_optional, !is_list, ArgType::BOOLEAN, {false} } },
+ { "-encoder", Arg { {}, is_optional, !is_list, ArgType::STRING, {false} } },
};
for(int i = 1; i < argc; i += 2) {
- auto it = args.find(argv[i]);
+ const char *arg_name = argv[i];
+ auto it = args.find(arg_name);
if(it == args.end()) {
- fprintf(stderr, "Invalid argument '%s'\n", argv[i]);
+ fprintf(stderr, "Error: invalid argument '%s'\n", arg_name);
usage();
}
if(!it->second.values.empty() && !it->second.list) {
- fprintf(stderr, "Expected argument '%s' to only be specified once\n", argv[i]);
+ fprintf(stderr, "Error: expected argument '%s' to only be specified once\n", arg_name);
usage();
}
if(i + 1 >= argc) {
- fprintf(stderr, "Missing value for argument '%s'\n", argv[i]);
+ fprintf(stderr, "Error: missing value for argument '%s'\n", arg_name);
usage();
}
- it->second.values.push_back(argv[i + 1]);
+ const char *arg_value = argv[i + 1];
+ if(it->second.arg_type == ArgType::BOOLEAN) {
+ if(strcmp(arg_value, "yes") == 0) {
+ it->second.typed_value.boolean = true;
+ } else if(strcmp(arg_value, "no") == 0) {
+ it->second.typed_value.boolean = false;
+ } else {
+ fprintf(stderr, "Error: %s should either be 'yes' or 'no', got: '%s'\n", arg_name, arg_value);
+ usage();
+ }
+ }
+
+ it->second.values.push_back(arg_value);
}
for(auto &it : args) {
if(!it.second.optional && !it.second.value()) {
- fprintf(stderr, "Missing argument '%s'\n", it.first.c_str());
+ fprintf(stderr, "Error: missing argument '%s'\n", it.first.c_str());
usage();
}
}
@@ -3172,75 +3364,13 @@ int main(int argc, char **argv) {
}
}
- bool overclock = false;
- const char *overclock_str = args["-oc"].value();
- if(!overclock_str)
- overclock_str = "no";
-
- if(strcmp(overclock_str, "yes") == 0) {
- overclock = true;
- } else if(strcmp(overclock_str, "no") == 0) {
- overclock = false;
- } else {
- fprintf(stderr, "Error: -oc should either be either 'yes' or 'no', got: '%s'\n", overclock_str);
- usage();
- }
-
- bool verbose = true;
- const char *verbose_str = args["-v"].value();
- if(!verbose_str)
- verbose_str = "yes";
-
- if(strcmp(verbose_str, "yes") == 0) {
- verbose = true;
- } else if(strcmp(verbose_str, "no") == 0) {
- verbose = false;
- } else {
- fprintf(stderr, "Error: -v should either be either 'yes' or 'no', got: '%s'\n", verbose_str);
- usage();
- }
-
- bool record_cursor = true;
- const char *record_cursor_str = args["-cursor"].value();
- if(!record_cursor_str)
- record_cursor_str = "yes";
-
- if(strcmp(record_cursor_str, "yes") == 0) {
- record_cursor = true;
- } else if(strcmp(record_cursor_str, "no") == 0) {
- record_cursor = false;
- } else {
- fprintf(stderr, "Error: -cursor should either be either 'yes' or 'no', got: '%s'\n", record_cursor_str);
- usage();
- }
-
- bool date_folders = false;
- const char *date_folders_str = args["-df"].value();
- if(!date_folders_str)
- date_folders_str = "no";
-
- if(strcmp(date_folders_str, "yes") == 0) {
- date_folders = true;
- } else if(strcmp(date_folders_str, "no") == 0) {
- date_folders = false;
- } else {
- fprintf(stderr, "Error: -df should either be either 'yes' or 'no', got: '%s'\n", date_folders_str);
- usage();
- }
-
- bool restore_portal_session = false;
- const char *restore_portal_session_str = args["-restore-portal-session"].value();
- if(!restore_portal_session_str)
- restore_portal_session_str = "no";
-
- if(strcmp(restore_portal_session_str, "yes") == 0) {
- restore_portal_session = true;
- } else if(strcmp(restore_portal_session_str, "no") == 0) {
- restore_portal_session = false;
- } else {
- fprintf(stderr, "Error: -restore-portal-session should either be either 'yes' or 'no', got: '%s'\n", restore_portal_session_str);
- usage();
- }
+ bool overclock = arg_get_boolean_value(args, "-oc", false);
+ const bool verbose = arg_get_boolean_value(args, "-v", true);
+ const bool gl_debug = arg_get_boolean_value(args, "-gl-debug", false);
+ const bool record_cursor = arg_get_boolean_value(args, "-cursor", true);
+ const bool date_folders = arg_get_boolean_value(args, "-df", false);
+ const bool restore_portal_session = arg_get_boolean_value(args, "-restore-portal-session", false);
+ const bool restart_replay_on_save = arg_get_boolean_value(args, "-restart-replay-on-save", false);
const char *portal_session_token_filepath = args["-portal-session-token-filepath"].value();
if(portal_session_token_filepath) {
@@ -3280,20 +3410,12 @@ int main(int argc, char **argv) {
}
const Arg &audio_input_arg = args["-a"];
- const Arg &app_audio_input_arg = args["-aa"];
- const Arg &app_audio_input_inverted_arg = args["-aai"];
AudioDevices audio_devices;
if(!audio_input_arg.values.empty())
audio_devices = get_pulseaudio_inputs();
-
- if(!app_audio_input_arg.values.empty())
- fprintf(stderr, "gsr warning: argument -aa is deprecated, use -a with app: prefix instead, for example: -a \"app:Brave\"\n");
-
- if(!app_audio_input_inverted_arg.values.empty())
- fprintf(stderr, "gsr warning: argument -aai is deprecated, use -a with app-inverse: prefix instead, for example: -a \"app-inverse:Brave\"\n");
- std::vector<MergedAudioInputs> requested_audio_inputs = parse_audio_inputs(audio_devices, audio_input_arg, app_audio_input_arg, app_audio_input_inverted_arg);
+ std::vector<MergedAudioInputs> requested_audio_inputs = parse_audio_inputs(audio_devices, audio_input_arg);
const bool uses_app_audio = merged_audio_inputs_has_app_audio(requested_audio_inputs);
std::vector<std::string> app_audio_names;
@@ -3337,8 +3459,8 @@ int main(int argc, char **argv) {
const char *replay_buffer_size_secs_str = args["-r"].value();
if(replay_buffer_size_secs_str) {
replay_buffer_size_secs = atoi(replay_buffer_size_secs_str);
- if(replay_buffer_size_secs < 5 || replay_buffer_size_secs > 1200) {
- fprintf(stderr, "Error: option -r has to be between 5 and 1200, was: %s\n", replay_buffer_size_secs_str);
+ if(replay_buffer_size_secs < 2 || replay_buffer_size_secs > 10800) {
+ fprintf(stderr, "Error: option -r has to be between 2 and 10800, was: %s\n", replay_buffer_size_secs_str);
_exit(1);
}
replay_buffer_size_secs += std::ceil(keyint); // Add a few seconds to account of lost packets because of non-keyframe packets skipped
@@ -3372,6 +3494,12 @@ int main(int argc, char **argv) {
disable_prime_run();
}
+ gsr_window *window = gsr_window_create(dpy, wayland);
+ if(!window) {
+ fprintf(stderr, "Error: failed to create window\n");
+ _exit(1);
+ }
+
if(is_portal_capture && is_using_prime_run()) {
fprintf(stderr, "Warning: use of prime-run with -w portal option is currently not supported. Disabling prime-run\n");
disable_prime_run();
@@ -3382,9 +3510,14 @@ int main(int argc, char **argv) {
_exit(1);
}
+ if(video_codec_is_hdr(video_codec) && is_portal_capture) {
+ fprintf(stderr, "Warning: portal capture option doesn't support hdr yet (PipeWire doesn't support hdr), the video will be tonemapped from hdr to sdr\n");
+ video_codec = hdr_video_codec_to_sdr_video_codec(video_codec);
+ }
+
const bool is_monitor_capture = strcmp(window_str.c_str(), "focused") != 0 && !is_portal_capture && contains_non_hex_number(window_str.c_str());
gsr_egl egl;
- if(!gsr_egl_load(&egl, dpy, wayland, is_monitor_capture)) {
+ if(!gsr_egl_load(&egl, window, is_monitor_capture, gl_debug)) {
fprintf(stderr, "gsr error: failed to load opengl\n");
_exit(1);
}
@@ -3412,7 +3545,7 @@ int main(int argc, char **argv) {
}
egl.card_path[0] = '\0';
- if(monitor_capture_use_drm(&egl, wayland)) {
+ if(monitor_capture_use_drm(window, egl.gpu_info.vendor)) {
// TODO: Allow specifying another card, and in other places
if(!gsr_get_valid_card_path(&egl, egl.card_path, is_monitor_capture)) {
fprintf(stderr, "Error: no /dev/dri/cardX device found. Make sure that you have at least one monitor connected or record a single window instead on X11 or record with the -w portal option\n");
@@ -3601,6 +3734,12 @@ int main(int argc, char **argv) {
const bool is_output_piped = strcmp(filename, "/dev/stdout") == 0;
+ set_video_codec_for_image_output(filename, &video_codec, &video_codec_to_use);
+ if(video_codec_is_image(video_codec) && !audio_input_arg.values.empty()) {
+ fprintf(stderr, "Error: can't record audio (-a) when taking a screenshot\n");
+ _exit(1);
+ }
+
AVFormatContext *av_format_context;
// The output format is automatically guessed by the file extension
avformat_alloc_output_context2(&av_format_context, nullptr, container_format, filename);
@@ -3626,25 +3765,21 @@ int main(int argc, char **argv) {
const bool force_no_audio_offset = is_livestream || is_output_piped || (file_extension != "mp4" && file_extension != "mkv" && file_extension != "webm");
const double target_fps = 1.0 / (double)fps;
- if(video_codec_is_hdr(video_codec) && is_portal_capture) {
- fprintf(stderr, "Warning: portal capture option doesn't support hdr yet (PipeWire doesn't support hdr), the video will be tonemapped from hdr to sdr\n");
- video_codec = hdr_video_codec_to_sdr_video_codec(video_codec);
- }
-
const bool uses_amix = merged_audio_inputs_should_use_amix(requested_audio_inputs);
- audio_codec = select_audio_codec_with_fallback(audio_codec, file_extension, uses_amix);
+ if(!video_codec_is_image(video_codec))
+ audio_codec = select_audio_codec_with_fallback(audio_codec, file_extension, uses_amix);
bool low_power = false;
const AVCodec *video_codec_f = select_video_codec_with_fallback(&video_codec, video_codec_to_use, file_extension.c_str(), use_software_video_encoder, &egl, &low_power);
const gsr_color_depth color_depth = video_codec_to_bit_depth(video_codec);
- gsr_capture *capture = create_capture_impl(window_str, output_resolution, wayland, &egl, fps, video_codec, color_range, record_cursor, use_software_video_encoder, restore_portal_session, portal_session_token_filepath, color_depth);
+ gsr_capture *capture = create_capture_impl(window_str, output_resolution, wayland, &egl, fps, video_codec, color_range, record_cursor, restore_portal_session, portal_session_token_filepath, color_depth);
// (Some?) livestreaming services require at least one audio track to work.
// If not audio is provided then create one silent audio track.
if(is_livestream && requested_audio_inputs.empty()) {
fprintf(stderr, "Info: live streaming but no audio track was added. Adding a silent audio track\n");
MergedAudioInputs mai;
- mai.audio_inputs.push_back({ "", "gsr-silent" });
+ mai.audio_inputs.push_back({""});
requested_audio_inputs.push_back(std::move(mai));
}
@@ -3709,7 +3844,9 @@ int main(int argc, char **argv) {
gsr_color_conversion_clear(&color_conversion);
- if(use_software_video_encoder) {
+ if(video_codec_is_image(video_codec)) {
+ open_video_image(video_codec_context);
+ } else if(use_software_video_encoder) {
open_video_software(video_codec_context, quality, pixel_format, hdr, color_depth, bitrate_mode);
} else {
open_video_hardware(video_codec_context, quality, very_old_gpu, egl.gpu_info.vendor, pixel_format, hdr, color_depth, bitrate_mode, video_codec, low_power);
@@ -3727,6 +3864,9 @@ int main(int argc, char **argv) {
if(replay_buffer_size_secs == -1)
audio_stream = create_stream(av_format_context, audio_codec_context);
+ if(audio_stream && !merged_audio_inputs.track_name.empty())
+ av_dict_set(&audio_stream->metadata, "title", merged_audio_inputs.track_name.c_str(), 0);
+
open_audio(audio_codec_context);
if(audio_stream)
avcodec_parameters_from_context(audio_stream->codecpar, audio_codec_context);
@@ -3758,7 +3898,7 @@ int main(int argc, char **argv) {
const double audio_startup_time_seconds = force_no_audio_offset ? 0 : audio_codec_get_desired_delay(audio_codec, fps);// * ((double)audio_codec_context->frame_size / 1024.0);
const double num_audio_frames_shift = audio_startup_time_seconds / timeout_sec;
- std::vector<AudioDevice> audio_track_audio_devices;
+ std::vector<AudioDeviceData> audio_track_audio_devices;
if(audio_inputs_has_app_audio(merged_audio_inputs.audio_inputs)) {
assert(!use_amix);
#ifdef GSR_APP_AUDIO
@@ -3769,6 +3909,7 @@ int main(int argc, char **argv) {
}
AudioTrack audio_track;
+ audio_track.name = merged_audio_inputs.track_name;
audio_track.codec_context = audio_codec_context;
audio_track.stream = audio_stream;
audio_track.audio_devices = std::move(audio_track_audio_devices);
@@ -3795,6 +3936,8 @@ int main(int argc, char **argv) {
if(replay_buffer_size_secs == -1) {
AVDictionary *options = nullptr;
av_dict_set(&options, "strict", "experimental", 0);
+ if(video_codec_is_image(video_codec))
+ av_dict_set(&options, "update", "true", 0);
//av_dict_set_int(&av_format_context->metadata, "video_full_range_flag", 1, 0);
int ret = avformat_write_header(av_format_context, &options);
@@ -3819,6 +3962,7 @@ 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);
std::deque<std::shared_ptr<PacketData>> frame_data_queue;
bool frames_erased = false;
@@ -3831,7 +3975,7 @@ int main(int argc, char **argv) {
memset(empty_audio, 0, audio_buffer_size);
for(AudioTrack &audio_track : audio_tracks) {
- for(AudioDevice &audio_device : audio_track.audio_devices) {
+ for(AudioDeviceData &audio_device : audio_track.audio_devices) {
audio_device.thread = std::thread([&]() mutable {
const AVSampleFormat sound_device_sample_format = audio_format_to_sample_format(audio_codec_context_get_audio_format(audio_track.codec_context));
// TODO: Always do conversion for now. This fixes issue with stuttering audio on pulseaudio with opus + multiple audio sources merged
@@ -3937,7 +4081,7 @@ int main(int argc, char **argv) {
ret = avcodec_send_frame(audio_track.codec_context, audio_device.frame);
if(ret >= 0) {
// TODO: Move to separate thread because this could write to network (for example when livestreaming)
- receive_frames(audio_track.codec_context, audio_track.stream_index, audio_track.stream, audio_device.frame->pts, av_format_context, record_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset);
+ receive_frames(audio_track.codec_context, audio_track.stream_index, audio_track.stream, audio_device.frame->pts, av_format_context, replay_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset);
} else {
fprintf(stderr, "Failed to encode audio!\n");
}
@@ -3969,7 +4113,7 @@ int main(int argc, char **argv) {
ret = avcodec_send_frame(audio_track.codec_context, audio_device.frame);
if(ret >= 0) {
// TODO: Move to separate thread because this could write to network (for example when livestreaming)
- receive_frames(audio_track.codec_context, audio_track.stream_index, audio_track.stream, audio_device.frame->pts, av_format_context, record_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset);
+ receive_frames(audio_track.codec_context, audio_track.stream_index, audio_track.stream, audio_device.frame->pts, av_format_context, replay_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset);
} else {
fprintf(stderr, "Failed to encode audio!\n");
}
@@ -4003,7 +4147,7 @@ int main(int argc, char **argv) {
err = avcodec_send_frame(audio_track.codec_context, aframe);
if(err >= 0){
// TODO: Move to separate thread because this could write to network (for example when livestreaming)
- receive_frames(audio_track.codec_context, audio_track.stream_index, audio_track.stream, aframe->pts, av_format_context, record_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset);
+ receive_frames(audio_track.codec_context, audio_track.stream_index, audio_track.stream, aframe->pts, av_format_context, replay_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset);
} else {
fprintf(stderr, "Failed to encode audio!\n");
}
@@ -4033,7 +4177,7 @@ int main(int argc, char **argv) {
bool use_damage_tracking = false;
gsr_damage damage;
memset(&damage, 0, sizeof(damage));
- if(gsr_egl_get_display_server(&egl) == GSR_DISPLAY_SERVER_X11) {
+ if(gsr_window_get_display_server(window) == GSR_DISPLAY_SERVER_X11) {
gsr_damage_init(&damage, &egl, record_cursor);
use_damage_tracking = true;
}
@@ -4043,12 +4187,13 @@ int main(int argc, char **argv) {
double last_capture_seconds = record_start_time;
bool wait_until_frame_time_elapsed = false;
+ const bool is_image_output = video_codec_is_image(video_codec);
while(running) {
const double frame_start = clock_get_monotonic_seconds();
- while(gsr_egl_process_event(&egl)) {
- gsr_damage_on_event(&damage, gsr_egl_get_event_data(&egl));
+ while(gsr_window_process_event(window)) {
+ gsr_damage_on_event(&damage, gsr_window_get_event_data(window));
gsr_capture_on_event(capture, &egl);
}
gsr_damage_tick(&damage);
@@ -4149,7 +4294,11 @@ int main(int argc, char **argv) {
if(ret == 0) {
// TODO: Move to separate thread because this could write to network (for example when livestreaming)
receive_frames(video_codec_context, VIDEO_STREAM_INDEX, video_stream, video_frame->pts, av_format_context,
- record_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset);
+ replay_start_time, frame_data_queue, replay_buffer_size_secs, frames_erased, write_output_mutex, paused_time_offset);
+ if(is_image_output) {
+ running = 0;
+ break;
+ }
} else {
fprintf(stderr, "Error: avcodec_send_frame failed, error: %s\n", av_error_to_string(ret));
}
@@ -4178,6 +4327,7 @@ int main(int argc, char **argv) {
fflush(stdout);
if(recording_saved_script)
run_recording_saved_script_async(recording_saved_script, save_replay_output_filepath.c_str(), "replay");
+
std::lock_guard<std::mutex> lock(write_output_mutex);
save_replay_packets.clear();
}
@@ -4185,6 +4335,13 @@ int main(int argc, char **argv) {
if(save_replay == 1 && !save_replay_thread.valid() && replay_buffer_size_secs != -1) {
save_replay = 0;
save_replay_async(video_codec_context, VIDEO_STREAM_INDEX, audio_tracks, frame_data_queue, frames_erased, filename, container_format, file_extension, write_output_mutex, date_folders, hdr, capture);
+
+ std::lock_guard<std::mutex> lock(write_output_mutex);
+ if(restart_replay_on_save) {
+ frame_data_queue.clear();
+ frames_erased = true;
+ replay_start_time = clock_get_monotonic_seconds() - paused_time_offset;
+ }
}
const double frame_end = clock_get_monotonic_seconds();
@@ -4226,7 +4383,7 @@ int main(int argc, char **argv) {
}
for(AudioTrack &audio_track : audio_tracks) {
- for(AudioDevice &audio_device : audio_track.audio_devices) {
+ for(auto &audio_device : audio_track.audio_devices) {
audio_device.thread.join();
sound_device_close(&audio_device.sound_device);
}
@@ -4239,8 +4396,10 @@ int main(int argc, char **argv) {
fprintf(stderr, "Failed to write trailer\n");
}
- if(replay_buffer_size_secs == -1 && !(output_format->flags & AVFMT_NOFILE))
+ if(replay_buffer_size_secs == -1 && !(output_format->flags & AVFMT_NOFILE)) {
avio_close(av_format_context->pb);
+ avformat_free_context(av_format_context);
+ }
gsr_damage_deinit(&damage);
gsr_color_conversion_deinit(&color_conversion);
@@ -4258,6 +4417,9 @@ int main(int argc, char **argv) {
//XCloseDisplay(dpy);
}
+ //gsr_egl_unload(&egl);
+ //gsr_window_destroy(&window);
+
//av_frame_free(&video_frame);
free(empty_audio);
// We do an _exit here because cuda uses at_exit to do _something_ that causes the program to freeze,
diff --git a/src/pipewire_audio.c b/src/pipewire_audio.c
index 4af41e4..00cd4b4 100644
--- a/src/pipewire_audio.c
+++ b/src/pipewire_audio.c
@@ -186,6 +186,8 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
gsr_pipewire_audio_create_links(self);
}
+ } else if(self->num_stream_nodes >= GSR_PIPEWIRE_AUDIO_MAX_STREAM_NODES) {
+ fprintf(stderr, "gsr error: reached the maximum amount of audio stream nodes\n");
}
} else if(strcmp(type, PW_TYPE_INTERFACE_Port) == 0) {
const char *port_name = spa_dict_lookup(props, PW_KEY_PORT_NAME);
@@ -212,6 +214,8 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
gsr_pipewire_audio_create_links(self);
}
+ } else if(self->num_ports >= GSR_PIPEWIRE_AUDIO_MAX_PORTS) {
+ fprintf(stderr, "gsr error: reached the maximum amount of audio ports\n");
}
}
}
@@ -273,20 +277,20 @@ bool gsr_pipewire_audio_init(gsr_pipewire_audio *self) {
self->thread_loop = pw_thread_loop_new("gsr screen capture", NULL);
if(!self->thread_loop) {
- fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to create pipewire thread\n");
+ fprintf(stderr, "gsr error: gsr_pipewire_audio_init: failed to create pipewire thread\n");
gsr_pipewire_audio_deinit(self);
return false;
}
self->context = pw_context_new(pw_thread_loop_get_loop(self->thread_loop), NULL, 0);
if(!self->context) {
- fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to create pipewire context\n");
+ fprintf(stderr, "gsr error: gsr_pipewire_audio_init: failed to create pipewire context\n");
gsr_pipewire_audio_deinit(self);
return false;
}
if(pw_thread_loop_start(self->thread_loop) < 0) {
- fprintf(stderr, "gsr error: gsr_pipewire_video_setup_stream: failed to start thread\n");
+ fprintf(stderr, "gsr error: gsr_pipewire_audio_init: failed to start thread\n");
gsr_pipewire_audio_deinit(self);
return false;
}
@@ -308,7 +312,6 @@ bool gsr_pipewire_audio_init(gsr_pipewire_audio *self) {
self->server_version_sync = pw_core_sync(self->core, PW_ID_CORE, 0);
pw_thread_loop_wait(self->thread_loop);
-
pw_thread_loop_unlock(self->thread_loop);
return true;
}
@@ -319,6 +322,14 @@ void gsr_pipewire_audio_deinit(gsr_pipewire_audio *self) {
pw_thread_loop_stop(self->thread_loop);
}
+ for(int i = 0; i < self->num_virtual_sink_proxies; ++i) {
+ if(self->virtual_sink_proxies[i]) {
+ pw_proxy_destroy(self->virtual_sink_proxies[i]);
+ self->virtual_sink_proxies[i] = NULL;
+ }
+ }
+ self->num_virtual_sink_proxies = 0;
+
if(self->core) {
pw_core_disconnect(self->core);
self->core = NULL;
@@ -358,6 +369,54 @@ void gsr_pipewire_audio_deinit(gsr_pipewire_audio *self) {
#endif
}
+static struct pw_properties* gsr_pipewire_create_null_audio_sink(const char *name) {
+ char props_str[512];
+ snprintf(props_str, sizeof(props_str), "{ factory.name=support.null-audio-sink node.name=\"%s\" media.class=Audio/Sink object.linger=false audio.position=[FL FR] monitor.channel-volumes=true monitor.passthrough=true adjust_time=0 node.description=gsr-app-sink slaves=\"\" }", name);
+ struct pw_properties *props = pw_properties_new_string(props_str);
+ if(!props) {
+ fprintf(stderr, "gsr error: gsr_pipewire_create_null_audio_sink: failed to create virtual sink properties\n");
+ return NULL;
+ }
+ return props;
+}
+
+bool gsr_pipewire_audio_create_virtual_sink(gsr_pipewire_audio *self, const char *name) {
+ if(self->num_virtual_sink_proxies == GSR_PIPEWIRE_AUDIO_MAX_VIRTUAL_SINKS) {
+ fprintf(stderr, "gsr error: gsr_pipewire_audio_create_virtual_sink: reached max number of virtual sinks\n");
+ return false;
+ }
+
+ pw_thread_loop_lock(self->thread_loop);
+
+ struct pw_properties *virtual_sink_props = gsr_pipewire_create_null_audio_sink(name);
+ if(!virtual_sink_props) {
+ pw_thread_loop_unlock(self->thread_loop);
+ return false;
+ }
+
+ struct pw_proxy *virtual_sink_proxy = pw_core_create_object(self->core, "adapter", PW_TYPE_INTERFACE_Node, PW_VERSION_NODE, &virtual_sink_props->dict, 0);
+ // TODO:
+ // If these are done then the above needs sizeof(*self) as the last argument
+ //pw_proxy_add_object_listener(virtual_sink_proxy, &pd->object_listener, &node_events, self);
+ //pw_proxy_add_listener(virtual_sink_proxy, &pd->proxy_listener, &proxy_events, self);
+ // TODO: proxy
+ pw_properties_free(virtual_sink_props);
+ if(!virtual_sink_proxy) {
+ fprintf(stderr, "gsr error: gsr_pipewire_audio_create_virtual_sink: failed to create virtual sink\n");
+ pw_thread_loop_unlock(self->thread_loop);
+ return false;
+ }
+
+ self->server_version_sync = pw_core_sync(self->core, PW_ID_CORE, self->server_version_sync);
+ pw_thread_loop_wait(self->thread_loop);
+ pw_thread_loop_unlock(self->thread_loop);
+
+ self->virtual_sink_proxies[self->num_virtual_sink_proxies] = virtual_sink_proxy;
+ ++self->num_virtual_sink_proxies;
+
+ return true;
+}
+
static bool string_remove_suffix(char *str, const char *suffix) {
int str_len = strlen(str);
int suffix_len = strlen(suffix);
@@ -370,8 +429,10 @@ static bool string_remove_suffix(char *str, const char *suffix) {
}
static bool gsr_pipewire_audio_add_link_from_apps_to_output(gsr_pipewire_audio *self, const char **output_names, int num_output_names, const char *input_name, gsr_pipewire_audio_node_type output_type, gsr_pipewire_audio_link_input_type input_type, bool inverted) {
- if(self->num_requested_links >= GSR_PIPEWIRE_AUDIO_MAX_REQUESTED_LINKS)
+ if(self->num_requested_links >= GSR_PIPEWIRE_AUDIO_MAX_REQUESTED_LINKS) {
+ fprintf(stderr, "gsr error: reached the maximum amount of audio links\n");
return false;
+ }
char **output_names_copy = calloc(num_output_names, sizeof(char*));
if(!output_names_copy)
@@ -381,6 +442,9 @@ static bool gsr_pipewire_audio_add_link_from_apps_to_output(gsr_pipewire_audio *
if(!input_name_copy)
goto error;
+ if(input_type == GSR_PIPEWIRE_AUDIO_LINK_INPUT_TYPE_SINK)
+ string_remove_suffix(input_name_copy, ".monitor");
+
for(int i = 0; i < num_output_names; ++i) {
output_names_copy[i] = strdup(output_names[i]);
if(!output_names_copy[i])
diff --git a/src/pipewire_video.c b/src/pipewire_video.c
index 3c6965e..023a2db 100644
--- a/src/pipewire_video.c
+++ b/src/pipewire_video.c
@@ -14,7 +14,7 @@
/* This code is partially based on xr-video-player pipewire implementation which is based on obs-studio's pipewire implementation */
/* TODO: Make gsr_pipewire_video_init asynchronous */
-/* TODO: Support 10-bit capture (hdr) when pipewire supports it */
+/* TODO: Support hdr when pipewire supports it */
/* TODO: Test all of the image formats */
#ifndef SPA_POD_PROP_FLAG_DONT_FIXATE
@@ -65,14 +65,20 @@ static void on_core_done_cb(void *user_data, uint32_t id, int seq) {
static bool is_cursor_format_supported(const enum spa_video_format format) {
switch(format) {
- case SPA_VIDEO_FORMAT_RGBx: return true;
- case SPA_VIDEO_FORMAT_BGRx: return true;
- case SPA_VIDEO_FORMAT_xRGB: return true;
- case SPA_VIDEO_FORMAT_xBGR: return true;
- case SPA_VIDEO_FORMAT_RGBA: return true;
- case SPA_VIDEO_FORMAT_BGRA: return true;
- case SPA_VIDEO_FORMAT_ARGB: return true;
- case SPA_VIDEO_FORMAT_ABGR: return true;
+ case SPA_VIDEO_FORMAT_RGBx: return true;
+ case SPA_VIDEO_FORMAT_BGRx: return true;
+ case SPA_VIDEO_FORMAT_RGBA: return true;
+ case SPA_VIDEO_FORMAT_BGRA: return true;
+ case SPA_VIDEO_FORMAT_RGB: return true;
+ case SPA_VIDEO_FORMAT_BGR: return true;
+ case SPA_VIDEO_FORMAT_ARGB: return true;
+ case SPA_VIDEO_FORMAT_ABGR: return true;
+#if PW_CHECK_VERSION(0, 3, 41)
+ case SPA_VIDEO_FORMAT_xRGB_210LE: return true;
+ case SPA_VIDEO_FORMAT_xBGR_210LE: return true;
+ case SPA_VIDEO_FORMAT_ARGB_210LE: return true;
+ case SPA_VIDEO_FORMAT_ABGR_210LE: return true;
+#endif
default: break;
}
return false;
@@ -338,24 +344,46 @@ static inline struct spa_pod *build_format(struct spa_pod_builder *b,
/* For some reason gstreamer formats are in opposite order to drm formats */
static int64_t spa_video_format_to_drm_format(const enum spa_video_format format) {
switch(format) {
- case SPA_VIDEO_FORMAT_RGBx: return DRM_FORMAT_XBGR8888;
- case SPA_VIDEO_FORMAT_BGRx: return DRM_FORMAT_XRGB8888;
- case SPA_VIDEO_FORMAT_RGBA: return DRM_FORMAT_ABGR8888;
- case SPA_VIDEO_FORMAT_BGRA: return DRM_FORMAT_ARGB8888;
- case SPA_VIDEO_FORMAT_RGB: return DRM_FORMAT_XBGR8888;
- case SPA_VIDEO_FORMAT_BGR: return DRM_FORMAT_XRGB8888;
+ case SPA_VIDEO_FORMAT_RGBx: return DRM_FORMAT_XBGR8888;
+ case SPA_VIDEO_FORMAT_BGRx: return DRM_FORMAT_XRGB8888;
+ case SPA_VIDEO_FORMAT_RGBA: return DRM_FORMAT_ABGR8888;
+ case SPA_VIDEO_FORMAT_BGRA: return DRM_FORMAT_ARGB8888;
+ case SPA_VIDEO_FORMAT_RGB: return DRM_FORMAT_XBGR8888;
+ case SPA_VIDEO_FORMAT_BGR: return DRM_FORMAT_XRGB8888;
+ case SPA_VIDEO_FORMAT_ARGB: return DRM_FORMAT_XRGB8888;
+ case SPA_VIDEO_FORMAT_ABGR: return DRM_FORMAT_XRGB8888;
+#if PW_CHECK_VERSION(0, 3, 41)
+ case SPA_VIDEO_FORMAT_xRGB_210LE: return DRM_FORMAT_XRGB2101010;
+ case SPA_VIDEO_FORMAT_xBGR_210LE: return DRM_FORMAT_XBGR2101010;
+ case SPA_VIDEO_FORMAT_ARGB_210LE: return DRM_FORMAT_ARGB2101010;
+ case SPA_VIDEO_FORMAT_ABGR_210LE: return DRM_FORMAT_ABGR2101010;
+#endif
default: break;
}
return DRM_FORMAT_INVALID;
}
-static const enum spa_video_format video_formats[] = {
+#if PW_CHECK_VERSION(0, 3, 41)
+#define GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS GSR_PIPEWIRE_VIDEO_MAX_VIDEO_FORMATS
+#else
+#define GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS 8
+#endif
+
+static const enum spa_video_format video_formats[GSR_PIPEWIRE_VIDEO_MAX_VIDEO_FORMATS] = {
SPA_VIDEO_FORMAT_BGRA,
SPA_VIDEO_FORMAT_BGRx,
SPA_VIDEO_FORMAT_BGR,
SPA_VIDEO_FORMAT_RGBx,
SPA_VIDEO_FORMAT_RGBA,
SPA_VIDEO_FORMAT_RGB,
+ SPA_VIDEO_FORMAT_ARGB,
+ SPA_VIDEO_FORMAT_ABGR,
+#if PW_CHECK_VERSION(0, 3, 41)
+ SPA_VIDEO_FORMAT_xRGB_210LE,
+ SPA_VIDEO_FORMAT_xBGR_210LE,
+ SPA_VIDEO_FORMAT_ARGB_210LE,
+ SPA_VIDEO_FORMAT_ABGR_210LE
+#endif
};
static bool gsr_pipewire_video_build_format_params(gsr_pipewire_video *self, struct spa_pod_builder *pod_builder, struct spa_pod **params, uint32_t *num_params) {
@@ -367,7 +395,7 @@ static bool gsr_pipewire_video_build_format_params(gsr_pipewire_video *self, str
for(size_t i = 0; i < GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS; i++) {
if(self->supported_video_formats[i].modifiers_size == 0)
continue;
- params[i] = build_format(pod_builder, &self->video_info, self->supported_video_formats[i].format, self->modifiers + self->supported_video_formats[i].modifiers_index, self->supported_video_formats[i].modifiers_size);
+ params[*num_params] = build_format(pod_builder, &self->video_info, self->supported_video_formats[i].format, self->modifiers + self->supported_video_formats[i].modifiers_index, self->supported_video_formats[i].modifiers_size);
++(*num_params);
}
@@ -382,7 +410,7 @@ static void renegotiate_format(void *data, uint64_t expirations) {
struct spa_pod *params[GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS];
uint32_t num_video_formats = 0;
- uint8_t params_buffer[2048];
+ uint8_t params_buffer[4096];
struct spa_pod_builder pod_builder = SPA_POD_BUILDER_INIT(params_buffer, sizeof(params_buffer));
if (!gsr_pipewire_video_build_format_params(self, &pod_builder, params, &num_video_formats)) {
pw_thread_loop_unlock(self->thread_loop);
@@ -413,6 +441,11 @@ static bool spa_video_format_get_modifiers(gsr_pipewire_video *self, const enum
}
const int64_t drm_format = spa_video_format_to_drm_format(format);
+ if(drm_format == DRM_FORMAT_INVALID) {
+ fprintf(stderr, "gsr error: spa_video_format_get_modifiers: unsupported format: %d\n", (int)format);
+ return false;
+ }
+
if(!self->egl->eglQueryDmaBufModifiersEXT(self->egl->egl_display, drm_format, max_modifiers, modifiers, NULL, num_modifiers)) {
fprintf(stderr, "gsr error: spa_video_format_get_modifiers: eglQueryDmaBufModifiersEXT failed with drm format %d, %" PRIi64 "\n", (int)format, drm_format);
//modifiers[0] = DRM_FORMAT_MOD_LINEAR;
@@ -443,7 +476,7 @@ static void gsr_pipewire_video_init_modifiers(gsr_pipewire_video *self) {
static bool gsr_pipewire_video_setup_stream(gsr_pipewire_video *self) {
struct spa_pod *params[GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS];
uint32_t num_video_formats = 0;
- uint8_t params_buffer[2048];
+ uint8_t params_buffer[4096];
struct spa_pod_builder pod_builder = SPA_POD_BUILDER_INIT(params_buffer, sizeof(params_buffer));
self->thread_loop = pw_thread_loop_new("gsr screen capture", NULL);
diff --git a/src/sound.cpp b/src/sound.cpp
index b500a57..3359d3c 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -42,30 +42,11 @@ struct pa_handle {
int operation_success;
double latency_seconds;
-
- uint32_t combined_sink_module_index;
};
-static void destroy_combined_sink(pa_handle *p) {
- // TODO: error handling
- pa_operation *module_pa = pa_context_unload_module(p->context, p->combined_sink_module_index, NULL, NULL);
- for(;;) {
- if(pa_operation_get_state(module_pa) == PA_OPERATION_DONE) {
- pa_operation_unref(module_pa);
- break;
- }
- pa_mainloop_iterate(p->mainloop, 1, NULL);
- }
-}
-
static void pa_sound_device_free(pa_handle *p) {
assert(p);
- if(p->combined_sink_module_index != PA_INVALID_INDEX) {
- destroy_combined_sink(p);
- p->combined_sink_module_index = PA_INVALID_INDEX;
- }
-
if (p->stream) {
pa_stream_unref(p->stream);
p->stream = NULL;
@@ -90,31 +71,10 @@ static void pa_sound_device_free(pa_handle *p) {
pa_xfree(p);
}
-static void module_index_callback(pa_context*, uint32_t idx, void *userdata) {
- pa_handle *p = (pa_handle*)userdata;
- p->combined_sink_module_index = idx;
-}
-
-static bool create_null_sink(pa_handle *p, const char *null_sink_name) {
- // TODO: Error handling
- char module_argument[256];
- snprintf(module_argument, sizeof(module_argument), "sink_name=\"%s\" slaves= adjust_time=0", null_sink_name);
- pa_operation *module_pa = pa_context_load_module(p->context, "module-null-sink", module_argument, module_index_callback, p);
- for(;;) {
- if(pa_operation_get_state(module_pa) == PA_OPERATION_DONE) {
- pa_operation_unref(module_pa);
- break;
- }
- pa_mainloop_iterate(p->mainloop, 1, NULL);
- }
- return p->combined_sink_module_index != PA_INVALID_INDEX;
-}
-
static pa_handle* pa_sound_device_new(const char *server,
const char *name,
const char *dev,
const char *stream_name,
- const char *combined_sink_name,
const pa_sample_spec *ss,
const pa_buffer_attr *attr,
int *rerror) {
@@ -122,7 +82,6 @@ static pa_handle* pa_sound_device_new(const char *server,
int error = PA_ERR_INTERNAL, r;
p = pa_xnew0(pa_handle, 1);
- p->combined_sink_module_index = PA_INVALID_INDEX;
const int buffer_size = attr->fragsize;
void *buffer = malloc(buffer_size);
@@ -161,23 +120,12 @@ static pa_handle* pa_sound_device_new(const char *server,
pa_mainloop_iterate(p->mainloop, 1, NULL);
}
- char device_to_record[256];
- if(combined_sink_name) {
- if(!create_null_sink(p, combined_sink_name)) {
- fprintf(stderr, "gsr error: pa_sound_device_new: failed to create module-combine-sink\n");
- goto fail;
- }
- snprintf(device_to_record, sizeof(device_to_record), "%s.monitor", combined_sink_name);
- } else {
- snprintf(device_to_record, sizeof(device_to_record), "%s", dev);
- }
-
if (!(p->stream = pa_stream_new(p->context, stream_name, ss, NULL))) {
error = pa_context_errno(p->context);
goto fail;
}
- r = pa_stream_connect_record(p->stream, device_to_record, attr,
+ r = pa_stream_connect_record(p->stream, dev, attr,
(pa_stream_flags_t)(PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_ADJUST_LATENCY|PA_STREAM_AUTO_TIMING_UPDATE));
if (r < 0) {
@@ -312,7 +260,7 @@ static int audio_format_to_get_bytes_per_sample(AudioFormat audio_format) {
return 2;
}
-static int sound_device_setup_record(SoundDevice *device, const char *device_name, const char *description, unsigned int num_channels, unsigned int period_frame_size, AudioFormat audio_format, const char *combined_sink_name) {
+int sound_device_get_by_name(SoundDevice *device, const char *device_name, const char *description, unsigned int num_channels, unsigned int period_frame_size, AudioFormat audio_format) {
pa_sample_spec ss;
ss.format = audio_format_to_pulse_audio_format(audio_format);
ss.rate = 48000;
@@ -326,9 +274,9 @@ static int sound_device_setup_record(SoundDevice *device, const char *device_nam
buffer_attr.maxlength = buffer_attr.fragsize;
int error = 0;
- pa_handle *handle = pa_sound_device_new(nullptr, description, device_name, description, combined_sink_name, &ss, &buffer_attr, &error);
+ pa_handle *handle = pa_sound_device_new(nullptr, description, device_name, description, &ss, &buffer_attr, &error);
if(!handle) {
- fprintf(stderr, "pa_sound_device_new() failed: %s. Audio input device %s might not be valid\n", pa_strerror(error), description);
+ fprintf(stderr, "pa_sound_device_new() failed: %s. Audio input device %s might not be valid\n", pa_strerror(error), device_name);
return -1;
}
@@ -337,14 +285,6 @@ static int sound_device_setup_record(SoundDevice *device, const char *device_nam
return 0;
}
-int sound_device_get_by_name(SoundDevice *device, const char *device_name, const char *description, unsigned int num_channels, unsigned int period_frame_size, AudioFormat audio_format) {
- return sound_device_setup_record(device, device_name, description, num_channels, period_frame_size, audio_format, NULL);
-}
-
-int sound_device_create_combined_sink_connect(SoundDevice *device, const char *combined_sink_name, unsigned int num_channels, unsigned int period_frame_size, AudioFormat audio_format) {
- return sound_device_setup_record(device, "gpu-screen-recorder", "gpu-screen-recorder", num_channels, period_frame_size, audio_format, combined_sink_name);
-}
-
void sound_device_close(SoundDevice *device) {
if(device->handle)
pa_sound_device_free((pa_handle*)device->handle);
diff --git a/src/utils.c b/src/utils.c
index be5e58b..61ca856 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,4 +1,5 @@
#include "../include/utils.h"
+#include "../include/window/window.h"
#include <time.h>
#include <string.h>
@@ -47,16 +48,6 @@ bool generate_random_characters_standard_alphabet(char *buffer, int buffer_size)
return generate_random_characters(buffer, buffer_size, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 62);
}
-static gsr_monitor_rotation wayland_transform_to_gsr_rotation(int32_t rot) {
- switch(rot) {
- case 0: return GSR_MONITOR_ROT_0;
- case 1: return GSR_MONITOR_ROT_90;
- case 2: return GSR_MONITOR_ROT_180;
- case 3: return GSR_MONITOR_ROT_270;
- }
- return GSR_MONITOR_ROT_0;
-}
-
static const XRRModeInfo* get_mode_info(const XRRScreenResources *sr, RRMode id) {
for(int i = 0; i < sr->nmode; ++i) {
if(sr->modes[i].id == id)
@@ -146,31 +137,22 @@ void for_each_active_monitor_output_x11_not_cached(Display *display, active_moni
XRRFreeScreenResources(screen_res);
}
-void for_each_active_monitor_output_x11(const gsr_egl *egl, active_monitor_callback callback, void *userdata) {
- for(int i = 0; i < egl->x11.num_outputs; ++i) {
- const gsr_x11_output *output = &egl->x11.outputs[i];
- const gsr_monitor monitor = {
- .name = output->name,
- .name_len = strlen(output->name),
- .pos = output->pos,
- .size = output->size,
- .connector_id = output->connector_id,
- .rotation = output->rotation,
- .monitor_identifier = output->monitor_identifier
- };
- callback(&monitor, userdata);
- }
+/* TODO: Support more connector types */
+int get_connector_type_by_name(const char *name) {
+ int len = strlen(name);
+ if(len >= 5 && strncmp(name, "HDMI-", 5) == 0)
+ return 1;
+ else if(len >= 3 && strncmp(name, "DP-", 3) == 0)
+ return 2;
+ else if(len >= 12 && strncmp(name, "DisplayPort-", 12) == 0)
+ return 3;
+ else if(len >= 4 && strncmp(name, "eDP-", 4) == 0)
+ return 4;
+ else
+ return -1;
}
-typedef struct {
- int type;
- int count;
- int count_active;
-} drm_connector_type_count;
-
-#define CONNECTOR_TYPE_COUNTS 32
-
-static drm_connector_type_count* drm_connector_types_get_index(drm_connector_type_count *type_counts, int *num_type_counts, int connector_type) {
+drm_connector_type_count* drm_connector_types_get_index(drm_connector_type_count *type_counts, int *num_type_counts, int connector_type) {
for(int i = 0; i < *num_type_counts; ++i) {
if(type_counts[i].type == connector_type)
return &type_counts[i];
@@ -187,6 +169,10 @@ static drm_connector_type_count* drm_connector_types_get_index(drm_connector_typ
return &type_counts[index];
}
+uint32_t monitor_identifier_from_type_and_count(int monitor_type_index, int monitor_type_count) {
+ return ((uint32_t)monitor_type_index << 16) | ((uint32_t)monitor_type_count);
+}
+
static bool connector_get_property_by_name(int drmfd, drmModeConnectorPtr props, const char *name, uint64_t *result) {
for(int i = 0; i < props->count_props; ++i) {
drmModePropertyPtr prop = drmModeGetProperty(drmfd, props->props[i]);
@@ -202,61 +188,12 @@ static bool connector_get_property_by_name(int drmfd, drmModeConnectorPtr props,
return false;
}
-/* TODO: Support more connector types */
-static int get_connector_type_by_name(const char *name) {
- int len = strlen(name);
- if(len >= 5 && strncmp(name, "HDMI-", 5) == 0)
- return 1;
- else if(len >= 3 && strncmp(name, "DP-", 3) == 0)
- return 2;
- else if(len >= 12 && strncmp(name, "DisplayPort-", 12) == 0)
- return 3;
- else if(len >= 4 && strncmp(name, "eDP-", 4) == 0)
- return 4;
- else
- return -1;
-}
-
-static uint32_t monitor_identifier_from_type_and_count(int monitor_type_index, int monitor_type_count) {
- return ((uint32_t)monitor_type_index << 16) | ((uint32_t)monitor_type_count);
-}
-
-static void for_each_active_monitor_output_wayland(const gsr_egl *egl, active_monitor_callback callback, void *userdata) {
- drm_connector_type_count type_counts[CONNECTOR_TYPE_COUNTS];
- int num_type_counts = 0;
-
- for(int i = 0; i < egl->wayland.num_outputs; ++i) {
- const gsr_wayland_output *output = &egl->wayland.outputs[i];
- if(!output->name)
- continue;
-
- const int connector_type_index = get_connector_type_by_name(output->name);
- drm_connector_type_count *connector_type = NULL;
- if(connector_type_index != -1)
- connector_type = drm_connector_types_get_index(type_counts, &num_type_counts, connector_type_index);
-
- if(connector_type) {
- ++connector_type->count;
- ++connector_type->count_active;
- }
-
- const gsr_monitor monitor = {
- .name = output->name,
- .name_len = strlen(output->name),
- .pos = { .x = output->pos.x, .y = output->pos.y },
- .size = { .x = output->size.x, .y = output->size.y },
- .connector_id = 0,
- .rotation = wayland_transform_to_gsr_rotation(output->transform),
- .monitor_identifier = connector_type ? monitor_identifier_from_type_and_count(connector_type_index, connector_type->count_active) : 0
- };
- callback(&monitor, userdata);
- }
-}
-
-static void for_each_active_monitor_output_drm(const gsr_egl *egl, active_monitor_callback callback, void *userdata) {
- int fd = open(egl->card_path, O_RDONLY);
- if(fd == -1)
+static void for_each_active_monitor_output_drm(const char *card_path, active_monitor_callback callback, void *userdata) {
+ int fd = open(card_path, O_RDONLY);
+ if(fd == -1) {
+ fprintf(stderr, "gsr error: for_each_active_monitor_output_drm failed, failed to open \"%s\", error: %s\n", card_path, strerror(errno));
return;
+ }
drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1);
@@ -315,16 +252,14 @@ static void for_each_active_monitor_output_drm(const gsr_egl *egl, active_monito
close(fd);
}
-void for_each_active_monitor_output(const gsr_egl *egl, gsr_connection_type connection_type, active_monitor_callback callback, void *userdata) {
+void for_each_active_monitor_output(const gsr_window *window, const char *card_path, gsr_connection_type connection_type, active_monitor_callback callback, void *userdata) {
switch(connection_type) {
case GSR_CONNECTION_X11:
- for_each_active_monitor_output_x11(egl, callback, userdata);
- break;
case GSR_CONNECTION_WAYLAND:
- for_each_active_monitor_output_wayland(egl, callback, userdata);
+ gsr_window_for_each_active_monitor_output_cached(window, callback, userdata);
break;
case GSR_CONNECTION_DRM:
- for_each_active_monitor_output_drm(egl, callback, userdata);
+ for_each_active_monitor_output_drm(card_path, callback, userdata);
break;
}
}
@@ -347,7 +282,7 @@ bool get_monitor_by_name(const gsr_egl *egl, gsr_connection_type connection_type
userdata.name_len = strlen(name);
userdata.monitor = monitor;
userdata.found_monitor = false;
- for_each_active_monitor_output(egl, connection_type, get_monitor_by_name_callback, &userdata);
+ for_each_active_monitor_output(egl->window, egl->card_path, connection_type, get_monitor_by_name_callback, &userdata);
return userdata.found_monitor;
}
@@ -379,14 +314,14 @@ static void get_monitor_by_connector_id_callback(const gsr_monitor *monitor, voi
}
}
-gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_egl *egl, const gsr_monitor *monitor) {
- if(gsr_egl_get_display_server(egl) == GSR_DISPLAY_SERVER_WAYLAND) {
+gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_window *window, const gsr_monitor *monitor) {
+ if(gsr_window_get_display_server(window) == GSR_DISPLAY_SERVER_WAYLAND) {
{
get_monitor_by_connector_id_userdata userdata;
userdata.monitor = monitor;
userdata.rotation = GSR_MONITOR_ROT_0;
userdata.match_found = false;
- for_each_active_monitor_output_wayland(egl, get_monitor_by_name_and_size_callback, &userdata);
+ gsr_window_for_each_active_monitor_output_cached(window, get_monitor_by_name_and_size_callback, &userdata);
if(userdata.match_found)
return userdata.rotation;
}
@@ -395,7 +330,7 @@ gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_egl *egl,
userdata.monitor = monitor;
userdata.rotation = GSR_MONITOR_ROT_0;
userdata.match_found = false;
- for_each_active_monitor_output_wayland(egl, get_monitor_by_connector_id_callback, &userdata);
+ gsr_window_for_each_active_monitor_output_cached(window, get_monitor_by_connector_id_callback, &userdata);
return userdata.rotation;
}
} else {
@@ -403,7 +338,7 @@ gsr_monitor_rotation drm_monitor_get_display_server_rotation(const gsr_egl *egl,
userdata.monitor = monitor;
userdata.rotation = GSR_MONITOR_ROT_0;
userdata.match_found = false;
- for_each_active_monitor_output_x11(egl, get_monitor_by_connector_id_callback, &userdata);
+ gsr_window_for_each_active_monitor_output_cached(window, get_monitor_by_connector_id_callback, &userdata);
return userdata.rotation;
}
@@ -478,15 +413,15 @@ bool gl_get_gpu_info(gsr_egl *egl, gsr_gpu_info *info) {
return supported;
}
-static bool version_greater_than(int major, int minor, int patch, int other_major, int other_minor, int other_patch) {
+bool version_greater_than(int major, int minor, int patch, int other_major, int other_minor, int other_patch) {
return (major > other_major) || (major == other_major && minor > other_minor) || (major == other_major && minor == other_minor && patch > other_patch);
}
-bool gl_driver_version_greater_than(const gsr_egl *egl, int major, int minor, int patch) {
- return version_greater_than(egl->gpu_info.driver_major, egl->gpu_info.driver_minor, egl->gpu_info.driver_patch, major, minor, patch);
+bool gl_driver_version_greater_than(const gsr_gpu_info *gpu_info, int major, int minor, int patch) {
+ return version_greater_than(gpu_info->driver_major, gpu_info->driver_minor, gpu_info->driver_patch, major, minor, patch);
}
-static bool try_card_has_valid_plane(const char *card_path) {
+bool try_card_has_valid_plane(const char *card_path) {
drmVersion *ver = NULL;
drmModePlaneResPtr planes = NULL;
bool found_screen_card = false;
diff --git a/src/window/window.c b/src/window/window.c
new file mode 100644
index 0000000..1c6a24e
--- /dev/null
+++ b/src/window/window.c
@@ -0,0 +1,30 @@
+#include "../../include/window/window.h"
+#include <stddef.h>
+
+void gsr_window_destroy(gsr_window *self);
+
+bool gsr_window_process_event(gsr_window *self) {
+ return self->process_event(self);
+}
+
+XEvent* gsr_window_get_event_data(gsr_window *self) {
+ if(self->get_event_data)
+ return self->get_event_data(self);
+ return NULL;
+}
+
+gsr_display_server gsr_window_get_display_server(const gsr_window *self) {
+ return self->get_display_server();
+}
+
+void* gsr_window_get_display(gsr_window *self) {
+ return self->get_display(self);
+}
+
+void* gsr_window_get_window(gsr_window *self) {
+ return self->get_window(self);
+}
+
+void gsr_window_for_each_active_monitor_output_cached(const gsr_window *self, active_monitor_callback callback, void *userdata) {
+ self->for_each_active_monitor_output_cached(self, callback, userdata);
+}
diff --git a/src/window/window_wayland.c b/src/window/window_wayland.c
new file mode 100644
index 0000000..3a82bfa
--- /dev/null
+++ b/src/window/window_wayland.c
@@ -0,0 +1,321 @@
+#include "../../include/window/window_wayland.h"
+
+#include "../../include/vec2.h"
+#include "../../include/defs.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <wayland-client.h>
+#include <wayland-egl.h>
+
+#define GSR_MAX_OUTPUTS 32
+
+typedef struct {
+ uint32_t wl_name;
+ void *output;
+ vec2i pos;
+ vec2i size;
+ int32_t transform;
+ char *name;
+} gsr_wayland_output;
+
+typedef struct {
+ void *display;
+ void *window;
+ void *registry;
+ void *surface;
+ void *compositor;
+ gsr_wayland_output outputs[GSR_MAX_OUTPUTS];
+ int num_outputs;
+} gsr_window_wayland;
+
+static void output_handle_geometry(void *data, struct wl_output *wl_output,
+ int32_t x, int32_t y, int32_t phys_width, int32_t phys_height,
+ int32_t subpixel, const char *make, const char *model,
+ int32_t transform) {
+ (void)wl_output;
+ (void)phys_width;
+ (void)phys_height;
+ (void)subpixel;
+ (void)make;
+ (void)model;
+ gsr_wayland_output *gsr_output = data;
+ gsr_output->pos.x = x;
+ gsr_output->pos.y = y;
+ gsr_output->transform = transform;
+}
+
+static void output_handle_mode(void *data, struct wl_output *wl_output, uint32_t flags, int32_t width, int32_t height, int32_t refresh) {
+ (void)wl_output;
+ (void)flags;
+ (void)refresh;
+ gsr_wayland_output *gsr_output = data;
+ gsr_output->size.x = width;
+ gsr_output->size.y = height;
+}
+
+static void output_handle_done(void *data, struct wl_output *wl_output) {
+ (void)data;
+ (void)wl_output;
+}
+
+static void output_handle_scale(void* data, struct wl_output *wl_output, int32_t factor) {
+ (void)data;
+ (void)wl_output;
+ (void)factor;
+}
+
+static void output_handle_name(void *data, struct wl_output *wl_output, const char *name) {
+ (void)wl_output;
+ gsr_wayland_output *gsr_output = data;
+ if(gsr_output->name) {
+ free(gsr_output->name);
+ gsr_output->name = NULL;
+ }
+ gsr_output->name = strdup(name);
+}
+
+static void output_handle_description(void *data, struct wl_output *wl_output, const char *description) {
+ (void)data;
+ (void)wl_output;
+ (void)description;
+}
+
+static const struct wl_output_listener output_listener = {
+ .geometry = output_handle_geometry,
+ .mode = output_handle_mode,
+ .done = output_handle_done,
+ .scale = output_handle_scale,
+ .name = output_handle_name,
+ .description = output_handle_description,
+};
+
+static void registry_add_object(void *data, struct wl_registry *registry, uint32_t name, const char *interface, uint32_t version) {
+ (void)version;
+ gsr_window_wayland *window_wayland = data;
+ if (strcmp(interface, "wl_compositor") == 0) {
+ if(window_wayland->compositor) {
+ wl_compositor_destroy(window_wayland->compositor);
+ window_wayland->compositor = NULL;
+ }
+ window_wayland->compositor = wl_registry_bind(registry, name, &wl_compositor_interface, 1);
+ } else if(strcmp(interface, wl_output_interface.name) == 0) {
+ if(version < 4) {
+ fprintf(stderr, "gsr warning: wl output interface version is < 4, expected >= 4 to capture a monitor. Using KMS capture instead\n");
+ return;
+ }
+
+ if(window_wayland->num_outputs == GSR_MAX_OUTPUTS) {
+ fprintf(stderr, "gsr warning: reached maximum outputs (%d), ignoring output %u\n", GSR_MAX_OUTPUTS, name);
+ return;
+ }
+
+ gsr_wayland_output *gsr_output = &window_wayland->outputs[window_wayland->num_outputs];
+ window_wayland->num_outputs++;
+ *gsr_output = (gsr_wayland_output) {
+ .wl_name = name,
+ .output = wl_registry_bind(registry, name, &wl_output_interface, 4),
+ .pos = { .x = 0, .y = 0 },
+ .size = { .x = 0, .y = 0 },
+ .transform = 0,
+ .name = NULL,
+ };
+ wl_output_add_listener(gsr_output->output, &output_listener, gsr_output);
+ }
+}
+
+static void registry_remove_object(void *data, struct wl_registry *registry, uint32_t name) {
+ (void)data;
+ (void)registry;
+ (void)name;
+}
+
+static struct wl_registry_listener registry_listener = {
+ .global = registry_add_object,
+ .global_remove = registry_remove_object,
+};
+
+static void gsr_window_wayland_deinit(gsr_window_wayland *self) {
+ if(self->window) {
+ wl_egl_window_destroy(self->window);
+ self->window = NULL;
+ }
+
+ if(self->surface) {
+ wl_surface_destroy(self->surface);
+ self->surface = NULL;
+ }
+
+ for(int i = 0; i < self->num_outputs; ++i) {
+ if(self->outputs[i].output) {
+ wl_output_destroy(self->outputs[i].output);
+ self->outputs[i].output = NULL;
+ }
+
+ if(self->outputs[i].name) {
+ free(self->outputs[i].name);
+ self->outputs[i].name = NULL;
+ }
+ }
+ self->num_outputs = 0;
+
+ if(self->compositor) {
+ wl_compositor_destroy(self->compositor);
+ self->compositor = NULL;
+ }
+
+ if(self->registry) {
+ wl_registry_destroy(self->registry);
+ self->registry = NULL;
+ }
+
+ if(self->display) {
+ wl_display_disconnect(self->display);
+ self->display = NULL;
+ }
+}
+
+static bool gsr_window_wayland_init(gsr_window_wayland *self) {
+ self->display = wl_display_connect(NULL);
+ if(!self->display) {
+ fprintf(stderr, "gsr error: gsr_window_wayland_init failed: failed to connect to the Wayland server\n");
+ goto fail;
+ }
+
+ self->registry = wl_display_get_registry(self->display); // TODO: Error checking
+ wl_registry_add_listener(self->registry, &registry_listener, self); // TODO: Error checking
+
+ // Fetch globals
+ wl_display_roundtrip(self->display);
+
+ // Fetch wl_output
+ wl_display_roundtrip(self->display);
+
+ if(!self->compositor) {
+ fprintf(stderr, "gsr error: gsr_window_wayland_init failed: failed to find compositor\n");
+ goto fail;
+ }
+
+ self->surface = wl_compositor_create_surface(self->compositor);
+ if(!self->surface) {
+ fprintf(stderr, "gsr error: gsr_window_wayland_init failed: failed to create surface\n");
+ goto fail;
+ }
+
+ self->window = wl_egl_window_create(self->surface, 16, 16);
+ if(!self->window) {
+ fprintf(stderr, "gsr error: gsr_window_wayland_init failed: failed to create window\n");
+ goto fail;
+ }
+
+ return true;
+
+ fail:
+ gsr_window_wayland_deinit(self);
+ return false;
+}
+
+static void gsr_window_wayland_destroy(gsr_window *window) {
+ gsr_window_wayland *self = window->priv;
+ gsr_window_wayland_deinit(self);
+ free(self);
+ free(window);
+}
+
+static bool gsr_window_wayland_process_event(gsr_window *window) {
+ gsr_window_wayland *self = window->priv;
+ // TODO: pselect on wl_display_get_fd before doing dispatch
+ const bool events_available = wl_display_dispatch_pending(self->display) > 0;
+ wl_display_flush(self->display);
+ return events_available;
+}
+
+static gsr_display_server gsr_wayland_get_display_server(void) {
+ return GSR_DISPLAY_SERVER_WAYLAND;
+}
+
+static void* gsr_window_wayland_get_display(gsr_window *window) {
+ gsr_window_wayland *self = window->priv;
+ return self->display;
+}
+
+static void* gsr_window_wayland_get_window(gsr_window *window) {
+ gsr_window_wayland *self = window->priv;
+ return self->window;
+}
+
+static gsr_monitor_rotation wayland_transform_to_gsr_rotation(int32_t rot) {
+ switch(rot) {
+ case 0: return GSR_MONITOR_ROT_0;
+ case 1: return GSR_MONITOR_ROT_90;
+ case 2: return GSR_MONITOR_ROT_180;
+ case 3: return GSR_MONITOR_ROT_270;
+ }
+ return GSR_MONITOR_ROT_0;
+}
+
+static void gsr_window_wayland_for_each_active_monitor_output_cached(const gsr_window *window, active_monitor_callback callback, void *userdata) {
+ const gsr_window_wayland *self = window->priv;
+ drm_connector_type_count type_counts[CONNECTOR_TYPE_COUNTS];
+ int num_type_counts = 0;
+
+ for(int i = 0; i < self->num_outputs; ++i) {
+ const gsr_wayland_output *output = &self->outputs[i];
+ if(!output->name)
+ continue;
+
+ const int connector_type_index = get_connector_type_by_name(output->name);
+ drm_connector_type_count *connector_type = NULL;
+ if(connector_type_index != -1)
+ connector_type = drm_connector_types_get_index(type_counts, &num_type_counts, connector_type_index);
+
+ if(connector_type) {
+ ++connector_type->count;
+ ++connector_type->count_active;
+ }
+
+ const gsr_monitor monitor = {
+ .name = output->name,
+ .name_len = strlen(output->name),
+ .pos = { .x = output->pos.x, .y = output->pos.y },
+ .size = { .x = output->size.x, .y = output->size.y },
+ .connector_id = 0,
+ .rotation = wayland_transform_to_gsr_rotation(output->transform),
+ .monitor_identifier = connector_type ? monitor_identifier_from_type_and_count(connector_type_index, connector_type->count_active) : 0
+ };
+ callback(&monitor, userdata);
+ }
+}
+
+gsr_window* gsr_window_wayland_create(void) {
+ gsr_window *window = calloc(1, sizeof(gsr_window));
+ if(!window)
+ return window;
+
+ gsr_window_wayland *window_wayland = calloc(1, sizeof(gsr_window_wayland));
+ if(!window_wayland) {
+ free(window);
+ return NULL;
+ }
+
+ if(!gsr_window_wayland_init(window_wayland)) {
+ free(window_wayland);
+ free(window);
+ return NULL;
+ }
+
+ *window = (gsr_window) {
+ .destroy = gsr_window_wayland_destroy,
+ .process_event = gsr_window_wayland_process_event,
+ .get_event_data = NULL,
+ .get_display_server = gsr_wayland_get_display_server,
+ .get_display = gsr_window_wayland_get_display,
+ .get_window = gsr_window_wayland_get_window,
+ .for_each_active_monitor_output_cached = gsr_window_wayland_for_each_active_monitor_output_cached,
+ .priv = window_wayland
+ };
+
+ return window;
+}
diff --git a/src/window/window_x11.c b/src/window/window_x11.c
new file mode 100644
index 0000000..55b0a75
--- /dev/null
+++ b/src/window/window_x11.c
@@ -0,0 +1,162 @@
+#include "../../include/window/window_x11.h"
+
+#include "../../include/vec2.h"
+#include "../../include/defs.h"
+#include "../../include/utils.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <X11/Xlib.h>
+
+#define GSR_MAX_OUTPUTS 32
+
+typedef struct {
+ char *name;
+ vec2i pos;
+ vec2i size;
+ uint32_t connector_id;
+ gsr_monitor_rotation rotation;
+ uint32_t monitor_identifier; /* crtc id */
+} gsr_x11_output;
+
+typedef struct {
+ Display *display;
+ Window window;
+ gsr_x11_output outputs[GSR_MAX_OUTPUTS];
+ int num_outputs;
+ XEvent xev;
+} gsr_window_x11;
+
+static void store_x11_monitor(const gsr_monitor *monitor, void *userdata) {
+ gsr_window_x11 *window_x11 = userdata;
+ if(window_x11->num_outputs == GSR_MAX_OUTPUTS) {
+ fprintf(stderr, "gsr warning: reached maximum outputs (%d), ignoring output %s\n", GSR_MAX_OUTPUTS, monitor->name);
+ return;
+ }
+
+ char *monitor_name = strdup(monitor->name);
+ if(!monitor_name)
+ return;
+
+ const int index = window_x11->num_outputs;
+ window_x11->outputs[index].name = monitor_name;
+ window_x11->outputs[index].pos = monitor->pos;
+ window_x11->outputs[index].size = monitor->size;
+ window_x11->outputs[index].connector_id = monitor->connector_id;
+ window_x11->outputs[index].rotation = monitor->rotation;
+ window_x11->outputs[index].monitor_identifier = monitor->monitor_identifier;
+ ++window_x11->num_outputs;
+}
+
+static void gsr_window_x11_deinit(gsr_window_x11 *self) {
+ if(self->window) {
+ XDestroyWindow(self->display, self->window);
+ self->window = None;
+ }
+
+ for(int i = 0; i < self->num_outputs; ++i) {
+ if(self->outputs[i].name) {
+ free(self->outputs[i].name);
+ self->outputs[i].name = NULL;
+ }
+ }
+ self->num_outputs = 0;
+}
+
+static bool gsr_window_x11_init(gsr_window_x11 *self) {
+ self->window = XCreateWindow(self->display, DefaultRootWindow(self->display), 0, 0, 16, 16, 0, CopyFromParent, InputOutput, CopyFromParent, 0, NULL);
+ if(!self->window) {
+ fprintf(stderr, "gsr error: gsr_window_x11_init failed: failed to create gl window\n");
+ return false;
+ }
+
+ self->num_outputs = 0;
+ for_each_active_monitor_output_x11_not_cached(self->display, store_x11_monitor, self);
+ return true;
+}
+
+static void gsr_window_x11_destroy(gsr_window *window) {
+ gsr_window_x11 *self = window->priv;
+ gsr_window_x11_deinit(self);
+ free(self);
+ free(window);
+}
+
+static bool gsr_window_x11_process_event(gsr_window *window) {
+ gsr_window_x11 *self = window->priv;
+ if(XPending(self->display)) {
+ XNextEvent(self->display, &self->xev);
+ return true;
+ }
+ return false;
+}
+
+static XEvent* gsr_window_x11_get_event_data(gsr_window *window) {
+ gsr_window_x11 *self = window->priv;
+ return &self->xev;
+}
+
+static gsr_display_server gsr_window_x11_get_display_server(void) {
+ return GSR_DISPLAY_SERVER_X11;
+}
+
+static void* gsr_window_x11_get_display(gsr_window *window) {
+ gsr_window_x11 *self = window->priv;
+ return self->display;
+}
+
+static void* gsr_window_x11_get_window(gsr_window *window) {
+ gsr_window_x11 *self = window->priv;
+ return (void*)self->window;
+}
+
+static void gsr_window_x11_for_each_active_monitor_output_cached(const gsr_window *window, active_monitor_callback callback, void *userdata) {
+ const gsr_window_x11 *self = window->priv;
+ for(int i = 0; i < self->num_outputs; ++i) {
+ const gsr_x11_output *output = &self->outputs[i];
+ const gsr_monitor monitor = {
+ .name = output->name,
+ .name_len = strlen(output->name),
+ .pos = output->pos,
+ .size = output->size,
+ .connector_id = output->connector_id,
+ .rotation = output->rotation,
+ .monitor_identifier = output->monitor_identifier
+ };
+ callback(&monitor, userdata);
+ }
+}
+
+gsr_window* gsr_window_x11_create(Display *display) {
+ gsr_window *window = calloc(1, sizeof(gsr_window));
+ if(!window)
+ return window;
+
+ gsr_window_x11 *window_x11 = calloc(1, sizeof(gsr_window_x11));
+ if(!window_x11) {
+ free(window);
+ return NULL;
+ }
+
+ window_x11->display = display;
+ if(!gsr_window_x11_init(window_x11)) {
+ free(window_x11);
+ free(window);
+ return NULL;
+ }
+
+ *window = (gsr_window) {
+ .destroy = gsr_window_x11_destroy,
+ .process_event = gsr_window_x11_process_event,
+ .get_event_data = gsr_window_x11_get_event_data,
+ .get_display_server = gsr_window_x11_get_display_server,
+ .get_display = gsr_window_x11_get_display,
+ .get_window = gsr_window_x11_get_window,
+ .for_each_active_monitor_output_cached = gsr_window_x11_for_each_active_monitor_output_cached,
+ .priv = window_x11
+ };
+
+ return window;
+}
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-20 08:45:19 +0000