Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1748037 - Update AudioIPC macOS branch to 62086d05. r=chunmin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D134889
This commit is contained in:
Matthew Gregan 2021-12-31 00:09:44 +00:00
parent 5125801679
commit ba3e6065c0
9 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config.in
View File

@ -64,7 +64,7 @@ rev = "21c26326f5f45f415c49eac4ba5bc41a2f961321"
[source."https://github.com/kinetiknz/audioipc-2"]
git = "https://github.com/kinetiknz/audioipc-2"
replace-with = "vendored-sources"
rev = "2ec125ecf1926c7f94ce682c16048a3fe2bf3800"
rev = "62086d05c1c6ea9ba42a33c3920db65c678fc567"
[source."https://github.com/jfkthame/mapped_hyph.git"]
git = "https://github.com/jfkthame/mapped_hyph.git"

10
Cargo.lock generated
View File

@ -133,9 +133,9 @@ dependencies = [
[[package]]
name = "ashmem"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b43da58b19e1c6ffb1859b10766a2049cefa15f613c42dfeab8423701e8b76b6"
checksum = "b947f77692187a29daa2768b6644e589cef61e7434bb96300197acfb876105ac"
dependencies = [
"ioctl-sys",
"libc",
@ -267,7 +267,7 @@ dependencies = [
[[package]]
name = "audioipc2"
version = "0.5.0"
source = "git+https://github.com/kinetiknz/audioipc-2?rev=2ec125ecf1926c7f94ce682c16048a3fe2bf3800#2ec125ecf1926c7f94ce682c16048a3fe2bf3800"
source = "git+https://github.com/kinetiknz/audioipc-2?rev=62086d05c1c6ea9ba42a33c3920db65c678fc567#62086d05c1c6ea9ba42a33c3920db65c678fc567"
dependencies = [
"ashmem",
"audio_thread_priority",
@ -292,7 +292,7 @@ dependencies = [
[[package]]
name = "audioipc2-client"
version = "0.5.0"
source = "git+https://github.com/kinetiknz/audioipc-2?rev=2ec125ecf1926c7f94ce682c16048a3fe2bf3800#2ec125ecf1926c7f94ce682c16048a3fe2bf3800"
source = "git+https://github.com/kinetiknz/audioipc-2?rev=62086d05c1c6ea9ba42a33c3920db65c678fc567#62086d05c1c6ea9ba42a33c3920db65c678fc567"
dependencies = [
"audio_thread_priority",
"audioipc2",
@ -303,7 +303,7 @@ dependencies = [
[[package]]
name = "audioipc2-server"
version = "0.5.0"
source = "git+https://github.com/kinetiknz/audioipc-2?rev=2ec125ecf1926c7f94ce682c16048a3fe2bf3800#2ec125ecf1926c7f94ce682c16048a3fe2bf3800"
source = "git+https://github.com/kinetiknz/audioipc-2?rev=62086d05c1c6ea9ba42a33c3920db65c678fc567#62086d05c1c6ea9ba42a33c3920db65c678fc567"
dependencies = [
"audio_thread_priority",
"audioipc2",

2
third_party/rust/ashmem/.cargo-checksum.json vendored
View File

@ -1 +1 @@
{"files":{"Cargo.toml":"f47254594088bbfd225cfaa4ab60784662c235c9042517ec2ced3fcdfd62988a","README.md":"1513a18130cee5213ff581dd1703897ba9ad3f99fc601e502745833f93b78a25","src/lib.rs":"0024c010b7618e4e25bb6ea3295f229a0e4bf2ecd7144c764de3f175ad839ce5"},"package":"b43da58b19e1c6ffb1859b10766a2049cefa15f613c42dfeab8423701e8b76b6"}
{"files":{"Cargo.toml":"3b0ce20438cc2ce5485f734aaf93b50976757d39eab3d78b788932cf734d7830","README.md":"1513a18130cee5213ff581dd1703897ba9ad3f99fc601e502745833f93b78a25","src/lib.rs":"1306aacebf851c0ba32ef6c142dc35db678cf5463f267a226a4a10fd1c02041b"},"package":"b947f77692187a29daa2768b6644e589cef61e7434bb96300197acfb876105ac"}

11
third_party/rust/ashmem/Cargo.toml vendored
View File

@ -3,17 +3,16 @@
# When uploading crates to the registry Cargo will automatically
# "normalize" Cargo.toml files for maximal compatibility
# with all versions of Cargo and also rewrite `path` dependencies
# to registry (e.g., crates.io) dependencies
# to registry (e.g., crates.io) dependencies.
#
# If you believe there's an error in this file please file an
# issue against the rust-lang/cargo repository. If you're
# editing this file be aware that the upstream Cargo.toml
# will likely look very different (and much more reasonable)
# If you are reading this file be aware that the original Cargo.toml
# will likely look very different (and much more reasonable).
# See Cargo.toml.orig for the original contents.
[package]
edition = "2018"
name = "ashmem"
version = "0.1.1"
version = "0.1.2"
authors = ["Matthew Gregan <kinetik@flim.org>"]
description = "Rust wrapper around Android's ASharedMemory (ashmem) API"
license = "ISC"

4
third_party/rust/ashmem/src/lib.rs vendored
View File

@ -27,7 +27,7 @@ static mut LIBANDROID_ASHAREDMEMORY_SETPROT: Option<
> = None;
unsafe fn maybe_init() {
const LIBANDROID_NAME: *const libc::c_char = "libandroid\0".as_ptr() as *const libc::c_char;
const LIBANDROID_NAME: *const libc::c_char = "libandroid.so\0".as_ptr() as *const libc::c_char;
const LIBANDROID_ASHAREDMEMORY_CREATE_NAME: *const libc::c_char =
"ASharedMemory_create\0".as_ptr() as _;
const LIBANDROID_ASHAREDMEMORY_GETSIZE_NAME: *const libc::c_char =
@ -58,7 +58,7 @@ unsafe fn maybe_init() {
/// Directly calls C or kernel APIs.
#[allow(non_snake_case)]
pub unsafe fn ASharedMemory_create(name: *const libc::c_char, size: libc::size_t) -> libc::c_int {
const ASHMEM_NAME_DEF: *const libc::c_char = "/dev/ashmem".as_ptr() as _;
const ASHMEM_NAME_DEF: *const libc::c_char = "/dev/ashmem\0".as_ptr() as _;
const ASHMEM_NAME_LEN: usize = 256;
const ASHMEM_SET_NAME: libc::c_int = iow!(
__ASHMEMIOC,

2
third_party/rust/audioipc2/.cargo-checksum.json vendored
View File

@ -1 +1 @@
{"files":{"Cargo.toml":"2fdc5fd55b09266565d2f316de7ac9485a63867d76364d3d5dba5b4e4dee19c1","benches/serialization.rs":"d56855d868dab6aa22c8b03a61084535351b76c94b68d8b1d20764e352fe473f","build.rs":"3f061cf9a989f63a71c693a543d26f7003e8b643c39c23ea555110252a2c39d2","src/cmsghdr.c":"d7344b3dc15cdce410c68669b848bb81f7fe36362cd3699668cb613fa05180f8","src/codec.rs":"b24f3dac2fa0a566883295627b5391b132e1772eddc2ff0b31e857c58f485a09","src/errors.rs":"67a4a994d0724397657581cde153bdfc05ce86e7efc467f23fafc8f64df80fa4","src/ipccore.rs":"474271f867809b1f4058e52595e0268b2818bb8d56d116c46e711b181d32ac23","src/lib.rs":"69622b35ba60ee17daffb5b243c5d2c31d8359219a54c08ad9a13326a51aa3f6","src/messages.rs":"d78247a1c2d5de1d799df100baaeebf6e1b6daba95ef6058fd90387f82526f80","src/rpccore.rs":"e6800250049690cd900b66a010541affad4b30a6f4dea168ebe807043490f916","src/shm.rs":"94dee9454acfb4541b7757fd6763b8ecfe1961bb0da780caf463dc6509ba1d98","src/sys/mod.rs":"da4412ee630e53a0d3a79d9e18953280818bd58ed3fb3c6abedeeb8a092d3dfc","src/sys/unix/cmsg.rs":"71a51a5cd6fd54054f500af82a76b19a690258767ac7b68c6c35cc9d962d5629","src/sys/unix/mod.rs":"246e83874d9765f6db88ea8bc3511b8d1ce4557744f4415ad41de135f6b9baff","src/sys/unix/msg.rs":"d29d3974c145df8b1b931222f62aa64be0ec165b578f31b8f98555fa4d052b01","src/sys/windows/mod.rs":"50af90f17d9b61045ac009e0f53077f9a645c72c214c400b116c4eca2adce0d7"},"package":null}
{"files":{"Cargo.toml":"d12aaf7e88bb704890b9401de55775c9e746be92448c6f280c1cb8e37e2e773f","benches/serialization.rs":"d56855d868dab6aa22c8b03a61084535351b76c94b68d8b1d20764e352fe473f","build.rs":"3f061cf9a989f63a71c693a543d26f7003e8b643c39c23ea555110252a2c39d2","src/cmsghdr.c":"d7344b3dc15cdce410c68669b848bb81f7fe36362cd3699668cb613fa05180f8","src/codec.rs":"b24f3dac2fa0a566883295627b5391b132e1772eddc2ff0b31e857c58f485a09","src/errors.rs":"67a4a994d0724397657581cde153bdfc05ce86e7efc467f23fafc8f64df80fa4","src/ipccore.rs":"474271f867809b1f4058e52595e0268b2818bb8d56d116c46e711b181d32ac23","src/lib.rs":"69622b35ba60ee17daffb5b243c5d2c31d8359219a54c08ad9a13326a51aa3f6","src/messages.rs":"d78247a1c2d5de1d799df100baaeebf6e1b6daba95ef6058fd90387f82526f80","src/rpccore.rs":"e6800250049690cd900b66a010541affad4b30a6f4dea168ebe807043490f916","src/shm.rs":"748c4a261e298900ee0266acf42e4e9f72594d9b90f530c71d8d4f1d659a6de0","src/sys/mod.rs":"da4412ee630e53a0d3a79d9e18953280818bd58ed3fb3c6abedeeb8a092d3dfc","src/sys/unix/cmsg.rs":"71a51a5cd6fd54054f500af82a76b19a690258767ac7b68c6c35cc9d962d5629","src/sys/unix/mod.rs":"246e83874d9765f6db88ea8bc3511b8d1ce4557744f4415ad41de135f6b9baff","src/sys/unix/msg.rs":"d29d3974c145df8b1b931222f62aa64be0ec165b578f31b8f98555fa4d052b01","src/sys/windows/mod.rs":"50af90f17d9b61045ac009e0f53077f9a645c72c214c400b116c4eca2adce0d7"},"package":null}

2
third_party/rust/audioipc2/Cargo.toml vendored
View File

@ -33,7 +33,7 @@ audio_thread_priority = "0.23.4"
winapi = { version = "0.3", features = ["combaseapi", "memoryapi", "objbase"] }
[target.'cfg(target_os = "android")'.dependencies]
ashmem = "0.1"
ashmem = "0.1.2"
[dependencies.error-chain]
version = "0.11.0"

4
third_party/rust/audioipc2/src/shm.rs vendored
View File

@ -196,7 +196,7 @@ mod unix {
impl SharedMem {
pub fn new(id: &str, size: usize) -> Result<SharedMem> {
let file = open_shm_file(id, size)?;
let mut mmap = unsafe { MmapOptions::new().map_mut(&file)? };
let mut mmap = unsafe { MmapOptions::new().len(size).map_mut(&file)? };
assert_eq!(mmap.len(), size);
let view = SharedMemView {
ptr: mmap.as_mut_ptr() as _,
@ -215,7 +215,7 @@ mod unix {
pub unsafe fn from(handle: PlatformHandle, size: usize) -> Result<SharedMem> {
let file = File::from_raw_fd(handle.into_raw());
let mut mmap = MmapOptions::new().map_mut(&file)?;
let mut mmap = MmapOptions::new().len(size).map_mut(&file)?;
assert_eq!(mmap.len(), size);
let view = SharedMemView {
ptr: mmap.as_mut_ptr() as _,

4
toolkit/library/rust/shared/Cargo.toml
View File

@ -81,8 +81,8 @@ audioipc-server = { git = "https://github.com/mozilla/audioipc-2", rev = "515bb2
# https://github.com/kinetiknz/audioipc-2/commits/macos
[target.'cfg(target_os = "macos")'.dependencies]
audioipc2-client = { git = "https://github.com/kinetiknz/audioipc-2", rev = "2ec125ecf1926c7f94ce682c16048a3fe2bf3800", optional = true }
audioipc2-server = { git = "https://github.com/kinetiknz/audioipc-2", rev = "2ec125ecf1926c7f94ce682c16048a3fe2bf3800", optional = true }
audioipc2-client = { git = "https://github.com/kinetiknz/audioipc-2", rev = "62086d05c1c6ea9ba42a33c3920db65c678fc567", optional = true }
audioipc2-server = { git = "https://github.com/kinetiknz/audioipc-2", rev = "62086d05c1c6ea9ba42a33c3920db65c678fc567", optional = true }
[features]
default = []