streamer45
diff --git a/‎crates/engine/benches/compositor_only.rs‎
Lines changed: 3 additions & 0 deletions b/‎crates/engine/benches/compositor_only.rs‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎crates/nodes/src/video/compositor/config.rs‎
Lines changed: 28 additions & 0 deletions b/‎crates/nodes/src/video/compositor/config.rs‎
Lines changed: 28 additions & 0 deletions
diff --git a/‎crates/nodes/src/video/compositor/kernel.rs‎
Lines changed: 13 additions & 1 deletion b/‎crates/nodes/src/video/compositor/kernel.rs‎
Lines changed: 13 additions & 1 deletion
diff --git a/‎crates/nodes/src/video/compositor/mod.rs‎
Lines changed: 9 additions & 1 deletion b/‎crates/nodes/src/video/compositor/mod.rs‎
Lines changed: 9 additions & 1 deletion
@@ -120,6 +120,7 @@ fn make_layer(
         crop_zoom: 1.0,
         crop_x: 0.5,
         crop_y: 0.5,
+        crop_shape: streamkit_nodes::video::compositor::config::CropShape::Rect,
     })
 }
 
@@ -414,6 +415,7 @@ fn build_scenarios(canvas_w: u32, canvas_h: u32) -> Vec<Scenario> {
                         crop_zoom: 1.0,
                         crop_x: 0.5,
                         crop_y: 0.5,
+                        crop_shape: streamkit_nodes::video::compositor::config::CropShape::Rect,
                     }),
                     Some(LayerSnapshot {
                         data: pip,
@@ -429,6 +431,7 @@ fn build_scenarios(canvas_w: u32, canvas_h: u32) -> Vec<Scenario> {
                         crop_zoom: 1.0,
                         crop_x: 0.5,
                         crop_y: 0.5,
+                        crop_shape: streamkit_nodes::video::compositor::config::CropShape::Rect,
                     }),
                 ]
             },
 
@@ -11,6 +11,27 @@ use std::collections::HashMap;
 
 // ── Configuration ───────────────────────────────────────────────────────────
 
+/// Shape used to clip a composited layer.
+///
+/// `Rect` (the default) renders the layer as-is within its destination
+/// rectangle.  `Circle` clips to an ellipse inscribed in the destination
+/// rect — when the rect is square this produces a perfect circle, ideal
+/// for Loom-style webcam PIP overlays.
+///
+/// New variants (e.g. `RoundedRect`, `Hexagon`) can be added in the
+/// future.  The field-level `#[serde(default)]` on `LayerConfig` means a
+/// missing `crop_shape` key defaults to `Rect`.
+#[derive(Deserialize, Serialize, Debug, Clone, Copy, Default, PartialEq, Eq, JsonSchema)]
+#[cfg_attr(feature = "codegen", derive(ts_rs::TS))]
+#[serde(rename_all = "snake_case")]
+pub enum CropShape {
+    /// No shape clipping — the layer fills its destination rectangle.
+    #[default]
+    Rect,
+    /// Clip to an ellipse inscribed in the destination rectangle.
+    Circle,
+}
+
 const fn default_width() -> u32 {
     1280
 }
@@ -204,6 +225,10 @@ pub struct LayerConfig {
     /// visible effect when `crop_zoom > 1.0`.  Default 0.5.
     #[serde(default = "default_crop_center")]
     pub crop_y: f32,
+    /// Shape clipping applied to the layer.  Default `Rect` (no clipping).
+    /// Set to `Circle` for Loom-style circular webcam PIP overlays.
+    #[serde(default)]
+    pub crop_shape: CropShape,
 }
 
 impl Default for LayerConfig {
@@ -218,6 +243,7 @@ impl Default for LayerConfig {
             crop_zoom: default_crop_zoom(),
             crop_x: default_crop_center(),
             crop_y: default_crop_center(),
+            crop_shape: CropShape::default(),
         }
     }
 }
@@ -299,6 +325,8 @@ pub struct ResolvedLayer {
     pub crop_x: f32,
     /// Normalized crop tilt Y (0.0–1.0).
     pub crop_y: f32,
+    /// Shape clipping applied to the layer.
+    pub crop_shape: CropShape,
 }
 
 /// Server-computed layout for a single overlay (text or image).
 
@@ -218,6 +218,8 @@ pub struct LayerSnapshot {
     pub crop_x: f32,
     /// Normalized crop tilt Y (0.0–1.0).  Default 0.5 (centred).
     pub crop_y: f32,
+    /// Shape clipping applied to the layer.
+    pub crop_shape: super::config::CropShape,
 }
 
 /// Work item sent from the async loop to the persistent compositing thread.
@@ -252,6 +254,7 @@ pub struct CompositeResult {
 
 /// A resolved, ready-to-composite item.  Unifies video layers and decoded
 /// overlays into a single type for the z-sorted compositing loop.
+#[allow(clippy::struct_excessive_bools)]
 struct CompositeItem<'a> {
     src_data: &'a [u8],
     src_width: u32,
@@ -269,6 +272,8 @@ struct CompositeItem<'a> {
     /// Source sub-region in pixel coordinates `(x, y, w, h)`.  `None` means
     /// sample the entire source.  Used for virtual PTZ crop/zoom.
     src_region: Option<(u32, u32, u32, u32)>,
+    /// Shape clipping applied to the composited layer.
+    crop_shape: super::config::CropShape,
 }
 
 /// Compute the source crop rectangle from normalised crop parameters.
@@ -361,7 +366,10 @@ pub fn composite_frame(
         layers.iter().enumerate().find_map(|(i, e)| e.as_ref().map(|l| (i, l))).is_some_and(
             |(_slot_idx, layer)| {
                 // Quick checks that don't need the pixel data.
-                if layer.opacity < 1.0 || layer.rotation_degrees.abs() >= 0.01 {
+                if layer.opacity < 1.0
+                    || layer.rotation_degrees.abs() >= 0.01
+                    || layer.crop_shape != super::config::CropShape::Rect
+                {
                     return false;
                 }
                 let covers = layer.rect.as_ref().is_none_or(|r| {
@@ -446,6 +454,7 @@ pub fn composite_frame(
             mirror_horizontal: layer.mirror_horizontal,
             mirror_vertical: layer.mirror_vertical,
             src_region,
+            crop_shape: layer.crop_shape,
         });
         insertion_order += 1;
     }
@@ -464,6 +473,7 @@ pub fn composite_frame(
             mirror_horizontal: ov.mirror_horizontal,
             mirror_vertical: ov.mirror_vertical,
             src_region: None,
+            crop_shape: super::config::CropShape::Rect,
         });
         insertion_order += 1;
     }
@@ -482,6 +492,7 @@ pub fn composite_frame(
             mirror_horizontal: ov.mirror_horizontal,
             mirror_vertical: ov.mirror_vertical,
             src_region: None,
+            crop_shape: super::config::CropShape::Rect,
         });
         insertion_order += 1;
     }
@@ -505,6 +516,7 @@ pub fn composite_frame(
             item.mirror_horizontal,
             item.mirror_vertical,
             item.src_region,
+            item.crop_shape == super::config::CropShape::Circle,
         );
     }
 
 
@@ -70,6 +70,7 @@ struct InputSlot {
 /// Rebuilt only when compositor config or pin set changes, avoiding
 /// per-frame `HashMap` lookups and `sort_by` calls.
 #[derive(Clone)]
+#[allow(clippy::struct_excessive_bools)]
 struct ResolvedSlotConfig {
     rect: Option<config::Rect>,
     opacity: f32,
@@ -84,6 +85,7 @@ struct ResolvedSlotConfig {
     crop_zoom: f32,
     crop_x: f32,
     crop_y: f32,
+    crop_shape: config::CropShape,
 }
 
 /// Fully-resolved compositor scene for one configuration epoch.
@@ -152,6 +154,7 @@ fn resolve_scene(
             crop_zoom,
             crop_x,
             crop_y,
+            crop_shape,
         ) = if let Some(lc) = layer_cfg {
             (
                 lc.rect,
@@ -164,6 +167,7 @@ fn resolve_scene(
                 lc.crop_zoom,
                 lc.crop_x,
                 lc.crop_y,
+                lc.crop_shape,
             )
         } else if idx > 0 && num_slots > 1 {
             // Auto-PiP: non-first layers without explicit config.
@@ -185,9 +189,10 @@ fn resolve_scene(
                 1.0,
                 0.5,
                 0.5,
+                config::CropShape::Rect,
             )
         } else {
-            (None, 1.0, 0, 0.0, false, false, false, 1.0, 0.5, 0.5)
+            (None, 1.0, 0, 0.0, false, false, false, 1.0, 0.5, 0.5, config::CropShape::Rect)
         };
 
         // Build the view-data layer using the current latest_frame for
@@ -219,6 +224,7 @@ fn resolve_scene(
             crop_zoom,
             crop_x,
             crop_y,
+            crop_shape,
         });
 
         configs.push(ResolvedSlotConfig {
@@ -232,6 +238,7 @@ fn resolve_scene(
             crop_zoom,
             crop_x,
             crop_y,
+            crop_shape,
         });
     }
 
@@ -772,6 +779,7 @@ impl ProcessorNode for CompositorNode {
                             crop_zoom: cfg.crop_zoom,
                             crop_x: cfg.crop_x,
                             crop_y: cfg.crop_y,
+                            crop_shape: cfg.crop_shape,
                         }
                     })
                 })