Invalidate estimates when reconfiguring decoder during command string expansion

lilith · lilith · commit 999744c29691 · 2017-08-21T16:42:28.000-06:00
diff --git a/imageflow_core/src/flow/nodes/constrain.rs b/imageflow_core/src/flow/nodes/constrain.rs
@@ -171,19 +171,26 @@ fn command_string_partially_expanded_def() -> NodeDefinition {
         description: "expanding command string",
         fn_estimate: Some({
             fn f(ctx: &mut OpCtxMut, ix: NodeIndex<u32>) {
-                let e = get_expand(ctx, ix);
 
+                let old_estimate = ctx.weight(ix).frame_est;
+
+
+                if old_estimate == FrameEstimate::Invalidated{
+                    ctx.weight_mut(ix).frame_est = FrameEstimate::Impossible;
+                } else {
+                    let e = get_expand(ctx, ix);
 
-                if let Some(command) = e.get_decode_commands().unwrap() {
-                    //Send command to codec
-                    for io_id in ctx.get_decoder_io_ids(ix) {
-                        ctx.job.tell_decoder(io_id, command.clone()).unwrap();
+                    if let Some(command) = e.get_decode_commands().unwrap() {
+                        //Send command to codec
+                        for (io_id, decoder_ix) in ctx.get_decoder_io_ids_and_indexes(ix) {
+                            ctx.job.tell_decoder(io_id, command.clone()).unwrap();
+                            ctx.weight_mut(decoder_ix).frame_est = FrameEstimate::Invalidated;
+                        }
                     }
-                }
 
-                let weight = &mut ctx.weight_mut(ix);
-//                let canvas = e.get_canvas_size().unwrap();
-                weight.frame_est = FrameEstimate::Impossible;
+                    //                let canvas = e.get_canvas_size().unwrap();
+                    ctx.weight_mut(ix).frame_est = FrameEstimate::Invalidated;
+                }
 
 
 //                FrameEstimate::UpperBound(FrameInfo {
diff --git a/imageflow_core/src/flow/nodes/mod.rs b/imageflow_core/src/flow/nodes/mod.rs
@@ -308,14 +308,18 @@ impl<'c> OpCtxMut<'c> {
         self.graph.remove_node(index).unwrap();
     }
 
-    pub fn get_decoder_io_ids(&self,
+    pub fn get_decoder_io_ids_and_indexes(&self,
                               ancestors_of_node: NodeIndex<u32>)
-                              -> Vec<i32> {
+                              -> Vec<(i32,NodeIndex<u32>)> {
         self.graph.parents(ancestors_of_node).iter(self.graph).map(|(_, ix)| match self.weight(ix).params{
-            NodeParams::Json(s::Node::Decode { io_id, ..}) => Some(io_id), _ => None
+            NodeParams::Json(s::Node::Decode { io_id, ..}) => Some((io_id,ix)), _ => None
         } ).filter(|v| v.is_some()).map(|v| v.unwrap()).collect::<>()
     }
-
+    pub fn get_decoder_io_ids(&self,
+                                          ancestors_of_node: NodeIndex<u32>)
+                                          -> Vec<i32> {
+        self.get_decoder_io_ids_and_indexes(ancestors_of_node).into_iter().map(|(a,b)| a).collect::<>()
+    }
     pub fn get_image_info_list(&mut self,
                             ancestors_of_node: NodeIndex<u32>) -> Vec<::std::result::Result<s::ImageInfo, ::FlowError>>{
         self.get_decoder_io_ids(ancestors_of_node).into_iter().map(|io_id| self.job.get_image_info(io_id)).collect::<>()
diff --git a/imageflow_core/tests/visuals.rs b/imageflow_core/tests/visuals.rs
@@ -278,6 +278,23 @@ fn test_jpeg_rotation() {
     }
 
 }
+
+
+#[test]
+fn test_jpeg_crop() {
+    let matched = compare(Some(s::IoEnum::Url("https://s3-us-west-2.amazonaws.com/imageflow-resources/test_inputs/waterhouse.jpg".to_owned())), 500,
+                          "jpeg_crop".to_owned(), false, false, vec![
+            s::Node::CommandString{
+                kind: s::CommandStringKind::ImageResizer4,
+                value: "width=100&height=200&mode=crop".to_owned(),
+                decode: Some(0),
+                encode: None
+            }
+        ]
+    );
+    assert!(matched);
+}
+
 //
 //#[test]
 //fn test_gif_ir4(){
diff --git a/imageflow_core/tests/visuals/checksums.json b/imageflow_core/tests/visuals/checksums.json
@@ -1,31 +1,32 @@
 {
+  "MarsRGB_ICCv4_Scaled400300": "0CEA7717E76E828C0_0E6130049ADFEB2D0",
+  "WhiteBalanceNight": "0D84206BD2DD308DA_0219F93FDDB57B45C",
+  "ScaleTheHouse": "0568E6941605D8031_0E6130049ADFEB2D0",
+  "Test_Apply_Orientation_Landscape_6.jpg": "022F25890464CEF5E_0737E89DC5F717498",
   "Test_Apply_Orientation_Landscape_4.jpg": "0983D7771C9D027F3_0737E89DC5F717498",
-  "FillRectEECCFFExpand2233AAFF": "0BEE361EED2335E51_0B0FCB3BE40D894D1",
-  "MarsRGB_ICC_Scaled400300": "051EA508DFA6C0FDA_0E6130049ADFEB2D0",
-  "DetectWhitespace": "0549704430DA253E1_0B144C3EB1ECD0F26",
-  "Test_Apply_Orientation_Portrait_5.jpg": "0D76AD5A6519860A1_0C7861091F69310F8",
-  "FillRectAndCrop": "023A1A32B1D12004D_0116F4507255DDCBF",
+  "Test_Apply_Orientation_Portrait_4.jpg": "0DF5904E42A836E8E_0C7861091F69310F8",
+  "FillRectEECCFF": "0D2D3A96EC962A552_0B0FCB3BE40D894D1",
   "FillRect": "0E528C65475538702_0E6130049ADFEB2D0",
-  "RingsDownscaling": "041EAE7364EE7D48F_0B0FCB3BE40D894D1",
-  "WhiteBalanceNight": "0D84206BD2DD308DA_0219F93FDDB57B45C",
-  "Test_Apply_Orientation_Landscape_8.jpg": "03797221195AC1AF6_0737E89DC5F717498",
-  "Test_Apply_Orientation_Portrait_3.jpg": "0F4B6AFFAAF67A89E_0C7861091F69310F8",
   "Test_Apply_Orientation_Landscape_3.jpg": "0BE692134537D68C9_0737E89DC5F717498",
-  "FillRectEECCFF": "0D2D3A96EC962A552_0B0FCB3BE40D894D1",
   "Test_Apply_Orientation_Portrait_2.jpg": "0821FC43B168957D2_0C7861091F69310F8",
-  "MarsRGB_ICCv4_Scaled400300": "0CEA7717E76E828C0_0E6130049ADFEB2D0",
-  "ScaleIDCT_approx_gamma": "01DD6D368FDF435EF_0BA63E6C61FFC4738",
-  "ScaleTheHouse": "0568E6941605D8031_0E6130049ADFEB2D0",
-  "ScaleIDCTFastvsSlow": "04549C40B272C69E8_0E6130049ADFEB2D0",
   "Test_Apply_Orientation_Portrait_1.jpg": "0130B45451220FE91_0C7861091F69310F8",
-  "Test_Apply_Orientation_Portrait_6.jpg": "00D24FDAA62F061A5_0C7861091F69310F8",
+  "DetectWhitespace": "0549704430DA253E1_0B144C3EB1ECD0F26",
+  "Test_Apply_Orientation_Portrait_5.jpg": "0D76AD5A6519860A1_0C7861091F69310F8",
+  "MarsRGB_ICC_Scaled400300": "051EA508DFA6C0FDA_0E6130049ADFEB2D0",
+  "Test_Apply_Orientation_Portrait_3.jpg": "0F4B6AFFAAF67A89E_0C7861091F69310F8",
+  "jpeg_crop": "0AC75CD46C66EA068_0C6CF405827FDE14C",
   "Test_Apply_Orientation_Landscape_1.jpg": "0D893C1AB988C1626_0737E89DC5F717498",
+  "Test_Apply_Orientation_Portrait_6.jpg": "00D24FDAA62F061A5_0C7861091F69310F8",
+  "ScaleIDCT_approx_gamma": "01DD6D368FDF435EF_0BA63E6C61FFC4738",
+  "FillRectEECCFFExpand2233AAFF": "0BEE361EED2335E51_0B0FCB3BE40D894D1",
   "Test_Apply_Orientation_Landscape_2.jpg": "0F26C3C320ED5A074_0737E89DC5F717498",
-  "Test_Apply_Orientation_Landscape_6.jpg": "022F25890464CEF5E_0737E89DC5F717498",
   "Test_Apply_Orientation_Portrait_8.jpg": "0AC9F547ADDDEF923_0C7861091F69310F8",
-  "mountain_gif_scaled400": "0E9E7863A738C1054_0E6130049ADFEB2D0",
-  "Test_Apply_Orientation_Portrait_4.jpg": "0DF5904E42A836E8E_0C7861091F69310F8",
-  "Test_Apply_Orientation_Portrait_7.jpg": "0002098ACFD00B380_0C7861091F69310F8",
+  "Test_Apply_Orientation_Landscape_7.jpg": "052524D529AA08236_0737E89DC5F717498",
   "Test_Apply_Orientation_Landscape_5.jpg": "0C80D19F51A28A93B_0737E89DC5F717498",
-  "Test_Apply_Orientation_Landscape_7.jpg": "052524D529AA08236_0737E89DC5F717498"
+  "FillRectAndCrop": "023A1A32B1D12004D_0116F4507255DDCBF",
+  "mountain_gif_scaled400": "0E9E7863A738C1054_0E6130049ADFEB2D0",
+  "Test_Apply_Orientation_Landscape_8.jpg": "03797221195AC1AF6_0737E89DC5F717498",
+  "ScaleIDCTFastvsSlow": "04549C40B272C69E8_0E6130049ADFEB2D0",
+  "RingsDownscaling": "041EAE7364EE7D48F_0B0FCB3BE40D894D1",
+  "Test_Apply_Orientation_Portrait_7.jpg": "0002098ACFD00B380_0C7861091F69310F8"
 }
diff --git a/imageflow_riapi/src/ir4/layout.rs b/imageflow_riapi/src/ir4/layout.rs
@@ -447,3 +447,12 @@ impl FramewiseBuilder {
     }
 }
 
+#[test]
+fn test_crop_and_scale(){
+    let mut b = FramewiseBuilder::new();
+
+    let l  = Ir4Layout::new(Instructions{w: Some(100), h: Some(200), mode: Some(FitMode::Crop), .. Default::default() }, 768, 433);
+    l.add_steps(&mut b);
+
+    assert_eq!(b.steps, vec![s::Node::Crop { x1: 275, y1: 0, x2: 492, y2: 433 }, s::Node::Resample2D { w: 100, h: 200, down_filter: None, up_filter: None, scaling_colorspace: None, hints: Some(s::ResampleHints { sharpen_percent: None, prefer_1d_twice: None }) }]);
+}
diff --git a/imageflow_riapi/src/sizing_tests.rs b/imageflow_riapi/src/sizing_tests.rs
@@ -580,6 +580,7 @@ impl Kit{
 }
 
 
+
 #[test]
 fn test_scale_to_outer(){
     let cropper = sizing::IdentityCropProvider::new();

Original file line number	Diff line number	Diff line change
`@@ -447,3 +447,12 @@ impl FramewiseBuilder {`
`447`	`447`	`}`
`448`	`448`	`}`
`449`	`449`
	`450`	`+#[test]`
	`451`	`+fn test_crop_and_scale(){`
	`452`	`+ let mut b = FramewiseBuilder::new();`
	`453`	`+`
	`454`	`+ let l = Ir4Layout::new(Instructions{w: Some(100), h: Some(200), mode: Some(FitMode::Crop), .. Default::default() }, 768, 433);`
	`455`	`+ l.add_steps(&mut b);`
	`456`	`+`
	`457`	`+ assert_eq!(b.steps, vec![s::Node::Crop { x1: 275, y1: 0, x2: 492, y2: 433 }, s::Node::Resample2D { w: 100, h: 200, down_filter: None, up_filter: None, scaling_colorspace: None, hints: Some(s::ResampleHints { sharpen_percent: None, prefer_1d_twice: None }) }]);`
	`458`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -580,6 +580,7 @@ impl Kit{`
`580`	`580`	`}`
`581`	`581`
`582`	`582`
	`583`	`+`
`583`	`584`	`#[test]`
`584`	`585`	`fn test_scale_to_outer(){`
`585`	`586`	`let cropper = sizing::IdentityCropProvider::new();`