use ffmpeg-sys-next, single version of bindgen (#162)

* use ffmpeg-sys-next, single version of bindgen One version is easier to keep track of and should reduce build times. * replace ffmpeg-sys with ffmpeg-sys-next, which (among other things) uses bindgen 0.64. ffmpeg-sys was using a pre-0.60 version, so in some of our call sites, it hit build errors on Rust 1.70 due to rust-lang/rust-bindgen#2083 https://github.com/rust-lang/rust-bindgen/blob/main/CHANGELOG.md#0600 * update cargo lock stuff to use the same version * remove stale comments about older versions * fix xilinx build errors with bindgen 0.64
sportsball-ai · Jun 22, 2023 · 2a8b6ba · 2a8b6ba
1 parent 91e066f
commit 2a8b6ba
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 93 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ffmpeg/Cargo.toml b/ffmpeg/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-# XXX: ffmpeg-sys doesn't seem to build without avcodec.
-ffmpeg-sys = {git = "https://github.com/meh/rust-ffmpeg-sys", rev="8ba86ee3f9b85a3ad86002d980fb518f5e90afb1", default-features = false, features = ["avcodec"] }
+# XXX: ffmpeg-sys-next doesn't seem to build without avcodec.
+ffmpeg-sys = { package = "ffmpeg-sys-next", version = "6.0.1", default-features = false, features = ["avcodec"] }
 thiserror = "1.0"
 
 [features]

diff --git a/macos/video-toolbox/build.rs b/macos/video-toolbox/build.rs
@@ -8,9 +8,6 @@ fn main() {
 
         let sdk_root = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk";
 
-        // the "whitelist_" functions have been renamed in newer bindgen versions, but we use the
-        // old names for wider compatibility
-        #[allow(deprecated)]
         let bindings = bindgen::Builder::default()
             .clang_arg(format!("-isysroot{}", sdk_root))
             .header("src/lib.hpp")

diff --git a/xilinx/src/xlnx_enc_props.rs b/xilinx/src/xlnx_enc_props.rs
@@ -355,7 +355,7 @@ impl XlnxXmaEncoderProperties {
     ) {
         enc_params[0].name = ENC_OPTIONS_PARAM_NAME.as_ptr() as *mut i8;
         enc_params[0].type_ = XmaDataType_XMA_STRING;
-        enc_params[0].length = enc_options.len() as u64;
+        enc_params[0].length = enc_options.len();
         enc_params[0].value = enc_options_ptr_ptr as *mut std::ffi::c_void;
 
         enc_params[1].name = LATENCY_LOGGING_PARAM_NAME.as_ptr() as *mut i8;

diff --git a/xilinx/src/xlnx_encoder.rs b/xilinx/src/xlnx_encoder.rs
@@ -12,7 +12,7 @@ impl XlnxEncoder {
         let enc_session = xlnx_create_enc_session(xma_enc_props, xlnx_enc_ctx)?;
 
         let buffer_size = xma_enc_props.height * xma_enc_props.width * xma_enc_props.bits_per_pixel;
-        let out_buffer = unsafe { xma_data_buffer_alloc(buffer_size as u64, false) };
+        let out_buffer = unsafe { xma_data_buffer_alloc(buffer_size as usize, false) };
 
         Ok(Self {
             enc_session,