From d78aee16c99377f9bc6ac381dc3c7d1a43dcd0b0 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Tue, 19 Apr 2022 18:25:41 +0200 Subject: [PATCH] ndk-sys,ndk: Turn type aliases into newtype wrappers and fix mismatches (#245) Some stray `camera_status_t` showed up in the helper media bindings, which is not caught as a mismatch to `media_status_t` unless both are a newtype. For similar reasons `AndroidBitmapFormat`, `AHardwareBuffer_Format` and `AIMAGE_FORMATS` are also converted to cleaner newtype wrappers. --- ndk-sys/CHANGELOG.md | 2 + ndk-sys/generate_bindings.sh | 4 + ndk-sys/src/ffi_aarch64.rs | 795 +++++++++++++++++++--------------- ndk-sys/src/ffi_arm.rs | 687 +++++++++++++++++------------ ndk-sys/src/ffi_i686.rs | 633 +++++++++++++++++---------- ndk-sys/src/ffi_x86_64.rs | 703 +++++++++++++++++++----------- ndk/CHANGELOG.md | 5 +- ndk/src/bitmap.rs | 12 +- ndk/src/hardware_buffer.rs | 28 +- ndk/src/media/error.rs | 114 ++--- ndk/src/media/image_reader.rs | 38 +- ndk/src/media/media_codec.rs | 4 +- ndk/src/media/mod.rs | 4 +- 13 files changed, 1827 insertions(+), 1202 deletions(-) diff --git a/ndk-sys/CHANGELOG.md b/ndk-sys/CHANGELOG.md index ee0bee00..0add4ea5 100644 --- a/ndk-sys/CHANGELOG.md +++ b/ndk-sys/CHANGELOG.md @@ -1,5 +1,7 @@ # Unreleased +- **Breaking:** Turn `enum` type aliases into newtype wrappers. (#245) + # 0.3.0 (2022-01-05) - **Breaking:** Use `jni-sys` for low-level JNI types instead of those autogenerated by `bindgen` based on the header. diff --git a/ndk-sys/generate_bindings.sh b/ndk-sys/generate_bindings.sh index acc8d0bb..d050d89c 100755 --- a/ndk-sys/generate_bindings.sh +++ b/ndk-sys/generate_bindings.sh @@ -6,6 +6,10 @@ while read ARCH && read TARGET ; do --blocklist-item 'C?_?JNIEnv' \ --blocklist-item '_?JavaVM' \ --blocklist-item '_?j\w+' \ + --newtype-enum '\w+_(result|status)_t' \ + --newtype-enum 'AndroidBitmapFormat' \ + --newtype-enum 'AHardwareBuffer_Format' \ + --newtype-enum 'AIMAGE_FORMATS' \ -- \ --sysroot="${ANDROID_NDK_ROOT}"/toolchains/llvm/prebuilt/linux-x86_64/sysroot/ --target=$TARGET done << EOF diff --git a/ndk-sys/src/ffi_aarch64.rs b/ndk-sys/src/ffi_aarch64.rs index 69091fd4..a2703c5e 100644 --- a/ndk-sys/src/ffi_aarch64.rs +++ b/ndk-sys/src/ffi_aarch64.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.59.1 */ +/* automatically generated by rust-bindgen 0.59.2 */ #[repr(C)] #[derive(Default)] @@ -94,163 +94,163 @@ pub const __GNUC_VA_LIST: u32 = 1; pub const true_: u32 = 1; pub const false_: u32 = 0; pub const __bool_true_false_are_defined: u32 = 1; -pub const __PRI_64_prefix: &'static [u8; 2usize] = b"l\0"; -pub const __PRI_PTR_prefix: &'static [u8; 2usize] = b"l\0"; -pub const __PRI_FAST_prefix: &'static [u8; 2usize] = b"l\0"; -pub const PRId8: &'static [u8; 2usize] = b"d\0"; -pub const PRId16: &'static [u8; 2usize] = b"d\0"; -pub const PRId32: &'static [u8; 2usize] = b"d\0"; -pub const PRId64: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdLEAST8: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST16: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST32: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST64: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdFAST8: &'static [u8; 2usize] = b"d\0"; -pub const PRIdFAST16: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdFAST32: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdFAST64: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdMAX: &'static [u8; 3usize] = b"jd\0"; -pub const PRIdPTR: &'static [u8; 3usize] = b"ld\0"; -pub const PRIi8: &'static [u8; 2usize] = b"i\0"; -pub const PRIi16: &'static [u8; 2usize] = b"i\0"; -pub const PRIi32: &'static [u8; 2usize] = b"i\0"; -pub const PRIi64: &'static [u8; 3usize] = b"li\0"; -pub const PRIiLEAST8: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST16: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST32: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST64: &'static [u8; 3usize] = b"li\0"; -pub const PRIiFAST8: &'static [u8; 2usize] = b"i\0"; -pub const PRIiFAST16: &'static [u8; 3usize] = b"li\0"; -pub const PRIiFAST32: &'static [u8; 3usize] = b"li\0"; -pub const PRIiFAST64: &'static [u8; 3usize] = b"li\0"; -pub const PRIiMAX: &'static [u8; 3usize] = b"ji\0"; -pub const PRIiPTR: &'static [u8; 3usize] = b"li\0"; -pub const PRIo8: &'static [u8; 2usize] = b"o\0"; -pub const PRIo16: &'static [u8; 2usize] = b"o\0"; -pub const PRIo32: &'static [u8; 2usize] = b"o\0"; -pub const PRIo64: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoLEAST8: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST16: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST32: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST64: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoFAST8: &'static [u8; 2usize] = b"o\0"; -pub const PRIoFAST16: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoFAST32: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoFAST64: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoMAX: &'static [u8; 3usize] = b"jo\0"; -pub const PRIoPTR: &'static [u8; 3usize] = b"lo\0"; -pub const PRIu8: &'static [u8; 2usize] = b"u\0"; -pub const PRIu16: &'static [u8; 2usize] = b"u\0"; -pub const PRIu32: &'static [u8; 2usize] = b"u\0"; -pub const PRIu64: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuLEAST8: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST16: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST32: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST64: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuFAST8: &'static [u8; 2usize] = b"u\0"; -pub const PRIuFAST16: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuFAST32: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuFAST64: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuMAX: &'static [u8; 3usize] = b"ju\0"; -pub const PRIuPTR: &'static [u8; 3usize] = b"lu\0"; -pub const PRIx8: &'static [u8; 2usize] = b"x\0"; -pub const PRIx16: &'static [u8; 2usize] = b"x\0"; -pub const PRIx32: &'static [u8; 2usize] = b"x\0"; -pub const PRIx64: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxLEAST8: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST16: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST32: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST64: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxFAST8: &'static [u8; 2usize] = b"x\0"; -pub const PRIxFAST16: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxFAST32: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxFAST64: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxMAX: &'static [u8; 3usize] = b"jx\0"; -pub const PRIxPTR: &'static [u8; 3usize] = b"lx\0"; -pub const PRIX8: &'static [u8; 2usize] = b"X\0"; -pub const PRIX16: &'static [u8; 2usize] = b"X\0"; -pub const PRIX32: &'static [u8; 2usize] = b"X\0"; -pub const PRIX64: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXLEAST8: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST16: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST32: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST64: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXFAST8: &'static [u8; 2usize] = b"X\0"; -pub const PRIXFAST16: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXFAST32: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXFAST64: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXMAX: &'static [u8; 3usize] = b"jX\0"; -pub const PRIXPTR: &'static [u8; 3usize] = b"lX\0"; -pub const SCNd8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNd16: &'static [u8; 3usize] = b"hd\0"; -pub const SCNd32: &'static [u8; 2usize] = b"d\0"; -pub const SCNd64: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdLEAST8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNdLEAST16: &'static [u8; 3usize] = b"hd\0"; -pub const SCNdLEAST32: &'static [u8; 2usize] = b"d\0"; -pub const SCNdLEAST64: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdFAST8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNdFAST16: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdFAST32: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdFAST64: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdMAX: &'static [u8; 3usize] = b"jd\0"; -pub const SCNdPTR: &'static [u8; 3usize] = b"ld\0"; -pub const SCNi8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNi16: &'static [u8; 3usize] = b"hi\0"; -pub const SCNi32: &'static [u8; 2usize] = b"i\0"; -pub const SCNi64: &'static [u8; 3usize] = b"li\0"; -pub const SCNiLEAST8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNiLEAST16: &'static [u8; 3usize] = b"hi\0"; -pub const SCNiLEAST32: &'static [u8; 2usize] = b"i\0"; -pub const SCNiLEAST64: &'static [u8; 3usize] = b"li\0"; -pub const SCNiFAST8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNiFAST16: &'static [u8; 3usize] = b"li\0"; -pub const SCNiFAST32: &'static [u8; 3usize] = b"li\0"; -pub const SCNiFAST64: &'static [u8; 3usize] = b"li\0"; -pub const SCNiMAX: &'static [u8; 3usize] = b"ji\0"; -pub const SCNiPTR: &'static [u8; 3usize] = b"li\0"; -pub const SCNo8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNo16: &'static [u8; 3usize] = b"ho\0"; -pub const SCNo32: &'static [u8; 2usize] = b"o\0"; -pub const SCNo64: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoLEAST8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNoLEAST16: &'static [u8; 3usize] = b"ho\0"; -pub const SCNoLEAST32: &'static [u8; 2usize] = b"o\0"; -pub const SCNoLEAST64: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoFAST8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNoFAST16: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoFAST32: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoFAST64: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoMAX: &'static [u8; 3usize] = b"jo\0"; -pub const SCNoPTR: &'static [u8; 3usize] = b"lo\0"; -pub const SCNu8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNu16: &'static [u8; 3usize] = b"hu\0"; -pub const SCNu32: &'static [u8; 2usize] = b"u\0"; -pub const SCNu64: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuLEAST8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNuLEAST16: &'static [u8; 3usize] = b"hu\0"; -pub const SCNuLEAST32: &'static [u8; 2usize] = b"u\0"; -pub const SCNuLEAST64: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuFAST8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNuFAST16: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuFAST32: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuFAST64: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuMAX: &'static [u8; 3usize] = b"ju\0"; -pub const SCNuPTR: &'static [u8; 3usize] = b"lu\0"; -pub const SCNx8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNx16: &'static [u8; 3usize] = b"hx\0"; -pub const SCNx32: &'static [u8; 2usize] = b"x\0"; -pub const SCNx64: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxLEAST8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNxLEAST16: &'static [u8; 3usize] = b"hx\0"; -pub const SCNxLEAST32: &'static [u8; 2usize] = b"x\0"; -pub const SCNxLEAST64: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxFAST8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNxFAST16: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxFAST32: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxFAST64: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxMAX: &'static [u8; 3usize] = b"jx\0"; -pub const SCNxPTR: &'static [u8; 3usize] = b"lx\0"; +pub const __PRI_64_prefix: &[u8; 2usize] = b"l\0"; +pub const __PRI_PTR_prefix: &[u8; 2usize] = b"l\0"; +pub const __PRI_FAST_prefix: &[u8; 2usize] = b"l\0"; +pub const PRId8: &[u8; 2usize] = b"d\0"; +pub const PRId16: &[u8; 2usize] = b"d\0"; +pub const PRId32: &[u8; 2usize] = b"d\0"; +pub const PRId64: &[u8; 3usize] = b"ld\0"; +pub const PRIdLEAST8: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST16: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST32: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST64: &[u8; 3usize] = b"ld\0"; +pub const PRIdFAST8: &[u8; 2usize] = b"d\0"; +pub const PRIdFAST16: &[u8; 3usize] = b"ld\0"; +pub const PRIdFAST32: &[u8; 3usize] = b"ld\0"; +pub const PRIdFAST64: &[u8; 3usize] = b"ld\0"; +pub const PRIdMAX: &[u8; 3usize] = b"jd\0"; +pub const PRIdPTR: &[u8; 3usize] = b"ld\0"; +pub const PRIi8: &[u8; 2usize] = b"i\0"; +pub const PRIi16: &[u8; 2usize] = b"i\0"; +pub const PRIi32: &[u8; 2usize] = b"i\0"; +pub const PRIi64: &[u8; 3usize] = b"li\0"; +pub const PRIiLEAST8: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST16: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST32: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST64: &[u8; 3usize] = b"li\0"; +pub const PRIiFAST8: &[u8; 2usize] = b"i\0"; +pub const PRIiFAST16: &[u8; 3usize] = b"li\0"; +pub const PRIiFAST32: &[u8; 3usize] = b"li\0"; +pub const PRIiFAST64: &[u8; 3usize] = b"li\0"; +pub const PRIiMAX: &[u8; 3usize] = b"ji\0"; +pub const PRIiPTR: &[u8; 3usize] = b"li\0"; +pub const PRIo8: &[u8; 2usize] = b"o\0"; +pub const PRIo16: &[u8; 2usize] = b"o\0"; +pub const PRIo32: &[u8; 2usize] = b"o\0"; +pub const PRIo64: &[u8; 3usize] = b"lo\0"; +pub const PRIoLEAST8: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST16: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST32: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST64: &[u8; 3usize] = b"lo\0"; +pub const PRIoFAST8: &[u8; 2usize] = b"o\0"; +pub const PRIoFAST16: &[u8; 3usize] = b"lo\0"; +pub const PRIoFAST32: &[u8; 3usize] = b"lo\0"; +pub const PRIoFAST64: &[u8; 3usize] = b"lo\0"; +pub const PRIoMAX: &[u8; 3usize] = b"jo\0"; +pub const PRIoPTR: &[u8; 3usize] = b"lo\0"; +pub const PRIu8: &[u8; 2usize] = b"u\0"; +pub const PRIu16: &[u8; 2usize] = b"u\0"; +pub const PRIu32: &[u8; 2usize] = b"u\0"; +pub const PRIu64: &[u8; 3usize] = b"lu\0"; +pub const PRIuLEAST8: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST16: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST32: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST64: &[u8; 3usize] = b"lu\0"; +pub const PRIuFAST8: &[u8; 2usize] = b"u\0"; +pub const PRIuFAST16: &[u8; 3usize] = b"lu\0"; +pub const PRIuFAST32: &[u8; 3usize] = b"lu\0"; +pub const PRIuFAST64: &[u8; 3usize] = b"lu\0"; +pub const PRIuMAX: &[u8; 3usize] = b"ju\0"; +pub const PRIuPTR: &[u8; 3usize] = b"lu\0"; +pub const PRIx8: &[u8; 2usize] = b"x\0"; +pub const PRIx16: &[u8; 2usize] = b"x\0"; +pub const PRIx32: &[u8; 2usize] = b"x\0"; +pub const PRIx64: &[u8; 3usize] = b"lx\0"; +pub const PRIxLEAST8: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST16: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST32: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST64: &[u8; 3usize] = b"lx\0"; +pub const PRIxFAST8: &[u8; 2usize] = b"x\0"; +pub const PRIxFAST16: &[u8; 3usize] = b"lx\0"; +pub const PRIxFAST32: &[u8; 3usize] = b"lx\0"; +pub const PRIxFAST64: &[u8; 3usize] = b"lx\0"; +pub const PRIxMAX: &[u8; 3usize] = b"jx\0"; +pub const PRIxPTR: &[u8; 3usize] = b"lx\0"; +pub const PRIX8: &[u8; 2usize] = b"X\0"; +pub const PRIX16: &[u8; 2usize] = b"X\0"; +pub const PRIX32: &[u8; 2usize] = b"X\0"; +pub const PRIX64: &[u8; 3usize] = b"lX\0"; +pub const PRIXLEAST8: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST16: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST32: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST64: &[u8; 3usize] = b"lX\0"; +pub const PRIXFAST8: &[u8; 2usize] = b"X\0"; +pub const PRIXFAST16: &[u8; 3usize] = b"lX\0"; +pub const PRIXFAST32: &[u8; 3usize] = b"lX\0"; +pub const PRIXFAST64: &[u8; 3usize] = b"lX\0"; +pub const PRIXMAX: &[u8; 3usize] = b"jX\0"; +pub const PRIXPTR: &[u8; 3usize] = b"lX\0"; +pub const SCNd8: &[u8; 4usize] = b"hhd\0"; +pub const SCNd16: &[u8; 3usize] = b"hd\0"; +pub const SCNd32: &[u8; 2usize] = b"d\0"; +pub const SCNd64: &[u8; 3usize] = b"ld\0"; +pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0"; +pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0"; +pub const SCNdLEAST32: &[u8; 2usize] = b"d\0"; +pub const SCNdLEAST64: &[u8; 3usize] = b"ld\0"; +pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0"; +pub const SCNdFAST16: &[u8; 3usize] = b"ld\0"; +pub const SCNdFAST32: &[u8; 3usize] = b"ld\0"; +pub const SCNdFAST64: &[u8; 3usize] = b"ld\0"; +pub const SCNdMAX: &[u8; 3usize] = b"jd\0"; +pub const SCNdPTR: &[u8; 3usize] = b"ld\0"; +pub const SCNi8: &[u8; 4usize] = b"hhi\0"; +pub const SCNi16: &[u8; 3usize] = b"hi\0"; +pub const SCNi32: &[u8; 2usize] = b"i\0"; +pub const SCNi64: &[u8; 3usize] = b"li\0"; +pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0"; +pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0"; +pub const SCNiLEAST32: &[u8; 2usize] = b"i\0"; +pub const SCNiLEAST64: &[u8; 3usize] = b"li\0"; +pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0"; +pub const SCNiFAST16: &[u8; 3usize] = b"li\0"; +pub const SCNiFAST32: &[u8; 3usize] = b"li\0"; +pub const SCNiFAST64: &[u8; 3usize] = b"li\0"; +pub const SCNiMAX: &[u8; 3usize] = b"ji\0"; +pub const SCNiPTR: &[u8; 3usize] = b"li\0"; +pub const SCNo8: &[u8; 4usize] = b"hho\0"; +pub const SCNo16: &[u8; 3usize] = b"ho\0"; +pub const SCNo32: &[u8; 2usize] = b"o\0"; +pub const SCNo64: &[u8; 3usize] = b"lo\0"; +pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0"; +pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0"; +pub const SCNoLEAST32: &[u8; 2usize] = b"o\0"; +pub const SCNoLEAST64: &[u8; 3usize] = b"lo\0"; +pub const SCNoFAST8: &[u8; 4usize] = b"hho\0"; +pub const SCNoFAST16: &[u8; 3usize] = b"lo\0"; +pub const SCNoFAST32: &[u8; 3usize] = b"lo\0"; +pub const SCNoFAST64: &[u8; 3usize] = b"lo\0"; +pub const SCNoMAX: &[u8; 3usize] = b"jo\0"; +pub const SCNoPTR: &[u8; 3usize] = b"lo\0"; +pub const SCNu8: &[u8; 4usize] = b"hhu\0"; +pub const SCNu16: &[u8; 3usize] = b"hu\0"; +pub const SCNu32: &[u8; 2usize] = b"u\0"; +pub const SCNu64: &[u8; 3usize] = b"lu\0"; +pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0"; +pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0"; +pub const SCNuLEAST32: &[u8; 2usize] = b"u\0"; +pub const SCNuLEAST64: &[u8; 3usize] = b"lu\0"; +pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0"; +pub const SCNuFAST16: &[u8; 3usize] = b"lu\0"; +pub const SCNuFAST32: &[u8; 3usize] = b"lu\0"; +pub const SCNuFAST64: &[u8; 3usize] = b"lu\0"; +pub const SCNuMAX: &[u8; 3usize] = b"ju\0"; +pub const SCNuPTR: &[u8; 3usize] = b"lu\0"; +pub const SCNx8: &[u8; 4usize] = b"hhx\0"; +pub const SCNx16: &[u8; 3usize] = b"hx\0"; +pub const SCNx32: &[u8; 2usize] = b"x\0"; +pub const SCNx64: &[u8; 3usize] = b"lx\0"; +pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0"; +pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0"; +pub const SCNxLEAST32: &[u8; 2usize] = b"x\0"; +pub const SCNxLEAST64: &[u8; 3usize] = b"lx\0"; +pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0"; +pub const SCNxFAST16: &[u8; 3usize] = b"lx\0"; +pub const SCNxFAST32: &[u8; 3usize] = b"lx\0"; +pub const SCNxFAST64: &[u8; 3usize] = b"lx\0"; +pub const SCNxMAX: &[u8; 3usize] = b"jx\0"; +pub const SCNxPTR: &[u8; 3usize] = b"lx\0"; pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8; pub const O_DIRECTORY: u32 = 16384; pub const O_NOFOLLOW: u32 = 32768; @@ -643,11 +643,11 @@ pub const SOL_NFC: u32 = 280; pub const SOL_KCM: u32 = 281; pub const SOL_TLS: u32 = 282; pub const IPX_TYPE: u32 = 1; -pub const _PATH_HEQUIV: &'static [u8; 24usize] = b"/system/etc/hosts.equiv\0"; -pub const _PATH_HOSTS: &'static [u8; 18usize] = b"/system/etc/hosts\0"; -pub const _PATH_NETWORKS: &'static [u8; 21usize] = b"/system/etc/networks\0"; -pub const _PATH_PROTOCOLS: &'static [u8; 22usize] = b"/system/etc/protocols\0"; -pub const _PATH_SERVICES: &'static [u8; 21usize] = b"/system/etc/services\0"; +pub const _PATH_HEQUIV: &[u8; 24usize] = b"/system/etc/hosts.equiv\0"; +pub const _PATH_HOSTS: &[u8; 18usize] = b"/system/etc/hosts\0"; +pub const _PATH_NETWORKS: &[u8; 21usize] = b"/system/etc/networks\0"; +pub const _PATH_PROTOCOLS: &[u8; 22usize] = b"/system/etc/protocols\0"; +pub const _PATH_SERVICES: &[u8; 21usize] = b"/system/etc/services\0"; pub const NETDB_INTERNAL: i32 = -1; pub const NETDB_SUCCESS: u32 = 0; pub const HOST_NOT_FOUND: u32 = 1; @@ -713,7 +713,7 @@ pub const FOPEN_MAX: u32 = 20; pub const FILENAME_MAX: u32 = 4096; pub const L_tmpnam: u32 = 4096; pub const TMP_MAX: u32 = 308915776; -pub const P_tmpdir: &'static [u8; 6usize] = b"/tmp/\0"; +pub const P_tmpdir: &[u8; 6usize] = b"/tmp/\0"; pub const L_ctermid: u32 = 1024; pub const STRUCT_MALLINFO_DECLARED: u32 = 1; pub const M_DECAY_TIME: i32 = -100; @@ -1146,11 +1146,11 @@ pub const CLOCKS_PER_SEC: u32 = 1000000; pub const TIME_UTC: u32 = 1; pub const AAUDIO_UNSPECIFIED: u32 = 0; pub const AAUDIO_SYSTEM_USAGE_OFFSET: u32 = 1000; -pub const PROPERTY_VENDOR: &'static [u8; 7usize] = b"vendor\0"; -pub const PROPERTY_VERSION: &'static [u8; 8usize] = b"version\0"; -pub const PROPERTY_DESCRIPTION: &'static [u8; 12usize] = b"description\0"; -pub const PROPERTY_ALGORITHMS: &'static [u8; 11usize] = b"algorithms\0"; -pub const PROPERTY_DEVICE_UNIQUE_ID: &'static [u8; 15usize] = b"deviceUniqueId\0"; +pub const PROPERTY_VENDOR: &[u8; 7usize] = b"vendor\0"; +pub const PROPERTY_VERSION: &[u8; 8usize] = b"version\0"; +pub const PROPERTY_DESCRIPTION: &[u8; 12usize] = b"description\0"; +pub const PROPERTY_ALGORITHMS: &[u8; 11usize] = b"algorithms\0"; +pub const PROPERTY_DEVICE_UNIQUE_ID: &[u8; 15usize] = b"deviceUniqueId\0"; extern "C" { pub fn android_get_application_target_sdk_version() -> ::std::os::raw::c_int; } @@ -1619,6 +1619,7 @@ pub type loff_t = off_t; pub type off64_t = loff_t; pub type __socklen_t = u32; pub type socklen_t = __socklen_t; +pub type __va_list = [u64; 4usize]; pub type ssize_t = __kernel_ssize_t; pub type uint_t = ::std::os::raw::c_uint; pub type uint = ::std::os::raw::c_uint; @@ -1724,8 +1725,8 @@ extern "C" { extern "C" { pub fn AAsset_isAllocated(asset: *mut AAsset) -> ::std::os::raw::c_int; } -pub type va_list = __builtin_va_list; -pub type __gnuc_va_list = __builtin_va_list; +pub type va_list = [u64; 4usize]; +pub type __gnuc_va_list = [u64; 4usize]; #[repr(C)] pub struct JavaVMAttachArgs { pub version: jint, @@ -1884,13 +1885,27 @@ pub const ANDROID_BITMAP_RESULT_BAD_PARAMETER: ::std::os::raw::c_int = -1; pub const ANDROID_BITMAP_RESULT_JNI_EXCEPTION: ::std::os::raw::c_int = -2; pub const ANDROID_BITMAP_RESULT_ALLOCATION_FAILED: ::std::os::raw::c_int = -3; pub type _bindgen_ty_2 = ::std::os::raw::c_int; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_NONE: AndroidBitmapFormat = 0; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_8888: AndroidBitmapFormat = 1; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGB_565: AndroidBitmapFormat = 4; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_4444: AndroidBitmapFormat = 7; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_A_8: AndroidBitmapFormat = 8; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_F16: AndroidBitmapFormat = 9; -pub type AndroidBitmapFormat = ::std::os::raw::c_uint; +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_NONE: AndroidBitmapFormat = AndroidBitmapFormat(0); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_8888: AndroidBitmapFormat = AndroidBitmapFormat(1); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGB_565: AndroidBitmapFormat = AndroidBitmapFormat(4); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_4444: AndroidBitmapFormat = AndroidBitmapFormat(7); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_A_8: AndroidBitmapFormat = AndroidBitmapFormat(8); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_F16: AndroidBitmapFormat = AndroidBitmapFormat(9); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AndroidBitmapFormat(pub ::std::os::raw::c_uint); pub const ANDROID_BITMAP_FLAGS_ALPHA_PREMUL: ::std::os::raw::c_uint = 0; pub const ANDROID_BITMAP_FLAGS_ALPHA_OPAQUE: ::std::os::raw::c_uint = 1; pub const ANDROID_BITMAP_FLAGS_ALPHA_UNPREMUL: ::std::os::raw::c_uint = 2; @@ -2700,25 +2715,60 @@ fn bindgen_test_layout_ARect() { ) ); } -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = 1; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = 2; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM: AHardwareBuffer_Format = 3; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM: AHardwareBuffer_Format = 4; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT: AHardwareBuffer_Format = - 22; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM: AHardwareBuffer_Format = - 43; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_BLOB: AHardwareBuffer_Format = 33; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D16_UNORM: AHardwareBuffer_Format = 48; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM: AHardwareBuffer_Format = 49; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT: AHardwareBuffer_Format = - 50; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT: AHardwareBuffer_Format = 51; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHardwareBuffer_Format = - 52; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = 53; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35; -pub type AHardwareBuffer_Format = ::std::os::raw::c_uint; +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(1); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(2); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(3); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(4); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT: AHardwareBuffer_Format = + AHardwareBuffer_Format(22); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(43); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_BLOB: AHardwareBuffer_Format = AHardwareBuffer_Format(33); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D16_UNORM: AHardwareBuffer_Format = AHardwareBuffer_Format(48); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D24_UNORM: AHardwareBuffer_Format = AHardwareBuffer_Format(49); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT: AHardwareBuffer_Format = + AHardwareBuffer_Format(50); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D32_FLOAT: AHardwareBuffer_Format = AHardwareBuffer_Format(51); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHardwareBuffer_Format = + AHardwareBuffer_Format(52); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = AHardwareBuffer_Format(53); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = + AHardwareBuffer_Format(35); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AHardwareBuffer_Format(pub ::std::os::raw::c_uint); pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER: AHardwareBuffer_UsageFlags = 0; pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_RARELY: @@ -5914,13 +5964,13 @@ extern "C" { pub fn vfprintf( __fp: *mut FILE, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: [u64; 4usize], ) -> ::std::os::raw::c_int; } extern "C" { pub fn vprintf( __fp: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: [u64; 4usize], ) -> ::std::os::raw::c_int; } extern "C" { @@ -5948,7 +5998,7 @@ extern "C" { pub fn vsprintf( __s: *mut ::std::os::raw::c_char, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: [u64; 4usize], ) -> ::std::os::raw::c_int; } extern "C" { @@ -6060,13 +6110,13 @@ extern "C" { pub fn vfscanf( __fp: *mut FILE, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: [u64; 4usize], ) -> ::std::os::raw::c_int; } extern "C" { pub fn vscanf( __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: [u64; 4usize], ) -> ::std::os::raw::c_int; } extern "C" { @@ -6074,14 +6124,14 @@ extern "C" { __buf: *mut ::std::os::raw::c_char, __size: ::std::os::raw::c_ulong, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: [u64; 4usize], ) -> ::std::os::raw::c_int; } extern "C" { pub fn vsscanf( __s: *const ::std::os::raw::c_char, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: [u64; 4usize], ) -> ::std::os::raw::c_int; } extern "C" { @@ -13905,36 +13955,96 @@ extern "C" { extern "C" { pub fn AAudioStream_isPrivacySensitive(stream: *mut AAudioStream) -> bool; } -pub const media_status_t_AMEDIA_OK: media_status_t = 0; -pub const media_status_t_AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE: media_status_t = 1100; -pub const media_status_t_AMEDIACODEC_ERROR_RECLAIMED: media_status_t = 1101; -pub const media_status_t_AMEDIA_ERROR_BASE: media_status_t = -10000; -pub const media_status_t_AMEDIA_ERROR_UNKNOWN: media_status_t = -10000; -pub const media_status_t_AMEDIA_ERROR_MALFORMED: media_status_t = -10001; -pub const media_status_t_AMEDIA_ERROR_UNSUPPORTED: media_status_t = -10002; -pub const media_status_t_AMEDIA_ERROR_INVALID_OBJECT: media_status_t = -10003; -pub const media_status_t_AMEDIA_ERROR_INVALID_PARAMETER: media_status_t = -10004; -pub const media_status_t_AMEDIA_ERROR_INVALID_OPERATION: media_status_t = -10005; -pub const media_status_t_AMEDIA_ERROR_END_OF_STREAM: media_status_t = -10006; -pub const media_status_t_AMEDIA_ERROR_IO: media_status_t = -10007; -pub const media_status_t_AMEDIA_ERROR_WOULD_BLOCK: media_status_t = -10008; -pub const media_status_t_AMEDIA_DRM_ERROR_BASE: media_status_t = -20000; -pub const media_status_t_AMEDIA_DRM_NOT_PROVISIONED: media_status_t = -20001; -pub const media_status_t_AMEDIA_DRM_RESOURCE_BUSY: media_status_t = -20002; -pub const media_status_t_AMEDIA_DRM_DEVICE_REVOKED: media_status_t = -20003; -pub const media_status_t_AMEDIA_DRM_SHORT_BUFFER: media_status_t = -20004; -pub const media_status_t_AMEDIA_DRM_SESSION_NOT_OPENED: media_status_t = -20005; -pub const media_status_t_AMEDIA_DRM_TAMPER_DETECTED: media_status_t = -20006; -pub const media_status_t_AMEDIA_DRM_VERIFY_FAILED: media_status_t = -20007; -pub const media_status_t_AMEDIA_DRM_NEED_KEY: media_status_t = -20008; -pub const media_status_t_AMEDIA_DRM_LICENSE_EXPIRED: media_status_t = -20009; -pub const media_status_t_AMEDIA_IMGREADER_ERROR_BASE: media_status_t = -30000; -pub const media_status_t_AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE: media_status_t = -30001; -pub const media_status_t_AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED: media_status_t = -30002; -pub const media_status_t_AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE: media_status_t = -30003; -pub const media_status_t_AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE: media_status_t = -30004; -pub const media_status_t_AMEDIA_IMGREADER_IMAGE_NOT_LOCKED: media_status_t = -30005; -pub type media_status_t = ::std::os::raw::c_int; +impl media_status_t { + pub const AMEDIA_OK: media_status_t = media_status_t(0); +} +impl media_status_t { + pub const AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE: media_status_t = media_status_t(1100); +} +impl media_status_t { + pub const AMEDIACODEC_ERROR_RECLAIMED: media_status_t = media_status_t(1101); +} +impl media_status_t { + pub const AMEDIA_ERROR_BASE: media_status_t = media_status_t(-10000); +} +impl media_status_t { + pub const AMEDIA_ERROR_UNKNOWN: media_status_t = media_status_t(-10000); +} +impl media_status_t { + pub const AMEDIA_ERROR_MALFORMED: media_status_t = media_status_t(-10001); +} +impl media_status_t { + pub const AMEDIA_ERROR_UNSUPPORTED: media_status_t = media_status_t(-10002); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_OBJECT: media_status_t = media_status_t(-10003); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_PARAMETER: media_status_t = media_status_t(-10004); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_OPERATION: media_status_t = media_status_t(-10005); +} +impl media_status_t { + pub const AMEDIA_ERROR_END_OF_STREAM: media_status_t = media_status_t(-10006); +} +impl media_status_t { + pub const AMEDIA_ERROR_IO: media_status_t = media_status_t(-10007); +} +impl media_status_t { + pub const AMEDIA_ERROR_WOULD_BLOCK: media_status_t = media_status_t(-10008); +} +impl media_status_t { + pub const AMEDIA_DRM_ERROR_BASE: media_status_t = media_status_t(-20000); +} +impl media_status_t { + pub const AMEDIA_DRM_NOT_PROVISIONED: media_status_t = media_status_t(-20001); +} +impl media_status_t { + pub const AMEDIA_DRM_RESOURCE_BUSY: media_status_t = media_status_t(-20002); +} +impl media_status_t { + pub const AMEDIA_DRM_DEVICE_REVOKED: media_status_t = media_status_t(-20003); +} +impl media_status_t { + pub const AMEDIA_DRM_SHORT_BUFFER: media_status_t = media_status_t(-20004); +} +impl media_status_t { + pub const AMEDIA_DRM_SESSION_NOT_OPENED: media_status_t = media_status_t(-20005); +} +impl media_status_t { + pub const AMEDIA_DRM_TAMPER_DETECTED: media_status_t = media_status_t(-20006); +} +impl media_status_t { + pub const AMEDIA_DRM_VERIFY_FAILED: media_status_t = media_status_t(-20007); +} +impl media_status_t { + pub const AMEDIA_DRM_NEED_KEY: media_status_t = media_status_t(-20008); +} +impl media_status_t { + pub const AMEDIA_DRM_LICENSE_EXPIRED: media_status_t = media_status_t(-20009); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_ERROR_BASE: media_status_t = media_status_t(-30000); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE: media_status_t = media_status_t(-30001); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED: media_status_t = media_status_t(-30002); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE: media_status_t = media_status_t(-30003); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE: media_status_t = media_status_t(-30004); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_IMAGE_NOT_LOCKED: media_status_t = media_status_t(-30005); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct media_status_t(pub ::std::os::raw::c_int); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct AMidiDevice { @@ -14024,24 +14134,60 @@ extern "C" { extern "C" { pub fn AMidiInputPort_close(inputPort: *const AMidiInputPort); } -pub const camera_status_t_ACAMERA_OK: camera_status_t = 0; -pub const camera_status_t_ACAMERA_ERROR_BASE: camera_status_t = -10000; -pub const camera_status_t_ACAMERA_ERROR_UNKNOWN: camera_status_t = -10000; -pub const camera_status_t_ACAMERA_ERROR_INVALID_PARAMETER: camera_status_t = -10001; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DISCONNECTED: camera_status_t = -10002; -pub const camera_status_t_ACAMERA_ERROR_NOT_ENOUGH_MEMORY: camera_status_t = -10003; -pub const camera_status_t_ACAMERA_ERROR_METADATA_NOT_FOUND: camera_status_t = -10004; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DEVICE: camera_status_t = -10005; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_SERVICE: camera_status_t = -10006; -pub const camera_status_t_ACAMERA_ERROR_SESSION_CLOSED: camera_status_t = -10007; -pub const camera_status_t_ACAMERA_ERROR_INVALID_OPERATION: camera_status_t = -10008; -pub const camera_status_t_ACAMERA_ERROR_STREAM_CONFIGURE_FAIL: camera_status_t = -10009; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_IN_USE: camera_status_t = -10010; -pub const camera_status_t_ACAMERA_ERROR_MAX_CAMERA_IN_USE: camera_status_t = -10011; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DISABLED: camera_status_t = -10012; -pub const camera_status_t_ACAMERA_ERROR_PERMISSION_DENIED: camera_status_t = -10013; -pub const camera_status_t_ACAMERA_ERROR_UNSUPPORTED_OPERATION: camera_status_t = -10014; -pub type camera_status_t = ::std::os::raw::c_int; +impl camera_status_t { + pub const ACAMERA_OK: camera_status_t = camera_status_t(0); +} +impl camera_status_t { + pub const ACAMERA_ERROR_BASE: camera_status_t = camera_status_t(-10000); +} +impl camera_status_t { + pub const ACAMERA_ERROR_UNKNOWN: camera_status_t = camera_status_t(-10000); +} +impl camera_status_t { + pub const ACAMERA_ERROR_INVALID_PARAMETER: camera_status_t = camera_status_t(-10001); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DISCONNECTED: camera_status_t = camera_status_t(-10002); +} +impl camera_status_t { + pub const ACAMERA_ERROR_NOT_ENOUGH_MEMORY: camera_status_t = camera_status_t(-10003); +} +impl camera_status_t { + pub const ACAMERA_ERROR_METADATA_NOT_FOUND: camera_status_t = camera_status_t(-10004); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DEVICE: camera_status_t = camera_status_t(-10005); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_SERVICE: camera_status_t = camera_status_t(-10006); +} +impl camera_status_t { + pub const ACAMERA_ERROR_SESSION_CLOSED: camera_status_t = camera_status_t(-10007); +} +impl camera_status_t { + pub const ACAMERA_ERROR_INVALID_OPERATION: camera_status_t = camera_status_t(-10008); +} +impl camera_status_t { + pub const ACAMERA_ERROR_STREAM_CONFIGURE_FAIL: camera_status_t = camera_status_t(-10009); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_IN_USE: camera_status_t = camera_status_t(-10010); +} +impl camera_status_t { + pub const ACAMERA_ERROR_MAX_CAMERA_IN_USE: camera_status_t = camera_status_t(-10011); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DISABLED: camera_status_t = camera_status_t(-10012); +} +impl camera_status_t { + pub const ACAMERA_ERROR_PERMISSION_DENIED: camera_status_t = camera_status_t(-10013); +} +impl camera_status_t { + pub const ACAMERA_ERROR_UNSUPPORTED_OPERATION: camera_status_t = camera_status_t(-10014); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct camera_status_t(pub ::std::os::raw::c_int); pub const acamera_metadata_section_ACAMERA_COLOR_CORRECTION: acamera_metadata_section = 0; pub const acamera_metadata_section_ACAMERA_CONTROL: acamera_metadata_section = 1; pub const acamera_metadata_section_ACAMERA_DEMOSAIC: acamera_metadata_section = 2; @@ -16667,24 +16813,60 @@ extern "C" { pub struct AImage { _unused: [u8; 0], } -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_8888: AIMAGE_FORMATS = 1; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBX_8888: AIMAGE_FORMATS = 2; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_888: AIMAGE_FORMATS = 3; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_565: AIMAGE_FORMATS = 4; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_FP16: AIMAGE_FORMATS = 22; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_YUV_420_888: AIMAGE_FORMATS = 35; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_JPEG: AIMAGE_FORMATS = 256; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW16: AIMAGE_FORMATS = 32; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW_PRIVATE: AIMAGE_FORMATS = 36; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW10: AIMAGE_FORMATS = 37; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW12: AIMAGE_FORMATS = 38; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH16: AIMAGE_FORMATS = 1144402265; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_POINT_CLOUD: AIMAGE_FORMATS = 257; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_PRIVATE: AIMAGE_FORMATS = 34; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_Y8: AIMAGE_FORMATS = 538982489; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_HEIC: AIMAGE_FORMATS = 1212500294; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_JPEG: AIMAGE_FORMATS = 1768253795; -pub type AIMAGE_FORMATS = ::std::os::raw::c_uint; +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBA_8888: AIMAGE_FORMATS = AIMAGE_FORMATS(1); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBX_8888: AIMAGE_FORMATS = AIMAGE_FORMATS(2); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGB_888: AIMAGE_FORMATS = AIMAGE_FORMATS(3); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGB_565: AIMAGE_FORMATS = AIMAGE_FORMATS(4); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBA_FP16: AIMAGE_FORMATS = AIMAGE_FORMATS(22); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_YUV_420_888: AIMAGE_FORMATS = AIMAGE_FORMATS(35); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_JPEG: AIMAGE_FORMATS = AIMAGE_FORMATS(256); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW16: AIMAGE_FORMATS = AIMAGE_FORMATS(32); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW_PRIVATE: AIMAGE_FORMATS = AIMAGE_FORMATS(36); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW10: AIMAGE_FORMATS = AIMAGE_FORMATS(37); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW12: AIMAGE_FORMATS = AIMAGE_FORMATS(38); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH16: AIMAGE_FORMATS = AIMAGE_FORMATS(1144402265); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH_POINT_CLOUD: AIMAGE_FORMATS = AIMAGE_FORMATS(257); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_PRIVATE: AIMAGE_FORMATS = AIMAGE_FORMATS(34); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_Y8: AIMAGE_FORMATS = AIMAGE_FORMATS(538982489); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_HEIC: AIMAGE_FORMATS = AIMAGE_FORMATS(1212500294); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH_JPEG: AIMAGE_FORMATS = AIMAGE_FORMATS(1768253795); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AIMAGE_FORMATS(pub ::std::os::raw::c_uint); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct AImageCropRect { @@ -18720,77 +18902,4 @@ extern "C" { extern "C" { pub fn AMediaMuxer_getTrackFormat(muxer: *mut AMediaMuxer, idx: size_t) -> *mut AMediaFormat; } -pub type __builtin_va_list = __va_list; -#[repr(C)] -#[derive(Debug, Copy, Clone)] -pub struct __va_list { - pub __stack: *mut ::std::os::raw::c_void, - pub __gr_top: *mut ::std::os::raw::c_void, - pub __vr_top: *mut ::std::os::raw::c_void, - pub __gr_offs: ::std::os::raw::c_int, - pub __vr_offs: ::std::os::raw::c_int, -} -#[test] -fn bindgen_test_layout___va_list() { - assert_eq!( - ::std::mem::size_of::<__va_list>(), - 32usize, - concat!("Size of: ", stringify!(__va_list)) - ); - assert_eq!( - ::std::mem::align_of::<__va_list>(), - 8usize, - concat!("Alignment of ", stringify!(__va_list)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__va_list>())).__stack as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(__va_list), - "::", - stringify!(__stack) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__va_list>())).__gr_top as *const _ as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(__va_list), - "::", - stringify!(__gr_top) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__va_list>())).__vr_top as *const _ as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(__va_list), - "::", - stringify!(__vr_top) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__va_list>())).__gr_offs as *const _ as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(__va_list), - "::", - stringify!(__gr_offs) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__va_list>())).__vr_offs as *const _ as usize }, - 28usize, - concat!( - "Offset of field: ", - stringify!(__va_list), - "::", - stringify!(__vr_offs) - ) - ); -} pub type __uint128_t = u128; diff --git a/ndk-sys/src/ffi_arm.rs b/ndk-sys/src/ffi_arm.rs index 79409089..23cffeda 100644 --- a/ndk-sys/src/ffi_arm.rs +++ b/ndk-sys/src/ffi_arm.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.59.1 */ +/* automatically generated by rust-bindgen 0.59.2 */ #[repr(C)] #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] @@ -180,128 +180,128 @@ pub const __GNUC_VA_LIST: u32 = 1; pub const true_: u32 = 1; pub const false_: u32 = 0; pub const __bool_true_false_are_defined: u32 = 1; -pub const __PRI_64_prefix: &'static [u8; 3usize] = b"ll\0"; -pub const PRId8: &'static [u8; 2usize] = b"d\0"; -pub const PRId16: &'static [u8; 2usize] = b"d\0"; -pub const PRId32: &'static [u8; 2usize] = b"d\0"; -pub const PRId64: &'static [u8; 4usize] = b"lld\0"; -pub const PRIdLEAST8: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST16: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST32: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST64: &'static [u8; 4usize] = b"lld\0"; -pub const PRIdFAST8: &'static [u8; 2usize] = b"d\0"; -pub const PRIdFAST64: &'static [u8; 4usize] = b"lld\0"; -pub const PRIdMAX: &'static [u8; 3usize] = b"jd\0"; -pub const PRIi8: &'static [u8; 2usize] = b"i\0"; -pub const PRIi16: &'static [u8; 2usize] = b"i\0"; -pub const PRIi32: &'static [u8; 2usize] = b"i\0"; -pub const PRIi64: &'static [u8; 4usize] = b"lli\0"; -pub const PRIiLEAST8: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST16: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST32: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST64: &'static [u8; 4usize] = b"lli\0"; -pub const PRIiFAST8: &'static [u8; 2usize] = b"i\0"; -pub const PRIiFAST64: &'static [u8; 4usize] = b"lli\0"; -pub const PRIiMAX: &'static [u8; 3usize] = b"ji\0"; -pub const PRIo8: &'static [u8; 2usize] = b"o\0"; -pub const PRIo16: &'static [u8; 2usize] = b"o\0"; -pub const PRIo32: &'static [u8; 2usize] = b"o\0"; -pub const PRIo64: &'static [u8; 4usize] = b"llo\0"; -pub const PRIoLEAST8: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST16: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST32: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST64: &'static [u8; 4usize] = b"llo\0"; -pub const PRIoFAST8: &'static [u8; 2usize] = b"o\0"; -pub const PRIoFAST64: &'static [u8; 4usize] = b"llo\0"; -pub const PRIoMAX: &'static [u8; 3usize] = b"jo\0"; -pub const PRIu8: &'static [u8; 2usize] = b"u\0"; -pub const PRIu16: &'static [u8; 2usize] = b"u\0"; -pub const PRIu32: &'static [u8; 2usize] = b"u\0"; -pub const PRIu64: &'static [u8; 4usize] = b"llu\0"; -pub const PRIuLEAST8: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST16: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST32: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST64: &'static [u8; 4usize] = b"llu\0"; -pub const PRIuFAST8: &'static [u8; 2usize] = b"u\0"; -pub const PRIuFAST64: &'static [u8; 4usize] = b"llu\0"; -pub const PRIuMAX: &'static [u8; 3usize] = b"ju\0"; -pub const PRIx8: &'static [u8; 2usize] = b"x\0"; -pub const PRIx16: &'static [u8; 2usize] = b"x\0"; -pub const PRIx32: &'static [u8; 2usize] = b"x\0"; -pub const PRIx64: &'static [u8; 4usize] = b"llx\0"; -pub const PRIxLEAST8: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST16: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST32: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST64: &'static [u8; 4usize] = b"llx\0"; -pub const PRIxFAST8: &'static [u8; 2usize] = b"x\0"; -pub const PRIxFAST64: &'static [u8; 4usize] = b"llx\0"; -pub const PRIxMAX: &'static [u8; 3usize] = b"jx\0"; -pub const PRIX8: &'static [u8; 2usize] = b"X\0"; -pub const PRIX16: &'static [u8; 2usize] = b"X\0"; -pub const PRIX32: &'static [u8; 2usize] = b"X\0"; -pub const PRIX64: &'static [u8; 4usize] = b"llX\0"; -pub const PRIXLEAST8: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST16: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST32: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST64: &'static [u8; 4usize] = b"llX\0"; -pub const PRIXFAST8: &'static [u8; 2usize] = b"X\0"; -pub const PRIXFAST64: &'static [u8; 4usize] = b"llX\0"; -pub const PRIXMAX: &'static [u8; 3usize] = b"jX\0"; -pub const SCNd8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNd16: &'static [u8; 3usize] = b"hd\0"; -pub const SCNd32: &'static [u8; 2usize] = b"d\0"; -pub const SCNd64: &'static [u8; 4usize] = b"lld\0"; -pub const SCNdLEAST8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNdLEAST16: &'static [u8; 3usize] = b"hd\0"; -pub const SCNdLEAST32: &'static [u8; 2usize] = b"d\0"; -pub const SCNdLEAST64: &'static [u8; 4usize] = b"lld\0"; -pub const SCNdFAST8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNdFAST64: &'static [u8; 4usize] = b"lld\0"; -pub const SCNdMAX: &'static [u8; 3usize] = b"jd\0"; -pub const SCNi8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNi16: &'static [u8; 3usize] = b"hi\0"; -pub const SCNi32: &'static [u8; 2usize] = b"i\0"; -pub const SCNi64: &'static [u8; 4usize] = b"lli\0"; -pub const SCNiLEAST8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNiLEAST16: &'static [u8; 3usize] = b"hi\0"; -pub const SCNiLEAST32: &'static [u8; 2usize] = b"i\0"; -pub const SCNiLEAST64: &'static [u8; 4usize] = b"lli\0"; -pub const SCNiFAST8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNiFAST64: &'static [u8; 4usize] = b"lli\0"; -pub const SCNiMAX: &'static [u8; 3usize] = b"ji\0"; -pub const SCNo8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNo16: &'static [u8; 3usize] = b"ho\0"; -pub const SCNo32: &'static [u8; 2usize] = b"o\0"; -pub const SCNo64: &'static [u8; 4usize] = b"llo\0"; -pub const SCNoLEAST8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNoLEAST16: &'static [u8; 3usize] = b"ho\0"; -pub const SCNoLEAST32: &'static [u8; 2usize] = b"o\0"; -pub const SCNoLEAST64: &'static [u8; 4usize] = b"llo\0"; -pub const SCNoFAST8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNoFAST64: &'static [u8; 4usize] = b"llo\0"; -pub const SCNoMAX: &'static [u8; 3usize] = b"jo\0"; -pub const SCNu8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNu16: &'static [u8; 3usize] = b"hu\0"; -pub const SCNu32: &'static [u8; 2usize] = b"u\0"; -pub const SCNu64: &'static [u8; 4usize] = b"llu\0"; -pub const SCNuLEAST8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNuLEAST16: &'static [u8; 3usize] = b"hu\0"; -pub const SCNuLEAST32: &'static [u8; 2usize] = b"u\0"; -pub const SCNuLEAST64: &'static [u8; 4usize] = b"llu\0"; -pub const SCNuFAST8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNuFAST64: &'static [u8; 4usize] = b"llu\0"; -pub const SCNuMAX: &'static [u8; 3usize] = b"ju\0"; -pub const SCNx8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNx16: &'static [u8; 3usize] = b"hx\0"; -pub const SCNx32: &'static [u8; 2usize] = b"x\0"; -pub const SCNx64: &'static [u8; 4usize] = b"llx\0"; -pub const SCNxLEAST8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNxLEAST16: &'static [u8; 3usize] = b"hx\0"; -pub const SCNxLEAST32: &'static [u8; 2usize] = b"x\0"; -pub const SCNxLEAST64: &'static [u8; 4usize] = b"llx\0"; -pub const SCNxFAST8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNxFAST64: &'static [u8; 4usize] = b"llx\0"; -pub const SCNxMAX: &'static [u8; 3usize] = b"jx\0"; +pub const __PRI_64_prefix: &[u8; 3usize] = b"ll\0"; +pub const PRId8: &[u8; 2usize] = b"d\0"; +pub const PRId16: &[u8; 2usize] = b"d\0"; +pub const PRId32: &[u8; 2usize] = b"d\0"; +pub const PRId64: &[u8; 4usize] = b"lld\0"; +pub const PRIdLEAST8: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST16: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST32: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST64: &[u8; 4usize] = b"lld\0"; +pub const PRIdFAST8: &[u8; 2usize] = b"d\0"; +pub const PRIdFAST64: &[u8; 4usize] = b"lld\0"; +pub const PRIdMAX: &[u8; 3usize] = b"jd\0"; +pub const PRIi8: &[u8; 2usize] = b"i\0"; +pub const PRIi16: &[u8; 2usize] = b"i\0"; +pub const PRIi32: &[u8; 2usize] = b"i\0"; +pub const PRIi64: &[u8; 4usize] = b"lli\0"; +pub const PRIiLEAST8: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST16: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST32: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST64: &[u8; 4usize] = b"lli\0"; +pub const PRIiFAST8: &[u8; 2usize] = b"i\0"; +pub const PRIiFAST64: &[u8; 4usize] = b"lli\0"; +pub const PRIiMAX: &[u8; 3usize] = b"ji\0"; +pub const PRIo8: &[u8; 2usize] = b"o\0"; +pub const PRIo16: &[u8; 2usize] = b"o\0"; +pub const PRIo32: &[u8; 2usize] = b"o\0"; +pub const PRIo64: &[u8; 4usize] = b"llo\0"; +pub const PRIoLEAST8: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST16: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST32: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST64: &[u8; 4usize] = b"llo\0"; +pub const PRIoFAST8: &[u8; 2usize] = b"o\0"; +pub const PRIoFAST64: &[u8; 4usize] = b"llo\0"; +pub const PRIoMAX: &[u8; 3usize] = b"jo\0"; +pub const PRIu8: &[u8; 2usize] = b"u\0"; +pub const PRIu16: &[u8; 2usize] = b"u\0"; +pub const PRIu32: &[u8; 2usize] = b"u\0"; +pub const PRIu64: &[u8; 4usize] = b"llu\0"; +pub const PRIuLEAST8: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST16: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST32: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST64: &[u8; 4usize] = b"llu\0"; +pub const PRIuFAST8: &[u8; 2usize] = b"u\0"; +pub const PRIuFAST64: &[u8; 4usize] = b"llu\0"; +pub const PRIuMAX: &[u8; 3usize] = b"ju\0"; +pub const PRIx8: &[u8; 2usize] = b"x\0"; +pub const PRIx16: &[u8; 2usize] = b"x\0"; +pub const PRIx32: &[u8; 2usize] = b"x\0"; +pub const PRIx64: &[u8; 4usize] = b"llx\0"; +pub const PRIxLEAST8: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST16: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST32: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST64: &[u8; 4usize] = b"llx\0"; +pub const PRIxFAST8: &[u8; 2usize] = b"x\0"; +pub const PRIxFAST64: &[u8; 4usize] = b"llx\0"; +pub const PRIxMAX: &[u8; 3usize] = b"jx\0"; +pub const PRIX8: &[u8; 2usize] = b"X\0"; +pub const PRIX16: &[u8; 2usize] = b"X\0"; +pub const PRIX32: &[u8; 2usize] = b"X\0"; +pub const PRIX64: &[u8; 4usize] = b"llX\0"; +pub const PRIXLEAST8: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST16: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST32: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST64: &[u8; 4usize] = b"llX\0"; +pub const PRIXFAST8: &[u8; 2usize] = b"X\0"; +pub const PRIXFAST64: &[u8; 4usize] = b"llX\0"; +pub const PRIXMAX: &[u8; 3usize] = b"jX\0"; +pub const SCNd8: &[u8; 4usize] = b"hhd\0"; +pub const SCNd16: &[u8; 3usize] = b"hd\0"; +pub const SCNd32: &[u8; 2usize] = b"d\0"; +pub const SCNd64: &[u8; 4usize] = b"lld\0"; +pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0"; +pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0"; +pub const SCNdLEAST32: &[u8; 2usize] = b"d\0"; +pub const SCNdLEAST64: &[u8; 4usize] = b"lld\0"; +pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0"; +pub const SCNdFAST64: &[u8; 4usize] = b"lld\0"; +pub const SCNdMAX: &[u8; 3usize] = b"jd\0"; +pub const SCNi8: &[u8; 4usize] = b"hhi\0"; +pub const SCNi16: &[u8; 3usize] = b"hi\0"; +pub const SCNi32: &[u8; 2usize] = b"i\0"; +pub const SCNi64: &[u8; 4usize] = b"lli\0"; +pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0"; +pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0"; +pub const SCNiLEAST32: &[u8; 2usize] = b"i\0"; +pub const SCNiLEAST64: &[u8; 4usize] = b"lli\0"; +pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0"; +pub const SCNiFAST64: &[u8; 4usize] = b"lli\0"; +pub const SCNiMAX: &[u8; 3usize] = b"ji\0"; +pub const SCNo8: &[u8; 4usize] = b"hho\0"; +pub const SCNo16: &[u8; 3usize] = b"ho\0"; +pub const SCNo32: &[u8; 2usize] = b"o\0"; +pub const SCNo64: &[u8; 4usize] = b"llo\0"; +pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0"; +pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0"; +pub const SCNoLEAST32: &[u8; 2usize] = b"o\0"; +pub const SCNoLEAST64: &[u8; 4usize] = b"llo\0"; +pub const SCNoFAST8: &[u8; 4usize] = b"hho\0"; +pub const SCNoFAST64: &[u8; 4usize] = b"llo\0"; +pub const SCNoMAX: &[u8; 3usize] = b"jo\0"; +pub const SCNu8: &[u8; 4usize] = b"hhu\0"; +pub const SCNu16: &[u8; 3usize] = b"hu\0"; +pub const SCNu32: &[u8; 2usize] = b"u\0"; +pub const SCNu64: &[u8; 4usize] = b"llu\0"; +pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0"; +pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0"; +pub const SCNuLEAST32: &[u8; 2usize] = b"u\0"; +pub const SCNuLEAST64: &[u8; 4usize] = b"llu\0"; +pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0"; +pub const SCNuFAST64: &[u8; 4usize] = b"llu\0"; +pub const SCNuMAX: &[u8; 3usize] = b"ju\0"; +pub const SCNx8: &[u8; 4usize] = b"hhx\0"; +pub const SCNx16: &[u8; 3usize] = b"hx\0"; +pub const SCNx32: &[u8; 2usize] = b"x\0"; +pub const SCNx64: &[u8; 4usize] = b"llx\0"; +pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0"; +pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0"; +pub const SCNxLEAST32: &[u8; 2usize] = b"x\0"; +pub const SCNxLEAST64: &[u8; 4usize] = b"llx\0"; +pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0"; +pub const SCNxFAST64: &[u8; 4usize] = b"llx\0"; +pub const SCNxMAX: &[u8; 3usize] = b"jx\0"; pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8; pub const O_DIRECTORY: u32 = 16384; pub const O_NOFOLLOW: u32 = 32768; @@ -687,11 +687,11 @@ pub const SOL_NFC: u32 = 280; pub const SOL_KCM: u32 = 281; pub const SOL_TLS: u32 = 282; pub const IPX_TYPE: u32 = 1; -pub const _PATH_HEQUIV: &'static [u8; 24usize] = b"/system/etc/hosts.equiv\0"; -pub const _PATH_HOSTS: &'static [u8; 18usize] = b"/system/etc/hosts\0"; -pub const _PATH_NETWORKS: &'static [u8; 21usize] = b"/system/etc/networks\0"; -pub const _PATH_PROTOCOLS: &'static [u8; 22usize] = b"/system/etc/protocols\0"; -pub const _PATH_SERVICES: &'static [u8; 21usize] = b"/system/etc/services\0"; +pub const _PATH_HEQUIV: &[u8; 24usize] = b"/system/etc/hosts.equiv\0"; +pub const _PATH_HOSTS: &[u8; 18usize] = b"/system/etc/hosts\0"; +pub const _PATH_NETWORKS: &[u8; 21usize] = b"/system/etc/networks\0"; +pub const _PATH_PROTOCOLS: &[u8; 22usize] = b"/system/etc/protocols\0"; +pub const _PATH_SERVICES: &[u8; 21usize] = b"/system/etc/services\0"; pub const NETDB_INTERNAL: i32 = -1; pub const NETDB_SUCCESS: u32 = 0; pub const HOST_NOT_FOUND: u32 = 1; @@ -757,7 +757,7 @@ pub const FOPEN_MAX: u32 = 20; pub const FILENAME_MAX: u32 = 4096; pub const L_tmpnam: u32 = 4096; pub const TMP_MAX: u32 = 308915776; -pub const P_tmpdir: &'static [u8; 6usize] = b"/tmp/\0"; +pub const P_tmpdir: &[u8; 6usize] = b"/tmp/\0"; pub const L_ctermid: u32 = 1024; pub const STRUCT_MALLINFO_DECLARED: u32 = 1; pub const M_DECAY_TIME: i32 = -100; @@ -1171,11 +1171,11 @@ pub const CLOCKS_PER_SEC: u32 = 1000000; pub const TIME_UTC: u32 = 1; pub const AAUDIO_UNSPECIFIED: u32 = 0; pub const AAUDIO_SYSTEM_USAGE_OFFSET: u32 = 1000; -pub const PROPERTY_VENDOR: &'static [u8; 7usize] = b"vendor\0"; -pub const PROPERTY_VERSION: &'static [u8; 8usize] = b"version\0"; -pub const PROPERTY_DESCRIPTION: &'static [u8; 12usize] = b"description\0"; -pub const PROPERTY_ALGORITHMS: &'static [u8; 11usize] = b"algorithms\0"; -pub const PROPERTY_DEVICE_UNIQUE_ID: &'static [u8; 15usize] = b"deviceUniqueId\0"; +pub const PROPERTY_VENDOR: &[u8; 7usize] = b"vendor\0"; +pub const PROPERTY_VERSION: &[u8; 8usize] = b"version\0"; +pub const PROPERTY_DESCRIPTION: &[u8; 12usize] = b"description\0"; +pub const PROPERTY_ALGORITHMS: &[u8; 11usize] = b"algorithms\0"; +pub const PROPERTY_DEVICE_UNIQUE_ID: &[u8; 15usize] = b"deviceUniqueId\0"; extern "C" { pub fn android_get_application_target_sdk_version() -> ::std::os::raw::c_int; } @@ -1631,6 +1631,7 @@ pub type loff_t = __kernel_loff_t; pub type off64_t = loff_t; pub type __socklen_t = i32; pub type socklen_t = __socklen_t; +pub type __va_list = u32; pub type ssize_t = __kernel_ssize_t; pub type uint_t = ::std::os::raw::c_uint; pub type uint = ::std::os::raw::c_uint; @@ -1736,8 +1737,8 @@ extern "C" { extern "C" { pub fn AAsset_isAllocated(asset: *mut AAsset) -> ::std::os::raw::c_int; } -pub type va_list = __builtin_va_list; -pub type __gnuc_va_list = __builtin_va_list; +pub type va_list = u32; +pub type __gnuc_va_list = u32; #[repr(C)] pub struct JavaVMAttachArgs { pub version: jint, @@ -1896,13 +1897,27 @@ pub const ANDROID_BITMAP_RESULT_BAD_PARAMETER: ::std::os::raw::c_int = -1; pub const ANDROID_BITMAP_RESULT_JNI_EXCEPTION: ::std::os::raw::c_int = -2; pub const ANDROID_BITMAP_RESULT_ALLOCATION_FAILED: ::std::os::raw::c_int = -3; pub type _bindgen_ty_2 = ::std::os::raw::c_int; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_NONE: AndroidBitmapFormat = 0; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_8888: AndroidBitmapFormat = 1; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGB_565: AndroidBitmapFormat = 4; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_4444: AndroidBitmapFormat = 7; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_A_8: AndroidBitmapFormat = 8; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_F16: AndroidBitmapFormat = 9; -pub type AndroidBitmapFormat = ::std::os::raw::c_uint; +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_NONE: AndroidBitmapFormat = AndroidBitmapFormat(0); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_8888: AndroidBitmapFormat = AndroidBitmapFormat(1); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGB_565: AndroidBitmapFormat = AndroidBitmapFormat(4); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_4444: AndroidBitmapFormat = AndroidBitmapFormat(7); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_A_8: AndroidBitmapFormat = AndroidBitmapFormat(8); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_F16: AndroidBitmapFormat = AndroidBitmapFormat(9); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AndroidBitmapFormat(pub ::std::os::raw::c_uint); pub const ANDROID_BITMAP_FLAGS_ALPHA_PREMUL: ::std::os::raw::c_uint = 0; pub const ANDROID_BITMAP_FLAGS_ALPHA_OPAQUE: ::std::os::raw::c_uint = 1; pub const ANDROID_BITMAP_FLAGS_ALPHA_UNPREMUL: ::std::os::raw::c_uint = 2; @@ -2712,25 +2727,60 @@ fn bindgen_test_layout_ARect() { ) ); } -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = 1; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = 2; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM: AHardwareBuffer_Format = 3; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM: AHardwareBuffer_Format = 4; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT: AHardwareBuffer_Format = - 22; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM: AHardwareBuffer_Format = - 43; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_BLOB: AHardwareBuffer_Format = 33; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D16_UNORM: AHardwareBuffer_Format = 48; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM: AHardwareBuffer_Format = 49; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT: AHardwareBuffer_Format = - 50; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT: AHardwareBuffer_Format = 51; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHardwareBuffer_Format = - 52; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = 53; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35; -pub type AHardwareBuffer_Format = ::std::os::raw::c_uint; +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(1); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(2); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(3); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(4); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT: AHardwareBuffer_Format = + AHardwareBuffer_Format(22); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(43); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_BLOB: AHardwareBuffer_Format = AHardwareBuffer_Format(33); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D16_UNORM: AHardwareBuffer_Format = AHardwareBuffer_Format(48); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D24_UNORM: AHardwareBuffer_Format = AHardwareBuffer_Format(49); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT: AHardwareBuffer_Format = + AHardwareBuffer_Format(50); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D32_FLOAT: AHardwareBuffer_Format = AHardwareBuffer_Format(51); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHardwareBuffer_Format = + AHardwareBuffer_Format(52); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = AHardwareBuffer_Format(53); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = + AHardwareBuffer_Format(35); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AHardwareBuffer_Format(pub ::std::os::raw::c_uint); pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER: AHardwareBuffer_UsageFlags = 0; pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_RARELY: @@ -5926,14 +5976,11 @@ extern "C" { pub fn vfprintf( __fp: *mut FILE, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: u32, ) -> ::std::os::raw::c_int; } extern "C" { - pub fn vprintf( - __fp: *const ::std::os::raw::c_char, - __args: __builtin_va_list, - ) -> ::std::os::raw::c_int; + pub fn vprintf(__fp: *const ::std::os::raw::c_char, __args: u32) -> ::std::os::raw::c_int; } extern "C" { pub fn dprintf( @@ -5960,7 +6007,7 @@ extern "C" { pub fn vsprintf( __s: *mut ::std::os::raw::c_char, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: u32, ) -> ::std::os::raw::c_int; } extern "C" { @@ -6072,28 +6119,25 @@ extern "C" { pub fn vfscanf( __fp: *mut FILE, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: u32, ) -> ::std::os::raw::c_int; } extern "C" { - pub fn vscanf( - __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, - ) -> ::std::os::raw::c_int; + pub fn vscanf(__fmt: *const ::std::os::raw::c_char, __args: u32) -> ::std::os::raw::c_int; } extern "C" { pub fn vsnprintf( __buf: *mut ::std::os::raw::c_char, __size: ::std::os::raw::c_uint, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: u32, ) -> ::std::os::raw::c_int; } extern "C" { pub fn vsscanf( __s: *const ::std::os::raw::c_char, __fmt: *const ::std::os::raw::c_char, - __args: __builtin_va_list, + __args: u32, ) -> ::std::os::raw::c_int; } extern "C" { @@ -14196,36 +14240,96 @@ extern "C" { extern "C" { pub fn AAudioStream_isPrivacySensitive(stream: *mut AAudioStream) -> bool; } -pub const media_status_t_AMEDIA_OK: media_status_t = 0; -pub const media_status_t_AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE: media_status_t = 1100; -pub const media_status_t_AMEDIACODEC_ERROR_RECLAIMED: media_status_t = 1101; -pub const media_status_t_AMEDIA_ERROR_BASE: media_status_t = -10000; -pub const media_status_t_AMEDIA_ERROR_UNKNOWN: media_status_t = -10000; -pub const media_status_t_AMEDIA_ERROR_MALFORMED: media_status_t = -10001; -pub const media_status_t_AMEDIA_ERROR_UNSUPPORTED: media_status_t = -10002; -pub const media_status_t_AMEDIA_ERROR_INVALID_OBJECT: media_status_t = -10003; -pub const media_status_t_AMEDIA_ERROR_INVALID_PARAMETER: media_status_t = -10004; -pub const media_status_t_AMEDIA_ERROR_INVALID_OPERATION: media_status_t = -10005; -pub const media_status_t_AMEDIA_ERROR_END_OF_STREAM: media_status_t = -10006; -pub const media_status_t_AMEDIA_ERROR_IO: media_status_t = -10007; -pub const media_status_t_AMEDIA_ERROR_WOULD_BLOCK: media_status_t = -10008; -pub const media_status_t_AMEDIA_DRM_ERROR_BASE: media_status_t = -20000; -pub const media_status_t_AMEDIA_DRM_NOT_PROVISIONED: media_status_t = -20001; -pub const media_status_t_AMEDIA_DRM_RESOURCE_BUSY: media_status_t = -20002; -pub const media_status_t_AMEDIA_DRM_DEVICE_REVOKED: media_status_t = -20003; -pub const media_status_t_AMEDIA_DRM_SHORT_BUFFER: media_status_t = -20004; -pub const media_status_t_AMEDIA_DRM_SESSION_NOT_OPENED: media_status_t = -20005; -pub const media_status_t_AMEDIA_DRM_TAMPER_DETECTED: media_status_t = -20006; -pub const media_status_t_AMEDIA_DRM_VERIFY_FAILED: media_status_t = -20007; -pub const media_status_t_AMEDIA_DRM_NEED_KEY: media_status_t = -20008; -pub const media_status_t_AMEDIA_DRM_LICENSE_EXPIRED: media_status_t = -20009; -pub const media_status_t_AMEDIA_IMGREADER_ERROR_BASE: media_status_t = -30000; -pub const media_status_t_AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE: media_status_t = -30001; -pub const media_status_t_AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED: media_status_t = -30002; -pub const media_status_t_AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE: media_status_t = -30003; -pub const media_status_t_AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE: media_status_t = -30004; -pub const media_status_t_AMEDIA_IMGREADER_IMAGE_NOT_LOCKED: media_status_t = -30005; -pub type media_status_t = ::std::os::raw::c_int; +impl media_status_t { + pub const AMEDIA_OK: media_status_t = media_status_t(0); +} +impl media_status_t { + pub const AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE: media_status_t = media_status_t(1100); +} +impl media_status_t { + pub const AMEDIACODEC_ERROR_RECLAIMED: media_status_t = media_status_t(1101); +} +impl media_status_t { + pub const AMEDIA_ERROR_BASE: media_status_t = media_status_t(-10000); +} +impl media_status_t { + pub const AMEDIA_ERROR_UNKNOWN: media_status_t = media_status_t(-10000); +} +impl media_status_t { + pub const AMEDIA_ERROR_MALFORMED: media_status_t = media_status_t(-10001); +} +impl media_status_t { + pub const AMEDIA_ERROR_UNSUPPORTED: media_status_t = media_status_t(-10002); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_OBJECT: media_status_t = media_status_t(-10003); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_PARAMETER: media_status_t = media_status_t(-10004); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_OPERATION: media_status_t = media_status_t(-10005); +} +impl media_status_t { + pub const AMEDIA_ERROR_END_OF_STREAM: media_status_t = media_status_t(-10006); +} +impl media_status_t { + pub const AMEDIA_ERROR_IO: media_status_t = media_status_t(-10007); +} +impl media_status_t { + pub const AMEDIA_ERROR_WOULD_BLOCK: media_status_t = media_status_t(-10008); +} +impl media_status_t { + pub const AMEDIA_DRM_ERROR_BASE: media_status_t = media_status_t(-20000); +} +impl media_status_t { + pub const AMEDIA_DRM_NOT_PROVISIONED: media_status_t = media_status_t(-20001); +} +impl media_status_t { + pub const AMEDIA_DRM_RESOURCE_BUSY: media_status_t = media_status_t(-20002); +} +impl media_status_t { + pub const AMEDIA_DRM_DEVICE_REVOKED: media_status_t = media_status_t(-20003); +} +impl media_status_t { + pub const AMEDIA_DRM_SHORT_BUFFER: media_status_t = media_status_t(-20004); +} +impl media_status_t { + pub const AMEDIA_DRM_SESSION_NOT_OPENED: media_status_t = media_status_t(-20005); +} +impl media_status_t { + pub const AMEDIA_DRM_TAMPER_DETECTED: media_status_t = media_status_t(-20006); +} +impl media_status_t { + pub const AMEDIA_DRM_VERIFY_FAILED: media_status_t = media_status_t(-20007); +} +impl media_status_t { + pub const AMEDIA_DRM_NEED_KEY: media_status_t = media_status_t(-20008); +} +impl media_status_t { + pub const AMEDIA_DRM_LICENSE_EXPIRED: media_status_t = media_status_t(-20009); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_ERROR_BASE: media_status_t = media_status_t(-30000); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE: media_status_t = media_status_t(-30001); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED: media_status_t = media_status_t(-30002); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE: media_status_t = media_status_t(-30003); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE: media_status_t = media_status_t(-30004); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_IMAGE_NOT_LOCKED: media_status_t = media_status_t(-30005); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct media_status_t(pub ::std::os::raw::c_int); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct AMidiDevice { @@ -14315,24 +14419,60 @@ extern "C" { extern "C" { pub fn AMidiInputPort_close(inputPort: *const AMidiInputPort); } -pub const camera_status_t_ACAMERA_OK: camera_status_t = 0; -pub const camera_status_t_ACAMERA_ERROR_BASE: camera_status_t = -10000; -pub const camera_status_t_ACAMERA_ERROR_UNKNOWN: camera_status_t = -10000; -pub const camera_status_t_ACAMERA_ERROR_INVALID_PARAMETER: camera_status_t = -10001; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DISCONNECTED: camera_status_t = -10002; -pub const camera_status_t_ACAMERA_ERROR_NOT_ENOUGH_MEMORY: camera_status_t = -10003; -pub const camera_status_t_ACAMERA_ERROR_METADATA_NOT_FOUND: camera_status_t = -10004; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DEVICE: camera_status_t = -10005; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_SERVICE: camera_status_t = -10006; -pub const camera_status_t_ACAMERA_ERROR_SESSION_CLOSED: camera_status_t = -10007; -pub const camera_status_t_ACAMERA_ERROR_INVALID_OPERATION: camera_status_t = -10008; -pub const camera_status_t_ACAMERA_ERROR_STREAM_CONFIGURE_FAIL: camera_status_t = -10009; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_IN_USE: camera_status_t = -10010; -pub const camera_status_t_ACAMERA_ERROR_MAX_CAMERA_IN_USE: camera_status_t = -10011; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DISABLED: camera_status_t = -10012; -pub const camera_status_t_ACAMERA_ERROR_PERMISSION_DENIED: camera_status_t = -10013; -pub const camera_status_t_ACAMERA_ERROR_UNSUPPORTED_OPERATION: camera_status_t = -10014; -pub type camera_status_t = ::std::os::raw::c_int; +impl camera_status_t { + pub const ACAMERA_OK: camera_status_t = camera_status_t(0); +} +impl camera_status_t { + pub const ACAMERA_ERROR_BASE: camera_status_t = camera_status_t(-10000); +} +impl camera_status_t { + pub const ACAMERA_ERROR_UNKNOWN: camera_status_t = camera_status_t(-10000); +} +impl camera_status_t { + pub const ACAMERA_ERROR_INVALID_PARAMETER: camera_status_t = camera_status_t(-10001); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DISCONNECTED: camera_status_t = camera_status_t(-10002); +} +impl camera_status_t { + pub const ACAMERA_ERROR_NOT_ENOUGH_MEMORY: camera_status_t = camera_status_t(-10003); +} +impl camera_status_t { + pub const ACAMERA_ERROR_METADATA_NOT_FOUND: camera_status_t = camera_status_t(-10004); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DEVICE: camera_status_t = camera_status_t(-10005); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_SERVICE: camera_status_t = camera_status_t(-10006); +} +impl camera_status_t { + pub const ACAMERA_ERROR_SESSION_CLOSED: camera_status_t = camera_status_t(-10007); +} +impl camera_status_t { + pub const ACAMERA_ERROR_INVALID_OPERATION: camera_status_t = camera_status_t(-10008); +} +impl camera_status_t { + pub const ACAMERA_ERROR_STREAM_CONFIGURE_FAIL: camera_status_t = camera_status_t(-10009); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_IN_USE: camera_status_t = camera_status_t(-10010); +} +impl camera_status_t { + pub const ACAMERA_ERROR_MAX_CAMERA_IN_USE: camera_status_t = camera_status_t(-10011); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DISABLED: camera_status_t = camera_status_t(-10012); +} +impl camera_status_t { + pub const ACAMERA_ERROR_PERMISSION_DENIED: camera_status_t = camera_status_t(-10013); +} +impl camera_status_t { + pub const ACAMERA_ERROR_UNSUPPORTED_OPERATION: camera_status_t = camera_status_t(-10014); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct camera_status_t(pub ::std::os::raw::c_int); pub const acamera_metadata_section_ACAMERA_COLOR_CORRECTION: acamera_metadata_section = 0; pub const acamera_metadata_section_ACAMERA_CONTROL: acamera_metadata_section = 1; pub const acamera_metadata_section_ACAMERA_DEMOSAIC: acamera_metadata_section = 2; @@ -16958,24 +17098,60 @@ extern "C" { pub struct AImage { _unused: [u8; 0], } -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_8888: AIMAGE_FORMATS = 1; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBX_8888: AIMAGE_FORMATS = 2; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_888: AIMAGE_FORMATS = 3; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_565: AIMAGE_FORMATS = 4; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_FP16: AIMAGE_FORMATS = 22; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_YUV_420_888: AIMAGE_FORMATS = 35; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_JPEG: AIMAGE_FORMATS = 256; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW16: AIMAGE_FORMATS = 32; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW_PRIVATE: AIMAGE_FORMATS = 36; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW10: AIMAGE_FORMATS = 37; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW12: AIMAGE_FORMATS = 38; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH16: AIMAGE_FORMATS = 1144402265; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_POINT_CLOUD: AIMAGE_FORMATS = 257; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_PRIVATE: AIMAGE_FORMATS = 34; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_Y8: AIMAGE_FORMATS = 538982489; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_HEIC: AIMAGE_FORMATS = 1212500294; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_JPEG: AIMAGE_FORMATS = 1768253795; -pub type AIMAGE_FORMATS = ::std::os::raw::c_uint; +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBA_8888: AIMAGE_FORMATS = AIMAGE_FORMATS(1); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBX_8888: AIMAGE_FORMATS = AIMAGE_FORMATS(2); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGB_888: AIMAGE_FORMATS = AIMAGE_FORMATS(3); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGB_565: AIMAGE_FORMATS = AIMAGE_FORMATS(4); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBA_FP16: AIMAGE_FORMATS = AIMAGE_FORMATS(22); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_YUV_420_888: AIMAGE_FORMATS = AIMAGE_FORMATS(35); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_JPEG: AIMAGE_FORMATS = AIMAGE_FORMATS(256); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW16: AIMAGE_FORMATS = AIMAGE_FORMATS(32); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW_PRIVATE: AIMAGE_FORMATS = AIMAGE_FORMATS(36); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW10: AIMAGE_FORMATS = AIMAGE_FORMATS(37); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW12: AIMAGE_FORMATS = AIMAGE_FORMATS(38); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH16: AIMAGE_FORMATS = AIMAGE_FORMATS(1144402265); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH_POINT_CLOUD: AIMAGE_FORMATS = AIMAGE_FORMATS(257); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_PRIVATE: AIMAGE_FORMATS = AIMAGE_FORMATS(34); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_Y8: AIMAGE_FORMATS = AIMAGE_FORMATS(538982489); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_HEIC: AIMAGE_FORMATS = AIMAGE_FORMATS(1212500294); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH_JPEG: AIMAGE_FORMATS = AIMAGE_FORMATS(1768253795); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AIMAGE_FORMATS(pub ::std::os::raw::c_uint); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct AImageCropRect { @@ -19011,32 +19187,3 @@ extern "C" { extern "C" { pub fn AMediaMuxer_getTrackFormat(muxer: *mut AMediaMuxer, idx: size_t) -> *mut AMediaFormat; } -pub type __builtin_va_list = __va_list; -#[repr(C)] -#[derive(Debug, Copy, Clone)] -pub struct __va_list { - pub __ap: *mut ::std::os::raw::c_void, -} -#[test] -fn bindgen_test_layout___va_list() { - assert_eq!( - ::std::mem::size_of::<__va_list>(), - 4usize, - concat!("Size of: ", stringify!(__va_list)) - ); - assert_eq!( - ::std::mem::align_of::<__va_list>(), - 4usize, - concat!("Alignment of ", stringify!(__va_list)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__va_list>())).__ap as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(__va_list), - "::", - stringify!(__ap) - ) - ); -} diff --git a/ndk-sys/src/ffi_i686.rs b/ndk-sys/src/ffi_i686.rs index a4d9abc9..f4225205 100644 --- a/ndk-sys/src/ffi_i686.rs +++ b/ndk-sys/src/ffi_i686.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.59.1 */ +/* automatically generated by rust-bindgen 0.59.2 */ #[repr(C)] #[derive(Default)] @@ -99,128 +99,128 @@ pub const __GNUC_VA_LIST: u32 = 1; pub const true_: u32 = 1; pub const false_: u32 = 0; pub const __bool_true_false_are_defined: u32 = 1; -pub const __PRI_64_prefix: &'static [u8; 3usize] = b"ll\0"; -pub const PRId8: &'static [u8; 2usize] = b"d\0"; -pub const PRId16: &'static [u8; 2usize] = b"d\0"; -pub const PRId32: &'static [u8; 2usize] = b"d\0"; -pub const PRId64: &'static [u8; 4usize] = b"lld\0"; -pub const PRIdLEAST8: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST16: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST32: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST64: &'static [u8; 4usize] = b"lld\0"; -pub const PRIdFAST8: &'static [u8; 2usize] = b"d\0"; -pub const PRIdFAST64: &'static [u8; 4usize] = b"lld\0"; -pub const PRIdMAX: &'static [u8; 3usize] = b"jd\0"; -pub const PRIi8: &'static [u8; 2usize] = b"i\0"; -pub const PRIi16: &'static [u8; 2usize] = b"i\0"; -pub const PRIi32: &'static [u8; 2usize] = b"i\0"; -pub const PRIi64: &'static [u8; 4usize] = b"lli\0"; -pub const PRIiLEAST8: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST16: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST32: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST64: &'static [u8; 4usize] = b"lli\0"; -pub const PRIiFAST8: &'static [u8; 2usize] = b"i\0"; -pub const PRIiFAST64: &'static [u8; 4usize] = b"lli\0"; -pub const PRIiMAX: &'static [u8; 3usize] = b"ji\0"; -pub const PRIo8: &'static [u8; 2usize] = b"o\0"; -pub const PRIo16: &'static [u8; 2usize] = b"o\0"; -pub const PRIo32: &'static [u8; 2usize] = b"o\0"; -pub const PRIo64: &'static [u8; 4usize] = b"llo\0"; -pub const PRIoLEAST8: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST16: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST32: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST64: &'static [u8; 4usize] = b"llo\0"; -pub const PRIoFAST8: &'static [u8; 2usize] = b"o\0"; -pub const PRIoFAST64: &'static [u8; 4usize] = b"llo\0"; -pub const PRIoMAX: &'static [u8; 3usize] = b"jo\0"; -pub const PRIu8: &'static [u8; 2usize] = b"u\0"; -pub const PRIu16: &'static [u8; 2usize] = b"u\0"; -pub const PRIu32: &'static [u8; 2usize] = b"u\0"; -pub const PRIu64: &'static [u8; 4usize] = b"llu\0"; -pub const PRIuLEAST8: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST16: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST32: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST64: &'static [u8; 4usize] = b"llu\0"; -pub const PRIuFAST8: &'static [u8; 2usize] = b"u\0"; -pub const PRIuFAST64: &'static [u8; 4usize] = b"llu\0"; -pub const PRIuMAX: &'static [u8; 3usize] = b"ju\0"; -pub const PRIx8: &'static [u8; 2usize] = b"x\0"; -pub const PRIx16: &'static [u8; 2usize] = b"x\0"; -pub const PRIx32: &'static [u8; 2usize] = b"x\0"; -pub const PRIx64: &'static [u8; 4usize] = b"llx\0"; -pub const PRIxLEAST8: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST16: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST32: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST64: &'static [u8; 4usize] = b"llx\0"; -pub const PRIxFAST8: &'static [u8; 2usize] = b"x\0"; -pub const PRIxFAST64: &'static [u8; 4usize] = b"llx\0"; -pub const PRIxMAX: &'static [u8; 3usize] = b"jx\0"; -pub const PRIX8: &'static [u8; 2usize] = b"X\0"; -pub const PRIX16: &'static [u8; 2usize] = b"X\0"; -pub const PRIX32: &'static [u8; 2usize] = b"X\0"; -pub const PRIX64: &'static [u8; 4usize] = b"llX\0"; -pub const PRIXLEAST8: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST16: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST32: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST64: &'static [u8; 4usize] = b"llX\0"; -pub const PRIXFAST8: &'static [u8; 2usize] = b"X\0"; -pub const PRIXFAST64: &'static [u8; 4usize] = b"llX\0"; -pub const PRIXMAX: &'static [u8; 3usize] = b"jX\0"; -pub const SCNd8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNd16: &'static [u8; 3usize] = b"hd\0"; -pub const SCNd32: &'static [u8; 2usize] = b"d\0"; -pub const SCNd64: &'static [u8; 4usize] = b"lld\0"; -pub const SCNdLEAST8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNdLEAST16: &'static [u8; 3usize] = b"hd\0"; -pub const SCNdLEAST32: &'static [u8; 2usize] = b"d\0"; -pub const SCNdLEAST64: &'static [u8; 4usize] = b"lld\0"; -pub const SCNdFAST8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNdFAST64: &'static [u8; 4usize] = b"lld\0"; -pub const SCNdMAX: &'static [u8; 3usize] = b"jd\0"; -pub const SCNi8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNi16: &'static [u8; 3usize] = b"hi\0"; -pub const SCNi32: &'static [u8; 2usize] = b"i\0"; -pub const SCNi64: &'static [u8; 4usize] = b"lli\0"; -pub const SCNiLEAST8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNiLEAST16: &'static [u8; 3usize] = b"hi\0"; -pub const SCNiLEAST32: &'static [u8; 2usize] = b"i\0"; -pub const SCNiLEAST64: &'static [u8; 4usize] = b"lli\0"; -pub const SCNiFAST8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNiFAST64: &'static [u8; 4usize] = b"lli\0"; -pub const SCNiMAX: &'static [u8; 3usize] = b"ji\0"; -pub const SCNo8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNo16: &'static [u8; 3usize] = b"ho\0"; -pub const SCNo32: &'static [u8; 2usize] = b"o\0"; -pub const SCNo64: &'static [u8; 4usize] = b"llo\0"; -pub const SCNoLEAST8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNoLEAST16: &'static [u8; 3usize] = b"ho\0"; -pub const SCNoLEAST32: &'static [u8; 2usize] = b"o\0"; -pub const SCNoLEAST64: &'static [u8; 4usize] = b"llo\0"; -pub const SCNoFAST8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNoFAST64: &'static [u8; 4usize] = b"llo\0"; -pub const SCNoMAX: &'static [u8; 3usize] = b"jo\0"; -pub const SCNu8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNu16: &'static [u8; 3usize] = b"hu\0"; -pub const SCNu32: &'static [u8; 2usize] = b"u\0"; -pub const SCNu64: &'static [u8; 4usize] = b"llu\0"; -pub const SCNuLEAST8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNuLEAST16: &'static [u8; 3usize] = b"hu\0"; -pub const SCNuLEAST32: &'static [u8; 2usize] = b"u\0"; -pub const SCNuLEAST64: &'static [u8; 4usize] = b"llu\0"; -pub const SCNuFAST8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNuFAST64: &'static [u8; 4usize] = b"llu\0"; -pub const SCNuMAX: &'static [u8; 3usize] = b"ju\0"; -pub const SCNx8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNx16: &'static [u8; 3usize] = b"hx\0"; -pub const SCNx32: &'static [u8; 2usize] = b"x\0"; -pub const SCNx64: &'static [u8; 4usize] = b"llx\0"; -pub const SCNxLEAST8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNxLEAST16: &'static [u8; 3usize] = b"hx\0"; -pub const SCNxLEAST32: &'static [u8; 2usize] = b"x\0"; -pub const SCNxLEAST64: &'static [u8; 4usize] = b"llx\0"; -pub const SCNxFAST8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNxFAST64: &'static [u8; 4usize] = b"llx\0"; -pub const SCNxMAX: &'static [u8; 3usize] = b"jx\0"; +pub const __PRI_64_prefix: &[u8; 3usize] = b"ll\0"; +pub const PRId8: &[u8; 2usize] = b"d\0"; +pub const PRId16: &[u8; 2usize] = b"d\0"; +pub const PRId32: &[u8; 2usize] = b"d\0"; +pub const PRId64: &[u8; 4usize] = b"lld\0"; +pub const PRIdLEAST8: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST16: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST32: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST64: &[u8; 4usize] = b"lld\0"; +pub const PRIdFAST8: &[u8; 2usize] = b"d\0"; +pub const PRIdFAST64: &[u8; 4usize] = b"lld\0"; +pub const PRIdMAX: &[u8; 3usize] = b"jd\0"; +pub const PRIi8: &[u8; 2usize] = b"i\0"; +pub const PRIi16: &[u8; 2usize] = b"i\0"; +pub const PRIi32: &[u8; 2usize] = b"i\0"; +pub const PRIi64: &[u8; 4usize] = b"lli\0"; +pub const PRIiLEAST8: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST16: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST32: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST64: &[u8; 4usize] = b"lli\0"; +pub const PRIiFAST8: &[u8; 2usize] = b"i\0"; +pub const PRIiFAST64: &[u8; 4usize] = b"lli\0"; +pub const PRIiMAX: &[u8; 3usize] = b"ji\0"; +pub const PRIo8: &[u8; 2usize] = b"o\0"; +pub const PRIo16: &[u8; 2usize] = b"o\0"; +pub const PRIo32: &[u8; 2usize] = b"o\0"; +pub const PRIo64: &[u8; 4usize] = b"llo\0"; +pub const PRIoLEAST8: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST16: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST32: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST64: &[u8; 4usize] = b"llo\0"; +pub const PRIoFAST8: &[u8; 2usize] = b"o\0"; +pub const PRIoFAST64: &[u8; 4usize] = b"llo\0"; +pub const PRIoMAX: &[u8; 3usize] = b"jo\0"; +pub const PRIu8: &[u8; 2usize] = b"u\0"; +pub const PRIu16: &[u8; 2usize] = b"u\0"; +pub const PRIu32: &[u8; 2usize] = b"u\0"; +pub const PRIu64: &[u8; 4usize] = b"llu\0"; +pub const PRIuLEAST8: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST16: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST32: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST64: &[u8; 4usize] = b"llu\0"; +pub const PRIuFAST8: &[u8; 2usize] = b"u\0"; +pub const PRIuFAST64: &[u8; 4usize] = b"llu\0"; +pub const PRIuMAX: &[u8; 3usize] = b"ju\0"; +pub const PRIx8: &[u8; 2usize] = b"x\0"; +pub const PRIx16: &[u8; 2usize] = b"x\0"; +pub const PRIx32: &[u8; 2usize] = b"x\0"; +pub const PRIx64: &[u8; 4usize] = b"llx\0"; +pub const PRIxLEAST8: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST16: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST32: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST64: &[u8; 4usize] = b"llx\0"; +pub const PRIxFAST8: &[u8; 2usize] = b"x\0"; +pub const PRIxFAST64: &[u8; 4usize] = b"llx\0"; +pub const PRIxMAX: &[u8; 3usize] = b"jx\0"; +pub const PRIX8: &[u8; 2usize] = b"X\0"; +pub const PRIX16: &[u8; 2usize] = b"X\0"; +pub const PRIX32: &[u8; 2usize] = b"X\0"; +pub const PRIX64: &[u8; 4usize] = b"llX\0"; +pub const PRIXLEAST8: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST16: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST32: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST64: &[u8; 4usize] = b"llX\0"; +pub const PRIXFAST8: &[u8; 2usize] = b"X\0"; +pub const PRIXFAST64: &[u8; 4usize] = b"llX\0"; +pub const PRIXMAX: &[u8; 3usize] = b"jX\0"; +pub const SCNd8: &[u8; 4usize] = b"hhd\0"; +pub const SCNd16: &[u8; 3usize] = b"hd\0"; +pub const SCNd32: &[u8; 2usize] = b"d\0"; +pub const SCNd64: &[u8; 4usize] = b"lld\0"; +pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0"; +pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0"; +pub const SCNdLEAST32: &[u8; 2usize] = b"d\0"; +pub const SCNdLEAST64: &[u8; 4usize] = b"lld\0"; +pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0"; +pub const SCNdFAST64: &[u8; 4usize] = b"lld\0"; +pub const SCNdMAX: &[u8; 3usize] = b"jd\0"; +pub const SCNi8: &[u8; 4usize] = b"hhi\0"; +pub const SCNi16: &[u8; 3usize] = b"hi\0"; +pub const SCNi32: &[u8; 2usize] = b"i\0"; +pub const SCNi64: &[u8; 4usize] = b"lli\0"; +pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0"; +pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0"; +pub const SCNiLEAST32: &[u8; 2usize] = b"i\0"; +pub const SCNiLEAST64: &[u8; 4usize] = b"lli\0"; +pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0"; +pub const SCNiFAST64: &[u8; 4usize] = b"lli\0"; +pub const SCNiMAX: &[u8; 3usize] = b"ji\0"; +pub const SCNo8: &[u8; 4usize] = b"hho\0"; +pub const SCNo16: &[u8; 3usize] = b"ho\0"; +pub const SCNo32: &[u8; 2usize] = b"o\0"; +pub const SCNo64: &[u8; 4usize] = b"llo\0"; +pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0"; +pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0"; +pub const SCNoLEAST32: &[u8; 2usize] = b"o\0"; +pub const SCNoLEAST64: &[u8; 4usize] = b"llo\0"; +pub const SCNoFAST8: &[u8; 4usize] = b"hho\0"; +pub const SCNoFAST64: &[u8; 4usize] = b"llo\0"; +pub const SCNoMAX: &[u8; 3usize] = b"jo\0"; +pub const SCNu8: &[u8; 4usize] = b"hhu\0"; +pub const SCNu16: &[u8; 3usize] = b"hu\0"; +pub const SCNu32: &[u8; 2usize] = b"u\0"; +pub const SCNu64: &[u8; 4usize] = b"llu\0"; +pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0"; +pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0"; +pub const SCNuLEAST32: &[u8; 2usize] = b"u\0"; +pub const SCNuLEAST64: &[u8; 4usize] = b"llu\0"; +pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0"; +pub const SCNuFAST64: &[u8; 4usize] = b"llu\0"; +pub const SCNuMAX: &[u8; 3usize] = b"ju\0"; +pub const SCNx8: &[u8; 4usize] = b"hhx\0"; +pub const SCNx16: &[u8; 3usize] = b"hx\0"; +pub const SCNx32: &[u8; 2usize] = b"x\0"; +pub const SCNx64: &[u8; 4usize] = b"llx\0"; +pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0"; +pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0"; +pub const SCNxLEAST32: &[u8; 2usize] = b"x\0"; +pub const SCNxLEAST64: &[u8; 4usize] = b"llx\0"; +pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0"; +pub const SCNxFAST64: &[u8; 4usize] = b"llx\0"; +pub const SCNxMAX: &[u8; 3usize] = b"jx\0"; pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8; pub const O_ACCMODE: u32 = 3; pub const O_RDONLY: u32 = 0; @@ -606,11 +606,11 @@ pub const SOL_NFC: u32 = 280; pub const SOL_KCM: u32 = 281; pub const SOL_TLS: u32 = 282; pub const IPX_TYPE: u32 = 1; -pub const _PATH_HEQUIV: &'static [u8; 24usize] = b"/system/etc/hosts.equiv\0"; -pub const _PATH_HOSTS: &'static [u8; 18usize] = b"/system/etc/hosts\0"; -pub const _PATH_NETWORKS: &'static [u8; 21usize] = b"/system/etc/networks\0"; -pub const _PATH_PROTOCOLS: &'static [u8; 22usize] = b"/system/etc/protocols\0"; -pub const _PATH_SERVICES: &'static [u8; 21usize] = b"/system/etc/services\0"; +pub const _PATH_HEQUIV: &[u8; 24usize] = b"/system/etc/hosts.equiv\0"; +pub const _PATH_HOSTS: &[u8; 18usize] = b"/system/etc/hosts\0"; +pub const _PATH_NETWORKS: &[u8; 21usize] = b"/system/etc/networks\0"; +pub const _PATH_PROTOCOLS: &[u8; 22usize] = b"/system/etc/protocols\0"; +pub const _PATH_SERVICES: &[u8; 21usize] = b"/system/etc/services\0"; pub const NETDB_INTERNAL: i32 = -1; pub const NETDB_SUCCESS: u32 = 0; pub const HOST_NOT_FOUND: u32 = 1; @@ -676,7 +676,7 @@ pub const FOPEN_MAX: u32 = 20; pub const FILENAME_MAX: u32 = 4096; pub const L_tmpnam: u32 = 4096; pub const TMP_MAX: u32 = 308915776; -pub const P_tmpdir: &'static [u8; 6usize] = b"/tmp/\0"; +pub const P_tmpdir: &[u8; 6usize] = b"/tmp/\0"; pub const L_ctermid: u32 = 1024; pub const STRUCT_MALLINFO_DECLARED: u32 = 1; pub const M_DECAY_TIME: i32 = -100; @@ -1091,11 +1091,11 @@ pub const CLOCKS_PER_SEC: u32 = 1000000; pub const TIME_UTC: u32 = 1; pub const AAUDIO_UNSPECIFIED: u32 = 0; pub const AAUDIO_SYSTEM_USAGE_OFFSET: u32 = 1000; -pub const PROPERTY_VENDOR: &'static [u8; 7usize] = b"vendor\0"; -pub const PROPERTY_VERSION: &'static [u8; 8usize] = b"version\0"; -pub const PROPERTY_DESCRIPTION: &'static [u8; 12usize] = b"description\0"; -pub const PROPERTY_ALGORITHMS: &'static [u8; 11usize] = b"algorithms\0"; -pub const PROPERTY_DEVICE_UNIQUE_ID: &'static [u8; 15usize] = b"deviceUniqueId\0"; +pub const PROPERTY_VENDOR: &[u8; 7usize] = b"vendor\0"; +pub const PROPERTY_VERSION: &[u8; 8usize] = b"version\0"; +pub const PROPERTY_DESCRIPTION: &[u8; 12usize] = b"description\0"; +pub const PROPERTY_ALGORITHMS: &[u8; 11usize] = b"algorithms\0"; +pub const PROPERTY_DEVICE_UNIQUE_ID: &[u8; 15usize] = b"deviceUniqueId\0"; extern "C" { pub fn android_get_application_target_sdk_version() -> ::std::os::raw::c_int; } @@ -1818,13 +1818,27 @@ pub const ANDROID_BITMAP_RESULT_BAD_PARAMETER: ::std::os::raw::c_int = -1; pub const ANDROID_BITMAP_RESULT_JNI_EXCEPTION: ::std::os::raw::c_int = -2; pub const ANDROID_BITMAP_RESULT_ALLOCATION_FAILED: ::std::os::raw::c_int = -3; pub type _bindgen_ty_2 = ::std::os::raw::c_int; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_NONE: AndroidBitmapFormat = 0; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_8888: AndroidBitmapFormat = 1; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGB_565: AndroidBitmapFormat = 4; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_4444: AndroidBitmapFormat = 7; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_A_8: AndroidBitmapFormat = 8; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_F16: AndroidBitmapFormat = 9; -pub type AndroidBitmapFormat = ::std::os::raw::c_uint; +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_NONE: AndroidBitmapFormat = AndroidBitmapFormat(0); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_8888: AndroidBitmapFormat = AndroidBitmapFormat(1); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGB_565: AndroidBitmapFormat = AndroidBitmapFormat(4); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_4444: AndroidBitmapFormat = AndroidBitmapFormat(7); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_A_8: AndroidBitmapFormat = AndroidBitmapFormat(8); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_F16: AndroidBitmapFormat = AndroidBitmapFormat(9); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AndroidBitmapFormat(pub ::std::os::raw::c_uint); pub const ANDROID_BITMAP_FLAGS_ALPHA_PREMUL: ::std::os::raw::c_uint = 0; pub const ANDROID_BITMAP_FLAGS_ALPHA_OPAQUE: ::std::os::raw::c_uint = 1; pub const ANDROID_BITMAP_FLAGS_ALPHA_UNPREMUL: ::std::os::raw::c_uint = 2; @@ -2634,25 +2648,60 @@ fn bindgen_test_layout_ARect() { ) ); } -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = 1; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = 2; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM: AHardwareBuffer_Format = 3; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM: AHardwareBuffer_Format = 4; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT: AHardwareBuffer_Format = - 22; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM: AHardwareBuffer_Format = - 43; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_BLOB: AHardwareBuffer_Format = 33; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D16_UNORM: AHardwareBuffer_Format = 48; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM: AHardwareBuffer_Format = 49; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT: AHardwareBuffer_Format = - 50; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT: AHardwareBuffer_Format = 51; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHardwareBuffer_Format = - 52; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = 53; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35; -pub type AHardwareBuffer_Format = ::std::os::raw::c_uint; +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(1); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(2); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(3); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(4); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT: AHardwareBuffer_Format = + AHardwareBuffer_Format(22); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(43); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_BLOB: AHardwareBuffer_Format = AHardwareBuffer_Format(33); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D16_UNORM: AHardwareBuffer_Format = AHardwareBuffer_Format(48); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D24_UNORM: AHardwareBuffer_Format = AHardwareBuffer_Format(49); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT: AHardwareBuffer_Format = + AHardwareBuffer_Format(50); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D32_FLOAT: AHardwareBuffer_Format = AHardwareBuffer_Format(51); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHardwareBuffer_Format = + AHardwareBuffer_Format(52); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = AHardwareBuffer_Format(53); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = + AHardwareBuffer_Format(35); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AHardwareBuffer_Format(pub ::std::os::raw::c_uint); pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER: AHardwareBuffer_UsageFlags = 0; pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_RARELY: @@ -15941,36 +15990,96 @@ extern "C" { extern "C" { pub fn AAudioStream_isPrivacySensitive(stream: *mut AAudioStream) -> bool; } -pub const media_status_t_AMEDIA_OK: media_status_t = 0; -pub const media_status_t_AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE: media_status_t = 1100; -pub const media_status_t_AMEDIACODEC_ERROR_RECLAIMED: media_status_t = 1101; -pub const media_status_t_AMEDIA_ERROR_BASE: media_status_t = -10000; -pub const media_status_t_AMEDIA_ERROR_UNKNOWN: media_status_t = -10000; -pub const media_status_t_AMEDIA_ERROR_MALFORMED: media_status_t = -10001; -pub const media_status_t_AMEDIA_ERROR_UNSUPPORTED: media_status_t = -10002; -pub const media_status_t_AMEDIA_ERROR_INVALID_OBJECT: media_status_t = -10003; -pub const media_status_t_AMEDIA_ERROR_INVALID_PARAMETER: media_status_t = -10004; -pub const media_status_t_AMEDIA_ERROR_INVALID_OPERATION: media_status_t = -10005; -pub const media_status_t_AMEDIA_ERROR_END_OF_STREAM: media_status_t = -10006; -pub const media_status_t_AMEDIA_ERROR_IO: media_status_t = -10007; -pub const media_status_t_AMEDIA_ERROR_WOULD_BLOCK: media_status_t = -10008; -pub const media_status_t_AMEDIA_DRM_ERROR_BASE: media_status_t = -20000; -pub const media_status_t_AMEDIA_DRM_NOT_PROVISIONED: media_status_t = -20001; -pub const media_status_t_AMEDIA_DRM_RESOURCE_BUSY: media_status_t = -20002; -pub const media_status_t_AMEDIA_DRM_DEVICE_REVOKED: media_status_t = -20003; -pub const media_status_t_AMEDIA_DRM_SHORT_BUFFER: media_status_t = -20004; -pub const media_status_t_AMEDIA_DRM_SESSION_NOT_OPENED: media_status_t = -20005; -pub const media_status_t_AMEDIA_DRM_TAMPER_DETECTED: media_status_t = -20006; -pub const media_status_t_AMEDIA_DRM_VERIFY_FAILED: media_status_t = -20007; -pub const media_status_t_AMEDIA_DRM_NEED_KEY: media_status_t = -20008; -pub const media_status_t_AMEDIA_DRM_LICENSE_EXPIRED: media_status_t = -20009; -pub const media_status_t_AMEDIA_IMGREADER_ERROR_BASE: media_status_t = -30000; -pub const media_status_t_AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE: media_status_t = -30001; -pub const media_status_t_AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED: media_status_t = -30002; -pub const media_status_t_AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE: media_status_t = -30003; -pub const media_status_t_AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE: media_status_t = -30004; -pub const media_status_t_AMEDIA_IMGREADER_IMAGE_NOT_LOCKED: media_status_t = -30005; -pub type media_status_t = ::std::os::raw::c_int; +impl media_status_t { + pub const AMEDIA_OK: media_status_t = media_status_t(0); +} +impl media_status_t { + pub const AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE: media_status_t = media_status_t(1100); +} +impl media_status_t { + pub const AMEDIACODEC_ERROR_RECLAIMED: media_status_t = media_status_t(1101); +} +impl media_status_t { + pub const AMEDIA_ERROR_BASE: media_status_t = media_status_t(-10000); +} +impl media_status_t { + pub const AMEDIA_ERROR_UNKNOWN: media_status_t = media_status_t(-10000); +} +impl media_status_t { + pub const AMEDIA_ERROR_MALFORMED: media_status_t = media_status_t(-10001); +} +impl media_status_t { + pub const AMEDIA_ERROR_UNSUPPORTED: media_status_t = media_status_t(-10002); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_OBJECT: media_status_t = media_status_t(-10003); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_PARAMETER: media_status_t = media_status_t(-10004); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_OPERATION: media_status_t = media_status_t(-10005); +} +impl media_status_t { + pub const AMEDIA_ERROR_END_OF_STREAM: media_status_t = media_status_t(-10006); +} +impl media_status_t { + pub const AMEDIA_ERROR_IO: media_status_t = media_status_t(-10007); +} +impl media_status_t { + pub const AMEDIA_ERROR_WOULD_BLOCK: media_status_t = media_status_t(-10008); +} +impl media_status_t { + pub const AMEDIA_DRM_ERROR_BASE: media_status_t = media_status_t(-20000); +} +impl media_status_t { + pub const AMEDIA_DRM_NOT_PROVISIONED: media_status_t = media_status_t(-20001); +} +impl media_status_t { + pub const AMEDIA_DRM_RESOURCE_BUSY: media_status_t = media_status_t(-20002); +} +impl media_status_t { + pub const AMEDIA_DRM_DEVICE_REVOKED: media_status_t = media_status_t(-20003); +} +impl media_status_t { + pub const AMEDIA_DRM_SHORT_BUFFER: media_status_t = media_status_t(-20004); +} +impl media_status_t { + pub const AMEDIA_DRM_SESSION_NOT_OPENED: media_status_t = media_status_t(-20005); +} +impl media_status_t { + pub const AMEDIA_DRM_TAMPER_DETECTED: media_status_t = media_status_t(-20006); +} +impl media_status_t { + pub const AMEDIA_DRM_VERIFY_FAILED: media_status_t = media_status_t(-20007); +} +impl media_status_t { + pub const AMEDIA_DRM_NEED_KEY: media_status_t = media_status_t(-20008); +} +impl media_status_t { + pub const AMEDIA_DRM_LICENSE_EXPIRED: media_status_t = media_status_t(-20009); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_ERROR_BASE: media_status_t = media_status_t(-30000); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE: media_status_t = media_status_t(-30001); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED: media_status_t = media_status_t(-30002); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE: media_status_t = media_status_t(-30003); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE: media_status_t = media_status_t(-30004); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_IMAGE_NOT_LOCKED: media_status_t = media_status_t(-30005); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct media_status_t(pub ::std::os::raw::c_int); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct AMidiDevice { @@ -16060,24 +16169,60 @@ extern "C" { extern "C" { pub fn AMidiInputPort_close(inputPort: *const AMidiInputPort); } -pub const camera_status_t_ACAMERA_OK: camera_status_t = 0; -pub const camera_status_t_ACAMERA_ERROR_BASE: camera_status_t = -10000; -pub const camera_status_t_ACAMERA_ERROR_UNKNOWN: camera_status_t = -10000; -pub const camera_status_t_ACAMERA_ERROR_INVALID_PARAMETER: camera_status_t = -10001; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DISCONNECTED: camera_status_t = -10002; -pub const camera_status_t_ACAMERA_ERROR_NOT_ENOUGH_MEMORY: camera_status_t = -10003; -pub const camera_status_t_ACAMERA_ERROR_METADATA_NOT_FOUND: camera_status_t = -10004; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DEVICE: camera_status_t = -10005; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_SERVICE: camera_status_t = -10006; -pub const camera_status_t_ACAMERA_ERROR_SESSION_CLOSED: camera_status_t = -10007; -pub const camera_status_t_ACAMERA_ERROR_INVALID_OPERATION: camera_status_t = -10008; -pub const camera_status_t_ACAMERA_ERROR_STREAM_CONFIGURE_FAIL: camera_status_t = -10009; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_IN_USE: camera_status_t = -10010; -pub const camera_status_t_ACAMERA_ERROR_MAX_CAMERA_IN_USE: camera_status_t = -10011; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DISABLED: camera_status_t = -10012; -pub const camera_status_t_ACAMERA_ERROR_PERMISSION_DENIED: camera_status_t = -10013; -pub const camera_status_t_ACAMERA_ERROR_UNSUPPORTED_OPERATION: camera_status_t = -10014; -pub type camera_status_t = ::std::os::raw::c_int; +impl camera_status_t { + pub const ACAMERA_OK: camera_status_t = camera_status_t(0); +} +impl camera_status_t { + pub const ACAMERA_ERROR_BASE: camera_status_t = camera_status_t(-10000); +} +impl camera_status_t { + pub const ACAMERA_ERROR_UNKNOWN: camera_status_t = camera_status_t(-10000); +} +impl camera_status_t { + pub const ACAMERA_ERROR_INVALID_PARAMETER: camera_status_t = camera_status_t(-10001); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DISCONNECTED: camera_status_t = camera_status_t(-10002); +} +impl camera_status_t { + pub const ACAMERA_ERROR_NOT_ENOUGH_MEMORY: camera_status_t = camera_status_t(-10003); +} +impl camera_status_t { + pub const ACAMERA_ERROR_METADATA_NOT_FOUND: camera_status_t = camera_status_t(-10004); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DEVICE: camera_status_t = camera_status_t(-10005); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_SERVICE: camera_status_t = camera_status_t(-10006); +} +impl camera_status_t { + pub const ACAMERA_ERROR_SESSION_CLOSED: camera_status_t = camera_status_t(-10007); +} +impl camera_status_t { + pub const ACAMERA_ERROR_INVALID_OPERATION: camera_status_t = camera_status_t(-10008); +} +impl camera_status_t { + pub const ACAMERA_ERROR_STREAM_CONFIGURE_FAIL: camera_status_t = camera_status_t(-10009); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_IN_USE: camera_status_t = camera_status_t(-10010); +} +impl camera_status_t { + pub const ACAMERA_ERROR_MAX_CAMERA_IN_USE: camera_status_t = camera_status_t(-10011); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DISABLED: camera_status_t = camera_status_t(-10012); +} +impl camera_status_t { + pub const ACAMERA_ERROR_PERMISSION_DENIED: camera_status_t = camera_status_t(-10013); +} +impl camera_status_t { + pub const ACAMERA_ERROR_UNSUPPORTED_OPERATION: camera_status_t = camera_status_t(-10014); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct camera_status_t(pub ::std::os::raw::c_int); pub const acamera_metadata_section_ACAMERA_COLOR_CORRECTION: acamera_metadata_section = 0; pub const acamera_metadata_section_ACAMERA_CONTROL: acamera_metadata_section = 1; pub const acamera_metadata_section_ACAMERA_DEMOSAIC: acamera_metadata_section = 2; @@ -18703,24 +18848,60 @@ extern "C" { pub struct AImage { _unused: [u8; 0], } -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_8888: AIMAGE_FORMATS = 1; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBX_8888: AIMAGE_FORMATS = 2; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_888: AIMAGE_FORMATS = 3; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_565: AIMAGE_FORMATS = 4; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_FP16: AIMAGE_FORMATS = 22; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_YUV_420_888: AIMAGE_FORMATS = 35; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_JPEG: AIMAGE_FORMATS = 256; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW16: AIMAGE_FORMATS = 32; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW_PRIVATE: AIMAGE_FORMATS = 36; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW10: AIMAGE_FORMATS = 37; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW12: AIMAGE_FORMATS = 38; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH16: AIMAGE_FORMATS = 1144402265; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_POINT_CLOUD: AIMAGE_FORMATS = 257; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_PRIVATE: AIMAGE_FORMATS = 34; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_Y8: AIMAGE_FORMATS = 538982489; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_HEIC: AIMAGE_FORMATS = 1212500294; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_JPEG: AIMAGE_FORMATS = 1768253795; -pub type AIMAGE_FORMATS = ::std::os::raw::c_uint; +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBA_8888: AIMAGE_FORMATS = AIMAGE_FORMATS(1); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBX_8888: AIMAGE_FORMATS = AIMAGE_FORMATS(2); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGB_888: AIMAGE_FORMATS = AIMAGE_FORMATS(3); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGB_565: AIMAGE_FORMATS = AIMAGE_FORMATS(4); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBA_FP16: AIMAGE_FORMATS = AIMAGE_FORMATS(22); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_YUV_420_888: AIMAGE_FORMATS = AIMAGE_FORMATS(35); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_JPEG: AIMAGE_FORMATS = AIMAGE_FORMATS(256); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW16: AIMAGE_FORMATS = AIMAGE_FORMATS(32); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW_PRIVATE: AIMAGE_FORMATS = AIMAGE_FORMATS(36); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW10: AIMAGE_FORMATS = AIMAGE_FORMATS(37); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW12: AIMAGE_FORMATS = AIMAGE_FORMATS(38); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH16: AIMAGE_FORMATS = AIMAGE_FORMATS(1144402265); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH_POINT_CLOUD: AIMAGE_FORMATS = AIMAGE_FORMATS(257); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_PRIVATE: AIMAGE_FORMATS = AIMAGE_FORMATS(34); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_Y8: AIMAGE_FORMATS = AIMAGE_FORMATS(538982489); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_HEIC: AIMAGE_FORMATS = AIMAGE_FORMATS(1212500294); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH_JPEG: AIMAGE_FORMATS = AIMAGE_FORMATS(1768253795); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AIMAGE_FORMATS(pub ::std::os::raw::c_uint); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct AImageCropRect { diff --git a/ndk-sys/src/ffi_x86_64.rs b/ndk-sys/src/ffi_x86_64.rs index 1b7f4d49..68651f77 100644 --- a/ndk-sys/src/ffi_x86_64.rs +++ b/ndk-sys/src/ffi_x86_64.rs @@ -1,4 +1,4 @@ -/* automatically generated by rust-bindgen 0.59.1 */ +/* automatically generated by rust-bindgen 0.59.2 */ #[repr(C)] #[derive(Default)] @@ -93,163 +93,163 @@ pub const __GNUC_VA_LIST: u32 = 1; pub const true_: u32 = 1; pub const false_: u32 = 0; pub const __bool_true_false_are_defined: u32 = 1; -pub const __PRI_64_prefix: &'static [u8; 2usize] = b"l\0"; -pub const __PRI_PTR_prefix: &'static [u8; 2usize] = b"l\0"; -pub const __PRI_FAST_prefix: &'static [u8; 2usize] = b"l\0"; -pub const PRId8: &'static [u8; 2usize] = b"d\0"; -pub const PRId16: &'static [u8; 2usize] = b"d\0"; -pub const PRId32: &'static [u8; 2usize] = b"d\0"; -pub const PRId64: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdLEAST8: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST16: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST32: &'static [u8; 2usize] = b"d\0"; -pub const PRIdLEAST64: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdFAST8: &'static [u8; 2usize] = b"d\0"; -pub const PRIdFAST16: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdFAST32: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdFAST64: &'static [u8; 3usize] = b"ld\0"; -pub const PRIdMAX: &'static [u8; 3usize] = b"jd\0"; -pub const PRIdPTR: &'static [u8; 3usize] = b"ld\0"; -pub const PRIi8: &'static [u8; 2usize] = b"i\0"; -pub const PRIi16: &'static [u8; 2usize] = b"i\0"; -pub const PRIi32: &'static [u8; 2usize] = b"i\0"; -pub const PRIi64: &'static [u8; 3usize] = b"li\0"; -pub const PRIiLEAST8: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST16: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST32: &'static [u8; 2usize] = b"i\0"; -pub const PRIiLEAST64: &'static [u8; 3usize] = b"li\0"; -pub const PRIiFAST8: &'static [u8; 2usize] = b"i\0"; -pub const PRIiFAST16: &'static [u8; 3usize] = b"li\0"; -pub const PRIiFAST32: &'static [u8; 3usize] = b"li\0"; -pub const PRIiFAST64: &'static [u8; 3usize] = b"li\0"; -pub const PRIiMAX: &'static [u8; 3usize] = b"ji\0"; -pub const PRIiPTR: &'static [u8; 3usize] = b"li\0"; -pub const PRIo8: &'static [u8; 2usize] = b"o\0"; -pub const PRIo16: &'static [u8; 2usize] = b"o\0"; -pub const PRIo32: &'static [u8; 2usize] = b"o\0"; -pub const PRIo64: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoLEAST8: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST16: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST32: &'static [u8; 2usize] = b"o\0"; -pub const PRIoLEAST64: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoFAST8: &'static [u8; 2usize] = b"o\0"; -pub const PRIoFAST16: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoFAST32: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoFAST64: &'static [u8; 3usize] = b"lo\0"; -pub const PRIoMAX: &'static [u8; 3usize] = b"jo\0"; -pub const PRIoPTR: &'static [u8; 3usize] = b"lo\0"; -pub const PRIu8: &'static [u8; 2usize] = b"u\0"; -pub const PRIu16: &'static [u8; 2usize] = b"u\0"; -pub const PRIu32: &'static [u8; 2usize] = b"u\0"; -pub const PRIu64: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuLEAST8: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST16: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST32: &'static [u8; 2usize] = b"u\0"; -pub const PRIuLEAST64: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuFAST8: &'static [u8; 2usize] = b"u\0"; -pub const PRIuFAST16: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuFAST32: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuFAST64: &'static [u8; 3usize] = b"lu\0"; -pub const PRIuMAX: &'static [u8; 3usize] = b"ju\0"; -pub const PRIuPTR: &'static [u8; 3usize] = b"lu\0"; -pub const PRIx8: &'static [u8; 2usize] = b"x\0"; -pub const PRIx16: &'static [u8; 2usize] = b"x\0"; -pub const PRIx32: &'static [u8; 2usize] = b"x\0"; -pub const PRIx64: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxLEAST8: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST16: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST32: &'static [u8; 2usize] = b"x\0"; -pub const PRIxLEAST64: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxFAST8: &'static [u8; 2usize] = b"x\0"; -pub const PRIxFAST16: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxFAST32: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxFAST64: &'static [u8; 3usize] = b"lx\0"; -pub const PRIxMAX: &'static [u8; 3usize] = b"jx\0"; -pub const PRIxPTR: &'static [u8; 3usize] = b"lx\0"; -pub const PRIX8: &'static [u8; 2usize] = b"X\0"; -pub const PRIX16: &'static [u8; 2usize] = b"X\0"; -pub const PRIX32: &'static [u8; 2usize] = b"X\0"; -pub const PRIX64: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXLEAST8: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST16: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST32: &'static [u8; 2usize] = b"X\0"; -pub const PRIXLEAST64: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXFAST8: &'static [u8; 2usize] = b"X\0"; -pub const PRIXFAST16: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXFAST32: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXFAST64: &'static [u8; 3usize] = b"lX\0"; -pub const PRIXMAX: &'static [u8; 3usize] = b"jX\0"; -pub const PRIXPTR: &'static [u8; 3usize] = b"lX\0"; -pub const SCNd8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNd16: &'static [u8; 3usize] = b"hd\0"; -pub const SCNd32: &'static [u8; 2usize] = b"d\0"; -pub const SCNd64: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdLEAST8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNdLEAST16: &'static [u8; 3usize] = b"hd\0"; -pub const SCNdLEAST32: &'static [u8; 2usize] = b"d\0"; -pub const SCNdLEAST64: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdFAST8: &'static [u8; 4usize] = b"hhd\0"; -pub const SCNdFAST16: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdFAST32: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdFAST64: &'static [u8; 3usize] = b"ld\0"; -pub const SCNdMAX: &'static [u8; 3usize] = b"jd\0"; -pub const SCNdPTR: &'static [u8; 3usize] = b"ld\0"; -pub const SCNi8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNi16: &'static [u8; 3usize] = b"hi\0"; -pub const SCNi32: &'static [u8; 2usize] = b"i\0"; -pub const SCNi64: &'static [u8; 3usize] = b"li\0"; -pub const SCNiLEAST8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNiLEAST16: &'static [u8; 3usize] = b"hi\0"; -pub const SCNiLEAST32: &'static [u8; 2usize] = b"i\0"; -pub const SCNiLEAST64: &'static [u8; 3usize] = b"li\0"; -pub const SCNiFAST8: &'static [u8; 4usize] = b"hhi\0"; -pub const SCNiFAST16: &'static [u8; 3usize] = b"li\0"; -pub const SCNiFAST32: &'static [u8; 3usize] = b"li\0"; -pub const SCNiFAST64: &'static [u8; 3usize] = b"li\0"; -pub const SCNiMAX: &'static [u8; 3usize] = b"ji\0"; -pub const SCNiPTR: &'static [u8; 3usize] = b"li\0"; -pub const SCNo8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNo16: &'static [u8; 3usize] = b"ho\0"; -pub const SCNo32: &'static [u8; 2usize] = b"o\0"; -pub const SCNo64: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoLEAST8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNoLEAST16: &'static [u8; 3usize] = b"ho\0"; -pub const SCNoLEAST32: &'static [u8; 2usize] = b"o\0"; -pub const SCNoLEAST64: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoFAST8: &'static [u8; 4usize] = b"hho\0"; -pub const SCNoFAST16: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoFAST32: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoFAST64: &'static [u8; 3usize] = b"lo\0"; -pub const SCNoMAX: &'static [u8; 3usize] = b"jo\0"; -pub const SCNoPTR: &'static [u8; 3usize] = b"lo\0"; -pub const SCNu8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNu16: &'static [u8; 3usize] = b"hu\0"; -pub const SCNu32: &'static [u8; 2usize] = b"u\0"; -pub const SCNu64: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuLEAST8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNuLEAST16: &'static [u8; 3usize] = b"hu\0"; -pub const SCNuLEAST32: &'static [u8; 2usize] = b"u\0"; -pub const SCNuLEAST64: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuFAST8: &'static [u8; 4usize] = b"hhu\0"; -pub const SCNuFAST16: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuFAST32: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuFAST64: &'static [u8; 3usize] = b"lu\0"; -pub const SCNuMAX: &'static [u8; 3usize] = b"ju\0"; -pub const SCNuPTR: &'static [u8; 3usize] = b"lu\0"; -pub const SCNx8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNx16: &'static [u8; 3usize] = b"hx\0"; -pub const SCNx32: &'static [u8; 2usize] = b"x\0"; -pub const SCNx64: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxLEAST8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNxLEAST16: &'static [u8; 3usize] = b"hx\0"; -pub const SCNxLEAST32: &'static [u8; 2usize] = b"x\0"; -pub const SCNxLEAST64: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxFAST8: &'static [u8; 4usize] = b"hhx\0"; -pub const SCNxFAST16: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxFAST32: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxFAST64: &'static [u8; 3usize] = b"lx\0"; -pub const SCNxMAX: &'static [u8; 3usize] = b"jx\0"; -pub const SCNxPTR: &'static [u8; 3usize] = b"lx\0"; +pub const __PRI_64_prefix: &[u8; 2usize] = b"l\0"; +pub const __PRI_PTR_prefix: &[u8; 2usize] = b"l\0"; +pub const __PRI_FAST_prefix: &[u8; 2usize] = b"l\0"; +pub const PRId8: &[u8; 2usize] = b"d\0"; +pub const PRId16: &[u8; 2usize] = b"d\0"; +pub const PRId32: &[u8; 2usize] = b"d\0"; +pub const PRId64: &[u8; 3usize] = b"ld\0"; +pub const PRIdLEAST8: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST16: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST32: &[u8; 2usize] = b"d\0"; +pub const PRIdLEAST64: &[u8; 3usize] = b"ld\0"; +pub const PRIdFAST8: &[u8; 2usize] = b"d\0"; +pub const PRIdFAST16: &[u8; 3usize] = b"ld\0"; +pub const PRIdFAST32: &[u8; 3usize] = b"ld\0"; +pub const PRIdFAST64: &[u8; 3usize] = b"ld\0"; +pub const PRIdMAX: &[u8; 3usize] = b"jd\0"; +pub const PRIdPTR: &[u8; 3usize] = b"ld\0"; +pub const PRIi8: &[u8; 2usize] = b"i\0"; +pub const PRIi16: &[u8; 2usize] = b"i\0"; +pub const PRIi32: &[u8; 2usize] = b"i\0"; +pub const PRIi64: &[u8; 3usize] = b"li\0"; +pub const PRIiLEAST8: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST16: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST32: &[u8; 2usize] = b"i\0"; +pub const PRIiLEAST64: &[u8; 3usize] = b"li\0"; +pub const PRIiFAST8: &[u8; 2usize] = b"i\0"; +pub const PRIiFAST16: &[u8; 3usize] = b"li\0"; +pub const PRIiFAST32: &[u8; 3usize] = b"li\0"; +pub const PRIiFAST64: &[u8; 3usize] = b"li\0"; +pub const PRIiMAX: &[u8; 3usize] = b"ji\0"; +pub const PRIiPTR: &[u8; 3usize] = b"li\0"; +pub const PRIo8: &[u8; 2usize] = b"o\0"; +pub const PRIo16: &[u8; 2usize] = b"o\0"; +pub const PRIo32: &[u8; 2usize] = b"o\0"; +pub const PRIo64: &[u8; 3usize] = b"lo\0"; +pub const PRIoLEAST8: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST16: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST32: &[u8; 2usize] = b"o\0"; +pub const PRIoLEAST64: &[u8; 3usize] = b"lo\0"; +pub const PRIoFAST8: &[u8; 2usize] = b"o\0"; +pub const PRIoFAST16: &[u8; 3usize] = b"lo\0"; +pub const PRIoFAST32: &[u8; 3usize] = b"lo\0"; +pub const PRIoFAST64: &[u8; 3usize] = b"lo\0"; +pub const PRIoMAX: &[u8; 3usize] = b"jo\0"; +pub const PRIoPTR: &[u8; 3usize] = b"lo\0"; +pub const PRIu8: &[u8; 2usize] = b"u\0"; +pub const PRIu16: &[u8; 2usize] = b"u\0"; +pub const PRIu32: &[u8; 2usize] = b"u\0"; +pub const PRIu64: &[u8; 3usize] = b"lu\0"; +pub const PRIuLEAST8: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST16: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST32: &[u8; 2usize] = b"u\0"; +pub const PRIuLEAST64: &[u8; 3usize] = b"lu\0"; +pub const PRIuFAST8: &[u8; 2usize] = b"u\0"; +pub const PRIuFAST16: &[u8; 3usize] = b"lu\0"; +pub const PRIuFAST32: &[u8; 3usize] = b"lu\0"; +pub const PRIuFAST64: &[u8; 3usize] = b"lu\0"; +pub const PRIuMAX: &[u8; 3usize] = b"ju\0"; +pub const PRIuPTR: &[u8; 3usize] = b"lu\0"; +pub const PRIx8: &[u8; 2usize] = b"x\0"; +pub const PRIx16: &[u8; 2usize] = b"x\0"; +pub const PRIx32: &[u8; 2usize] = b"x\0"; +pub const PRIx64: &[u8; 3usize] = b"lx\0"; +pub const PRIxLEAST8: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST16: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST32: &[u8; 2usize] = b"x\0"; +pub const PRIxLEAST64: &[u8; 3usize] = b"lx\0"; +pub const PRIxFAST8: &[u8; 2usize] = b"x\0"; +pub const PRIxFAST16: &[u8; 3usize] = b"lx\0"; +pub const PRIxFAST32: &[u8; 3usize] = b"lx\0"; +pub const PRIxFAST64: &[u8; 3usize] = b"lx\0"; +pub const PRIxMAX: &[u8; 3usize] = b"jx\0"; +pub const PRIxPTR: &[u8; 3usize] = b"lx\0"; +pub const PRIX8: &[u8; 2usize] = b"X\0"; +pub const PRIX16: &[u8; 2usize] = b"X\0"; +pub const PRIX32: &[u8; 2usize] = b"X\0"; +pub const PRIX64: &[u8; 3usize] = b"lX\0"; +pub const PRIXLEAST8: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST16: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST32: &[u8; 2usize] = b"X\0"; +pub const PRIXLEAST64: &[u8; 3usize] = b"lX\0"; +pub const PRIXFAST8: &[u8; 2usize] = b"X\0"; +pub const PRIXFAST16: &[u8; 3usize] = b"lX\0"; +pub const PRIXFAST32: &[u8; 3usize] = b"lX\0"; +pub const PRIXFAST64: &[u8; 3usize] = b"lX\0"; +pub const PRIXMAX: &[u8; 3usize] = b"jX\0"; +pub const PRIXPTR: &[u8; 3usize] = b"lX\0"; +pub const SCNd8: &[u8; 4usize] = b"hhd\0"; +pub const SCNd16: &[u8; 3usize] = b"hd\0"; +pub const SCNd32: &[u8; 2usize] = b"d\0"; +pub const SCNd64: &[u8; 3usize] = b"ld\0"; +pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0"; +pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0"; +pub const SCNdLEAST32: &[u8; 2usize] = b"d\0"; +pub const SCNdLEAST64: &[u8; 3usize] = b"ld\0"; +pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0"; +pub const SCNdFAST16: &[u8; 3usize] = b"ld\0"; +pub const SCNdFAST32: &[u8; 3usize] = b"ld\0"; +pub const SCNdFAST64: &[u8; 3usize] = b"ld\0"; +pub const SCNdMAX: &[u8; 3usize] = b"jd\0"; +pub const SCNdPTR: &[u8; 3usize] = b"ld\0"; +pub const SCNi8: &[u8; 4usize] = b"hhi\0"; +pub const SCNi16: &[u8; 3usize] = b"hi\0"; +pub const SCNi32: &[u8; 2usize] = b"i\0"; +pub const SCNi64: &[u8; 3usize] = b"li\0"; +pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0"; +pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0"; +pub const SCNiLEAST32: &[u8; 2usize] = b"i\0"; +pub const SCNiLEAST64: &[u8; 3usize] = b"li\0"; +pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0"; +pub const SCNiFAST16: &[u8; 3usize] = b"li\0"; +pub const SCNiFAST32: &[u8; 3usize] = b"li\0"; +pub const SCNiFAST64: &[u8; 3usize] = b"li\0"; +pub const SCNiMAX: &[u8; 3usize] = b"ji\0"; +pub const SCNiPTR: &[u8; 3usize] = b"li\0"; +pub const SCNo8: &[u8; 4usize] = b"hho\0"; +pub const SCNo16: &[u8; 3usize] = b"ho\0"; +pub const SCNo32: &[u8; 2usize] = b"o\0"; +pub const SCNo64: &[u8; 3usize] = b"lo\0"; +pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0"; +pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0"; +pub const SCNoLEAST32: &[u8; 2usize] = b"o\0"; +pub const SCNoLEAST64: &[u8; 3usize] = b"lo\0"; +pub const SCNoFAST8: &[u8; 4usize] = b"hho\0"; +pub const SCNoFAST16: &[u8; 3usize] = b"lo\0"; +pub const SCNoFAST32: &[u8; 3usize] = b"lo\0"; +pub const SCNoFAST64: &[u8; 3usize] = b"lo\0"; +pub const SCNoMAX: &[u8; 3usize] = b"jo\0"; +pub const SCNoPTR: &[u8; 3usize] = b"lo\0"; +pub const SCNu8: &[u8; 4usize] = b"hhu\0"; +pub const SCNu16: &[u8; 3usize] = b"hu\0"; +pub const SCNu32: &[u8; 2usize] = b"u\0"; +pub const SCNu64: &[u8; 3usize] = b"lu\0"; +pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0"; +pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0"; +pub const SCNuLEAST32: &[u8; 2usize] = b"u\0"; +pub const SCNuLEAST64: &[u8; 3usize] = b"lu\0"; +pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0"; +pub const SCNuFAST16: &[u8; 3usize] = b"lu\0"; +pub const SCNuFAST32: &[u8; 3usize] = b"lu\0"; +pub const SCNuFAST64: &[u8; 3usize] = b"lu\0"; +pub const SCNuMAX: &[u8; 3usize] = b"ju\0"; +pub const SCNuPTR: &[u8; 3usize] = b"lu\0"; +pub const SCNx8: &[u8; 4usize] = b"hhx\0"; +pub const SCNx16: &[u8; 3usize] = b"hx\0"; +pub const SCNx32: &[u8; 2usize] = b"x\0"; +pub const SCNx64: &[u8; 3usize] = b"lx\0"; +pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0"; +pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0"; +pub const SCNxLEAST32: &[u8; 2usize] = b"x\0"; +pub const SCNxLEAST64: &[u8; 3usize] = b"lx\0"; +pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0"; +pub const SCNxFAST16: &[u8; 3usize] = b"lx\0"; +pub const SCNxFAST32: &[u8; 3usize] = b"lx\0"; +pub const SCNxFAST64: &[u8; 3usize] = b"lx\0"; +pub const SCNxMAX: &[u8; 3usize] = b"jx\0"; +pub const SCNxPTR: &[u8; 3usize] = b"lx\0"; pub const AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT: u32 = 8; pub const O_ACCMODE: u32 = 3; pub const O_RDONLY: u32 = 0; @@ -642,11 +642,11 @@ pub const SOL_NFC: u32 = 280; pub const SOL_KCM: u32 = 281; pub const SOL_TLS: u32 = 282; pub const IPX_TYPE: u32 = 1; -pub const _PATH_HEQUIV: &'static [u8; 24usize] = b"/system/etc/hosts.equiv\0"; -pub const _PATH_HOSTS: &'static [u8; 18usize] = b"/system/etc/hosts\0"; -pub const _PATH_NETWORKS: &'static [u8; 21usize] = b"/system/etc/networks\0"; -pub const _PATH_PROTOCOLS: &'static [u8; 22usize] = b"/system/etc/protocols\0"; -pub const _PATH_SERVICES: &'static [u8; 21usize] = b"/system/etc/services\0"; +pub const _PATH_HEQUIV: &[u8; 24usize] = b"/system/etc/hosts.equiv\0"; +pub const _PATH_HOSTS: &[u8; 18usize] = b"/system/etc/hosts\0"; +pub const _PATH_NETWORKS: &[u8; 21usize] = b"/system/etc/networks\0"; +pub const _PATH_PROTOCOLS: &[u8; 22usize] = b"/system/etc/protocols\0"; +pub const _PATH_SERVICES: &[u8; 21usize] = b"/system/etc/services\0"; pub const NETDB_INTERNAL: i32 = -1; pub const NETDB_SUCCESS: u32 = 0; pub const HOST_NOT_FOUND: u32 = 1; @@ -712,7 +712,7 @@ pub const FOPEN_MAX: u32 = 20; pub const FILENAME_MAX: u32 = 4096; pub const L_tmpnam: u32 = 4096; pub const TMP_MAX: u32 = 308915776; -pub const P_tmpdir: &'static [u8; 6usize] = b"/tmp/\0"; +pub const P_tmpdir: &[u8; 6usize] = b"/tmp/\0"; pub const L_ctermid: u32 = 1024; pub const STRUCT_MALLINFO_DECLARED: u32 = 1; pub const M_DECAY_TIME: i32 = -100; @@ -1126,11 +1126,11 @@ pub const CLOCKS_PER_SEC: u32 = 1000000; pub const TIME_UTC: u32 = 1; pub const AAUDIO_UNSPECIFIED: u32 = 0; pub const AAUDIO_SYSTEM_USAGE_OFFSET: u32 = 1000; -pub const PROPERTY_VENDOR: &'static [u8; 7usize] = b"vendor\0"; -pub const PROPERTY_VERSION: &'static [u8; 8usize] = b"version\0"; -pub const PROPERTY_DESCRIPTION: &'static [u8; 12usize] = b"description\0"; -pub const PROPERTY_ALGORITHMS: &'static [u8; 11usize] = b"algorithms\0"; -pub const PROPERTY_DEVICE_UNIQUE_ID: &'static [u8; 15usize] = b"deviceUniqueId\0"; +pub const PROPERTY_VENDOR: &[u8; 7usize] = b"vendor\0"; +pub const PROPERTY_VERSION: &[u8; 8usize] = b"version\0"; +pub const PROPERTY_DESCRIPTION: &[u8; 12usize] = b"description\0"; +pub const PROPERTY_ALGORITHMS: &[u8; 11usize] = b"algorithms\0"; +pub const PROPERTY_DEVICE_UNIQUE_ID: &[u8; 15usize] = b"deviceUniqueId\0"; extern "C" { pub fn android_get_application_target_sdk_version() -> ::std::os::raw::c_int; } @@ -1865,13 +1865,27 @@ pub const ANDROID_BITMAP_RESULT_BAD_PARAMETER: ::std::os::raw::c_int = -1; pub const ANDROID_BITMAP_RESULT_JNI_EXCEPTION: ::std::os::raw::c_int = -2; pub const ANDROID_BITMAP_RESULT_ALLOCATION_FAILED: ::std::os::raw::c_int = -3; pub type _bindgen_ty_2 = ::std::os::raw::c_int; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_NONE: AndroidBitmapFormat = 0; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_8888: AndroidBitmapFormat = 1; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGB_565: AndroidBitmapFormat = 4; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_4444: AndroidBitmapFormat = 7; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_A_8: AndroidBitmapFormat = 8; -pub const AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_F16: AndroidBitmapFormat = 9; -pub type AndroidBitmapFormat = ::std::os::raw::c_uint; +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_NONE: AndroidBitmapFormat = AndroidBitmapFormat(0); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_8888: AndroidBitmapFormat = AndroidBitmapFormat(1); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGB_565: AndroidBitmapFormat = AndroidBitmapFormat(4); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_4444: AndroidBitmapFormat = AndroidBitmapFormat(7); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_A_8: AndroidBitmapFormat = AndroidBitmapFormat(8); +} +impl AndroidBitmapFormat { + pub const ANDROID_BITMAP_FORMAT_RGBA_F16: AndroidBitmapFormat = AndroidBitmapFormat(9); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AndroidBitmapFormat(pub ::std::os::raw::c_uint); pub const ANDROID_BITMAP_FLAGS_ALPHA_PREMUL: ::std::os::raw::c_uint = 0; pub const ANDROID_BITMAP_FLAGS_ALPHA_OPAQUE: ::std::os::raw::c_uint = 1; pub const ANDROID_BITMAP_FLAGS_ALPHA_UNPREMUL: ::std::os::raw::c_uint = 2; @@ -2681,25 +2695,60 @@ fn bindgen_test_layout_ARect() { ) ); } -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = 1; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = 2; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM: AHardwareBuffer_Format = 3; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM: AHardwareBuffer_Format = 4; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT: AHardwareBuffer_Format = - 22; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM: AHardwareBuffer_Format = - 43; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_BLOB: AHardwareBuffer_Format = 33; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D16_UNORM: AHardwareBuffer_Format = 48; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM: AHardwareBuffer_Format = 49; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT: AHardwareBuffer_Format = - 50; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT: AHardwareBuffer_Format = 51; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHardwareBuffer_Format = - 52; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = 53; -pub const AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = 35; -pub type AHardwareBuffer_Format = ::std::os::raw::c_uint; +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(1); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(2); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(3); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(4); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT: AHardwareBuffer_Format = + AHardwareBuffer_Format(22); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM: AHardwareBuffer_Format = + AHardwareBuffer_Format(43); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_BLOB: AHardwareBuffer_Format = AHardwareBuffer_Format(33); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D16_UNORM: AHardwareBuffer_Format = AHardwareBuffer_Format(48); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D24_UNORM: AHardwareBuffer_Format = AHardwareBuffer_Format(49); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT: AHardwareBuffer_Format = + AHardwareBuffer_Format(50); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D32_FLOAT: AHardwareBuffer_Format = AHardwareBuffer_Format(51); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT: AHardwareBuffer_Format = + AHardwareBuffer_Format(52); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_S8_UINT: AHardwareBuffer_Format = AHardwareBuffer_Format(53); +} +impl AHardwareBuffer_Format { + pub const AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: AHardwareBuffer_Format = + AHardwareBuffer_Format(35); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AHardwareBuffer_Format(pub ::std::os::raw::c_uint); pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_NEVER: AHardwareBuffer_UsageFlags = 0; pub const AHardwareBuffer_UsageFlags_AHARDWAREBUFFER_USAGE_CPU_READ_RARELY: @@ -16149,36 +16198,96 @@ extern "C" { extern "C" { pub fn AAudioStream_isPrivacySensitive(stream: *mut AAudioStream) -> bool; } -pub const media_status_t_AMEDIA_OK: media_status_t = 0; -pub const media_status_t_AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE: media_status_t = 1100; -pub const media_status_t_AMEDIACODEC_ERROR_RECLAIMED: media_status_t = 1101; -pub const media_status_t_AMEDIA_ERROR_BASE: media_status_t = -10000; -pub const media_status_t_AMEDIA_ERROR_UNKNOWN: media_status_t = -10000; -pub const media_status_t_AMEDIA_ERROR_MALFORMED: media_status_t = -10001; -pub const media_status_t_AMEDIA_ERROR_UNSUPPORTED: media_status_t = -10002; -pub const media_status_t_AMEDIA_ERROR_INVALID_OBJECT: media_status_t = -10003; -pub const media_status_t_AMEDIA_ERROR_INVALID_PARAMETER: media_status_t = -10004; -pub const media_status_t_AMEDIA_ERROR_INVALID_OPERATION: media_status_t = -10005; -pub const media_status_t_AMEDIA_ERROR_END_OF_STREAM: media_status_t = -10006; -pub const media_status_t_AMEDIA_ERROR_IO: media_status_t = -10007; -pub const media_status_t_AMEDIA_ERROR_WOULD_BLOCK: media_status_t = -10008; -pub const media_status_t_AMEDIA_DRM_ERROR_BASE: media_status_t = -20000; -pub const media_status_t_AMEDIA_DRM_NOT_PROVISIONED: media_status_t = -20001; -pub const media_status_t_AMEDIA_DRM_RESOURCE_BUSY: media_status_t = -20002; -pub const media_status_t_AMEDIA_DRM_DEVICE_REVOKED: media_status_t = -20003; -pub const media_status_t_AMEDIA_DRM_SHORT_BUFFER: media_status_t = -20004; -pub const media_status_t_AMEDIA_DRM_SESSION_NOT_OPENED: media_status_t = -20005; -pub const media_status_t_AMEDIA_DRM_TAMPER_DETECTED: media_status_t = -20006; -pub const media_status_t_AMEDIA_DRM_VERIFY_FAILED: media_status_t = -20007; -pub const media_status_t_AMEDIA_DRM_NEED_KEY: media_status_t = -20008; -pub const media_status_t_AMEDIA_DRM_LICENSE_EXPIRED: media_status_t = -20009; -pub const media_status_t_AMEDIA_IMGREADER_ERROR_BASE: media_status_t = -30000; -pub const media_status_t_AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE: media_status_t = -30001; -pub const media_status_t_AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED: media_status_t = -30002; -pub const media_status_t_AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE: media_status_t = -30003; -pub const media_status_t_AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE: media_status_t = -30004; -pub const media_status_t_AMEDIA_IMGREADER_IMAGE_NOT_LOCKED: media_status_t = -30005; -pub type media_status_t = ::std::os::raw::c_int; +impl media_status_t { + pub const AMEDIA_OK: media_status_t = media_status_t(0); +} +impl media_status_t { + pub const AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE: media_status_t = media_status_t(1100); +} +impl media_status_t { + pub const AMEDIACODEC_ERROR_RECLAIMED: media_status_t = media_status_t(1101); +} +impl media_status_t { + pub const AMEDIA_ERROR_BASE: media_status_t = media_status_t(-10000); +} +impl media_status_t { + pub const AMEDIA_ERROR_UNKNOWN: media_status_t = media_status_t(-10000); +} +impl media_status_t { + pub const AMEDIA_ERROR_MALFORMED: media_status_t = media_status_t(-10001); +} +impl media_status_t { + pub const AMEDIA_ERROR_UNSUPPORTED: media_status_t = media_status_t(-10002); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_OBJECT: media_status_t = media_status_t(-10003); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_PARAMETER: media_status_t = media_status_t(-10004); +} +impl media_status_t { + pub const AMEDIA_ERROR_INVALID_OPERATION: media_status_t = media_status_t(-10005); +} +impl media_status_t { + pub const AMEDIA_ERROR_END_OF_STREAM: media_status_t = media_status_t(-10006); +} +impl media_status_t { + pub const AMEDIA_ERROR_IO: media_status_t = media_status_t(-10007); +} +impl media_status_t { + pub const AMEDIA_ERROR_WOULD_BLOCK: media_status_t = media_status_t(-10008); +} +impl media_status_t { + pub const AMEDIA_DRM_ERROR_BASE: media_status_t = media_status_t(-20000); +} +impl media_status_t { + pub const AMEDIA_DRM_NOT_PROVISIONED: media_status_t = media_status_t(-20001); +} +impl media_status_t { + pub const AMEDIA_DRM_RESOURCE_BUSY: media_status_t = media_status_t(-20002); +} +impl media_status_t { + pub const AMEDIA_DRM_DEVICE_REVOKED: media_status_t = media_status_t(-20003); +} +impl media_status_t { + pub const AMEDIA_DRM_SHORT_BUFFER: media_status_t = media_status_t(-20004); +} +impl media_status_t { + pub const AMEDIA_DRM_SESSION_NOT_OPENED: media_status_t = media_status_t(-20005); +} +impl media_status_t { + pub const AMEDIA_DRM_TAMPER_DETECTED: media_status_t = media_status_t(-20006); +} +impl media_status_t { + pub const AMEDIA_DRM_VERIFY_FAILED: media_status_t = media_status_t(-20007); +} +impl media_status_t { + pub const AMEDIA_DRM_NEED_KEY: media_status_t = media_status_t(-20008); +} +impl media_status_t { + pub const AMEDIA_DRM_LICENSE_EXPIRED: media_status_t = media_status_t(-20009); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_ERROR_BASE: media_status_t = media_status_t(-30000); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE: media_status_t = media_status_t(-30001); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED: media_status_t = media_status_t(-30002); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE: media_status_t = media_status_t(-30003); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE: media_status_t = media_status_t(-30004); +} +impl media_status_t { + pub const AMEDIA_IMGREADER_IMAGE_NOT_LOCKED: media_status_t = media_status_t(-30005); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct media_status_t(pub ::std::os::raw::c_int); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct AMidiDevice { @@ -16268,24 +16377,60 @@ extern "C" { extern "C" { pub fn AMidiInputPort_close(inputPort: *const AMidiInputPort); } -pub const camera_status_t_ACAMERA_OK: camera_status_t = 0; -pub const camera_status_t_ACAMERA_ERROR_BASE: camera_status_t = -10000; -pub const camera_status_t_ACAMERA_ERROR_UNKNOWN: camera_status_t = -10000; -pub const camera_status_t_ACAMERA_ERROR_INVALID_PARAMETER: camera_status_t = -10001; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DISCONNECTED: camera_status_t = -10002; -pub const camera_status_t_ACAMERA_ERROR_NOT_ENOUGH_MEMORY: camera_status_t = -10003; -pub const camera_status_t_ACAMERA_ERROR_METADATA_NOT_FOUND: camera_status_t = -10004; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DEVICE: camera_status_t = -10005; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_SERVICE: camera_status_t = -10006; -pub const camera_status_t_ACAMERA_ERROR_SESSION_CLOSED: camera_status_t = -10007; -pub const camera_status_t_ACAMERA_ERROR_INVALID_OPERATION: camera_status_t = -10008; -pub const camera_status_t_ACAMERA_ERROR_STREAM_CONFIGURE_FAIL: camera_status_t = -10009; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_IN_USE: camera_status_t = -10010; -pub const camera_status_t_ACAMERA_ERROR_MAX_CAMERA_IN_USE: camera_status_t = -10011; -pub const camera_status_t_ACAMERA_ERROR_CAMERA_DISABLED: camera_status_t = -10012; -pub const camera_status_t_ACAMERA_ERROR_PERMISSION_DENIED: camera_status_t = -10013; -pub const camera_status_t_ACAMERA_ERROR_UNSUPPORTED_OPERATION: camera_status_t = -10014; -pub type camera_status_t = ::std::os::raw::c_int; +impl camera_status_t { + pub const ACAMERA_OK: camera_status_t = camera_status_t(0); +} +impl camera_status_t { + pub const ACAMERA_ERROR_BASE: camera_status_t = camera_status_t(-10000); +} +impl camera_status_t { + pub const ACAMERA_ERROR_UNKNOWN: camera_status_t = camera_status_t(-10000); +} +impl camera_status_t { + pub const ACAMERA_ERROR_INVALID_PARAMETER: camera_status_t = camera_status_t(-10001); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DISCONNECTED: camera_status_t = camera_status_t(-10002); +} +impl camera_status_t { + pub const ACAMERA_ERROR_NOT_ENOUGH_MEMORY: camera_status_t = camera_status_t(-10003); +} +impl camera_status_t { + pub const ACAMERA_ERROR_METADATA_NOT_FOUND: camera_status_t = camera_status_t(-10004); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DEVICE: camera_status_t = camera_status_t(-10005); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_SERVICE: camera_status_t = camera_status_t(-10006); +} +impl camera_status_t { + pub const ACAMERA_ERROR_SESSION_CLOSED: camera_status_t = camera_status_t(-10007); +} +impl camera_status_t { + pub const ACAMERA_ERROR_INVALID_OPERATION: camera_status_t = camera_status_t(-10008); +} +impl camera_status_t { + pub const ACAMERA_ERROR_STREAM_CONFIGURE_FAIL: camera_status_t = camera_status_t(-10009); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_IN_USE: camera_status_t = camera_status_t(-10010); +} +impl camera_status_t { + pub const ACAMERA_ERROR_MAX_CAMERA_IN_USE: camera_status_t = camera_status_t(-10011); +} +impl camera_status_t { + pub const ACAMERA_ERROR_CAMERA_DISABLED: camera_status_t = camera_status_t(-10012); +} +impl camera_status_t { + pub const ACAMERA_ERROR_PERMISSION_DENIED: camera_status_t = camera_status_t(-10013); +} +impl camera_status_t { + pub const ACAMERA_ERROR_UNSUPPORTED_OPERATION: camera_status_t = camera_status_t(-10014); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct camera_status_t(pub ::std::os::raw::c_int); pub const acamera_metadata_section_ACAMERA_COLOR_CORRECTION: acamera_metadata_section = 0; pub const acamera_metadata_section_ACAMERA_CONTROL: acamera_metadata_section = 1; pub const acamera_metadata_section_ACAMERA_DEMOSAIC: acamera_metadata_section = 2; @@ -18911,24 +19056,60 @@ extern "C" { pub struct AImage { _unused: [u8; 0], } -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_8888: AIMAGE_FORMATS = 1; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBX_8888: AIMAGE_FORMATS = 2; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_888: AIMAGE_FORMATS = 3; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_565: AIMAGE_FORMATS = 4; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_FP16: AIMAGE_FORMATS = 22; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_YUV_420_888: AIMAGE_FORMATS = 35; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_JPEG: AIMAGE_FORMATS = 256; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW16: AIMAGE_FORMATS = 32; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW_PRIVATE: AIMAGE_FORMATS = 36; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW10: AIMAGE_FORMATS = 37; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_RAW12: AIMAGE_FORMATS = 38; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH16: AIMAGE_FORMATS = 1144402265; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_POINT_CLOUD: AIMAGE_FORMATS = 257; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_PRIVATE: AIMAGE_FORMATS = 34; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_Y8: AIMAGE_FORMATS = 538982489; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_HEIC: AIMAGE_FORMATS = 1212500294; -pub const AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_JPEG: AIMAGE_FORMATS = 1768253795; -pub type AIMAGE_FORMATS = ::std::os::raw::c_uint; +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBA_8888: AIMAGE_FORMATS = AIMAGE_FORMATS(1); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBX_8888: AIMAGE_FORMATS = AIMAGE_FORMATS(2); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGB_888: AIMAGE_FORMATS = AIMAGE_FORMATS(3); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGB_565: AIMAGE_FORMATS = AIMAGE_FORMATS(4); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RGBA_FP16: AIMAGE_FORMATS = AIMAGE_FORMATS(22); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_YUV_420_888: AIMAGE_FORMATS = AIMAGE_FORMATS(35); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_JPEG: AIMAGE_FORMATS = AIMAGE_FORMATS(256); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW16: AIMAGE_FORMATS = AIMAGE_FORMATS(32); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW_PRIVATE: AIMAGE_FORMATS = AIMAGE_FORMATS(36); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW10: AIMAGE_FORMATS = AIMAGE_FORMATS(37); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_RAW12: AIMAGE_FORMATS = AIMAGE_FORMATS(38); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH16: AIMAGE_FORMATS = AIMAGE_FORMATS(1144402265); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH_POINT_CLOUD: AIMAGE_FORMATS = AIMAGE_FORMATS(257); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_PRIVATE: AIMAGE_FORMATS = AIMAGE_FORMATS(34); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_Y8: AIMAGE_FORMATS = AIMAGE_FORMATS(538982489); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_HEIC: AIMAGE_FORMATS = AIMAGE_FORMATS(1212500294); +} +impl AIMAGE_FORMATS { + pub const AIMAGE_FORMAT_DEPTH_JPEG: AIMAGE_FORMATS = AIMAGE_FORMATS(1768253795); +} +#[repr(transparent)] +#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] +pub struct AIMAGE_FORMATS(pub ::std::os::raw::c_uint); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct AImageCropRect { diff --git a/ndk/CHANGELOG.md b/ndk/CHANGELOG.md index 542fd707..83faeebe 100644 --- a/ndk/CHANGELOG.md +++ b/ndk/CHANGELOG.md @@ -2,11 +2,12 @@ - ndk/hardware_buffer: Make `HardwareBuffer::as_ptr()` public for interop with Vulkan. - **Breaking:** `Configuration::country()` now returns `None` when the country is unset (akin to `Configuration::language()`) -- Add `MediaCodec` and `MediaFormat` bindings ([#216](https://github.com/rust-windowing/android-ndk-rs/pull/216)) +- Add `MediaCodec` and `MediaFormat` bindings. (#216) +- **Breaking:** Upgrade to [`ndk-sys 0.4.0`](../ndk-sys/CHANGELOG.md#040-TODO-YET-UNRELEASED) and use new `enum` newtype wrappers. (#245) # 0.6.0 (2022-01-05) -- **Breaking:** Upgrade to `ndk-sys 0.3.0` and migrate to `jni-sys` types that it now directly uses in its bindings. +- **Breaking:** Upgrade to [`ndk-sys 0.3.0`](../ndk-sys/CHANGELOG.md#030-2022-01-05) and migrate to `jni-sys` types that it now directly uses in its bindings. # 0.5.0 (2021-11-22) diff --git a/ndk/src/bitmap.rs b/ndk/src/bitmap.rs index d4e29dab..5806f63e 100644 --- a/ndk/src/bitmap.rs +++ b/ndk/src/bitmap.rs @@ -47,13 +47,13 @@ mod temp_allow_deprecated { #[derive(Copy, Clone, Debug, PartialEq, Eq, IntoPrimitive, TryFromPrimitive)] #[allow(non_camel_case_types)] pub enum BitmapFormat { - NONE = ffi::AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_NONE, - RGBA_8888 = ffi::AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_8888, - RGB_565 = ffi::AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGB_565, + NONE = ffi::AndroidBitmapFormat::ANDROID_BITMAP_FORMAT_NONE.0, + RGBA_8888 = ffi::AndroidBitmapFormat::ANDROID_BITMAP_FORMAT_RGBA_8888.0, + RGB_565 = ffi::AndroidBitmapFormat::ANDROID_BITMAP_FORMAT_RGB_565.0, #[deprecated = "Deprecated in API level 13. Because of the poor quality of this configuration, it is advised to use ARGB_8888 instead."] - RGBA_4444 = ffi::AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_4444, - A_8 = ffi::AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_A_8, - RGBA_F16 = ffi::AndroidBitmapFormat_ANDROID_BITMAP_FORMAT_RGBA_F16, + RGBA_4444 = ffi::AndroidBitmapFormat::ANDROID_BITMAP_FORMAT_RGBA_4444.0, + A_8 = ffi::AndroidBitmapFormat::ANDROID_BITMAP_FORMAT_A_8.0, + RGBA_F16 = ffi::AndroidBitmapFormat::ANDROID_BITMAP_FORMAT_RGBA_F16.0, } } pub use temp_allow_deprecated::*; diff --git a/ndk/src/hardware_buffer.rs b/ndk/src/hardware_buffer.rs index aed71ef4..9d52ee4a 100644 --- a/ndk/src/hardware_buffer.rs +++ b/ndk/src/hardware_buffer.rs @@ -83,20 +83,20 @@ impl HardwareBufferUsage { #[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)] #[allow(non_camel_case_types)] pub enum HardwareBufferFormat { - R8G8B8A8_UNORM = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM, - R8G8B8X8_UNORM = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM, - R8G8B8_UNORM = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM, - R5G6B5_UNORM = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM, - R16G16B16A16_FLOAT = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT, - R10G10B10A2_UNORM = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM, - BLOB = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_BLOB, - D16_UNORM = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D16_UNORM, - D24_UNORM = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM, - D24_UNORM_S8_UINT = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT, - D32_FLOAT = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT, - D32_FLOAT_S8_UINT = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT, - S8_UINT = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_S8_UINT, - Y8Cb8Cr8_420 = ffi::AHardwareBuffer_Format_AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420, + R8G8B8A8_UNORM = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM.0, + R8G8B8X8_UNORM = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM.0, + R8G8B8_UNORM = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM.0, + R5G6B5_UNORM = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM.0, + R16G16B16A16_FLOAT = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT.0, + R10G10B10A2_UNORM = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM.0, + BLOB = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_BLOB.0, + D16_UNORM = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_D16_UNORM.0, + D24_UNORM = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_D24_UNORM.0, + D24_UNORM_S8_UINT = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT.0, + D32_FLOAT = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_D32_FLOAT.0, + D32_FLOAT_S8_UINT = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT.0, + S8_UINT = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_S8_UINT.0, + Y8Cb8Cr8_420 = ffi::AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420.0, } #[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq)] diff --git a/ndk/src/media/error.rs b/ndk/src/media/error.rs index b864f4fa..05cff87e 100644 --- a/ndk/src/media/error.rs +++ b/ndk/src/media/error.rs @@ -4,77 +4,77 @@ use thiserror::Error; #[repr(i32)] #[derive(Copy, Clone, Debug, PartialEq, Eq)] pub enum MediaErrorResult { - CodecErrorInsufficientResource = ffi::media_status_t_AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE, - CodecErrorReclaimed = ffi::media_status_t_AMEDIACODEC_ERROR_RECLAIMED, - ErrorUnknown = ffi::media_status_t_AMEDIA_ERROR_UNKNOWN, - ErrorMalformed = ffi::media_status_t_AMEDIA_ERROR_MALFORMED, - ErrorUnsupported = ffi::media_status_t_AMEDIA_ERROR_UNSUPPORTED, - ErrorInvalidObject = ffi::media_status_t_AMEDIA_ERROR_INVALID_OBJECT, - ErrorInvalidParameter = ffi::media_status_t_AMEDIA_ERROR_INVALID_PARAMETER, - ErrorInvalidOperation = ffi::media_status_t_AMEDIA_ERROR_INVALID_OPERATION, - ErrorEndOfStream = ffi::media_status_t_AMEDIA_ERROR_END_OF_STREAM, - ErrorIo = ffi::media_status_t_AMEDIA_ERROR_IO, - ErrorWouldBlock = ffi::media_status_t_AMEDIA_ERROR_WOULD_BLOCK, - DrmErrorBase = ffi::media_status_t_AMEDIA_DRM_ERROR_BASE, - DrmNotProvisioned = ffi::media_status_t_AMEDIA_DRM_NOT_PROVISIONED, - DrmResourceBusy = ffi::media_status_t_AMEDIA_DRM_RESOURCE_BUSY, - DrmDeviceRevoked = ffi::media_status_t_AMEDIA_DRM_DEVICE_REVOKED, - DrmShortBuffer = ffi::media_status_t_AMEDIA_DRM_SHORT_BUFFER, - DrmSessionNotOpened = ffi::media_status_t_AMEDIA_DRM_SESSION_NOT_OPENED, - DrmTamperDetected = ffi::media_status_t_AMEDIA_DRM_TAMPER_DETECTED, - DrmVerifyFailed = ffi::media_status_t_AMEDIA_DRM_VERIFY_FAILED, - DrmNeedKey = ffi::media_status_t_AMEDIA_DRM_NEED_KEY, - DrmLicenseExpired = ffi::media_status_t_AMEDIA_DRM_LICENSE_EXPIRED, - ImgreaderErrorBase = ffi::media_status_t_AMEDIA_IMGREADER_ERROR_BASE, - ImgreaderNoBufferAvailable = ffi::media_status_t_AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE, - ImgreaderMaxImagesAcquired = ffi::media_status_t_AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED, - ImgreaderCannotLockImage = ffi::media_status_t_AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE, - ImgreaderCannotUnlockImage = ffi::media_status_t_AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE, - ImgreaderImageNotLocked = ffi::media_status_t_AMEDIA_IMGREADER_IMAGE_NOT_LOCKED, + CodecErrorInsufficientResource = ffi::media_status_t::AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE.0, + CodecErrorReclaimed = ffi::media_status_t::AMEDIACODEC_ERROR_RECLAIMED.0, + ErrorUnknown = ffi::media_status_t::AMEDIA_ERROR_UNKNOWN.0, + ErrorMalformed = ffi::media_status_t::AMEDIA_ERROR_MALFORMED.0, + ErrorUnsupported = ffi::media_status_t::AMEDIA_ERROR_UNSUPPORTED.0, + ErrorInvalidObject = ffi::media_status_t::AMEDIA_ERROR_INVALID_OBJECT.0, + ErrorInvalidParameter = ffi::media_status_t::AMEDIA_ERROR_INVALID_PARAMETER.0, + ErrorInvalidOperation = ffi::media_status_t::AMEDIA_ERROR_INVALID_OPERATION.0, + ErrorEndOfStream = ffi::media_status_t::AMEDIA_ERROR_END_OF_STREAM.0, + ErrorIo = ffi::media_status_t::AMEDIA_ERROR_IO.0, + ErrorWouldBlock = ffi::media_status_t::AMEDIA_ERROR_WOULD_BLOCK.0, + DrmErrorBase = ffi::media_status_t::AMEDIA_DRM_ERROR_BASE.0, + DrmNotProvisioned = ffi::media_status_t::AMEDIA_DRM_NOT_PROVISIONED.0, + DrmResourceBusy = ffi::media_status_t::AMEDIA_DRM_RESOURCE_BUSY.0, + DrmDeviceRevoked = ffi::media_status_t::AMEDIA_DRM_DEVICE_REVOKED.0, + DrmShortBuffer = ffi::media_status_t::AMEDIA_DRM_SHORT_BUFFER.0, + DrmSessionNotOpened = ffi::media_status_t::AMEDIA_DRM_SESSION_NOT_OPENED.0, + DrmTamperDetected = ffi::media_status_t::AMEDIA_DRM_TAMPER_DETECTED.0, + DrmVerifyFailed = ffi::media_status_t::AMEDIA_DRM_VERIFY_FAILED.0, + DrmNeedKey = ffi::media_status_t::AMEDIA_DRM_NEED_KEY.0, + DrmLicenseExpired = ffi::media_status_t::AMEDIA_DRM_LICENSE_EXPIRED.0, + ImgreaderErrorBase = ffi::media_status_t::AMEDIA_IMGREADER_ERROR_BASE.0, + ImgreaderNoBufferAvailable = ffi::media_status_t::AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE.0, + ImgreaderMaxImagesAcquired = ffi::media_status_t::AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED.0, + ImgreaderCannotLockImage = ffi::media_status_t::AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE.0, + ImgreaderCannotUnlockImage = ffi::media_status_t::AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE.0, + ImgreaderImageNotLocked = ffi::media_status_t::AMEDIA_IMGREADER_IMAGE_NOT_LOCKED.0, } #[derive(Debug, Error)] pub enum NdkMediaError { #[error("error Media result ({0:?})")] ErrorResult(MediaErrorResult), - #[error("unknown Media error result ({0})")] - UnknownResult(i32), + #[error("unknown Media error result ({0:?})")] + UnknownResult(ffi::media_status_t), } impl NdkMediaError { pub(crate) fn from_status(status: ffi::media_status_t) -> Result<()> { use MediaErrorResult::*; let result = match status { - ffi::media_status_t_AMEDIA_OK => return Ok(()), - ffi::media_status_t_AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE => { + ffi::media_status_t::AMEDIA_OK => return Ok(()), + ffi::media_status_t::AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE => { CodecErrorInsufficientResource } - ffi::media_status_t_AMEDIACODEC_ERROR_RECLAIMED => CodecErrorReclaimed, - ffi::media_status_t_AMEDIA_ERROR_UNKNOWN => ErrorUnknown, - ffi::media_status_t_AMEDIA_ERROR_MALFORMED => ErrorMalformed, - ffi::media_status_t_AMEDIA_ERROR_UNSUPPORTED => ErrorUnsupported, - ffi::media_status_t_AMEDIA_ERROR_INVALID_OBJECT => ErrorInvalidObject, - ffi::media_status_t_AMEDIA_ERROR_INVALID_PARAMETER => ErrorInvalidParameter, - ffi::media_status_t_AMEDIA_ERROR_INVALID_OPERATION => ErrorInvalidOperation, - ffi::media_status_t_AMEDIA_ERROR_END_OF_STREAM => ErrorEndOfStream, - ffi::media_status_t_AMEDIA_ERROR_IO => ErrorIo, - ffi::media_status_t_AMEDIA_ERROR_WOULD_BLOCK => ErrorWouldBlock, - ffi::media_status_t_AMEDIA_DRM_ERROR_BASE => DrmErrorBase, - ffi::media_status_t_AMEDIA_DRM_NOT_PROVISIONED => DrmNotProvisioned, - ffi::media_status_t_AMEDIA_DRM_RESOURCE_BUSY => DrmResourceBusy, - ffi::media_status_t_AMEDIA_DRM_DEVICE_REVOKED => DrmDeviceRevoked, - ffi::media_status_t_AMEDIA_DRM_SHORT_BUFFER => DrmShortBuffer, - ffi::media_status_t_AMEDIA_DRM_SESSION_NOT_OPENED => DrmSessionNotOpened, - ffi::media_status_t_AMEDIA_DRM_TAMPER_DETECTED => DrmTamperDetected, - ffi::media_status_t_AMEDIA_DRM_VERIFY_FAILED => DrmVerifyFailed, - ffi::media_status_t_AMEDIA_DRM_NEED_KEY => DrmNeedKey, - ffi::media_status_t_AMEDIA_DRM_LICENSE_EXPIRED => DrmLicenseExpired, - ffi::media_status_t_AMEDIA_IMGREADER_ERROR_BASE => ImgreaderErrorBase, - ffi::media_status_t_AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE => ImgreaderNoBufferAvailable, - ffi::media_status_t_AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED => ImgreaderMaxImagesAcquired, - ffi::media_status_t_AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE => ImgreaderCannotLockImage, - ffi::media_status_t_AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE => ImgreaderCannotUnlockImage, - ffi::media_status_t_AMEDIA_IMGREADER_IMAGE_NOT_LOCKED => ImgreaderImageNotLocked, + ffi::media_status_t::AMEDIACODEC_ERROR_RECLAIMED => CodecErrorReclaimed, + ffi::media_status_t::AMEDIA_ERROR_UNKNOWN => ErrorUnknown, + ffi::media_status_t::AMEDIA_ERROR_MALFORMED => ErrorMalformed, + ffi::media_status_t::AMEDIA_ERROR_UNSUPPORTED => ErrorUnsupported, + ffi::media_status_t::AMEDIA_ERROR_INVALID_OBJECT => ErrorInvalidObject, + ffi::media_status_t::AMEDIA_ERROR_INVALID_PARAMETER => ErrorInvalidParameter, + ffi::media_status_t::AMEDIA_ERROR_INVALID_OPERATION => ErrorInvalidOperation, + ffi::media_status_t::AMEDIA_ERROR_END_OF_STREAM => ErrorEndOfStream, + ffi::media_status_t::AMEDIA_ERROR_IO => ErrorIo, + ffi::media_status_t::AMEDIA_ERROR_WOULD_BLOCK => ErrorWouldBlock, + ffi::media_status_t::AMEDIA_DRM_ERROR_BASE => DrmErrorBase, + ffi::media_status_t::AMEDIA_DRM_NOT_PROVISIONED => DrmNotProvisioned, + ffi::media_status_t::AMEDIA_DRM_RESOURCE_BUSY => DrmResourceBusy, + ffi::media_status_t::AMEDIA_DRM_DEVICE_REVOKED => DrmDeviceRevoked, + ffi::media_status_t::AMEDIA_DRM_SHORT_BUFFER => DrmShortBuffer, + ffi::media_status_t::AMEDIA_DRM_SESSION_NOT_OPENED => DrmSessionNotOpened, + ffi::media_status_t::AMEDIA_DRM_TAMPER_DETECTED => DrmTamperDetected, + ffi::media_status_t::AMEDIA_DRM_VERIFY_FAILED => DrmVerifyFailed, + ffi::media_status_t::AMEDIA_DRM_NEED_KEY => DrmNeedKey, + ffi::media_status_t::AMEDIA_DRM_LICENSE_EXPIRED => DrmLicenseExpired, + ffi::media_status_t::AMEDIA_IMGREADER_ERROR_BASE => ImgreaderErrorBase, + ffi::media_status_t::AMEDIA_IMGREADER_NO_BUFFER_AVAILABLE => ImgreaderNoBufferAvailable, + ffi::media_status_t::AMEDIA_IMGREADER_MAX_IMAGES_ACQUIRED => ImgreaderMaxImagesAcquired, + ffi::media_status_t::AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE => ImgreaderCannotLockImage, + ffi::media_status_t::AMEDIA_IMGREADER_CANNOT_UNLOCK_IMAGE => ImgreaderCannotUnlockImage, + ffi::media_status_t::AMEDIA_IMGREADER_IMAGE_NOT_LOCKED => ImgreaderImageNotLocked, _ => return Err(NdkMediaError::UnknownResult(status)), }; Err(NdkMediaError::ErrorResult(result)) diff --git a/ndk/src/media/image_reader.rs b/ndk/src/media/image_reader.rs index c1159e49..e0e498ec 100644 --- a/ndk/src/media/image_reader.rs +++ b/ndk/src/media/image_reader.rs @@ -22,23 +22,23 @@ use crate::hardware_buffer::{HardwareBuffer, HardwareBufferUsage}; #[derive(Copy, Clone, Debug, PartialEq, Eq, TryFromPrimitive, IntoPrimitive)] #[allow(non_camel_case_types)] pub enum ImageFormat { - RGBA_8888 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_8888, - RGBX_8888 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_RGBX_8888, - RGB_888 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_888, - RGB_565 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_RGB_565, - RGBA_FP16 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_RGBA_FP16, - YUV_420_888 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_YUV_420_888, - JPEG = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_JPEG, - RAW16 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_RAW16, - RAW_PRIVATE = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_RAW_PRIVATE, - RAW10 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_RAW10, - RAW12 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_RAW12, - DEPTH16 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH16, - DEPTH_POINT_CLOUD = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_POINT_CLOUD, - PRIVATE = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_PRIVATE, - Y8 = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_Y8, - HEIC = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_HEIC, - DEPTH_JPEG = ffi::AIMAGE_FORMATS_AIMAGE_FORMAT_DEPTH_JPEG, + RGBA_8888 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_RGBA_8888.0, + RGBX_8888 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_RGBX_8888.0, + RGB_888 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_RGB_888.0, + RGB_565 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_RGB_565.0, + RGBA_FP16 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_RGBA_FP16.0, + YUV_420_888 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_YUV_420_888.0, + JPEG = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_JPEG.0, + RAW16 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_RAW16.0, + RAW_PRIVATE = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_RAW_PRIVATE.0, + RAW10 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_RAW10.0, + RAW12 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_RAW12.0, + DEPTH16 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_DEPTH16.0, + DEPTH_POINT_CLOUD = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_DEPTH_POINT_CLOUD.0, + PRIVATE = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_PRIVATE.0, + Y8 = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_Y8.0, + HEIC = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_HEIC.0, + DEPTH_JPEG = ffi::AIMAGE_FORMATS::AIMAGE_FORMAT_DEPTH_JPEG.0, } pub type ImageListener = Box; @@ -174,7 +174,7 @@ impl ImageReader { pub fn get_format(&self) -> Result { let format = construct(|res| unsafe { ffi::AImageReader_getFormat(self.as_ptr(), res) })?; - Ok((format as ffi::AIMAGE_FORMATS).try_into().unwrap()) + Ok((format as u32).try_into().unwrap()) } pub fn get_max_images(&self) -> Result { @@ -301,7 +301,7 @@ impl Image { pub fn get_format(&self) -> Result { let format = construct(|res| unsafe { ffi::AImage_getFormat(self.as_ptr(), res) })?; - Ok((format as ffi::AIMAGE_FORMATS).try_into().unwrap()) + Ok((format as u32).try_into().unwrap()) } pub fn get_timestamp(&self) -> Result { diff --git a/ndk/src/media/media_codec.rs b/ndk/src/media/media_codec.rs index 352a0db9..1b6b54cb 100644 --- a/ndk/src/media/media_codec.rs +++ b/ndk/src/media/media_codec.rs @@ -278,7 +278,7 @@ impl MediaCodec { index: result as ffi::size_t, })) } else { - NdkMediaError::from_status(result as ffi::media_status_t).map(|()| None) + NdkMediaError::from_status(ffi::media_status_t(result as _)).map(|()| None) } } @@ -306,7 +306,7 @@ impl MediaCodec { info, })) } else { - NdkMediaError::from_status(result as ffi::media_status_t).map(|()| None) + NdkMediaError::from_status(ffi::media_status_t(result as _)).map(|()| None) } } diff --git a/ndk/src/media/mod.rs b/ndk/src/media/mod.rs index f76e2547..cf380e9d 100644 --- a/ndk/src/media/mod.rs +++ b/ndk/src/media/mod.rs @@ -12,14 +12,14 @@ use std::{mem::MaybeUninit, ptr::NonNull}; pub type Result = std::result::Result; -fn construct(with_ptr: impl FnOnce(*mut T) -> ffi::camera_status_t) -> Result { +fn construct(with_ptr: impl FnOnce(*mut T) -> ffi::media_status_t) -> Result { let mut result = MaybeUninit::uninit(); let status = with_ptr(result.as_mut_ptr()); NdkMediaError::from_status(status).map(|()| unsafe { result.assume_init() }) } fn construct_never_null( - with_ptr: impl FnOnce(*mut *mut T) -> ffi::camera_status_t, + with_ptr: impl FnOnce(*mut *mut T) -> ffi::media_status_t, ) -> Result> { let result = construct(with_ptr)?; let non_null = if cfg!(debug_assertions) {