src/{ref,mem,cdf,data,picture,refmvs,log,thread_task,cpu}.rs: Dedup…

…licate declarations into `use` imports (#412)

src/cdf.rs

@@ -6,8 +6,6 @@ use ::libc;
 extern "C" {
     fn memcpy(_: *mut libc::c_void, _: *const libc::c_void, _: libc::c_ulong) -> *mut libc::c_void;
     fn memset(_: *mut libc::c_void, _: libc::c_int, _: libc::c_ulong) -> *mut libc::c_void;
-    fn dav1d_ref_create_using_pool(pool: *mut Dav1dMemPool, size: size_t) -> *mut Dav1dRef;
-    fn dav1d_ref_dec(r#ref: *mut *mut Dav1dRef);
 }
 
 use crate::src::tables::dav1d_partition_type_count;
@@ -17,6 +15,8 @@ use crate::include::stdatomic::atomic_uint;
 
 use crate::include::dav1d::common::Dav1dDataProps;
 use crate::include::dav1d::data::Dav1dData;
+use crate::src::r#ref::dav1d_ref_create_using_pool;
+use crate::src::r#ref::dav1d_ref_dec;
 use crate::src::r#ref::Dav1dRef;
 #[derive(Copy, Clone)]
 #[repr(C)]
@@ -5402,8 +5402,8 @@ static av1_default_coef_cdf: [CdfCoefContext; 4] = [
         ])),
     },
 ];
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_cdf_thread_update(
+
+pub unsafe fn dav1d_cdf_thread_update(
     hdr: *const Dav1dFrameHeader,
     dst: *mut CdfContext,
     src: *const CdfContext,
@@ -6136,6 +6136,7 @@ pub unsafe extern "C" fn dav1d_cdf_thread_update(
         k_17 += 1;
     }
 }
+
 #[inline]
 unsafe extern "C" fn get_qcat_idx(q: libc::c_int) -> libc::c_int {
     if q <= 20 {
@@ -6149,16 +6150,13 @@ unsafe extern "C" fn get_qcat_idx(q: libc::c_int) -> libc::c_int {
     }
     return 3 as libc::c_int;
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_cdf_thread_init_static(
-    cdf: *mut CdfThreadContext,
-    qidx: libc::c_int,
-) {
+
+pub unsafe fn dav1d_cdf_thread_init_static(cdf: *mut CdfThreadContext, qidx: libc::c_int) {
     (*cdf).r#ref = 0 as *mut Dav1dRef;
     (*cdf).data.qcat = get_qcat_idx(qidx) as libc::c_uint;
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_cdf_thread_copy(dst: *mut CdfContext, src: *const CdfThreadContext) {
+
+pub unsafe fn dav1d_cdf_thread_copy(dst: *mut CdfContext, src: *const CdfThreadContext) {
     if !((*src).r#ref).is_null() {
         memcpy(
             dst as *mut libc::c_void,
@@ -6189,6 +6187,7 @@ pub unsafe extern "C" fn dav1d_cdf_thread_copy(dst: *mut CdfContext, src: *const
         (*dst).mv.comp[0] = (*dst).mv.comp[1];
     };
 }
+
 #[no_mangle]
 pub unsafe extern "C" fn dav1d_cdf_thread_alloc(
     c: *mut Dav1dContext,
@@ -6209,18 +6208,15 @@ pub unsafe extern "C" fn dav1d_cdf_thread_alloc(
     }
     return 0 as libc::c_int;
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_cdf_thread_ref(
-    dst: *mut CdfThreadContext,
-    src: *mut CdfThreadContext,
-) {
+
+pub unsafe fn dav1d_cdf_thread_ref(dst: *mut CdfThreadContext, src: *mut CdfThreadContext) {
     *dst = *src;
     if !((*src).r#ref).is_null() {
         dav1d_ref_inc((*src).r#ref);
     }
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_cdf_thread_unref(cdf: *mut CdfThreadContext) {
+
+pub unsafe fn dav1d_cdf_thread_unref(cdf: *mut CdfThreadContext) {
     memset(
         &mut (*cdf).data as *mut CdfThreadContext_data as *mut libc::c_void,
         0 as libc::c_int,

src/cpu.rs

@@ -46,7 +46,6 @@ pub fn dav1d_get_cpu_flags() -> libc::c_uint {
     flags
 }
 
-#[no_mangle]
 #[cold]
 pub unsafe fn dav1d_init_cpu() {
     #[cfg(feature = "asm")]

src/data.rs

@@ -5,25 +5,18 @@ use ::libc;
 extern "C" {
     fn memset(_: *mut libc::c_void, _: libc::c_int, _: libc::c_ulong) -> *mut libc::c_void;
     fn fprintf(_: *mut libc::FILE, _: *const libc::c_char, _: ...) -> libc::c_int;
-    fn dav1d_ref_dec(r#ref: *mut *mut Dav1dRef);
-    fn dav1d_ref_wrap(
-        ptr: *const uint8_t,
-        free_callback: Option<unsafe extern "C" fn(*const uint8_t, *mut libc::c_void) -> ()>,
-        user_data: *mut libc::c_void,
-    ) -> *mut Dav1dRef;
-    fn dav1d_ref_create(size: size_t) -> *mut Dav1dRef;
 }
 
 use crate::src::r#ref::Dav1dRef;
 
 use crate::include::dav1d::common::Dav1dDataProps;
 use crate::include::dav1d::data::Dav1dData;
+use crate::src::r#ref::dav1d_ref_create;
+use crate::src::r#ref::dav1d_ref_dec;
 use crate::src::r#ref::dav1d_ref_inc;
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_data_create_internal(
-    buf: *mut Dav1dData,
-    sz: size_t,
-) -> *mut uint8_t {
+use crate::src::r#ref::dav1d_ref_wrap;
+
+pub unsafe fn dav1d_data_create_internal(buf: *mut Dav1dData, sz: size_t) -> *mut uint8_t {
     if buf.is_null() {
         fprintf(
             stderr,
@@ -49,8 +42,8 @@ pub unsafe extern "C" fn dav1d_data_create_internal(
     (*buf).m.size = sz;
     return (*(*buf).r#ref).data as *mut uint8_t;
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_data_wrap_internal(
+
+pub unsafe fn dav1d_data_wrap_internal(
     buf: *mut Dav1dData,
     ptr: *const uint8_t,
     sz: size_t,
@@ -103,8 +96,8 @@ pub unsafe extern "C" fn dav1d_data_wrap_internal(
     (*buf).m.size = sz;
     return 0 as libc::c_int;
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_data_wrap_user_data_internal(
+
+pub unsafe fn dav1d_data_wrap_user_data_internal(
     buf: *mut Dav1dData,
     user_data: *const uint8_t,
     free_callback: Option<unsafe extern "C" fn(*const uint8_t, *mut libc::c_void) -> ()>,
@@ -141,8 +134,8 @@ pub unsafe extern "C" fn dav1d_data_wrap_user_data_internal(
     (*buf).m.user_data.data = user_data;
     return 0 as libc::c_int;
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_data_ref(dst: *mut Dav1dData, src: *const Dav1dData) {
+
+pub unsafe fn dav1d_data_ref(dst: *mut Dav1dData, src: *const Dav1dData) {
     if dst.is_null() {
         fprintf(
             stderr,
@@ -192,11 +185,8 @@ pub unsafe extern "C" fn dav1d_data_ref(dst: *mut Dav1dData, src: *const Dav1dDa
     }
     *dst = *src;
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_data_props_copy(
-    dst: *mut Dav1dDataProps,
-    src: *const Dav1dDataProps,
-) {
+
+pub unsafe fn dav1d_data_props_copy(dst: *mut Dav1dDataProps, src: *const Dav1dDataProps) {
     if dst.is_null() {
         unreachable!();
     }
@@ -209,8 +199,8 @@ pub unsafe extern "C" fn dav1d_data_props_copy(
         dav1d_ref_inc((*dst).user_data.r#ref);
     }
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_data_props_set_defaults(props: *mut Dav1dDataProps) {
+
+pub unsafe fn dav1d_data_props_set_defaults(props: *mut Dav1dDataProps) {
     if props.is_null() {
         unreachable!();
     }
@@ -222,8 +212,8 @@ pub unsafe extern "C" fn dav1d_data_props_set_defaults(props: *mut Dav1dDataProp
     (*props).timestamp = i64::MIN;
     (*props).offset = -1;
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_data_props_unref_internal(props: *mut Dav1dDataProps) {
+
+pub unsafe fn dav1d_data_props_unref_internal(props: *mut Dav1dDataProps) {
     if props.is_null() {
         fprintf(
             stderr,
@@ -240,8 +230,8 @@ pub unsafe extern "C" fn dav1d_data_props_unref_internal(props: *mut Dav1dDataPr
     dav1d_data_props_set_defaults(props);
     dav1d_ref_dec(&mut user_data_ref);
 }
-#[no_mangle]
-pub unsafe extern "C" fn dav1d_data_unref_internal(buf: *mut Dav1dData) {
+
+pub unsafe fn dav1d_data_unref_internal(buf: *mut Dav1dData) {
     if buf.is_null() {
         fprintf(
             stderr,

src/decode.rs

@@ -9,7 +9,8 @@ use crate::include::dav1d::headers::{Dav1dTxfmMode, DAV1D_MAX_SEGMENTS};
 use crate::include::stddef::*;
 use crate::include::stdint::*;
 use crate::src::align::Align16;
-use crate::src::cdf::{CdfContext, CdfMvComponent, CdfMvContext};
+use crate::src::cdf::CdfMvComponent;
+use crate::src::cdf::CdfMvContext;
 use crate::src::ctx::CaseSet;
 use crate::src::looprestoration::dav1d_loop_restoration_dsp_init;
 
@@ -36,54 +37,11 @@ extern "C" {
     fn pthread_cond_signal(__cond: *mut pthread_cond_t) -> libc::c_int;
     fn pthread_cond_wait(__cond: *mut pthread_cond_t, __mutex: *mut pthread_mutex_t)
         -> libc::c_int;
-    fn dav1d_ref_create_using_pool(pool: *mut Dav1dMemPool, size: size_t) -> *mut Dav1dRef;
-    fn dav1d_ref_dec(r#ref: *mut *mut Dav1dRef);
-    fn dav1d_cdf_thread_init_static(cdf: *mut CdfThreadContext, qidx: libc::c_int);
     fn dav1d_cdf_thread_alloc(
         c: *mut Dav1dContext,
         cdf: *mut CdfThreadContext,
         have_frame_mt: libc::c_int,
     ) -> libc::c_int;
-    fn dav1d_cdf_thread_copy(dst: *mut CdfContext, src: *const CdfThreadContext);
-    fn dav1d_cdf_thread_ref(dst: *mut CdfThreadContext, src: *mut CdfThreadContext);
-    fn dav1d_cdf_thread_unref(cdf: *mut CdfThreadContext);
-    fn dav1d_cdf_thread_update(
-        hdr: *const Dav1dFrameHeader,
-        dst: *mut CdfContext,
-        src: *const CdfContext,
-    );
-    fn dav1d_data_props_copy(dst: *mut Dav1dDataProps, src: *const Dav1dDataProps);
-    fn dav1d_data_unref_internal(buf: *mut Dav1dData);
-    fn dav1d_refmvs_init_frame(
-        rf: *mut refmvs_frame,
-        seq_hdr: *const Dav1dSequenceHeader,
-        frm_hdr: *const Dav1dFrameHeader,
-        ref_poc: *const libc::c_uint,
-        rp: *mut refmvs_temporal_block,
-        ref_ref_poc: *const [libc::c_uint; 7],
-        rp_ref: *const *mut refmvs_temporal_block,
-        n_tile_threads: libc::c_int,
-        n_frame_threads: libc::c_int,
-    ) -> libc::c_int;
-    fn dav1d_refmvs_save_tmvs(
-        dsp: *const Dav1dRefmvsDSPContext,
-        rt: *const refmvs_tile,
-        col_start8: libc::c_int,
-        col_end8: libc::c_int,
-        row_start8: libc::c_int,
-        row_end8: libc::c_int,
-    );
-    fn dav1d_refmvs_tile_sbrow_init(
-        rt: *mut refmvs_tile,
-        rf: *const refmvs_frame,
-        tile_col_start4: libc::c_int,
-        tile_col_end4: libc::c_int,
-        tile_row_start4: libc::c_int,
-        tile_row_end4: libc::c_int,
-        sby: libc::c_int,
-        tile_row_idx: libc::c_int,
-        pass: libc::c_int,
-    );
     #[cfg(feature = "bitdepth_8")]
     fn dav1d_film_grain_dsp_init_8bpc(c: *mut Dav1dFilmGrainDSPContext);
     #[cfg(feature = "bitdepth_16")]
@@ -115,11 +73,6 @@ extern "C" {
         w: libc::c_int,
         src: *const Dav1dPicture,
     ) -> libc::c_int;
-    fn dav1d_picture_ref(dst: *mut Dav1dPicture, src: *const Dav1dPicture);
-    fn dav1d_thread_picture_ref(dst: *mut Dav1dThreadPicture, src: *const Dav1dThreadPicture);
-    fn dav1d_thread_picture_unref(p: *mut Dav1dThreadPicture);
-    fn dav1d_picture_unref_internal(p: *mut Dav1dPicture);
-    fn dav1d_picture_get_event_flags(p: *const Dav1dThreadPicture) -> Dav1dEventFlags;
     #[cfg(feature = "bitdepth_8")]
     fn dav1d_recon_b_intra_8bpc(
         t: *mut Dav1dTaskContext,
@@ -202,6 +155,9 @@ use crate::src::msac::dav1d_msac_decode_symbol_adapt8;
 use crate::src::msac::dav1d_msac_init;
 use crate::src::qm::dav1d_qm_tbl;
 use crate::src::refmvs::dav1d_refmvs_find;
+use crate::src::refmvs::dav1d_refmvs_init_frame;
+use crate::src::refmvs::dav1d_refmvs_save_tmvs;
+use crate::src::refmvs::dav1d_refmvs_tile_sbrow_init;
 use crate::src::tables::dav1d_al_part_ctx;
 use crate::src::tables::dav1d_block_dimensions;
 use crate::src::tables::dav1d_block_sizes;
@@ -223,6 +179,8 @@ use crate::include::dav1d::common::Dav1dDataProps;
 use crate::include::dav1d::data::Dav1dData;
 use crate::include::stdatomic::atomic_int;
 use crate::include::stdatomic::atomic_uint;
+use crate::src::data::dav1d_data_props_copy;
+use crate::src::data::dav1d_data_unref_internal;
 use crate::src::r#ref::Dav1dRef;
 #[derive(Copy, Clone)]
 #[repr(C)]
@@ -808,11 +766,21 @@ pub type generate_grain_uv_fn = Option<
 >;
 pub type generate_grain_y_fn =
     Option<unsafe extern "C" fn(*mut [entry; 82], *const Dav1dFilmGrainData) -> ()>;
+use crate::src::cdf::dav1d_cdf_thread_copy;
+use crate::src::cdf::dav1d_cdf_thread_init_static;
+use crate::src::cdf::dav1d_cdf_thread_ref;
+use crate::src::cdf::dav1d_cdf_thread_unref;
+use crate::src::cdf::dav1d_cdf_thread_update;
 use crate::src::cdf::CdfThreadContext;
 
 use crate::src::internal::Dav1dContext_frame_thread;
 use crate::src::internal::Dav1dContext_refs;
 use crate::src::internal::Dav1dTileGroup;
+use crate::src::picture::dav1d_picture_get_event_flags;
+use crate::src::picture::dav1d_picture_ref;
+use crate::src::picture::dav1d_picture_unref_internal;
+use crate::src::picture::dav1d_thread_picture_ref;
+use crate::src::picture::dav1d_thread_picture_unref;
 use crate::src::picture::Dav1dThreadPicture;
 pub type backup_ipred_edge_fn = Option<unsafe extern "C" fn(*mut Dav1dTaskContext) -> ()>;
 pub type filter_sbrow_fn = Option<unsafe extern "C" fn(*mut Dav1dFrameContext, libc::c_int) -> ()>;
@@ -901,6 +869,8 @@ use crate::src::mem::dav1d_alloc_aligned;
 use crate::src::mem::dav1d_free_aligned;
 use crate::src::mem::dav1d_freep_aligned;
 use crate::src::mem::freep;
+use crate::src::r#ref::dav1d_ref_create_using_pool;
+use crate::src::r#ref::dav1d_ref_dec;
 use crate::src::r#ref::dav1d_ref_inc;
 
 use crate::src::tables::cfl_allowed_mask;