Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use libc::c_char over i8

Browse Source 
C `char` is unsigned on some platforms
This commit is contained in:
FreezyLemon 2024-05-30 19:32:34 +02:00 committed by Josh Holmer
parent 8eb9fa688f
commit 176f12c04d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ffmpeg-sys-the-third/src/avutil/channel_layout.rs
View File

@ -311,6 +311,7 @@ pub const AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK: AVChannelLayout =
#[cfg(test)]
mod test {
use super::*;
use libc::c_char;
// TODO: Missing: Ambisonic layout
@ -330,15 +331,15 @@ mod test {
};
// TODO: Replace with cstr literals when MSRV is 1.77
const fn c_string<const N: usize, const K: usize>(byte_str: &[u8; N]) -> [i8; K] {
const fn c_string<const N: usize, const K: usize>(byte_str: &[u8; N]) -> [c_char; K] {
// Need at least one NUL byte at the end
assert!(N < K, "input string is too long (max 15 char)");
let mut result = [0i8; K];
let mut result = [0; K];
let mut i = 0;
while i < N {
result[i] = byte_str[i] as i8;
result[i] = byte_str[i] as c_char;
i += 1;
}

8
src/util/channel_layout/channel_custom.rs
View File

@ -1,3 +1,5 @@
use libc::c_char;
use crate::ffi::{AVChannel, AVChannelCustom};
use super::Channel;
@ -30,12 +32,12 @@ impl ChannelCustom {
}
}
fn to_char_array(bytes: &[u8]) -> [i8; 16] {
let mut result = [0i8; 16];
fn to_char_array(bytes: &[u8]) -> [c_char; 16] {
let mut result = [0; 16];
// Only take the first 15 bytes, leaving at least one NUL byte
for (b, r) in bytes.iter().take(15).zip(&mut result) {
*r = *b as i8;
*r = *b as c_char;
}
result