Address nits remaining from PR 1594

src/test_encode_decode/mod.rs

@@ -574,6 +574,7 @@ macro_rules! test_chroma_sampling {
 
 test_chroma_sampling! {(420, ChromaSampling::Cs420), (422, ChromaSampling::Cs422), (444, ChromaSampling::Cs444)}
 
+// FIXME: #1601
 //#[cfg_attr(feature = "decode_test", interpolate_test(aom, "aom"))]
 //#[cfg_attr(feature = "decode_test_dav1d", interpolate_test(dav1d, "dav1d"))]
 fn tile_encoding_with_stretched_restoration_units(decoder: &str) {

src/tiling/tile_restoration_state.rs

@@ -202,17 +202,20 @@ macro_rules! tile_restoration_plane_common {
       }
 
       pub fn restoration_unit_countable(&self, sbo: TileSuperBlockOffset) -> usize {
-        if let Some((x,y)) = self.restoration_unit_index(sbo) {
-          y*self.units.cols+x
+        if let Some((x, y)) = self.restoration_unit_index(sbo) {
+          y * self.units.cols + x
         } else {
           unreachable!()
         }
       }
 
       // Is this the last sb (in scan order) in the restoration unit?
       // Stretch makes this a bit annoying to compute.
-      pub fn restoration_unit_last_sb<T: Pixel>(&self, fi: &FrameInvariants<T>,
-                                            sbo: TileSuperBlockOffset) -> bool {
+      pub fn restoration_unit_last_sb<T: Pixel>(
+        &self,
+        fi: &FrameInvariants<T>,
+        sbo: TileSuperBlockOffset,
+      ) -> bool {
         // there is 1 restoration unit for (1 << sb_shift) super-blocks
         let mask = (1 << self.rp_cfg.sb_shift) - 1;
         // is this a stretch block?
@@ -335,7 +338,7 @@ macro_rules! tile_restoration_state_common {
         let units_x = sbo.0.x >> sb_shift;
         let units_y = sbo.0.y >> sb_shift;
         let units_cols = sb_width + (1 << sb_shift) - 1 >> sb_shift;
-        let units_rows = sb_height + (1<< sb_shift) - 1 >> sb_shift;
+        let units_rows = sb_height + (1 << sb_shift) - 1 >> sb_shift;
 
         let FrameRestorationUnits { cols: rs_cols, rows: rs_rows, .. } = rs.planes[pli].units;
         // +1 because the last super-block may use the "stretched" restoration unit

src/tiling/tiler.rs

@@ -309,6 +309,7 @@ pub mod test {
       ..Default::default()
     };
     let mut sequence = Sequence::new(&config);
+    // FIXME: #1601
     // smallest possible tiles smaller than smallest possible LRUs
     sequence.enable_large_lru = false;
     FrameInvariants::new(config, sequence)