Eyevinn
diff --git a/‎Cargo.lock‎
Lines changed: 5 additions & 4 deletions b/‎Cargo.lock‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 1 addition & 1 deletion b/‎Cargo.toml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎backend/src/api/flows.rs‎
Lines changed: 27 additions & 8 deletions b/‎backend/src/api/flows.rs‎
Lines changed: 27 additions & 8 deletions
diff --git a/‎backend/src/api/vision_mixer_page.rs‎
Lines changed: 12 additions & 2 deletions b/‎backend/src/api/vision_mixer_page.rs‎
Lines changed: 12 additions & 2 deletions
diff --git a/‎backend/src/blocks/builtin/vision_mixer/builder/pad_layout.rs‎
Lines changed: 30 additions & 10 deletions b/‎backend/src/blocks/builtin/vision_mixer/builder/pad_layout.rs‎
Lines changed: 30 additions & 10 deletions
@@ -4,7 +4,7 @@ members = ["types", "backend", "frontend", "mcp-server"]
 default-members = ["backend"]
 
 [workspace.package]
-version = "0.6.1"
+version = "0.6.2-dev"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 authors = ["Per Enstedt <per.enstedt@eyevinn.se>"]
 
@@ -1747,11 +1747,18 @@ pub async fn update_pip_config(
     }
 
     info!(
-        "Updating PiP {} on vision mixer {} in flow {}: bg={:?}, zones={:?}",
-        pip_idx, block_id, flow_id, req.bg, req.zones
+        "Updating PiP {} on vision mixer {} in flow {}: bg={:?}, zones={:?}, transforms={:?}",
+        pip_idx, block_id, flow_id, req.bg, req.zones, req.transforms
     );
     state
-        .apply_vision_mixer_pip_config(&flow_id, &block_id, pip_idx, req.bg, req.zones.clone())
+        .apply_vision_mixer_pip_config(
+            &flow_id,
+            &block_id,
+            pip_idx,
+            req.bg,
+            req.zones.clone(),
+            req.transforms.clone(),
+        )
         .await
         .map_err(|e| {
             error!("Failed to update PiP config: {}", e);
@@ -1766,20 +1773,26 @@ pub async fn update_pip_config(
 
     // Read back authoritative state. Validation runs in
     // `apply_vision_mixer_pip_config`, so the only mutation vs. the request
-    // is rect clamping (NormRect → [0,1]).
-    let (bg, zones) = if let Some(s) =
+    // is rect/crop clamping (NormRect → [0,1], SourceCrop clamped + zero
+    // entries dropped).
+    let (bg, zones, transforms) = if let Some(s) =
         crate::blocks::builtin::vision_mixer::overlay::get_overlay_state(&block_id)
     {
-        (s.pip_bg_input(pip_idx), s.pip_zones(pip_idx))
+        (
+            s.pip_bg_input(pip_idx),
+            s.pip_zones(pip_idx),
+            s.pip_transforms(pip_idx),
+        )
     } else {
-        (req.bg, req.zones)
+        (req.bg, req.zones, req.transforms)
     };
 
     Ok(Json(strom_types::api::UpdatePipConfigResponse {
         message: format!("PiP {} updated", pip_idx),
         pip_idx,
         bg,
         zones,
+        transforms,
     }))
 }
 
@@ -1803,7 +1816,7 @@ pub async fn update_pip_config(
     )
 )]
 pub async fn get_vision_mixer_state(
-    State(_state): State<AppState>,
+    State(state): State<AppState>,
     Path((flow_id, block_id)): Path<(FlowId, String)>,
 ) -> Result<Json<strom_types::api::VisionMixerState>, (StatusCode, Json<ErrorResponse>)> {
     let overlay = crate::blocks::builtin::vision_mixer::overlay::get_overlay_state(&block_id)
@@ -1824,6 +1837,7 @@ pub async fn get_vision_mixer_state(
         .map(|i| strom_types::api::PipState {
             bg: overlay.pip_bg_input(i),
             zones: overlay.pip_zones(i),
+            transforms: overlay.pip_transforms(i),
         })
         .collect();
 
@@ -1833,6 +1847,10 @@ pub async fn get_vision_mixer_state(
         .map(|a| a.load(std::sync::atomic::Ordering::Relaxed))
         .collect();
 
+    let input_resolutions = state
+        .vision_mixer_input_resolutions(&flow_id, &block_id, overlay.num_inputs)
+        .await;
+
     Ok(Json(strom_types::api::VisionMixerState {
         program_input: overlay.pgm_input(),
         preview_input: overlay.pvw_input(),
@@ -1844,6 +1862,7 @@ pub async fn get_vision_mixer_state(
         dsk_enabled,
         overlay_alpha: overlay.overlay_alpha(),
         pips,
+        input_resolutions,
     }))
 }
 
 
@@ -153,23 +153,32 @@ async fn render_vision_mixer_page(
     // therefore empty until the operator configures them.
     let pips: Vec<serde_json::Value> = (0..num_pips)
         .map(|i| {
-            let (bg, zones) = if let Some(s) = overlay.as_ref() {
-                (s.pip_bg_input(i), s.pip_zones(i))
+            let (bg, zones, transforms) = if let Some(s) = overlay.as_ref() {
+                (s.pip_bg_input(i), s.pip_zones(i), s.pip_transforms(i))
             } else {
                 (
                     vm_props::parse_pip_bg(&vm_block.properties, i, num_inputs),
                     Vec::<strom_types::vision_mixer::Zone>::new(),
+                    strom_types::vision_mixer::PipTransforms::new(),
                 )
             };
             serde_json::json!({
                 "bg": bg,
                 "zones": zones,
+                "transforms": transforms,
             })
         })
         .collect();
     let pvw_pip: Option<usize> = overlay.as_ref().and_then(|s| s.pvw_pip());
     let pgm_pip: Option<usize> = overlay.as_ref().and_then(|s| s.pgm_pip());
 
+    // Negotiated per-input resolutions (None until caps arrive). The crop
+    // editor needs the real source aspect — inputs are NOT normalized to the
+    // PGM resolution/aspect.
+    let input_resolutions = state
+        .vision_mixer_input_resolutions(flow_id, block_id, num_inputs)
+        .await;
+
     // Build a single JSON config object (safe injection via <script type="application/json">)
     let config = serde_json::json!({
         "flow_id": flow_id.to_string(),
@@ -188,6 +197,7 @@ async fn render_vision_mixer_page(
         "pgm_pip": pgm_pip,
         "pgm_w": pgm_w,
         "pgm_h": pgm_h,
+        "input_resolutions": input_resolutions,
     });
 
     let html = VISION_MIXER_HTML.replace("{{VM_CONFIG_JSON}}", &config.to_string());
 
@@ -31,7 +31,19 @@ fn initial_pad_geom_for_input(
         return (rx, ry, rw, rh, 1.0, bg_zorder as u64);
     }
     let zones = p.pip_zones.get(pip_idx).map(Vec::as_slice).unwrap_or(&[]);
-    let layouts = strom_types::vision_mixer::resolve_zone_pads(rx, ry, rw, rh, zones, src_aspect);
+    // Transforms are runtime-only (like zones) and caps are not negotiated
+    // yet — both maps are empty at build time. The caps probe re-applies
+    // aspect-correct geometry once each input's caps arrive.
+    let layouts = strom_types::vision_mixer::resolve_zone_pads(
+        rx,
+        ry,
+        rw,
+        rh,
+        zones,
+        src_aspect,
+        &strom_types::vision_mixer::PipTransforms::new(),
+        &strom_types::vision_mixer::SourceAspects::new(),
+    );
     if let Some(l) = layouts.iter().find(|l| l.input == input) {
         (
             l.x,
@@ -68,10 +80,10 @@ pub(super) fn build_pad_properties(
     use strom_types::vision_mixer::Source;
     let canvas_w = p.pgm_w as i32;
     let canvas_h = p.pgm_h as i32;
-    // Source aspect for PiP-tile cell math (assumes inputs share the PGM aspect,
-    // which is typical for broadcast workflows). resolve_zone_pads sizes each
-    // tile to this aspect so `keep-aspect-ratio` pads fill cleanly without
-    // transparent letterbox bands letting the bg peek through.
+    // Fallback aspect for PiP-tile cell math at build time: caps are not
+    // negotiated yet, so the slot grid and fits use the PGM canvas aspect.
+    // The caps probe re-applies per-source aspect-correct geometry once each
+    // input's caps arrive.
     let pgm_aspect = if canvas_h > 0 {
         canvas_w as f64 / canvas_h as f64
     } else {
@@ -112,9 +124,11 @@ pub(super) fn build_pad_properties(
         props.insert("width".to_string(), PropertyValue::Int(w as i64));
         props.insert("height".to_string(), PropertyValue::Int(h as i64));
         props.insert("zorder".to_string(), PropertyValue::UInt(zorder));
+        // Explicit geometry: layout code aspect-fits every rect itself,
+        // so the pad must render exactly (width, height). See aspect_fit_rect.
         props.insert(
             "sizing-policy".to_string(),
-            PropertyValue::String("keep-aspect-ratio".to_string()),
+            PropertyValue::String("none".to_string()),
         );
     }
 
@@ -152,9 +166,11 @@ pub(super) fn build_pad_properties(
             "zorder".to_string(),
             PropertyValue::UInt(vision_mixer::MV_THUMBNAIL_ZORDER as u64),
         );
+        // Explicit geometry: layout code aspect-fits every rect itself,
+        // so the pad must render exactly (width, height). See aspect_fit_rect.
         props.insert(
             "sizing-policy".to_string(),
-            PropertyValue::String("keep-aspect-ratio".to_string()),
+            PropertyValue::String("none".to_string()),
         );
     }
 
@@ -172,9 +188,11 @@ pub(super) fn build_pad_properties(
             "zorder".to_string(),
             PropertyValue::UInt(vision_mixer::MV_BIG_DISPLAY_ZORDER as u64),
         );
+        // Explicit geometry: layout code aspect-fits every rect itself,
+        // so the pad must render exactly (width, height). See aspect_fit_rect.
         props.insert(
             "sizing-policy".to_string(),
-            PropertyValue::String("keep-aspect-ratio".to_string()),
+            PropertyValue::String("none".to_string()),
         );
     }
 
@@ -220,9 +238,11 @@ pub(super) fn build_pad_properties(
         props.insert("height".to_string(), PropertyValue::Int(h as i64));
         props.insert("alpha".to_string(), PropertyValue::Float(alpha));
         props.insert("zorder".to_string(), PropertyValue::UInt(zorder));
+        // Explicit geometry: layout code aspect-fits every rect itself,
+        // so the pad must render exactly (width, height). See aspect_fit_rect.
         props.insert(
             "sizing-policy".to_string(),
-            PropertyValue::String("keep-aspect-ratio".to_string()),
+            PropertyValue::String("none".to_string()),
         );
     }
 
@@ -256,7 +276,7 @@ pub(super) fn build_pad_properties(
             props.insert("zorder".to_string(), PropertyValue::UInt(zorder));
             props.insert(
                 "sizing-policy".to_string(),
-                PropertyValue::String("keep-aspect-ratio".to_string()),
+                PropertyValue::String("none".to_string()),
             );
         }
     }