Rav1dFrameContext_frame_thread::cf: Unconditionally resize

memorysafety · Feb 23, 2024 · 9eb28ad · 9eb28ad
1 parent 0188504
commit 9eb28ad
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/src/align.rs b/src/align.rs
@@ -168,11 +168,6 @@ impl<T: Copy> AlignedVec64<T> {
 
         self.len = new_len;
     }
-
-    pub fn clear(&mut self) {
-        self.inner.clear();
-        self.len = 0;
-    }
 }
 
 impl<T: Copy> Deref for AlignedVec64<T> {

diff --git a/src/decode.rs b/src/decode.rs
@@ -4361,11 +4361,8 @@ pub(crate) unsafe fn rav1d_decode_frame_init(
         }
 
         let cf_sz = (num_sb128 * size_mul[0] as c_int) << hbd;
-        if cf_sz as usize != f.frame_thread.cf_sz() {
-            f.frame_thread.cf.clear();
-            // TODO: Fallible allocation
-            f.frame_thread.cf.resize(cf_sz as usize * 128 * 128 / 2, 0);
-        }
+        // TODO: Fallible allocation
+        f.frame_thread.cf.resize(cf_sz as usize * 128 * 128 / 2, 0);
 
         if frame_hdr.allow_screen_content_tools != 0 {
             // TODO: Fallible allocation

diff --git a/src/internal.rs b/src/internal.rs
@@ -427,12 +427,6 @@ pub struct Rav1dFrameContext_frame_thread {
     pub tile_start_off: *mut u32,
 }
 
-impl Rav1dFrameContext_frame_thread {
-    pub fn cf_sz(&self) -> usize {
-        self.cf.len() / (128 * 128 / 2)
-    }
-}
-
 /// loopfilter
 #[repr(C)]
 pub struct Rav1dFrameContext_lf {