layout tests pass now, so let's run them

sportsball-ai · Jul 15, 2024 · 0276b72 · 0276b72
1 parent e7db7ab
commit 0276b72
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/xcoder/xcoder-quadra/src/encoder.rs b/xcoder/xcoder-quadra/src/encoder.rs
@@ -1,6 +1,6 @@
 use crate::XcoderPixelFormat;
 
-use super::{fps_to_rational, XcoderHardware, XcoderHardwareFrame};
+use super::{alloc_zeroed, fps_to_rational, XcoderHardware, XcoderHardwareFrame};
 use av_traits::{EncodedFrameType, EncodedVideoFrame, RawVideoFrame, VideoEncoder, VideoEncoderOutput};
 use scopeguard::{guard, ScopeGuard};
 use snafu::Snafu;
@@ -233,7 +233,6 @@ impl<F> XcoderEncoder<F> {
                 config.width as _,
                 config.height as _,
                 if config.bit_depth > 8 { 2 } else { 1 }, // bit depth factor
-                0,                                        // is nv12
                 frame_data_strides.as_mut_ptr(),
                 frame_data_heights.as_mut_ptr(),
             );

diff --git a/xcoder/xcoder-quadra/xcoder-quadra-sys/build.rs b/xcoder/xcoder-quadra/xcoder-quadra-sys/build.rs
@@ -78,9 +78,6 @@ fn main() {
             .allowlist_type("ni_.+")
             .allowlist_var("NI_.+")
             .allowlist_var("GC620_.+")
-            // bindgen 0.60.0 broke layout tests: https://github.com/rust-lang/rust-bindgen/issues/2218
-            // 0.60.1 claims to have fixed the issue, but does not.
-            .layout_tests(false)
             .clang_arg(format!("-I{}", source_path.to_str().unwrap()))
             .generate()
             .expect("unable to generate bindings");