fn rav1d_apply_grain_row: Make nominally safe.

memorysafety · May 28, 2024 · 3093ff8 · 3093ff8
1 parent 3bd941e
commit 3093ff8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/src/fg_apply.rs b/src/fg_apply.rs
@@ -129,7 +129,7 @@ pub(crate) unsafe fn rav1d_prep_grain<BD: BitDepth>(
     }
 }
 
-pub(crate) unsafe fn rav1d_apply_grain_row<BD: BitDepth>(
+pub(crate) fn rav1d_apply_grain_row<BD: BitDepth>(
     dsp: &Rav1dFilmGrainDSPContext,
     out: &Rav1dPicture,
     r#in: &Rav1dPicture,

diff --git a/src/thread_task.rs b/src/thread_task.rs
@@ -751,29 +751,23 @@ fn delayed_fg_task<'l, 'ttd: 'l>(
             match &delayed_fg.grain {
                 #[cfg(feature = "bitdepth_8")]
                 Grain::Bpc8(grain) => {
-                    // SAFETY: TODO make safe
-                    unsafe {
-                        rav1d_apply_grain_row::<BitDepth8>(
-                            dsp,
-                            &delayed_fg.out,
-                            &delayed_fg.in_0,
-                            grain,
-                            row as usize,
-                        );
-                    }
+                    rav1d_apply_grain_row::<BitDepth8>(
+                        dsp,
+                        &delayed_fg.out,
+                        &delayed_fg.in_0,
+                        grain,
+                        row as usize,
+                    );
                 }
                 #[cfg(feature = "bitdepth_16")]
                 Grain::Bpc16(grain) => {
-                    // SAFETY: TODO make safe
-                    unsafe {
-                        rav1d_apply_grain_row::<BitDepth16>(
-                            dsp,
-                            &delayed_fg.out,
-                            &delayed_fg.in_0,
-                            grain,
-                            row as usize,
-                        );
-                    }
+                    rav1d_apply_grain_row::<BitDepth16>(
+                        dsp,
+                        &delayed_fg.out,
+                        &delayed_fg.in_0,
+                        grain,
+                        row as usize,
+                    );
                 }
             }
         }