public/gpu-screen-recorder
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder synced 2026-03-31 09:07:13 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

attempt EGLImage without modifiers when last failed

Browse Source
This commit is contained in:
eonphi
2026-02-11 23:48:46 +01:00
committed by dec05eba
parent 8f7608e7ee
commit 4a4af85b6d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/pipewire_video.h
View File

@@ -106,6 +106,7 @@ typedef struct {
bool no_modifiers_fallback; bool no_modifiers_fallback;
bool external_texture_fallback; bool external_texture_fallback;
uint64_t renegotiated_modifier;
uint64_t modifiers[GSR_PIPEWIRE_VIDEO_MAX_MODIFIERS]; uint64_t modifiers[GSR_PIPEWIRE_VIDEO_MAX_MODIFIERS];
size_t num_modifiers; size_t num_modifiers;

9
src/pipewire_video.c
View File

@@ -687,6 +687,7 @@ bool gsr_pipewire_video_init(gsr_pipewire_video *self, int pipewire_fd, uint32_t
self->video_info.fps_num = fps; self->video_info.fps_num = fps;
self->video_info.fps_den = 1; self->video_info.fps_den = 1;
self->cursor.visible = capture_cursor; self->cursor.visible = capture_cursor;
self->renegotiated_modifier = DRM_FORMAT_MOD_INVALID;
if(!gsr_pipewire_video_setup_stream(self)) { if(!gsr_pipewire_video_setup_stream(self)) {
gsr_pipewire_video_deinit(self); gsr_pipewire_video_deinit(self);
@@ -792,8 +793,14 @@ static EGLImage gsr_pipewire_video_create_egl_image_with_fallback(gsr_pipewire_v
fprintf(stderr, "gsr error: gsr_pipewire_video_create_egl_image_with_fallback: failed to create egl image with modifiers, trying without modifiers\n"); 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; self->no_modifiers_fallback = true;
image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, false); image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, false);
} else if(self->renegotiated_modifier == self->format.info.raw.modifier) {
fprintf(stderr, "gsr error: gsr_pipewire_video_create_egl_image_with_fallback: modifier 0x%" PRIx64 " failed again after renegotiation, trying without modifiers as last resort\n", self->format.info.raw.modifier);
image = gsr_pipewire_video_create_egl_image(self, fds, offsets, pitches, modifiers, false);
if(image)
self->no_modifiers_fallback = true;
} else { } 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"); fprintf(stderr, "gsr error: gsr_pipewire_video_create_egl_image_with_fallback: failed to create egl image with modifier 0x%" PRIx64 ", renegotiating with a different modifier\n", self->format.info.raw.modifier);
self->renegotiated_modifier = self->format.info.raw.modifier;
self->negotiated = false; self->negotiated = false;
pw_thread_loop_lock(self->thread_loop); pw_thread_loop_lock(self->thread_loop);
gsr_pipewire_video_remove_modifier(self, self->format.info.raw.modifier); gsr_pipewire_video_remove_modifier(self, self->format.info.raw.modifier);