Use libc types directly (#486)

include/dav1d/picture.rs

@@ -5,9 +5,9 @@ use crate::include::dav1d::headers::Dav1dITUTT35;
 use crate::include::dav1d::headers::Dav1dMasteringDisplay;
 use crate::include::dav1d::headers::Dav1dPixelLayout;
 use crate::include::dav1d::headers::Dav1dSequenceHeader;
-use crate::include::stddef::ptrdiff_t;
-use crate::include::stdint::uintptr_t;
 use crate::src::r#ref::Dav1dRef;
+use libc::ptrdiff_t;
+use libc::uintptr_t;
 
 #[derive(Clone)]
 #[repr(C)]

lib.rs

@@ -26,8 +26,6 @@ pub mod include {
     pub mod pthread;
     pub mod sched;
     pub mod stdatomic;
-    pub mod stddef;
-    pub mod stdint;
 } // mod include
 pub mod src {
     mod align;

src/cdef.rs

@@ -1,7 +1,7 @@
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::bitdepth::LeftPixelRow2px;
 use crate::include::common::intops::apply_sign;
-use crate::include::stddef::ptrdiff_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 pub type CdefEdgeFlags = libc::c_uint;

src/cdef_apply_tmpl_16.rs

@@ -4,7 +4,6 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::align::Align16;
 use crate::src::cdef::CdefEdgeFlags;
 use crate::src::cdef::CDEF_HAVE_BOTTOM;
@@ -15,6 +14,7 @@ use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
 use crate::src::internal::Dav1dTaskContext;
 use crate::src::lf_mask::Av1Filter;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {

src/cdef_apply_tmpl_8.rs

@@ -4,7 +4,6 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::align::Align16;
 use crate::src::cdef::CdefEdgeFlags;
 use crate::src::cdef::CDEF_HAVE_BOTTOM;
@@ -15,6 +14,7 @@ use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
 use crate::src::internal::Dav1dTaskContext;
 use crate::src::lf_mask::Av1Filter;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {

src/cdef_tmpl_16.rs

@@ -3,7 +3,6 @@ use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::bitdepth::LeftPixelRow2px;
 use crate::include::common::intops::iclip;
 use crate::include::common::intops::ulog2;
-use crate::include::stddef::*;
 use crate::src::cdef::constrain;
 use crate::src::cdef::fill;
 use crate::src::cdef::CdefEdgeFlags;
@@ -13,6 +12,7 @@ use crate::src::cdef::CDEF_HAVE_LEFT;
 use crate::src::cdef::CDEF_HAVE_RIGHT;
 use crate::src::cdef::CDEF_HAVE_TOP;
 use crate::src::tables::dav1d_cdef_directions;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]

src/cdef_tmpl_8.rs

@@ -2,7 +2,6 @@ use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::bitdepth::LeftPixelRow2px;
 use crate::include::common::intops::iclip;
 use crate::include::common::intops::ulog2;
-use crate::include::stddef::*;
 use crate::src::cdef::constrain;
 use crate::src::cdef::fill;
 use crate::src::cdef::CdefEdgeFlags;
@@ -12,6 +11,7 @@ use crate::src::cdef::CDEF_HAVE_LEFT;
 use crate::src::cdef::CDEF_HAVE_RIGHT;
 use crate::src::cdef::CDEF_HAVE_TOP;
 use crate::src::tables::dav1d_cdef_directions;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(all(feature = "asm", any(target_arch = "arm", target_arch = "aarch64"),))]

src/decode.rs

@@ -33,8 +33,6 @@ use crate::include::dav1d::headers::DAV1D_WM_TYPE_TRANSLATION;
 use crate::include::dav1d::picture::Dav1dPicture;
 use crate::include::stdatomic::atomic_int;
 use crate::include::stdatomic::atomic_uint;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::align::Align16;
 use crate::src::cdef::Dav1dCdefDSPContext;
 use crate::src::cdf::dav1d_cdf_thread_copy;
@@ -221,6 +219,8 @@ use libc::pthread_cond_signal;
 use libc::pthread_cond_wait;
 use libc::pthread_mutex_lock;
 use libc::pthread_mutex_unlock;
+use libc::ptrdiff_t;
+use libc::uintptr_t;
 use std::array;
 use std::cmp;
 use std::iter;

src/env.rs

@@ -2,7 +2,6 @@ use crate::include::common::intops::apply_sign;
 use crate::include::dav1d::headers::Dav1dFrameHeader;
 use crate::include::dav1d::headers::Dav1dWarpedMotionParams;
 use crate::include::dav1d::headers::DAV1D_N_SWITCHABLE_FILTERS;
-use crate::include::stddef::ptrdiff_t;
 use crate::src::align::Align8;
 use crate::src::levels::mv;
 use crate::src::levels::BlockLevel;
@@ -30,6 +29,7 @@ use crate::src::levels::V_ADST;
 use crate::src::levels::V_FLIPADST;
 use crate::src::refmvs::refmvs_candidate;
 use crate::src::tables::TxfmInfo;
+use libc::ptrdiff_t;
 use std::cmp;
 use std::cmp::Ordering;
 

src/fg_apply_tmpl_16.rs

@@ -4,11 +4,11 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
 use crate::include::dav1d::picture::Dav1dPicture;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::align::Align1;
 use crate::src::align::Align16;
 use crate::src::filmgrain::Dav1dFilmGrainDSPContext;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {

src/fg_apply_tmpl_8.rs

@@ -4,11 +4,11 @@ use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
 use crate::include::dav1d::picture::Dav1dPicture;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::align::Align16;
 use crate::src::filmgrain::Dav1dFilmGrainDSPContext;
 use cfg_if::cfg_if;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {

src/filmgrain.rs

@@ -1,8 +1,8 @@
 use crate::include::common::bitdepth::DynEntry;
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::dav1d::headers::Dav1dFilmGrainData;
-use crate::include::stddef::ptrdiff_t;
-use crate::include::stdint::intptr_t;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 
 #[inline]
 pub unsafe extern "C" fn get_random_number(

src/filmgrain_tmpl_16.rs

@@ -6,13 +6,13 @@ use crate::include::dav1d::headers::Dav1dFilmGrainData;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
-use crate::include::stdint::*;
 use crate::src::filmgrain::get_random_number;
 use crate::src::filmgrain::round2;
 use crate::src::filmgrain::Dav1dFilmGrainDSPContext;
 use crate::src::filmgrain::GRAIN_WIDTH;
 use crate::src::tables::dav1d_gaussian_sequence;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]

src/filmgrain_tmpl_8.rs

@@ -6,13 +6,13 @@ use crate::include::dav1d::headers::Dav1dFilmGrainData;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::ptrdiff_t;
-use crate::include::stdint::intptr_t;
 use crate::src::filmgrain::get_random_number;
 use crate::src::filmgrain::round2;
 use crate::src::filmgrain::Dav1dFilmGrainDSPContext;
 use crate::src::filmgrain::GRAIN_WIDTH;
 use crate::src::tables::dav1d_gaussian_sequence;
+use libc::intptr_t;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]

src/internal.rs

@@ -16,7 +16,6 @@ use crate::include::dav1d::picture::Dav1dPicAllocator;
 use crate::include::dav1d::picture::Dav1dPicture;
 use crate::include::stdatomic::atomic_int;
 use crate::include::stdatomic::atomic_uint;
-use crate::include::stddef::ptrdiff_t;
 use crate::src::align::*;
 use crate::src::cdef::Dav1dCdefDSPContext;
 use crate::src::cdf::CdfContext;
@@ -56,6 +55,7 @@ use crate::src::refmvs::Dav1dRefmvsDSPContext;
 use crate::src::thread_data::thread_data;
 use libc::pthread_cond_t;
 use libc::pthread_mutex_t;
+use libc::ptrdiff_t;
 
 #[repr(C)]
 pub struct Dav1dDSPContext {

src/ipred.rs

@@ -1,5 +1,5 @@
 use crate::include::common::bitdepth::DynPixel;
-use crate::include::stddef::ptrdiff_t;
+use libc::ptrdiff_t;
 
 #[inline]
 pub unsafe extern "C" fn get_upsample(

src/ipred_prepare_tmpl_16.rs

@@ -1,5 +1,4 @@
 use crate::include::common::attributes::clz;
-use crate::include::stddef::*;
 use crate::src::intra_edge::EdgeFlags;
 use crate::src::intra_edge::EDGE_I444_LEFT_HAS_BOTTOM;
 use crate::src::intra_edge::EDGE_I444_TOP_HAS_RIGHT;
@@ -17,6 +16,7 @@ use crate::src::levels::Z1_PRED;
 use crate::src::levels::Z2_PRED;
 use crate::src::levels::Z3_PRED;
 use c2rust_bitfields::BitfieldStruct;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {

src/ipred_prepare_tmpl_8.rs

@@ -1,4 +1,3 @@
-use crate::include::stddef::*;
 use crate::src::intra_edge::EdgeFlags;
 use crate::src::intra_edge::EDGE_I444_LEFT_HAS_BOTTOM;
 use crate::src::intra_edge::EDGE_I444_TOP_HAS_RIGHT;
@@ -16,6 +15,7 @@ use crate::src::levels::Z1_PRED;
 use crate::src::levels::Z2_PRED;
 use crate::src::levels::Z3_PRED;
 use c2rust_bitfields::BitfieldStruct;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {

src/ipred_tmpl_16.rs

@@ -5,7 +5,6 @@ use crate::include::common::intops::iclip;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::ipred::get_upsample;
 use crate::src::ipred::Dav1dIntraPredDSPContext;
 use crate::src::levels::DC_128_PRED;
@@ -25,6 +24,7 @@ use crate::src::levels::Z3_PRED;
 use crate::src::tables::dav1d_dr_intra_derivative;
 use crate::src::tables::dav1d_filter_intra_taps;
 use crate::src::tables::dav1d_sm_weights;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]

src/ipred_tmpl_8.rs

@@ -6,7 +6,6 @@ use crate::include::common::intops::iclip_u8;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I422;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::ipred::get_upsample;
 use crate::src::ipred::Dav1dIntraPredDSPContext;
 use crate::src::levels::DC_128_PRED;
@@ -26,6 +25,7 @@ use crate::src::levels::Z3_PRED;
 use crate::src::tables::dav1d_dr_intra_derivative;
 use crate::src::tables::dav1d_filter_intra_taps;
 use crate::src::tables::dav1d_sm_weights;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[cfg(feature = "asm")]

src/itx.rs

@@ -3,9 +3,9 @@ use crate::include::common::bitdepth::BitDepth;
 use crate::include::common::bitdepth::DynCoef;
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::intops::iclip;
-use crate::include::stddef::*;
 use crate::src::levels::N_RECT_TX_SIZES;
 use crate::src::levels::N_TX_TYPES_PLUS_LL;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {

src/itx_1d.rs

@@ -1,5 +1,5 @@
 use crate::include::common::intops::iclip;
-use crate::include::stddef::*;
+use libc::ptrdiff_t;
 
 #[inline(never)]
 unsafe extern "C" fn inv_dct4_1d_internal_c(

src/itx_tmpl_16.rs

@@ -2,7 +2,6 @@ use crate::include::common::bitdepth::BitDepth16;
 use crate::include::common::bitdepth::DynCoef;
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::intops::iclip;
-use crate::include::stddef::*;
 use crate::src::itx::Dav1dInvTxfmDSPContext;
 use crate::src::levels::ADST_ADST;
 use crate::src::levels::ADST_DCT;
@@ -40,6 +39,7 @@ use crate::src::levels::V_ADST;
 use crate::src::levels::V_DCT;
 use crate::src::levels::V_FLIPADST;
 use crate::src::levels::WHT_WHT;
+use libc::ptrdiff_t;
 
 #[cfg(feature = "asm")]
 use crate::src::cpu::dav1d_get_cpu_flags;

src/itx_tmpl_8.rs

@@ -2,7 +2,6 @@ use crate::include::common::bitdepth::BitDepth8;
 use crate::include::common::bitdepth::DynCoef;
 use crate::include::common::bitdepth::DynPixel;
 use crate::include::common::intops::iclip_u8;
-use crate::include::stddef::*;
 use crate::src::itx::Dav1dInvTxfmDSPContext;
 use crate::src::levels::ADST_ADST;
 use crate::src::levels::ADST_DCT;
@@ -40,6 +39,7 @@ use crate::src::levels::V_ADST;
 use crate::src::levels::V_DCT;
 use crate::src::levels::V_FLIPADST;
 use crate::src::levels::WHT_WHT;
+use libc::ptrdiff_t;
 
 #[cfg(feature = "asm")]
 use crate::src::cpu::dav1d_get_cpu_flags;

src/lf_apply_tmpl_16.rs

@@ -1,14 +1,14 @@
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::env::BlockContext;
 use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
 use crate::src::lf_mask::Av1Filter;
 use crate::src::lr_apply::LR_RESTORE_U;
 use crate::src::lr_apply::LR_RESTORE_V;
 use crate::src::lr_apply::LR_RESTORE_Y;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {

src/lf_apply_tmpl_8.rs

@@ -1,14 +1,14 @@
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I400;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::*;
 use crate::src::env::BlockContext;
 use crate::src::internal::Dav1dDSPContext;
 use crate::src::internal::Dav1dFrameContext;
 use crate::src::lf_mask::Av1Filter;
 use crate::src::lr_apply::LR_RESTORE_U;
 use crate::src::lr_apply::LR_RESTORE_V;
 use crate::src::lr_apply::LR_RESTORE_Y;
+use libc::ptrdiff_t;
 use std::cmp;
 
 extern "C" {

src/lf_mask.rs

@@ -5,14 +5,14 @@ use crate::include::dav1d::headers::Dav1dPixelLayout;
 use crate::include::dav1d::headers::Dav1dRestorationType;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I420;
 use crate::include::dav1d::headers::DAV1D_PIXEL_LAYOUT_I444;
-use crate::include::stddef::ptrdiff_t;
 use crate::src::align::Align16;
 use crate::src::ctx::CaseSet;
 use crate::src::levels::BlockSize;
 use crate::src::levels::RectTxfmSize;
 use crate::src::levels::TX_4X4;
 use crate::src::tables::dav1d_block_dimensions;
 use crate::src::tables::dav1d_txfm_dimensions;
+use libc::ptrdiff_t;
 use std::cmp;
 
 #[repr(C)]

src/loopfilter.rs

@@ -1,6 +1,6 @@
 use crate::include::common::bitdepth::DynPixel;
-use crate::include::stddef::ptrdiff_t;
 use crate::src::lf_mask::Av1FilterLUT;
+use libc::ptrdiff_t;
 
 pub type loopfilter_sb_fn = unsafe extern "C" fn(
     *mut DynPixel,