screencast: add cropping via wlroots capture_output_region

emersion · Jul 9, 2021 · 28f75f2 · 28f75f2
1 parent 92c493b
commit 28f75f2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/include/screencast_common.h b/include/screencast_common.h
@@ -48,6 +48,12 @@ struct xdpw_frame_crop {
 	uint32_t height;
 };
 
+enum xdpw_cropmode {
+	XDPW_CROP_NONE,
+	XDPW_CROP_WLROOTS,
+	XDPW_CROP_PIPEWIRE,
+};
+
 struct xdpw_frame {
 	uint32_t size;
 	uint32_t stride;
@@ -97,6 +103,7 @@ struct xdpw_screencast_instance {
 	struct xdpw_screencast_context *ctx;
 	bool initialized;
 	struct xdpw_frame simple_frame;
+	enum xdpw_cropmode cropmode;
 
 	// pipewire
 	struct pw_stream *stream;

diff --git a/src/screencast/pipewire_screencast.c b/src/screencast/pipewire_screencast.c
@@ -232,7 +232,7 @@ void xdpw_pwr_export_buffer(struct xdpw_screencast_instance *cast) {
 		damage->region.size.height = cast->simple_frame.damage.height;
 	}
 
-	if ((crop = spa_buffer_find_meta_data(spa_buf, SPA_META_VideoCrop, sizeof(*crop)))) {
+	if (cast->cropmode == XDPW_CROP_PIPEWIRE && (crop = spa_buffer_find_meta_data(spa_buf, SPA_META_VideoCrop, sizeof(*crop)))) {
 		crop->region.position.x = cast->simple_frame.crop.x;
 		crop->region.position.y = cast->simple_frame.crop.y;
 		crop->region.size.width = cast->simple_frame.crop.width;

diff --git a/src/screencast/wlr_screencast.c b/src/screencast/wlr_screencast.c
@@ -181,8 +181,17 @@ static const struct zwlr_screencopy_frame_v1_listener wlr_frame_listener = {
 };
 
 void xdpw_wlr_register_cb(struct xdpw_screencast_instance *cast) {
-	cast->frame_callback = zwlr_screencopy_manager_v1_capture_output(
-		cast->ctx->screencopy_manager, cast->with_cursor, cast->target_output->output);
+	switch (cast->cropmode) {
+	case XDPW_CROP_WLROOTS:
+		cast->frame_callback = zwlr_screencopy_manager_v1_capture_output_region(
+			cast->ctx->screencopy_manager, cast->with_cursor, cast->target_output->output,
+			cast->simple_frame.crop.x, cast->simple_frame.crop.y,
+			cast->simple_frame.crop.width, cast->simple_frame.crop.height);
+		break;
+	default:
+		cast->frame_callback = zwlr_screencopy_manager_v1_capture_output(
+			cast->ctx->screencopy_manager, cast->with_cursor, cast->target_output->output);
+	}
 
 	zwlr_screencopy_frame_v1_add_listener(cast->frame_callback,
 		&wlr_frame_listener, cast);