Support cropping via pipewire #156

columbarius · 2021-07-02T00:55:45Z

Depends: #141

Blockers:

Add an region option in the config file to be used with output_name and chooser_type = none
Extend the protocol between the chooser and xdpw to support a region.
Create a patch for slurp to output coordinates wrt. to the screen (local coordinates)

columbarius · 2021-07-06T14:08:13Z

Well... didn't increment the number of params announced to pipewire. Fixed!

columbarius · 2021-07-06T14:24:19Z

Do we want a xdpw_frame_damage and a xdpw_frame_crop or should we merge them into xdpw_frame_region?

danshick · 2021-07-07T02:48:04Z

Whoops, sorry.

danshick · 2021-07-07T02:49:15Z

Do we want a xdpw_frame_damage and a xdpw_frame_crop or should we merge them into xdpw_frame_region?

Maybe a frame_region with a "type" enum?

columbarius · 2021-07-09T09:15:23Z

Maybe a frame_region with a "type" enum?

I don't think we need a "type" enum, because the variable name should be telling enough like:

struct xdpw_region damage;
struct xdpw_region cropping;

Or am i missing something?

columbarius · 2021-11-09T15:59:00Z

Since i won't have time to pick this up in the next months I added a checklist with open points on top.
Adding a config option might happen, but for everything else feel free to pick it up.

columbarius · 2021-11-14T14:32:11Z

@Hubro: Added config option. It only works when no chooser is used. Documented in the manpage.

xdg-desktop-portal-wlr.5.scd

columbarius · 2022-06-01T19:13:50Z

rebased onto master

Hubro · 2022-06-23T09:18:23Z

@columbarius I may have run into another edge case with my weird setup 😅

I built xdg-desktop-portal-wlr from the most recent commit in the cropping branch (fea4934a) and set my configuration to:

[screencast]
max_fps=60
chooser_cmd=slurp -f %o -or
chooser_type=none
cropmode=wlroots
region=1280,0:2560x1412

And my screen capture now looks like this:

EDIT: cropmode=pipewire does not have the same issue
EDIT: Just checked if I could still screen-share in Chromium based browsers with cropmode=pipewire, and I can't 😞 They all immediately crash, just as if I hadn't cropped at all. (They can't handle 5120x1440 streaming for some reason.) The only way for me to screen share is to crop down to 2560x1440 or smaller using wlroots cropping.

columbarius · 2022-06-23T20:16:01Z

@Hubro Could you please add the option
force_mod_linear=1
to your config file and test obs again? If this doesn't improve things, please send a 'DEBUG' log.

Hubro · 2022-06-23T21:19:39Z

@columbarius Didn't help, unfortunately. Debug log: https://gist.githubusercontent.com/Hubro/8117cfdb28a8b87af5f3eef43e4bd3c4/raw/44929c8ed116bed84351e7fd0f363ade73d33029/xdg-desktop-portal-wlr-debug.log

columbarius · 2022-06-26T08:54:51Z

@Hubro Can you please explain what you did to produce the log. I see 4 finished negotiations, with the first one producing a lot of out of buffer events, which looks like the stream was stalled.

Hubro · 2022-06-26T12:51:01Z

@columbarius I started xdg-desktop-portal-wlr with -l DEBUG and piped the output to a log file, then I started OBS, exited OBS and stopped xdg-desktop-portal-wlr. However, in hindsight, I did use tee to pipe the output, so I guess logs from several attempts may have ended up in the same file.

I've produced a new debug log file now, from this command:

./build/xdg-desktop-portal-wlr -l DEBUG > ~/Desktop/xdg-desktop-portal-wlr-debug.log 2>&1

Result: https://gist.githubusercontent.com/Hubro/8cf609df0c7b10654b40179258f7c39c/raw/7b6da667e5ee25dff7ecca32300edb32db95e299/xdg-desktop-portal-wlr-debug.log

All I did now was:

Run the command
Launch OBS
Wait a few seconds
Close OBS
Stop the command

columbarius · 2022-06-29T00:04:26Z

@Hubro please see #223

Hubro · 2022-06-30T16:36:01Z

@Hubro please see #223

Just left for a 2 week vacation away from my glorious monitor... 💔

I will take a look as soon as I get home!

betaboon · 2022-11-11T09:20:08Z

is there any way we can help to move this forward ?

bhcopeland · 2023-01-26T12:17:30Z

Is there anyway we can push this? I'd love to screen select record on Meet, it would be a awesome feature.

Happy to put some money into a bounty!

columbarius · 2023-02-20T16:26:11Z

Damage tracking was merged via #203

Updated this to current master

oneingan · 2023-06-24T13:36:45Z

Using this commit, with or without enabling crop, core dump me. While 0.7.0 release with same build steps and closure works ok.


Jun 24 15:31:03 x2100 systemd-coredump[39343]: [🡕] Process 39057 (.xdg-desktop-po) of user 1000 dumped core.
                                               
                                               Module libXdmcp.so.6 without build-id.
                                               Module libXau.so.6 without build-id.
                                               Module libxcb.so.1 without build-id.
                                               Module libxml2.so.2 without build-id.
                                               Module libncursesw.so.6 without build-id.
                                               Module libgcc_s.so.1 without build-id.
                                               Module libstdc++.so.6 without build-id.
                                               Module libxcb-dri3.so.0 without build-id.
                                               Module libdrm_nouveau.so.2 without build-id.
                                               Module libdrm_amdgpu.so.1 without build-id.
                                               Module libelf.so.0 without build-id.
                                               Module libdrm_radeon.so.1 without build-id.
                                               Module libz.so.1 without build-id.
                                               Module libpipewire-module-session-manager.so without build-id.
                                               Module libpipewire-module-metadata.so without build-id.
                                               Module libpipewire-module-adapter.so without build-id.
                                               Module libpipewire-module-client-device.so without build-id.
                                               Module libpipewire-module-client-node.so without build-id.
                                               Module libpipewire-module-protocol-native.so without build-id.
                                               Module libdbus-1.so.3 without build-id.
                                               Module libspa-dbus.so without build-id.
                                               Module libspa-journal.so without build-id.
                                               Module libspa-support.so without build-id.
                                               Module libgpg-error.so.0 without build-id.
                                               Module libexpat.so.1 without build-id.
                                               Module liblz4.so.1 without build-id.
                                               Module libzstd.so.1 without build-id.
                                               Module liblzma.so.5 without build-id.
                                               Module libgcrypt.so.20 without build-id.
                                               Module libcap.so.2 without build-id.
                                               Module libffi.so.8 without build-id.
                                               Module libdrm.so.2 without build-id.
                                               Module libinih.so.0 without build-id.
                                               Module libpipewire-0.3.so.0 without build-id.
                                               Module libsystemd.so.0 without build-id.
                                               Module .xdg-desktop-portal-wlr-wrapped without build-id.
                                               Stack trace of thread 39057:
                                               #0  0x00007f630a1eb062 update_params (libpipewire-0.3.so.0 + 0xa0062)
                                               #1  0x00007f630a1f73d6 pw_stream_update_params (libpipewire-0.3.so.0 + 0xac3d6)
                                               #2  0x00000000004103db pwr_handle_stream_param_changed (.xdg-desktop-portal-wlr-wrapped + 0x103db)
                                               #3  0x00007f630a1ec48d impl_port_set_param (libpipewire-0.3.so.0 + 0xa148d)
                                               #4  0x00007f630a1dfdab pw_impl_port_set_param (libpipewire-0.3.so.0 + 0x94dab)
                                               #5  0x00007f6309a2b4b7 client_node_port_set_param (libpipewire-module-client-node.so + 0x154b7)
                                               #6  0x00007f6309a37f0f client_node_demarshal_port_set_param (libpipewire-module-client-node.so + 0x21f0f)
                                               #7  0x00007f6309a867c4 process_remote (libpipewire-module-protocol-native.so + 0x177c4)
                                               #8  0x00007f6309a86e38 on_remote_data (libpipewire-module-protocol-native.so + 0x17e38)
                                               #9  0x00007f6309b31e56 loop_iterate (libspa-support.so + 0x9e56)
                                               #10 0x0000000000404e30 main (.xdg-desktop-portal-wlr-wrapped + 0x4e30)
                                               #11 0x00007f6309f59ace __libc_start_call_main (libc.so.6 + 0x23ace)
                                               #12 0x00007f6309f59b89 __libc_start_main@@GLIBC_2.34 (libc.so.6 + 0x23b89)
                                               #13 0x0000000000405075 _start (.xdg-desktop-portal-wlr-wrapped +

DEBUG output is:

$> /nix/store/5vixb5vld63yjxj3562cr5n11nidrk2n-xdg-desktop-portal-wlr-0.7.0/libexec/xdg-desktop-portal-wlr --config=/nix/store/gns41xkid70v1nc3accnsjwgj3zyxin6-xdg-desktop-portal-wlr.ini -l DEBUG
2023/06/24 15:34:58 [DEBUG] - config: outputname:  (null)
2023/06/24 15:34:58 [DEBUG] - config: max_fps:  0.000000
2023/06/24 15:34:58 [DEBUG] - config: exec_before:  (null)
2023/06/24 15:34:58 [DEBUG] - config: exec_after:  (null)
2023/06/24 15:34:58 [DEBUG] - config: chooser_cmd: (null)
2023/06/24 15:34:58 [DEBUG] - config: chooser_type: default
2023/06/24 15:34:58 [DEBUG] - config: force_mod_linear: 0
2023/06/24 15:34:58 [DEBUG] - config: cropmode: none
2023/06/24 15:34:58 [DEBUG] - config: cropping_region x: 0
2023/06/24 15:34:58 [DEBUG] - config: cropping_region y: 0
2023/06/24 15:34:58 [DEBUG] - config: cropping_region width: 0
2023/06/24 15:34:58 [DEBUG] - config: cropping_region height: 0
2023/06/24 15:34:58 [DEBUG] - dbus: connected
2023/06/24 15:34:58 [DEBUG] - wlroots: wl_display connected
2023/06/24 15:34:58 [DEBUG] - pipewire: pw_loop created
2023/06/24 15:34:58 [DEBUG] - pipewire: establishing connection to core
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register wl_shm  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: |-- registered to interface wl_shm (Version 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register wl_drm  (Version: 2)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwp_linux_dmabuf_v1  (Version: 4)
2023/06/24 15:34:58 [DEBUG] - wlroots: |-- registered to interface zwp_linux_dmabuf_v1 (Version 4)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register wl_compositor  (Version: 5)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register wl_subcompositor  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register xdg_wm_base  (Version: 2)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwlr_layer_shell_v1  (Version: 4)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwlr_foreign_toplevel_manager_v1  (Version: 3)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register xdg_activation_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwp_primary_selection_device_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zxdg_decoration_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zxdg_output_manager_v1  (Version: 3)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwlr_output_manager_v1  (Version: 4)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwlr_output_power_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register ext_idle_notifier_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwp_pointer_constraints_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwp_relative_pointer_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwlr_virtual_pointer_manager_v1  (Version: 2)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwp_virtual_keyboard_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register wl_seat  (Version: 8)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwp_pointer_gestures_v1  (Version: 3)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zriver_control_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zriver_status_manager_v1  (Version: 4)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register river_layout_manager_v3  (Version: 2)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwp_idle_inhibit_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register ext_session_lock_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register wl_data_device_manager  (Version: 3)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwlr_data_control_manager_v1  (Version: 2)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwlr_export_dmabuf_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwlr_gamma_control_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register zwlr_screencopy_manager_v1  (Version: 3)
2023/06/24 15:34:58 [DEBUG] - wlroots: |-- registered to interface zwlr_screencopy_manager_v1 (Version 3)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register wp_single_pixel_buffer_manager_v1  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register wp_viewporter  (Version: 1)
2023/06/24 15:34:58 [DEBUG] - wlroots: interface to register wl_output  (Version: 4)
2023/06/24 15:34:58 [DEBUG] - wlroots: |-- registered to interface wl_output (Version 4)
2023/06/24 15:34:58 [DEBUG] - wayland: registry listeners run
2023/06/24 15:34:58 [DEBUG] - wlroots: linux_dmabuf_feedback_handle_main_device called
2023/06/24 15:34:58 [INFO] - xdpw: Using render node /dev/dri/renderD128
2023/06/24 15:34:58 [DEBUG] - wlroots: linux_dmabuf_feedback_format_table called
2023/06/24 15:34:58 [DEBUG] - wlroots: linux_dmabuf_feedback_tranche_target_devices called
2023/06/24 15:34:58 [DEBUG] - wlroots: linux_dmabuf_feedback_tranche_flags called
2023/06/24 15:34:58 [DEBUG] - wlroots: linux_dmabuf_feedback_tranche_formats called
2023/06/24 15:34:58 [DEBUG] - wlroots: linux_dmabuf_feedback_tranche_done called
2023/06/24 15:34:58 [DEBUG] - wlroots: linux_dmabuf_feedback_handle_done called
2023/06/24 15:34:58 [DEBUG] - wayland: dmabuf_feedback listeners run
2023/06/24 15:35:14 [INFO] - dbus: create session method invoked
2023/06/24 15:35:14 [INFO] - dbus: request_handle: /org/freedesktop/portal/desktop/request/1_18/webrtc_700658314
2023/06/24 15:35:14 [INFO] - dbus: session_handle: /org/freedesktop/portal/desktop/session/1_18/webrtc_session847366510
2023/06/24 15:35:14 [INFO] - dbus: app_id: 
2023/06/24 15:35:14 [INFO] - dbus: select sources method invoked
2023/06/24 15:35:14 [INFO] - dbus: request_handle: /org/freedesktop/portal/desktop/request/1_18/webrtc1110809563
2023/06/24 15:35:14 [INFO] - dbus: session_handle: /org/freedesktop/portal/desktop/session/1_18/webrtc_session847366510
2023/06/24 15:35:14 [INFO] - dbus: app_id: 
2023/06/24 15:35:14 [DEBUG] - dbus: select sources: found matching session /org/freedesktop/portal/desktop/session/1_18/webrtc_session847366510
2023/06/24 15:35:14 [INFO] - dbus: option types:3
2023/06/24 15:35:14 [INFO] - dbus: option multiple: 0
2023/06/24 15:35:14 [INFO] - dbus: option persist_mode:1
2023/06/24 15:35:14 [INFO] - wlroots: capturable output: LG Display model: 0x0582: id: 34 name: eDP-1
2023/06/24 15:35:14 [DEBUG] - wlroots: output chooser called
2023/06/24 15:35:14 [DEBUG] - wlroots: output chooser called
2023/06/24 15:35:14 [DEBUG] - wlroots: output chooser selects eDP-1
2023/06/24 15:35:14 [INFO] - xdpw: screencast instance 0x162da00 has 1 references
2023/06/24 15:35:14 [INFO] - xdpw: 1 active screencast instances
2023/06/24 15:35:14 [INFO] - wlroots: output: eDP-1
2023/06/24 15:35:14 [INFO] - dbus: start method invoked
2023/06/24 15:35:14 [INFO] - dbus: request_handle: /org/freedesktop/portal/desktop/request/1_18/webrtc1866088784
2023/06/24 15:35:14 [INFO] - dbus: session_handle: /org/freedesktop/portal/desktop/session/1_18/webrtc_session847366510
2023/06/24 15:35:14 [INFO] - dbus: app_id: 
2023/06/24 15:35:14 [INFO] - dbus: parent_window: 
2023/06/24 15:35:14 [DEBUG] - dbus: start: found matching session /org/freedesktop/portal/desktop/session/1_18/webrtc_session847366510
2023/06/24 15:35:14 [INFO] - wlroots: num_modififiers 5
2023/06/24 15:35:14 [INFO] - pipewire: stream state changed to "connecting"
2023/06/24 15:35:14 [INFO] - pipewire: node id is -1
2023/06/24 15:35:14 [INFO] - pipewire: stream state changed to "paused"
2023/06/24 15:35:14 [INFO] - pipewire: node id is 57
2023/06/24 15:35:14 [DEBUG] - dbus: start: returning node 57
2023/06/24 15:35:14 [INFO] - wlroots: num_modififiers 5
2023/06/24 15:35:14 [DEBUG] - pipewire: Format negotiated:
2023/06/24 15:35:14 [DEBUG] - pipewire: buffer_type: 1 (8)
2023/06/24 15:35:14 [DEBUG] - pipewire: format: 8
2023/06/24 15:35:14 [DEBUG] - pipewire: modifier: 72057594037927940
2023/06/24 15:35:14 [DEBUG] - pipewire: size: (3000, 2000)
2023/06/24 15:35:14 [DEBUG] - pipewire: max_framerate: (59 / 1)
fish: Job 1, '/nix/store/5vixb5vld63yjxj3562c…' terminated by signal SIGSEGV (Address boundary error)

oneingan · 2023-06-26T10:43:42Z

solved: columbarius#2

bhcopeland · 2023-07-04T12:36:37Z

Apologise, what is left to do for this?

Also, is it in working state, now? Would it be possible for someone to share the .config?

columbarius · 2023-10-19T22:25:21Z

solved: columbarius#2

Thanks fixed that.

columbarius marked this pull request as draft July 2, 2021 01:10

columbarius force-pushed the cropping branch 2 times, most recently from d015d45 to 92c493b Compare July 6, 2021 14:05

columbarius mentioned this pull request Jul 6, 2021

use pipewire buffers #141

Merged

columbarius mentioned this pull request Jul 6, 2021

Allow sharing of a region of a monitor #154

Open

danshick marked this pull request as ready for review July 7, 2021 02:46

danshick marked this pull request as draft July 7, 2021 02:47

columbarius mentioned this pull request Jul 26, 2021

Damage not being handled correctly #158

Closed

columbarius force-pushed the cropping branch from 28f75f2 to 4296495 Compare November 7, 2021 03:47

columbarius mentioned this pull request Nov 11, 2021

Create a more extendable chooser protocol #169

Open

columbarius mentioned this pull request Nov 23, 2021

OBS not connecting portal #165

Closed

betaboon reviewed Dec 13, 2021

View reviewed changes

xdg-desktop-portal-wlr.5.scd Outdated Show resolved Hide resolved

columbarius mentioned this pull request Mar 2, 2022

Allow sharing of individual windows. #107

Open

columbarius force-pushed the cropping branch 2 times, most recently from eaa7b87 to b9ad462 Compare April 10, 2022 20:52

columbarius force-pushed the cropping branch from b9ad462 to 6861733 Compare April 30, 2022 19:02

columbarius force-pushed the cropping branch from 6861733 to 6f1e972 Compare June 1, 2022 19:13

columbarius force-pushed the cropping branch from 6f1e972 to fea4934 Compare June 22, 2022 21:53

columbarius mentioned this pull request Jul 14, 2022

Get Zoom to work #226

Closed

columbarius force-pushed the cropping branch from fea4934 to 628a195 Compare February 20, 2023 16:24

columbarius changed the title ~~Support reporting damage and cropping via pipewire~~ Support cropping via pipewire Feb 20, 2023

columbarius force-pushed the cropping branch from 628a195 to 3410d24 Compare April 22, 2023 23:40

columbarius added 3 commits October 20, 2023 00:24

screencast: send crop via pipewire

eff922a

screencast: add cropping via wlroots capture_output_region

b088679

screencast: add option to select cropping region

d1aa9a2

columbarius force-pushed the cropping branch from 3410d24 to d1aa9a2 Compare October 19, 2023 22:25

vladimir-lu mentioned this pull request Nov 15, 2023

Fedora silverblue KDE variant using flatpak results in grey screen recording SeaDve/Kooha#236

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support cropping via pipewire #156

Support cropping via pipewire #156

columbarius commented Jul 2, 2021 •

edited

columbarius commented Jul 6, 2021

columbarius commented Jul 6, 2021

danshick commented Jul 7, 2021

danshick commented Jul 7, 2021

columbarius commented Jul 9, 2021

columbarius commented Nov 9, 2021

columbarius commented Nov 14, 2021

columbarius commented Jun 1, 2022

Hubro commented Jun 23, 2022 •

edited

columbarius commented Jun 23, 2022

Hubro commented Jun 23, 2022

columbarius commented Jun 26, 2022

Hubro commented Jun 26, 2022

columbarius commented Jun 29, 2022

Hubro commented Jun 30, 2022

betaboon commented Nov 11, 2022

bhcopeland commented Jan 26, 2023

columbarius commented Feb 20, 2023

oneingan commented Jun 24, 2023 •

edited

oneingan commented Jun 26, 2023

bhcopeland commented Jul 4, 2023

columbarius commented Oct 19, 2023

Support cropping via pipewire #156

Are you sure you want to change the base?

Support cropping via pipewire #156

Conversation

columbarius commented Jul 2, 2021 • edited

columbarius commented Jul 6, 2021

columbarius commented Jul 6, 2021

danshick commented Jul 7, 2021

danshick commented Jul 7, 2021

columbarius commented Jul 9, 2021

columbarius commented Nov 9, 2021

columbarius commented Nov 14, 2021

columbarius commented Jun 1, 2022

Hubro commented Jun 23, 2022 • edited

columbarius commented Jun 23, 2022

Hubro commented Jun 23, 2022

columbarius commented Jun 26, 2022

Hubro commented Jun 26, 2022

columbarius commented Jun 29, 2022

Hubro commented Jun 30, 2022

betaboon commented Nov 11, 2022

bhcopeland commented Jan 26, 2023

columbarius commented Feb 20, 2023

oneingan commented Jun 24, 2023 • edited

oneingan commented Jun 26, 2023

bhcopeland commented Jul 4, 2023

columbarius commented Oct 19, 2023

columbarius commented Jul 2, 2021 •

edited

Hubro commented Jun 23, 2022 •

edited

oneingan commented Jun 24, 2023 •

edited