From 50ca4c893667615aeb55badff2b7ce5aa8823218 Mon Sep 17 00:00:00 2001 From: Khyber Sen Date: Thu, 25 Jan 2024 15:43:59 -0800 Subject: [PATCH] `fn rav1d_ref_create`: Remove as all uses are gone (forgot to remove the final use even though it was unused). --- src/obu.rs | 11 ----------- src/ref.rs | 31 ------------------------------- 2 files changed, 42 deletions(-) diff --git a/src/obu.rs b/src/obu.rs index b8611c9ba..5ff4aa249 100644 --- a/src/obu.rs +++ b/src/obu.rs @@ -5,7 +5,6 @@ use crate::include::dav1d::data::Rav1dData; use crate::include::dav1d::dav1d::RAV1D_DECODEFRAMETYPE_INTRA; use crate::include::dav1d::dav1d::RAV1D_DECODEFRAMETYPE_REFERENCE; use crate::include::dav1d::headers::DRav1d; -use crate::include::dav1d::headers::Dav1dITUTT35; use crate::include::dav1d::headers::Rav1dAdaptiveBoolean; use crate::include::dav1d::headers::Rav1dChromaSamplePosition; use crate::include::dav1d::headers::Rav1dColorPrimaries; @@ -79,7 +78,6 @@ use crate::src::cdf::rav1d_cdf_thread_unref; use crate::src::decode::rav1d_submit_frame; use crate::src::env::get_poc_diff; use crate::src::error::Rav1dError::EINVAL; -use crate::src::error::Rav1dError::ENOMEM; use crate::src::error::Rav1dError::ERANGE; use crate::src::error::Rav1dResult; use crate::src::getbits::GetBits; @@ -97,7 +95,6 @@ use crate::src::picture::rav1d_picture_copy_props; use crate::src::picture::rav1d_thread_picture_ref; use crate::src::picture::rav1d_thread_picture_unref; use crate::src::picture::PictureFlags; -use crate::src::r#ref::rav1d_ref_create; use crate::src::r#ref::rav1d_ref_dec; use crate::src::r#ref::rav1d_ref_inc; use crate::src::thread_task::FRAME_ERROR; @@ -2442,14 +2439,6 @@ unsafe fn parse_obus( if payload_size <= 0 { writeln!(c.logger, "Malformed ITU-T T.35 metadata message format"); } else { - let r#ref = rav1d_ref_create( - ::core::mem::size_of::>() - + payload_size as usize * ::core::mem::size_of::(), - ); - if r#ref.is_null() { - return Err(ENOMEM); - } - let country_code = country_code as u8; let country_code_extension_byte = country_code_extension_byte as u8; let payload = (0..payload_size).map(|_| gb.get_bits(8) as u8).collect(); // TODO(kkysen) fallible allocation diff --git a/src/ref.rs b/src/ref.rs index 2a4090b54..c0087ae3c 100644 --- a/src/ref.rs +++ b/src/ref.rs @@ -1,5 +1,3 @@ -use crate::src::mem::rav1d_alloc_aligned; -use crate::src::mem::rav1d_free_aligned; use crate::src::mem::rav1d_mem_pool_pop; use crate::src::mem::rav1d_mem_pool_push; use crate::src::mem::Rav1dMemPool; @@ -26,35 +24,6 @@ pub unsafe fn rav1d_ref_inc(r#ref: *mut Rav1dRef) { (*r#ref).ref_cnt.fetch_add(1, Ordering::Relaxed); } -unsafe extern "C" fn default_free_callback(data: *const u8, user_data: *mut c_void) { - if !(data == user_data as *const u8) { - unreachable!(); - } - rav1d_free_aligned(user_data); -} - -pub unsafe fn rav1d_ref_create(mut size: usize) -> *mut Rav1dRef { - size = size - .wrapping_add(::core::mem::size_of::<*mut c_void>()) - .wrapping_sub(1) - & !(::core::mem::size_of::<*mut c_void>()).wrapping_sub(1); - let data: *mut u8 = rav1d_alloc_aligned( - size.wrapping_add(::core::mem::size_of::()), - 64 as c_int as usize, - ) as *mut u8; - if data.is_null() { - return 0 as *mut Rav1dRef; - } - let res: *mut Rav1dRef = data.offset(size as isize) as *mut Rav1dRef; - (*res).data = data as *mut c_void; - (*res).user_data = (*res).data; - (*res).const_data = (*res).user_data; - (*res).ref_cnt = AtomicI32::new(1); - (*res).free_ref = 0 as c_int; - (*res).free_callback = Some(default_free_callback); - return res; -} - unsafe extern "C" fn pool_free_callback(data: *const u8, user_data: *mut c_void) { rav1d_mem_pool_push( data as *mut Rav1dMemPool,