fn load_tmvs_c: Add safe rp_proj arg (#975)

src/decode.rs

@@ -62,6 +62,7 @@ use crate::src::error::Rav1dError::EINVAL;
 use crate::src::error::Rav1dError::ENOMEM;
 use crate::src::error::Rav1dError::ENOPROTOOPT;
 use crate::src::error::Rav1dResult;
+use crate::src::ffi_safe::FFISafe;
 use crate::src::filmgrain::Rav1dFilmGrainDSPContext;
 use crate::src::internal::Bxy;
 use crate::src::internal::Rav1dContext;
@@ -3920,6 +3921,7 @@ pub(crate) unsafe fn rav1d_decode_tile_sbrow(
             ts.tiling.col_end >> 1,
             t.b.y >> 1,
             t.b.y + sb_step >> 1,
+            FFISafe::new(&f.rf.rp_proj),
         );
     }
     t.pal_sz_uv[1] = Default::default();
@@ -4518,7 +4520,15 @@ unsafe fn rav1d_decode_frame_main(c: &Rav1dContext, f: &mut Rav1dFrameData) -> R
             let by_end = t.b.y + f.sb_step >> 1;
             if frame_hdr.use_ref_frame_mvs != 0 {
                 let rf = f.rf.as_mut_dav1d();
-                (c.refmvs_dsp.load_tmvs)(&rf, tile_row as c_int, 0, f.bw >> 1, t.b.y >> 1, by_end);
+                (c.refmvs_dsp.load_tmvs)(
+                    &rf,
+                    tile_row as c_int,
+                    0,
+                    f.bw >> 1,
+                    t.b.y >> 1,
+                    by_end,
+                    FFISafe::new(&f.rf.rp_proj),
+                );
             }
             for col in 0..cols {
                 t.ts = tile_row * cols + col;

src/refmvs.rs

@@ -64,6 +64,7 @@ extern "C" {
         col_end8: c_int,
         row_start8: c_int,
         row_end8: c_int,
+        _rp_proj: *const FFISafe<DisjointMut<AlignedVec64<refmvs_temporal_block>>>,
     );
 }
 
@@ -312,6 +313,7 @@ pub(crate) type load_tmvs_fn = unsafe extern "C" fn(
     col_end8: c_int,
     row_start8: c_int,
     row_end8: c_int,
+    rp_proj: *const FFISafe<DisjointMut<AlignedVec64<refmvs_temporal_block>>>,
 ) -> ();
 
 pub type save_tmvs_fn = unsafe extern "C" fn(
@@ -1383,7 +1385,9 @@ unsafe extern "C" fn load_tmvs_c(
     col_end8: c_int,
     row_start8: c_int,
     mut row_end8: c_int,
+    rp_proj: *const FFISafe<DisjointMut<AlignedVec64<refmvs_temporal_block>>>,
 ) {
+    let rp_proj = FFISafe::get(rp_proj);
     let rf = &*rf;
 
     if rf.n_tile_threads == 1 {
@@ -1394,17 +1398,16 @@ unsafe extern "C" fn load_tmvs_c(
     row_end8 = cmp::min(row_end8, rf.ih8);
     let col_start8i = cmp::max(col_start8 - 8, 0);
     let col_end8i = cmp::min(col_end8 + 8, rf.iw8);
-    let stride = rf.rp_stride;
-    let mut rp_proj = rf
-        .rp_proj
-        .offset(16 * stride * tile_row_idx as isize + (row_start8 & 15) as isize * stride);
-    for _ in row_start8..row_end8 {
-        for x in col_start8..col_end8 {
-            (*rp_proj.offset(x as isize)).mv = mv::INVALID;
+    let stride = rf.rp_stride as usize;
+    let rp_proj_offset = 16 * stride * tile_row_idx as usize;
+    for y in row_start8..row_end8 {
+        let offset = rp_proj_offset + (y & 15) as usize * stride;
+        for rp_proj in
+            &mut *rp_proj.index_mut(offset + col_start8 as usize..offset + col_end8 as usize)
+        {
+            rp_proj.mv = mv::INVALID;
         }
-        rp_proj = rp_proj.offset(stride as isize);
     }
-    rp_proj = rf.rp_proj.offset(16 * stride * tile_row_idx as isize);
     for n in 0..rf.n_mfmvs {
         let ref2cur = rf.mfmv_ref2cur[n as usize];
         if ref2cur == i32::MIN {
@@ -1413,7 +1416,7 @@ unsafe extern "C" fn load_tmvs_c(
         let r#ref = rf.mfmv_ref[n as usize] as c_int;
         let ref_sign = r#ref - 4;
         let mut r = (*rf.rp_ref.offset(r#ref as isize))
-            .offset(row_start8 as isize * stride)
+            .add(row_start8 as usize * stride)
             .cast_const();
         for y in row_start8..row_end8 {
             let y_sb_align = y & !7;
@@ -1439,14 +1442,18 @@ unsafe extern "C" fn load_tmvs_c(
                 let pos_y =
                     y + apply_sign((offset.y as c_int).abs() >> 6, offset.y as c_int ^ ref_sign);
                 if pos_y >= y_proj_start && pos_y < y_proj_end {
-                    let pos = (pos_y & 15) as isize * stride;
+                    let pos = (pos_y & 15) as usize * stride;
                     loop {
                         let x_sb_align = x & !7;
                         if pos_x >= cmp::max(x_sb_align - 8, col_start8)
                             && pos_x < cmp::min(x_sb_align + 16, col_end8)
                         {
-                            (*rp_proj.offset(pos + pos_x as isize)).mv = (*rb).mv;
-                            (*rp_proj.offset(pos + pos_x as isize)).r#ref = ref2ref as i8;
+                            *rp_proj.index_mut(
+                                rp_proj_offset + (pos as isize + pos_x as isize) as usize,
+                            ) = refmvs_temporal_block {
+                                mv: (*rb).mv,
+                                r#ref: ref2ref as i8,
+                            };
                         }
                         x += 1;
                         if x >= col_end8i {