mirror of
https://repo.dec05eba.com/gpu-screen-recorder
synced 2026-04-06 19:38:47 +09:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d0a620a574 | ||
|
|
ca0be79344 | ||
|
|
53557133c2 | ||
|
|
7f00ce22e7 | ||
|
|
3ba1dbda98 | ||
|
|
a849d2cdad | ||
|
|
b0b1442a03 | ||
|
|
baa7bfd5e4 | ||
|
|
3b09cb7fd3 | ||
|
|
1ab2c066b4 | ||
|
|
131209ddc0 | ||
|
|
b2487788c2 | ||
|
|
9485df761f |
@@ -70,6 +70,7 @@ Here are some known unofficial packages:
|
||||
* Fedora: [Copr](https://copr.fedorainfracloud.org/coprs/brycensranch/gpu-screen-recorder-git/)
|
||||
* OpenMandriva: [gpu-screen-recorder](https://github.com/OpenMandrivaAssociation/gpu-screen-recorder)
|
||||
* Solus: [gpu-screen-recorder](https://github.com/getsolus/packages/tree/main/packages/g/gpu-screen-recorder)
|
||||
* Nobara: [Nobara wiki](https://wiki.nobaraproject.org/en/general-usage/additional-software/GPU-Screen-Recorder)
|
||||
|
||||
# Dependencies
|
||||
GPU Screen Recorder uses meson build system so you need to install `meson` to build GPU Screen Recorder.
|
||||
@@ -125,7 +126,9 @@ in this case you could record a window or a monitor with the name `DP-1`.\
|
||||
To list available audio devices that you can use you can run `gpu-screen-recorder --list-audio-devices` and the name to use is on the left size of the `|`.\
|
||||
To list available audio application names that you can use you can run `gpu-screen-recorder --list-application-audio`.
|
||||
## Streaming
|
||||
Streaming works the same as recording, but the `-o` argument should be path to the live streaming service you want to use (including your live streaming key). Take a look at `scripts/twitch-stream.sh` to see an example of how to stream to twitch.
|
||||
Streaming works the same way as recording, but the `-o` argument should be path to the live streaming service you want to use (including your live streaming key). Take a look at `scripts/twitch-stream.sh` to see an example of how to stream to twitch.\
|
||||
GPU Screen Recorder uses Ffmpeg so GPU Screen Recorder supports all protocols that Ffmpeg supports.\
|
||||
If you want to reduce latency one thing you can do is to use the `-keyint` option, for example `-keyint 0.5`. Lower value means lower latency at the cost of increased bitrate/decreased quality.
|
||||
## Replay mode
|
||||
Run `gpu-screen-recorder` with the `-c mp4` and `-r` option, for example: `gpu-screen-recorder -w screen -f 60 -r 30 -c mp4 -o ~/Videos`. Note that in this case, `-o` should point to a directory.\
|
||||
If `-df yes` is set, replays are save in folders based on the date.
|
||||
@@ -187,7 +190,7 @@ You have to either record in hdr mode (-k `hevc_hdr` or -k `av1_hdr` option) to
|
||||
## GPU Screen Recorder records night light when recording in HDR mode
|
||||
You can record with desktop portal option (`-w portal`) instead which ignores night light, if you are ok with recording without HDR.
|
||||
## Kdenlive says that the video is not usable for editing because it has variable frame rate
|
||||
To fix this you can either just press cancel, which will allow you to continue or record the video in .mkv format or constant frame rate (-fm cfr).
|
||||
To fix this you can either just press cancel, which will allow you to continue or record the video in .mkv format or constant frame rate (-fm cfr). I recommend recording the video in .mkv format and variable frame rate (-fm vfr).
|
||||
## Colors look incorrect when recording HDR (with hevc_hdr/av1_hdr) or using an ICC profile
|
||||
KDE Plasma version 6.2 broke HDR and ICC profiles for screen recorders. This was changed in KDE plasma version 6.3 and recording HDR works now, as long as you set HDR brightness to 100% (which means setting "Maximum SDR Brightness" in KDE plasma display settings to 203) and set color accuracy to "Prefer color accuracy". If you want to convert HDR to SDR then record with desktop portal option (`-w portal`) instead.
|
||||
I don't know how well recording HDR works in wayland compositors other than KDE plasma.
|
||||
@@ -195,3 +198,5 @@ I don't know how well recording HDR works in wayland compositors other than KDE
|
||||
This is a [steam issue](https://github.com/ValveSoftware/steam-for-linux/issues/11446). Prepend the gpu-screen-recorder command with `LD_PREFIX=""`, for example `LD_PREFIX="" gpu-screen-recorder -w screen -o video.mp4`.
|
||||
## The video isn't smooth when gpu usage is 100%
|
||||
If you are using the flatpak version of GPU Screen Recorder then try installing GPU Screen Recorder from a non-flatpak source instead (such as from aur or from source). Flatpak has a limitation that prevents GPU Screen Recorder from running faster when playing very heavy games.
|
||||
## How do I apply audio effects, such as noise suppression?
|
||||
You have to use external software for that, such as Easy Effects or NoiseTorch.
|
||||
|
||||
15
TODO
15
TODO
@@ -287,3 +287,18 @@ When rpc is added add the option to add/remove audio devices/app audio and also
|
||||
Support hdr screenshot.
|
||||
|
||||
Recreate opengl context on loss. This can happen if there is a gpu driver bug, causing context to need to be recreated. This is a nice improvement to not break recording even with buggy driver.
|
||||
|
||||
Support saving video with surround sound. Surround sound audio capture does work, but it gets downmixed to stereo.
|
||||
|
||||
Add (render) plugin support. To simplify it (and possibly best performance) create one rgba texture (with the size of the output video) that is used across all plugins.
|
||||
Create a framebuffer and set this texture and the target and set the framebuffer as active before calling the plugins.
|
||||
Then the plugins can render simply by doing simple opengl draw functions.
|
||||
Maybe send some metadata to the plugin, such as video (and framebuffer) size. Although this data can be retrieved from the active framebuffer.
|
||||
|
||||
Either support webcam support with raw yuyv, mapping the buffer directly to opengl. Or use mjpeg, mapping the buffer directly to vaapi jpeg decoder and then get then map the decoded buffer to opengl.
|
||||
Some webcams dont support raw yuyv and many webcams support higher framerates for mjpeg.
|
||||
|
||||
Allow medium, high, very_high and ultra quality for -bm cbr. If that is used then it will automatically estimate the best bitrate for that quality based on resolution and fps.
|
||||
Maybe do this in the ui instead (or both?), to show estimated file size.
|
||||
|
||||
Maybe remove shader compute code. It doesn't seem necessary anymore now that glSwapBuffer/glFinish isn't used. dbus server isn't needed anymore either, the code can be moved back to the gpu screen recorder process.
|
||||
|
||||
@@ -33,7 +33,7 @@ static bool gsr_dbus_client_wait_for_startup(gsr_dbus_client *self) {
|
||||
int exit_code = -1;
|
||||
if(WIFEXITED(status))
|
||||
exit_code = WEXITSTATUS(status);
|
||||
fprintf(stderr, "gsr error: gsr_dbus_client_init: server side or never started, exit code: %d\n", exit_code);
|
||||
fprintf(stderr, "gsr error: gsr_dbus_client_init: server died or never started, exit code: %d\n", exit_code);
|
||||
self->pid = 0;
|
||||
return false;
|
||||
}
|
||||
@@ -73,7 +73,7 @@ bool gsr_dbus_client_init(gsr_dbus_client *self, const char *screencast_restore_
|
||||
const char *args[] = { "gsr-dbus-server", socket_pair_server_str, self->screencast_restore_token ? self->screencast_restore_token : "", NULL };
|
||||
execvp(args[0], (char *const*)args);
|
||||
|
||||
fprintf(stderr, "gsr error: gsr_dbus_client_init: execvp failed, error: %s\n", strerror(errno));
|
||||
fprintf(stderr, "gsr error: gsr_dbus_client_init: failed to launch \"gsr-dbus-server\", error: %s\n", strerror(errno));
|
||||
_exit(127);
|
||||
} else { /* parent */
|
||||
if(!gsr_dbus_client_wait_for_startup(self)) {
|
||||
|
||||
@@ -3,8 +3,3 @@
|
||||
# Needed to remove password prompt when recording a monitor (without desktop portal option) on amd/intel or nvidia wayland
|
||||
/usr/sbin/setcap cap_sys_admin+ep ${MESON_INSTALL_DESTDIR_PREFIX}/bin/gsr-kms-server \
|
||||
|| echo "\n!!! Please re-run install as root\n"
|
||||
|
||||
# This is needed (for EGL_CONTEXT_PRIORITY_HIGH_IMG) to allow gpu screen recorder to run faster than the heaviest application on AMD.
|
||||
# For example when trying to record a game at 60 fps and the game drops to 45 fps in some place that would also make gpu screen recorder
|
||||
# drop to 45 fps unless this setcap is used. Recording would also drop to below 60 fps in some games even though they run above 60 fps.
|
||||
/usr/sbin/setcap cap_sys_nice+ep ${MESON_INSTALL_DESTDIR_PREFIX}/bin/gpu-screen-recorder
|
||||
|
||||
@@ -50,6 +50,7 @@ typedef struct {
|
||||
|
||||
gsr_color_range color_range;
|
||||
bool load_external_image_shader;
|
||||
bool force_graphics_shader;
|
||||
} gsr_color_conversion_params;
|
||||
|
||||
typedef struct {
|
||||
@@ -77,6 +78,7 @@ void gsr_color_conversion_deinit(gsr_color_conversion *self);
|
||||
|
||||
void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_id, vec2i destination_pos, vec2i destination_size, vec2i source_pos, vec2i source_size, vec2i texture_size, gsr_rotation rotation, gsr_source_color source_color, bool external_texture, bool alpha_blending);
|
||||
void gsr_color_conversion_clear(gsr_color_conversion *self);
|
||||
void gsr_color_conversion_read_destination_texture(gsr_color_conversion *self, int destination_texture_index, int x, int y, int width, int height, unsigned int color_format, unsigned int data_format, void *pixels);
|
||||
|
||||
gsr_rotation gsr_monitor_rotation_to_rotation(gsr_monitor_rotation monitor_rotation);
|
||||
|
||||
|
||||
@@ -141,8 +141,6 @@ typedef void(*__GLXextFuncPtr)(void);
|
||||
#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS 0x90EB
|
||||
#define GL_TEXTURE0 0x84C0
|
||||
#define GL_TEXTURE1 0x84C1
|
||||
#define GL_CLAMP_TO_BORDER 0x812D
|
||||
#define GL_TEXTURE_BORDER_COLOR 0x1004
|
||||
#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020
|
||||
#define GL_ALL_BARRIER_BITS 0xFFFFFFFF
|
||||
|
||||
@@ -265,6 +263,7 @@ struct gsr_egl {
|
||||
void (*glGetTexLevelParameteriv)(unsigned int target, int level, unsigned int pname, int *params);
|
||||
void (*glTexImage2D)(unsigned int target, int level, int internalFormat, int width, int height, int border, unsigned int format, unsigned int type, const void *pixels);
|
||||
void (*glTexSubImage2D)(unsigned int target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type, const void *pixels);
|
||||
void (*glTexStorage2D)(unsigned int target, int levels, unsigned int internalformat, int width, int height);
|
||||
void (*glGetTexImage)(unsigned int target, int level, unsigned int format, unsigned int type, void *pixels);
|
||||
void (*glGenFramebuffers)(int n, unsigned int *framebuffers);
|
||||
void (*glBindFramebuffer)(unsigned int target, unsigned int framebuffer);
|
||||
|
||||
@@ -65,6 +65,7 @@ typedef struct {
|
||||
struct spa_video_info format;
|
||||
int server_version_sync;
|
||||
bool negotiated;
|
||||
bool renegotiated;
|
||||
bool damaged;
|
||||
|
||||
struct {
|
||||
|
||||
@@ -312,7 +312,7 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) {
|
||||
const char *args[] = { "pkexec", server_filepath, self->initial_socket_path, card_path, NULL };
|
||||
execvp(args[0], (char *const*)args);
|
||||
}
|
||||
fprintf(stderr, "gsr error: gsr_kms_client_init: execvp failed, error: %s\n", strerror(errno));
|
||||
fprintf(stderr, "gsr error: gsr_kms_client_init: failed to launch \"gsr-kms-server\", error: %s\n", strerror(errno));
|
||||
_exit(127);
|
||||
} else { /* parent */
|
||||
self->kms_server_pid = pid;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
project('gpu-screen-recorder', ['c', 'cpp'], version : '5.5.5', default_options : ['warning_level=2'])
|
||||
project('gpu-screen-recorder', ['c', 'cpp'], version : '5.5.8', default_options : ['warning_level=2'])
|
||||
|
||||
add_project_arguments('-Wshadow', language : ['c', 'cpp'])
|
||||
if get_option('buildtype') == 'debug'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
option('systemd', type : 'boolean', value : true, description : 'Install systemd service file')
|
||||
option('capabilities', type : 'boolean', value : true, description : 'Set binary admin capability on gsr-kms-server binary to remove password prompt when recording monitor (without desktop portal option) on amd/intel or nvidia wayland. Also sets nice capability on gpu-screen-recorder to allow it to run as a high priority graphics process for better performance')
|
||||
option('capabilities', type : 'boolean', value : true, description : 'Set binary admin capability on gsr-kms-server binary to remove password prompt when recording monitor (without desktop portal option) on amd/intel or nvidia wayland')
|
||||
option('nvidia_suspend_fix', type : 'boolean', value : true, description : 'Install nvidia modprobe config file to tell nvidia driver to preserve video memory on suspend. This is a workaround for an nvidia driver bug that breaks cuda (and gpu screen recorder) on suspend')
|
||||
option('portal', type : 'boolean', value : true, description : 'Build with support for xdg desktop portal ScreenCast capture (wayland only) (-w portal option). Requires pipewire')
|
||||
option('app_audio', type : 'boolean', value : true, description : 'Build with support for recording a single audio source (-a app: option). Requires pipewire')
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "gpu-screen-recorder"
|
||||
type = "executable"
|
||||
version = "5.5.5"
|
||||
version = "5.5.8"
|
||||
platforms = ["posix"]
|
||||
|
||||
[config]
|
||||
|
||||
@@ -194,7 +194,6 @@ static void usage_header() {
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
// TODO: Update with portal info
|
||||
static void usage_full() {
|
||||
const bool inside_flatpak = getenv("FLATPAK_ID") != NULL;
|
||||
const char *program_name = inside_flatpak ? "flatpak run --command=gpu-screen-recorder com.dec05eba.gpu_screen_recorder" : "gpu-screen-recorder";
|
||||
@@ -397,6 +396,7 @@ static void usage_full() {
|
||||
printf("EXAMPLES:\n");
|
||||
printf(" %s -w screen -f 60 -a default_output -o video.mp4\n", program_name);
|
||||
printf(" %s -w screen -f 60 -a default_output -a default_input -o video.mp4\n", program_name);
|
||||
printf(" %s -w $(xdotool selectwindow) -f 60 -a default_output -o video.mp4\n", program_name);
|
||||
printf(" %s -w screen -f 60 -a \"default_output|default_input\" -o video.mp4\n", program_name);
|
||||
printf(" %s -w screen -f 60 -a default_output -c mkv -r 60 -o \"$HOME/Videos\"\n", program_name);
|
||||
printf(" %s -w screen -f 60 -a default_output -c mkv -r 1800 -replay-storage disk -bm cbr -q 40000 -o \"$HOME/Videos\"\n", program_name);
|
||||
|
||||
@@ -108,22 +108,14 @@ static int max_int(int a, int b) {
|
||||
}
|
||||
|
||||
static void gsr_capture_kms_create_input_texture_ids(gsr_capture_kms *self) {
|
||||
const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
|
||||
|
||||
self->params.egl->glGenTextures(1, &self->input_texture_id);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_2D, self->input_texture_id);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
|
||||
|
||||
self->params.egl->glGenTextures(1, &self->external_input_texture_id);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, self->external_input_texture_id);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameterfv(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0);
|
||||
@@ -133,9 +125,6 @@ static void gsr_capture_kms_create_input_texture_ids(gsr_capture_kms *self) {
|
||||
|
||||
self->params.egl->glGenTextures(1, &self->cursor_texture_id);
|
||||
self->params.egl->glBindTexture(cursor_texture_id_target, self->cursor_texture_id);
|
||||
self->params.egl->glTexParameteri(cursor_texture_id_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameteri(cursor_texture_id_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameterfv(cursor_texture_id_target, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
self->params.egl->glTexParameteri(cursor_texture_id_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
self->params.egl->glTexParameteri(cursor_texture_id_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
self->params.egl->glBindTexture(cursor_texture_id_target, 0);
|
||||
|
||||
@@ -57,31 +57,20 @@ static void gsr_capture_portal_stop(gsr_capture_portal *self) {
|
||||
}
|
||||
|
||||
static void gsr_capture_portal_create_input_textures(gsr_capture_portal *self) {
|
||||
const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
|
||||
|
||||
self->params.egl->glGenTextures(1, &self->texture_map.texture_id);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_2D, self->texture_map.texture_id);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
|
||||
|
||||
self->params.egl->glGenTextures(1, &self->texture_map.external_texture_id);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, self->texture_map.external_texture_id);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameterfv(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0);
|
||||
|
||||
self->params.egl->glGenTextures(1, &self->texture_map.cursor_texture_id);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_2D, self->texture_map.cursor_texture_id);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
|
||||
@@ -324,7 +313,7 @@ static int gsr_capture_portal_capture(gsr_capture *cap, gsr_capture_metadata *ca
|
||||
gsr_color_conversion_clear(color_conversion);
|
||||
}
|
||||
} else {
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
|
||||
const bool is_scaled = self->params.output_resolution.x > 0 && self->params.output_resolution.y > 0;
|
||||
|
||||
@@ -89,15 +89,13 @@ static void get_compute_shader_header(char *header, size_t header_size, bool ext
|
||||
if(external_texture) {
|
||||
snprintf(header, header_size,
|
||||
"#version 310 es\n"
|
||||
"#extension GL_ARB_compute_shader: enable\n"
|
||||
"#extension GL_OES_EGL_image_external : enable\n"
|
||||
"#extension GL_OES_EGL_image_external_essl3 : require\n"
|
||||
"layout(binding = 0) uniform highp samplerExternalOES img_input;\n"
|
||||
"layout(binding = 1) uniform highp sampler2D img_background;\n");
|
||||
} else {
|
||||
snprintf(header, header_size,
|
||||
"#version 420\n"
|
||||
"#extension GL_ARB_compute_shader: enable\n"
|
||||
"#version 310 es\n"
|
||||
"layout(binding = 0) uniform highp sampler2D img_input;\n"
|
||||
"layout(binding = 1) uniform highp sampler2D img_background;\n");
|
||||
}
|
||||
@@ -109,7 +107,7 @@ static int load_compute_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_com
|
||||
char header[512];
|
||||
get_compute_shader_header(header, sizeof(header), external_texture);
|
||||
|
||||
char compute_shader[2048];
|
||||
char compute_shader[4096];
|
||||
snprintf(compute_shader, sizeof(compute_shader),
|
||||
"%s"
|
||||
"layout (local_size_x = %d, local_size_y = %d, local_size_z = 1) in;\n"
|
||||
@@ -127,12 +125,16 @@ static int load_compute_shader_y(gsr_shader *shader, gsr_egl *egl, gsr_color_com
|
||||
" ivec2 output_size = textureSize(img_background, 0);\n"
|
||||
" vec2 rotated_texel_coord = vec2(texel_coord - source_position - size_shift) * rotation_matrix + vec2(size_shift) + 0.5;\n"
|
||||
" vec2 output_texel_coord = vec2(texel_coord - source_position + target_position) + 0.5;\n"
|
||||
" vec4 source_color = texture(img_input, rotated_texel_coord/vec2(size));\n"
|
||||
" vec2 source_color_coords = rotated_texel_coord/vec2(size);\n"
|
||||
" vec4 source_color = texture(img_input, source_color_coords);\n"
|
||||
" if(source_color_coords.x > 1.0 || source_color_coords.y > 1.0)\n"
|
||||
" source_color.rgba = vec4(0.0, 0.0, 0.0, %s);\n"
|
||||
" vec4 source_color_yuv = RGBtoYUV * vec4(source_color.rgb, 1.0);\n"
|
||||
" vec4 output_color_yuv = %s;\n"
|
||||
" float y_color = mix(output_color_yuv.r, source_color_yuv.r, source_color.a);\n"
|
||||
" imageStore(img_output, texel_coord + target_position, vec4(y_color, 1.0, 1.0, 1.0));\n"
|
||||
"}\n", header, max_local_size_dim, max_local_size_dim, color_transform_matrix,
|
||||
alpha_blending ? "0.0" : "1.0",
|
||||
alpha_blending ? "texture(img_background, output_texel_coord/vec2(output_size))" : "source_color_yuv");
|
||||
|
||||
if(gsr_shader_init(shader, egl, NULL, NULL, compute_shader) != 0)
|
||||
@@ -151,7 +153,7 @@ static int load_compute_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_co
|
||||
char header[512];
|
||||
get_compute_shader_header(header, sizeof(header), external_texture);
|
||||
|
||||
char compute_shader[2048];
|
||||
char compute_shader[4096];
|
||||
snprintf(compute_shader, sizeof(compute_shader),
|
||||
"%s"
|
||||
"layout (local_size_x = %d, local_size_y = %d, local_size_z = 1) in;\n"
|
||||
@@ -169,12 +171,16 @@ static int load_compute_shader_uv(gsr_shader *shader, gsr_egl *egl, gsr_color_co
|
||||
" ivec2 output_size = textureSize(img_background, 0);\n"
|
||||
" vec2 rotated_texel_coord = vec2(texel_coord - source_position - size_shift) * rotation_matrix + vec2(size_shift) + 0.5;\n"
|
||||
" vec2 output_texel_coord = vec2(texel_coord - source_position + target_position) + 0.5;\n"
|
||||
" vec4 source_color = texture(img_input, rotated_texel_coord/vec2(size>>1));\n" // size/2
|
||||
" vec2 source_color_coords = rotated_texel_coord/vec2(size>>1);\n"
|
||||
" vec4 source_color = texture(img_input, source_color_coords);\n" // size/2
|
||||
" if(source_color_coords.x > 1.0 || source_color_coords.y > 1.0)\n"
|
||||
" source_color.rgba = vec4(0.0, 0.0, 0.0, %s);\n"
|
||||
" vec4 source_color_yuv = RGBtoYUV * vec4(source_color.rgb, 1.0);\n"
|
||||
" vec4 output_color_yuv = %s;\n"
|
||||
" vec2 uv_color = mix(output_color_yuv.rg, source_color_yuv.gb, source_color.a);\n"
|
||||
" imageStore(img_output, texel_coord + target_position, vec4(uv_color, 1.0, 1.0));\n"
|
||||
"}\n", header, max_local_size_dim, max_local_size_dim, color_transform_matrix,
|
||||
alpha_blending ? "0.0" : "1.0",
|
||||
alpha_blending ? "texture(img_background, output_texel_coord/vec2(output_size))" : "source_color_yuv");
|
||||
|
||||
if(gsr_shader_init(shader, egl, NULL, NULL, compute_shader) != 0)
|
||||
@@ -191,10 +197,11 @@ static int load_compute_shader_rgb(gsr_shader *shader, gsr_egl *egl, gsr_color_c
|
||||
char header[512];
|
||||
get_compute_shader_header(header, sizeof(header), external_texture);
|
||||
|
||||
char compute_shader[2048];
|
||||
char compute_shader[4096];
|
||||
snprintf(compute_shader, sizeof(compute_shader),
|
||||
"%s"
|
||||
"layout (local_size_x = %d, local_size_y = %d, local_size_z = 1) in;\n"
|
||||
"precision highp float;\n"
|
||||
"uniform ivec2 source_position;\n"
|
||||
"uniform ivec2 target_position;\n"
|
||||
"uniform vec2 scale;\n"
|
||||
@@ -207,11 +214,15 @@ static int load_compute_shader_rgb(gsr_shader *shader, gsr_egl *egl, gsr_color_c
|
||||
" ivec2 output_size = textureSize(img_background, 0);\n"
|
||||
" vec2 rotated_texel_coord = vec2(texel_coord - source_position - size_shift) * rotation_matrix + vec2(size_shift) + 0.5;\n"
|
||||
" vec2 output_texel_coord = vec2(texel_coord - source_position + target_position) + 0.5;\n"
|
||||
" vec4 source_color = texture(img_input, rotated_texel_coord/vec2(size));\n"
|
||||
" vec2 source_color_coords = rotated_texel_coord/vec2(size);\n"
|
||||
" vec4 source_color = texture(img_input, source_color_coords);\n"
|
||||
" if(source_color_coords.x > 1.0 || source_color_coords.y > 1.0)\n"
|
||||
" source_color.rgba = vec4(0.0, 0.0, 0.0, %s);\n"
|
||||
" vec4 output_color = %s;\n"
|
||||
" vec3 color = mix(output_color.rgb, source_color.rgb, source_color.a);\n"
|
||||
" imageStore(img_output, texel_coord + target_position, vec4(color, 1.0));\n"
|
||||
"}\n", header, max_local_size_dim, max_local_size_dim,
|
||||
alpha_blending ? "0.0" : "1.0",
|
||||
alpha_blending ? "texture(img_background, output_texel_coord/vec2(output_size))" : "source_color");
|
||||
|
||||
if(gsr_shader_init(shader, egl, NULL, NULL, compute_shader) != 0)
|
||||
@@ -620,20 +631,33 @@ int gsr_color_conversion_init(gsr_color_conversion *self, const gsr_color_conver
|
||||
}
|
||||
}
|
||||
|
||||
if(!gsr_color_conversion_load_compute_shaders(self)) {
|
||||
if(self->params.force_graphics_shader) {
|
||||
self->compute_shaders_failed_to_load = true;
|
||||
fprintf(stderr, "gsr info: failed to load one or more compute shaders, run gpu-screen-recorder with the '-gl-debug yes' option to see why. Falling back to slower graphics shader instead\n");
|
||||
self->external_compute_shaders_failed_to_load = true;
|
||||
|
||||
if(!gsr_color_conversion_load_graphics_shaders(self))
|
||||
goto err;
|
||||
}
|
||||
|
||||
if(self->params.load_external_image_shader) {
|
||||
if(!gsr_color_conversion_load_external_compute_shaders(self)) {
|
||||
self->external_compute_shaders_failed_to_load = true;
|
||||
fprintf(stderr, "gsr info: failed to load one or more external compute shaders, run gpu-screen-recorder with the '-gl-debug yes' option to see why. Falling back to slower graphics shader instead\n");
|
||||
if(self->params.load_external_image_shader) {
|
||||
if(!gsr_color_conversion_load_external_graphics_shaders(self))
|
||||
goto err;
|
||||
}
|
||||
} else {
|
||||
if(!gsr_color_conversion_load_compute_shaders(self)) {
|
||||
self->compute_shaders_failed_to_load = true;
|
||||
fprintf(stderr, "gsr info: failed to load one or more compute shaders, run gpu-screen-recorder with the '-gl-debug yes' option to see why. Falling back to slower graphics shader instead\n");
|
||||
if(!gsr_color_conversion_load_graphics_shaders(self))
|
||||
goto err;
|
||||
}
|
||||
|
||||
if(self->params.load_external_image_shader) {
|
||||
if(!gsr_color_conversion_load_external_compute_shaders(self)) {
|
||||
self->external_compute_shaders_failed_to_load = true;
|
||||
fprintf(stderr, "gsr info: failed to load one or more external compute shaders, run gpu-screen-recorder with the '-gl-debug yes' option to see why. Falling back to slower graphics shader instead\n");
|
||||
if(!gsr_color_conversion_load_external_graphics_shaders(self))
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(load_framebuffers(self) != 0)
|
||||
@@ -920,7 +944,6 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
|
||||
source_position.x += source_pos.x;
|
||||
source_position.y += source_pos.y;
|
||||
gsr_color_conversion_draw_graphics(self, texture_id, external_texture, rotation_matrix, source_position, source_size, destination_pos, texture_size, scale, source_color);
|
||||
// TODO: Is glFlush and glFinish needed here for graphics garbage?
|
||||
} else {
|
||||
switch(rotation) {
|
||||
case GSR_ROT_0:
|
||||
@@ -955,6 +978,7 @@ void gsr_color_conversion_draw(gsr_color_conversion *self, unsigned int texture_
|
||||
}
|
||||
}
|
||||
|
||||
self->params.egl->glFlush();
|
||||
// TODO: Use the minimal barrier required
|
||||
self->params.egl->glMemoryBarrier(GL_ALL_BARRIER_BITS); // GL_SHADER_IMAGE_ACCESS_BARRIER_BIT
|
||||
self->params.egl->glUseProgram(0);
|
||||
@@ -998,6 +1022,13 @@ void gsr_color_conversion_clear(gsr_color_conversion *self) {
|
||||
self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||
}
|
||||
|
||||
void gsr_color_conversion_read_destination_texture(gsr_color_conversion *self, int destination_texture_index, int x, int y, int width, int height, unsigned int color_format, unsigned int data_format, void *pixels) {
|
||||
assert(destination_texture_index >= 0 && destination_texture_index < self->params.num_destination_textures);
|
||||
self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, self->framebuffers[destination_texture_index]);
|
||||
self->params.egl->glReadPixels(x, y, width, height, color_format, data_format, pixels);
|
||||
self->params.egl->glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||
}
|
||||
|
||||
gsr_rotation gsr_monitor_rotation_to_rotation(gsr_monitor_rotation monitor_rotation) {
|
||||
return (gsr_rotation)monitor_rotation;
|
||||
}
|
||||
|
||||
@@ -56,10 +56,6 @@ static bool gsr_cursor_set_from_x11_cursor_image(gsr_cursor *self, XFixesCursorI
|
||||
self->egl->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, self->size.x, self->size.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, cursor_data);
|
||||
free(cursor_data);
|
||||
|
||||
const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
|
||||
|
||||
48
src/egl.c
48
src/egl.c
@@ -9,7 +9,6 @@
|
||||
#include <dlfcn.h>
|
||||
#include <assert.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/capability.h>
|
||||
|
||||
// TODO: rename gsr_egl to something else since this includes both egl and glx and in the future maybe vulkan too
|
||||
|
||||
@@ -29,49 +28,23 @@
|
||||
#define GLX_DEPTH_SIZE 12
|
||||
#define GLX_RGBA_TYPE 0x8014
|
||||
|
||||
#define GLX_CONTEXT_PRIORITY_LEVEL_EXT 0x3100
|
||||
#define GLX_CONTEXT_PRIORITY_HIGH_EXT 0x3101
|
||||
#define GLX_CONTEXT_PRIORITY_MEDIUM_EXT 0x3102
|
||||
#define GLX_CONTEXT_PRIORITY_LOW_EXT 0x3103
|
||||
|
||||
static void reset_cap_nice(void) {
|
||||
cap_t caps = cap_get_proc();
|
||||
if(!caps)
|
||||
return;
|
||||
|
||||
cap_flag_value_t cap_sys_nice_value = CAP_CLEAR;
|
||||
cap_get_flag(caps, CAP_SYS_NICE, CAP_EFFECTIVE, &cap_sys_nice_value);
|
||||
if(cap_sys_nice_value == CAP_CLEAR) {
|
||||
fprintf(stderr, "gsr warning: cap_sys_nice capability is missing on the gpu-screen-recorder binary, performance might be affected. If you are using the flatpak version of gpu-screen-recorder then the only fix is to use a non-flatpak version of gpu-screen-recorder\n");
|
||||
}
|
||||
|
||||
const cap_value_t cap_to_remove = CAP_SYS_NICE;
|
||||
cap_set_flag(caps, CAP_EFFECTIVE, 1, &cap_to_remove, CAP_CLEAR);
|
||||
cap_set_flag(caps, CAP_PERMITTED, 1, &cap_to_remove, CAP_CLEAR);
|
||||
cap_set_proc(caps);
|
||||
cap_free(caps);
|
||||
}
|
||||
|
||||
// TODO: Create egl context without surface (in other words, x11/wayland agnostic, doesn't require x11/wayland dependency)
|
||||
static bool gsr_egl_create_window(gsr_egl *self) {
|
||||
EGLConfig ecfg;
|
||||
int32_t num_config = 0;
|
||||
|
||||
// TODO: Use EGL_OPENGL_ES_BIT as amd requires that for external texture, but that breaks software encoding
|
||||
const int32_t attr[] = {
|
||||
EGL_BUFFER_SIZE, 24,
|
||||
EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
|
||||
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT,
|
||||
EGL_NONE, EGL_NONE
|
||||
};
|
||||
|
||||
const int32_t ctxattr[] = {
|
||||
EGL_CONTEXT_CLIENT_VERSION, 2,
|
||||
EGL_CONTEXT_PRIORITY_LEVEL_IMG, EGL_CONTEXT_PRIORITY_HIGH_IMG, /* requires cap_sys_nice, ignored otherwise */
|
||||
EGL_NONE, EGL_NONE
|
||||
};
|
||||
|
||||
// TODO: Use EGL_OPENGL_ES_API as amd requires that for external texture, but that breaks software encoding
|
||||
self->eglBindAPI(EGL_OPENGL_API);
|
||||
self->eglBindAPI(EGL_OPENGL_ES_API);
|
||||
|
||||
self->egl_display = self->eglGetDisplay((EGLNativeDisplayType)gsr_window_get_display(self->window));
|
||||
if(!self->egl_display) {
|
||||
@@ -106,11 +79,9 @@ static bool gsr_egl_create_window(gsr_egl *self) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
reset_cap_nice();
|
||||
return true;
|
||||
|
||||
fail:
|
||||
reset_cap_nice();
|
||||
gsr_egl_unload(self);
|
||||
return false;
|
||||
}
|
||||
@@ -306,6 +277,7 @@ static bool gsr_egl_load_gl(gsr_egl *self, void *library) {
|
||||
{ (void**)&self->glGetTexLevelParameteriv, "glGetTexLevelParameteriv" },
|
||||
{ (void**)&self->glTexImage2D, "glTexImage2D" },
|
||||
{ (void**)&self->glTexSubImage2D, "glTexSubImage2D" },
|
||||
{ (void**)&self->glTexStorage2D, "glTexStorage2D" },
|
||||
{ (void**)&self->glGetTexImage, "glGetTexImage" },
|
||||
{ (void**)&self->glGenFramebuffers, "glGenFramebuffers" },
|
||||
{ (void**)&self->glBindFramebuffer, "glBindFramebuffer" },
|
||||
@@ -544,15 +516,7 @@ void gsr_egl_unload(gsr_egl *self) {
|
||||
}
|
||||
|
||||
void gsr_egl_swap_buffers(gsr_egl *self) {
|
||||
/* This uses less cpu than swap buffer on nvidia */
|
||||
// TODO: Do these and remove swap
|
||||
//self->glFlush();
|
||||
//self->glFinish();
|
||||
if(self->egl_display) {
|
||||
self->eglSwapBuffers(self->egl_display, self->egl_surface);
|
||||
} else if(gsr_window_get_display_server(self->window) == GSR_DISPLAY_SERVER_X11) {
|
||||
Display *display = gsr_window_get_display(self->window);
|
||||
const Window window = (Window)gsr_window_get_window(self->window);
|
||||
self->glXSwapBuffers(display, window);
|
||||
}
|
||||
self->glFlush();
|
||||
// TODO: Use the minimal barrier required
|
||||
self->glMemoryBarrier(GL_ALL_BARRIER_BITS); // GL_SHADER_IMAGE_ACCESS_BARRIER_BIT
|
||||
}
|
||||
|
||||
@@ -71,16 +71,15 @@ void gsr_video_encoder_software_stop(gsr_video_encoder_software *self, AVCodecCo
|
||||
}
|
||||
|
||||
static void gsr_video_encoder_software_copy_textures_to_frame(gsr_video_encoder *encoder, AVFrame *frame, gsr_color_conversion *color_conversion) {
|
||||
gsr_video_encoder_software *self = encoder->priv;
|
||||
(void)encoder;
|
||||
//gsr_video_encoder_software *self = encoder->priv;
|
||||
// TODO: hdr support
|
||||
const unsigned int formats[2] = { GL_RED, GL_RG };
|
||||
const int div[2] = {1, 2}; // divide UV texture size by 2 because chroma is half size
|
||||
for(int i = 0; i < 2; ++i) {
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_2D, self->target_textures[i]);
|
||||
// We could use glGetTexSubImage and then we wouldn't have to use a specific linesize (LINESIZE_ALIGNMENT) that adds padding,
|
||||
// but glGetTexSubImage is only available starting from opengl 4.5.
|
||||
self->params.egl->glGetTexImage(GL_TEXTURE_2D, 0, formats[i], GL_UNSIGNED_BYTE, frame->data[i]);
|
||||
// TODO: Use glPixelStore?
|
||||
gsr_color_conversion_read_destination_texture(color_conversion, i, 0, 0, frame->width / div[i], frame->height / div[i], formats[i], GL_UNSIGNED_BYTE, frame->data[i]);
|
||||
}
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_2D, 0);
|
||||
// cap_kms->kms.base.egl->eglSwapBuffers(cap_kms->kms.base.egl->egl_display, cap_kms->kms.base.egl->egl_surface);
|
||||
|
||||
//self->params.egl->glFlush();
|
||||
|
||||
@@ -92,10 +92,6 @@ static bool gsr_video_encoder_vaapi_setup_textures(gsr_video_encoder_vaapi *self
|
||||
if(self->prime.fourcc == VA_FOURCC_NV12 || self->prime.fourcc == VA_FOURCC_P010) {
|
||||
const uint32_t *formats = self->prime.fourcc == VA_FOURCC_NV12 ? formats_nv12 : formats_p010;
|
||||
const int div[2] = {1, 2}; // divide UV texture size by 2 because chroma is half size
|
||||
const float border_colors[2][4] = {
|
||||
{0.0f, 0.0f, 0.0f, 1.0f},
|
||||
{0.5f, 0.5f, 0.0f, 1.0f}
|
||||
};
|
||||
|
||||
self->params.egl->glGenTextures(2, self->target_textures);
|
||||
for(int i = 0; i < 2; ++i) {
|
||||
@@ -125,9 +121,6 @@ static bool gsr_video_encoder_vaapi_setup_textures(gsr_video_encoder_vaapi *self
|
||||
}
|
||||
|
||||
self->params.egl->glBindTexture(GL_TEXTURE_2D, self->target_textures[i]);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->params.egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_colors[i]);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||
self->params.egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||
|
||||
|
||||
@@ -71,11 +71,15 @@ static bool gsr_image_writer_write_opengl_texture_to_file(gsr_image_writer *self
|
||||
return false;
|
||||
}
|
||||
|
||||
// TODO: hdr support
|
||||
self->egl->glBindTexture(GL_TEXTURE_2D, self->texture);
|
||||
// We could use glGetTexSubImage, but it's only available starting from opengl 4.5
|
||||
self->egl->glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, frame_data);
|
||||
self->egl->glBindTexture(GL_TEXTURE_2D, 0);
|
||||
unsigned int fbo = 0;
|
||||
self->egl->glGenFramebuffers(1, &fbo);
|
||||
self->egl->glBindFramebuffer(GL_FRAMEBUFFER, fbo);
|
||||
self->egl->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->texture, 0);
|
||||
|
||||
self->egl->glReadPixels(0, 0, self->width, self->height, GL_RGBA, GL_UNSIGNED_BYTE, frame_data);
|
||||
|
||||
self->egl->glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||
self->egl->glDeleteFramebuffers(1, &fbo);
|
||||
|
||||
self->egl->glFlush();
|
||||
self->egl->glFinish();
|
||||
|
||||
@@ -47,6 +47,7 @@ extern "C" {
|
||||
extern "C" {
|
||||
#include <libavutil/pixfmt.h>
|
||||
#include <libavcodec/avcodec.h>
|
||||
#include <libavcodec/defs.h>
|
||||
#include <libavformat/avformat.h>
|
||||
#include <libavutil/opt.h>
|
||||
#include <libswresample/swresample.h>
|
||||
@@ -261,8 +262,13 @@ static AVCodecContext* create_audio_codec_context(int fps, gsr_audio_codec audio
|
||||
codec_context->sample_fmt = audio_codec_get_sample_format(codec_context, audio_codec, codec, mix_audio);
|
||||
codec_context->bit_rate = audio_bitrate == 0 ? audio_codec_get_get_bitrate(audio_codec) : audio_bitrate;
|
||||
codec_context->sample_rate = AUDIO_SAMPLE_RATE;
|
||||
if(audio_codec == GSR_AUDIO_CODEC_AAC)
|
||||
if(audio_codec == GSR_AUDIO_CODEC_AAC) {
|
||||
#if LIBAVCODEC_VERSION_MAJOR < 62
|
||||
codec_context->profile = FF_PROFILE_AAC_LOW;
|
||||
#else
|
||||
codec_context->profile = AV_PROFILE_AAC_LOW;
|
||||
#endif
|
||||
}
|
||||
#if LIBAVCODEC_VERSION_MAJOR < 60
|
||||
codec_context->channel_layout = AV_CH_LAYOUT_STEREO;
|
||||
codec_context->channels = 2;
|
||||
@@ -657,7 +663,6 @@ static void open_video_software(AVCodecContext *codec_context, const args_parser
|
||||
|
||||
av_dict_set(&options, "preset", "veryfast", 0);
|
||||
av_dict_set(&options, "tune", "film", 0);
|
||||
av_dict_set(&options, "profile", "high", 0);
|
||||
|
||||
if(codec_context->codec_id == AV_CODEC_ID_H264) {
|
||||
av_dict_set(&options, "coder", "cabac", 0); // TODO: cavlc is faster than cabac but worse compression. Which to use?
|
||||
|
||||
@@ -358,7 +358,7 @@ static int64_t spa_video_format_to_drm_format(const enum spa_video_format format
|
||||
case SPA_VIDEO_FORMAT_ARGB_210LE: return DRM_FORMAT_ARGB2101010;
|
||||
case SPA_VIDEO_FORMAT_ABGR_210LE: return DRM_FORMAT_ABGR2101010;
|
||||
#endif
|
||||
default: break;
|
||||
default: break;
|
||||
}
|
||||
return DRM_FORMAT_INVALID;
|
||||
}
|
||||
@@ -471,6 +471,27 @@ static void gsr_pipewire_video_init_modifiers(gsr_pipewire_video *self) {
|
||||
spa_video_format_get_modifiers(self, self->supported_video_formats[i].format, self->modifiers + self->num_modifiers, GSR_PIPEWIRE_VIDEO_MAX_MODIFIERS - self->num_modifiers, &num_modifiers);
|
||||
self->supported_video_formats[i].modifiers_index = self->num_modifiers;
|
||||
self->supported_video_formats[i].modifiers_size = num_modifiers;
|
||||
self->num_modifiers += num_modifiers;
|
||||
}
|
||||
}
|
||||
|
||||
static void gsr_pipewire_video_format_remove_modifier(gsr_pipewire_video *self, gsr_video_format *video_format, uint64_t modifier) {
|
||||
for(size_t i = 0; i < video_format->modifiers_size; ++i) {
|
||||
if(self->modifiers[video_format->modifiers_index + i] != modifier)
|
||||
continue;
|
||||
|
||||
for(size_t j = i + 1; j < video_format->modifiers_size; ++j) {
|
||||
self->modifiers[j - 1] = self->modifiers[j];
|
||||
}
|
||||
--video_format->modifiers_size;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
static void gsr_pipewire_video_remove_modifier(gsr_pipewire_video *self, uint64_t modifier) {
|
||||
for(size_t i = 0; i < GSR_PIPEWIRE_VIDEO_NUM_VIDEO_FORMATS; i++) {
|
||||
gsr_video_format *video_format = &self->supported_video_formats[i];
|
||||
gsr_pipewire_video_format_remove_modifier(self, video_format, modifier);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -651,6 +672,7 @@ void gsr_pipewire_video_deinit(gsr_pipewire_video *self) {
|
||||
self->dmabuf_num_planes = 0;
|
||||
|
||||
self->negotiated = false;
|
||||
self->renegotiated = false;
|
||||
|
||||
if(self->mutex_initialized) {
|
||||
pthread_mutex_destroy(&self->mutex);
|
||||
@@ -702,9 +724,19 @@ static EGLImage gsr_pipewire_video_create_egl_image_with_fallback(gsr_pipewire_v
|
||||
} else {
|
||||
image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, true);
|
||||
if(!image) {
|
||||
fprintf(stderr, "gsr error: gsr_pipewire_video_create_egl_image_with_fallback: failed to create egl image with modifiers, trying without modifiers\n");
|
||||
self->no_modifiers_fallback = true;
|
||||
image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, false);
|
||||
if(self->renegotiated) {
|
||||
fprintf(stderr, "gsr error: gsr_pipewire_video_create_egl_image_with_fallback: failed to create egl image with modifiers, trying without modifiers\n");
|
||||
self->no_modifiers_fallback = true;
|
||||
image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, false);
|
||||
} else {
|
||||
fprintf(stderr, "gsr error: gsr_pipewire_video_create_egl_image_with_fallback: failed to create egl image with modifiers, renegotiating with a different modifier\n");
|
||||
self->negotiated = false;
|
||||
self->renegotiated = true;
|
||||
gsr_pipewire_video_remove_modifier(self, self->format.info.raw.modifier);
|
||||
pw_thread_loop_lock(self->thread_loop);
|
||||
pw_loop_signal_event(pw_thread_loop_get_loop(self->thread_loop), self->reneg);
|
||||
pw_thread_loop_unlock(self->thread_loop);
|
||||
}
|
||||
}
|
||||
}
|
||||
return image;
|
||||
@@ -736,13 +768,9 @@ static void gsr_pipewire_video_update_cursor_texture(gsr_pipewire_video *self, g
|
||||
if(!self->cursor.data)
|
||||
return;
|
||||
|
||||
const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
|
||||
self->egl->glBindTexture(GL_TEXTURE_2D, texture_map.cursor_texture_id);
|
||||
// TODO: glTextureSubImage2D if same size
|
||||
self->egl->glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, self->cursor.width, self->cursor.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, self->cursor.data);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
self->egl->glBindTexture(GL_TEXTURE_2D, 0);
|
||||
@@ -767,12 +795,15 @@ bool gsr_pipewire_video_map_texture(gsr_pipewire_video *self, gsr_texture_map te
|
||||
}
|
||||
|
||||
EGLImage image = gsr_pipewire_video_create_egl_image_with_fallback(self);
|
||||
if(image) {
|
||||
gsr_pipewire_video_bind_image_to_texture_with_fallback(self, texture_map, image);
|
||||
*using_external_image = self->external_texture_fallback;
|
||||
self->egl->eglDestroyImage(self->egl->egl_display, image);
|
||||
if(!image) {
|
||||
pthread_mutex_unlock(&self->mutex);
|
||||
return false;
|
||||
}
|
||||
|
||||
gsr_pipewire_video_bind_image_to_texture_with_fallback(self, texture_map, image);
|
||||
*using_external_image = self->external_texture_fallback;
|
||||
self->egl->eglDestroyImage(self->egl->egl_display, image);
|
||||
|
||||
gsr_pipewire_video_update_cursor_texture(self, texture_map);
|
||||
|
||||
region->x = 0;
|
||||
|
||||
131
src/utils.c
131
src/utils.c
@@ -19,6 +19,8 @@
|
||||
#include <libavcodec/avcodec.h>
|
||||
#include <libavutil/hwcontext_vaapi.h>
|
||||
|
||||
#define DRM_NUM_BUF_ATTRS 4
|
||||
|
||||
double clock_get_monotonic_seconds(void) {
|
||||
struct timespec ts;
|
||||
ts.tv_sec = 0;
|
||||
@@ -508,6 +510,41 @@ int create_directory_recursive(char *path) {
|
||||
}
|
||||
|
||||
void setup_dma_buf_attrs(intptr_t *img_attr, uint32_t format, uint32_t width, uint32_t height, const int *fds, const uint32_t *offsets, const uint32_t *pitches, const uint64_t *modifiers, int num_planes, bool use_modifier) {
|
||||
const uint32_t plane_fd_attrs[DRM_NUM_BUF_ATTRS] = {
|
||||
EGL_DMA_BUF_PLANE0_FD_EXT,
|
||||
EGL_DMA_BUF_PLANE1_FD_EXT,
|
||||
EGL_DMA_BUF_PLANE2_FD_EXT,
|
||||
EGL_DMA_BUF_PLANE3_FD_EXT
|
||||
};
|
||||
|
||||
const uint32_t plane_offset_attrs[DRM_NUM_BUF_ATTRS] = {
|
||||
EGL_DMA_BUF_PLANE0_OFFSET_EXT,
|
||||
EGL_DMA_BUF_PLANE1_OFFSET_EXT,
|
||||
EGL_DMA_BUF_PLANE2_OFFSET_EXT,
|
||||
EGL_DMA_BUF_PLANE3_OFFSET_EXT
|
||||
};
|
||||
|
||||
const uint32_t plane_pitch_attrs[DRM_NUM_BUF_ATTRS] = {
|
||||
EGL_DMA_BUF_PLANE0_PITCH_EXT,
|
||||
EGL_DMA_BUF_PLANE1_PITCH_EXT,
|
||||
EGL_DMA_BUF_PLANE2_PITCH_EXT,
|
||||
EGL_DMA_BUF_PLANE3_PITCH_EXT
|
||||
};
|
||||
|
||||
const uint32_t plane_modifier_lo_attrs[DRM_NUM_BUF_ATTRS] = {
|
||||
EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT,
|
||||
EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT,
|
||||
EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT,
|
||||
EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT
|
||||
};
|
||||
|
||||
const uint32_t plane_modifier_hi_attrs[DRM_NUM_BUF_ATTRS] = {
|
||||
EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT,
|
||||
EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT,
|
||||
EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT,
|
||||
EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT
|
||||
};
|
||||
|
||||
size_t img_attr_index = 0;
|
||||
|
||||
img_attr[img_attr_index++] = EGL_LINUX_DRM_FOURCC_EXT;
|
||||
@@ -519,79 +556,23 @@ void setup_dma_buf_attrs(intptr_t *img_attr, uint32_t format, uint32_t width, ui
|
||||
img_attr[img_attr_index++] = EGL_HEIGHT;
|
||||
img_attr[img_attr_index++] = height;
|
||||
|
||||
if(num_planes >= 1) {
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_FD_EXT;
|
||||
img_attr[img_attr_index++] = fds[0];
|
||||
assert(num_planes <= DRM_NUM_BUF_ATTRS);
|
||||
for(int i = 0; i < num_planes; ++i) {
|
||||
img_attr[img_attr_index++] = plane_fd_attrs[i];
|
||||
img_attr[img_attr_index++] = fds[i];
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_OFFSET_EXT;
|
||||
img_attr[img_attr_index++] = offsets[0];
|
||||
img_attr[img_attr_index++] = plane_offset_attrs[i];
|
||||
img_attr[img_attr_index++] = offsets[i];
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_PITCH_EXT;
|
||||
img_attr[img_attr_index++] = pitches[0];
|
||||
img_attr[img_attr_index++] = plane_pitch_attrs[i];
|
||||
img_attr[img_attr_index++] = pitches[i];
|
||||
|
||||
if(use_modifier) {
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT;
|
||||
img_attr[img_attr_index++] = modifiers[0] & 0xFFFFFFFFULL;
|
||||
img_attr[img_attr_index++] = plane_modifier_lo_attrs[i];
|
||||
img_attr[img_attr_index++] = modifiers[i] & 0xFFFFFFFFULL;
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT;
|
||||
img_attr[img_attr_index++] = modifiers[0] >> 32ULL;
|
||||
}
|
||||
}
|
||||
|
||||
if(num_planes >= 2) {
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_FD_EXT;
|
||||
img_attr[img_attr_index++] = fds[1];
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_OFFSET_EXT;
|
||||
img_attr[img_attr_index++] = offsets[1];
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_PITCH_EXT;
|
||||
img_attr[img_attr_index++] = pitches[1];
|
||||
|
||||
if(use_modifier) {
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT;
|
||||
img_attr[img_attr_index++] = modifiers[1] & 0xFFFFFFFFULL;
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT;
|
||||
img_attr[img_attr_index++] = modifiers[1] >> 32ULL;
|
||||
}
|
||||
}
|
||||
|
||||
if(num_planes >= 3) {
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_FD_EXT;
|
||||
img_attr[img_attr_index++] = fds[2];
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_OFFSET_EXT;
|
||||
img_attr[img_attr_index++] = offsets[2];
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_PITCH_EXT;
|
||||
img_attr[img_attr_index++] = pitches[2];
|
||||
|
||||
if(use_modifier) {
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT;
|
||||
img_attr[img_attr_index++] = modifiers[2] & 0xFFFFFFFFULL;
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT;
|
||||
img_attr[img_attr_index++] = modifiers[2] >> 32ULL;
|
||||
}
|
||||
}
|
||||
|
||||
if(num_planes >= 4) {
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_FD_EXT;
|
||||
img_attr[img_attr_index++] = fds[3];
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_OFFSET_EXT;
|
||||
img_attr[img_attr_index++] = offsets[3];
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_PITCH_EXT;
|
||||
img_attr[img_attr_index++] = pitches[3];
|
||||
|
||||
if(use_modifier) {
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT;
|
||||
img_attr[img_attr_index++] = modifiers[3] & 0xFFFFFFFFULL;
|
||||
|
||||
img_attr[img_attr_index++] = EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT;
|
||||
img_attr[img_attr_index++] = modifiers[3] >> 32ULL;
|
||||
img_attr[img_attr_index++] = plane_modifier_hi_attrs[i];
|
||||
img_attr[img_attr_index++] = modifiers[i] >> 32ULL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -617,22 +598,12 @@ vec2i scale_keep_aspect_ratio(vec2i from, vec2i to) {
|
||||
}
|
||||
|
||||
unsigned int gl_create_texture(gsr_egl *egl, int width, int height, int internal_format, unsigned int format, int filter) {
|
||||
float border_color[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
|
||||
if(format == GL_RG) { // UV
|
||||
border_color[0] = 0.5f;
|
||||
border_color[1] = 0.5f;
|
||||
border_color[2] = 0.0f;
|
||||
border_color[3] = 1.0f;
|
||||
}
|
||||
|
||||
unsigned int texture_id = 0;
|
||||
egl->glGenTextures(1, &texture_id);
|
||||
egl->glBindTexture(GL_TEXTURE_2D, texture_id);
|
||||
egl->glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
|
||||
//egl->glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
|
||||
egl->glTexStorage2D(GL_TEXTURE_2D, 1, internal_format, width, height);
|
||||
|
||||
egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
|
||||
egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
|
||||
|
||||
|
||||
@@ -85,10 +85,6 @@ int window_texture_on_resize(WindowTexture *self) {
|
||||
texture_id = self->texture_id;
|
||||
}
|
||||
|
||||
const float border_color[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
||||
self->egl->glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
self->egl->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user