Skip to content

linux-pipewire: Fix render technique in captures again #12424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PancakeTAS wants to merge 1 commit into
base: master
Choose a base branch
from
Open

linux-pipewire: Fix render technique in captures again #12424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions plugins/linux-pipewire/pipewire.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,11 +817,10 @@ static void process_video_sync(obs_pipewire_stream *obs_pw_stream)
g_clear_pointer(&obs_pw_stream->texture, gs_texture_destroy);

use_modifiers = obs_pw_stream->format.info.raw.modifier != DRM_FORMAT_MOD_INVALID;
obs_pw_stream->texture = gs_texture_create_from_dmabuf(obs_pw_stream->format.info.raw.size.width,
obs_pw_stream->format.info.raw.size.height,
obs_pw_video_format.drm_format, GS_BGRX, planes,
fds, strides, offsets,
use_modifiers ? modifiers : NULL);
obs_pw_stream->texture = gs_texture_create_from_dmabuf(
obs_pw_stream->format.info.raw.size.width, obs_pw_stream->format.info.raw.size.height,
obs_pw_video_format.drm_format, obs_pw_video_format.gs_format, planes, fds, strides, offsets,
use_modifiers ? modifiers : NULL);

if (obs_pw_stream->texture == NULL) {
remove_modifier_from_format(obs_pw_stream, obs_pw_stream->format.info.raw.format,
Expand Down Expand Up @@ -1328,6 +1327,11 @@ void obs_pipewire_stream_video_render(obs_pipewire_stream *obs_pw_stream, gs_eff

gs_eparam_t *image;

const char *tech_name = "DrawSrgbDecompress";
gs_technique_t *tech;

const bool previous = gs_framebuffer_srgb_enabled();

if (!obs_pw_stream->texture)
return;

Expand All @@ -1338,8 +1342,14 @@ void obs_pipewire_stream_video_render(obs_pipewire_stream *obs_pw_stream, gs_eff
gs_sync_destroy(acquire_sync);
}

/* FIXME: Use obs_pw_stream->format.info.raw colorimetry info to handle
* textures in their corresponding color space */
effect = obs_get_base_effect(OBS_EFFECT_DEFAULT);

tech = gs_effect_get_technique(effect, tech_name);
gs_technique_begin(tech);
gs_technique_begin_pass(tech, 0);

gs_enable_framebuffer_srgb(true);

image = gs_effect_get_param_by_name(effect, "image");
gs_effect_set_texture(image, obs_pw_stream->texture);

Expand Down Expand Up @@ -1383,6 +1393,11 @@ void obs_pipewire_stream_video_render(obs_pipewire_stream *obs_pw_stream, gs_eff

gs_blend_state_pop();

gs_enable_framebuffer_srgb(previous);

gs_technique_end_pass(tech);
gs_technique_end(tech);

if (obs_pw_stream->sync.set) {
gs_sync_t *release_sync = gs_sync_create();
gs_sync_export_syncobj_timeline_point(release_sync, obs_pw_stream->sync.release_syncobj_fd,
Expand Down
2 changes: 1 addition & 1 deletion plugins/linux-pipewire/screencast-portal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ void screencast_portal_load(void)
const struct obs_source_info screencast_portal_capture_info = {
.id = "pipewire-screen-capture-source",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_VIDEO,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_SRGB,
.get_name = screencast_portal_desktop_capture_get_name,
.create = screencast_portal_capture_create,
.destroy = screencast_portal_capture_destroy,
Expand Down