Verified Commit b8fc453c authored by Matthew Gregan's avatar Matthew Gregan Committed by ma1
Browse files

Bug 2042033 - Update audioipc to 3f0d4aef7a2c06b0146384592b312a7f47ab7cea. a=pascalc DONTBUILD 

Differential Revision: https://phabricator.services.mozilla.com/D307454
parent 3e7ee821

.cargo/config.toml.in

+2 −2
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ git = "https://github.com/mozilla/application-services" 
rev = "f5907a411e52a3985d0369d71c486eb507c2c4e6"

replace-with = "vendored-sources"



[source."git+https://github.com/mozilla/audioipc?rev=e6f44a2bd1e57d11dfc737632a9e849077632330"]

[source."git+https://github.com/mozilla/audioipc?rev=3f0d4aef7a2c06b0146384592b312a7f47ab7cea"]

git = "https://github.com/mozilla/audioipc"

rev = "e6f44a2bd1e57d11dfc737632a9e849077632330"

rev = "3f0d4aef7a2c06b0146384592b312a7f47ab7cea"

replace-with = "vendored-sources"



[source."git+https://github.com/mozilla/cubeb-coreaudio-rs?rev=bebaa23317332c95734df76e25193c24a83a6840"]

Cargo.lock

+3 −3
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ dependencies = [ 
[[package]]

name = "audioipc2"

version = "0.6.0"

source = "git+https://github.com/mozilla/audioipc?rev=e6f44a2bd1e57d11dfc737632a9e849077632330#e6f44a2bd1e57d11dfc737632a9e849077632330"

source = "git+https://github.com/mozilla/audioipc?rev=3f0d4aef7a2c06b0146384592b312a7f47ab7cea#3f0d4aef7a2c06b0146384592b312a7f47ab7cea"

dependencies = [

 "arrayvec",

 "ashmem",
@@ -309,7 +309,7 @@ dependencies = [ 
[[package]]

name = "audioipc2-client"

version = "0.6.0"

source = "git+https://github.com/mozilla/audioipc?rev=e6f44a2bd1e57d11dfc737632a9e849077632330#e6f44a2bd1e57d11dfc737632a9e849077632330"

source = "git+https://github.com/mozilla/audioipc?rev=3f0d4aef7a2c06b0146384592b312a7f47ab7cea#3f0d4aef7a2c06b0146384592b312a7f47ab7cea"

dependencies = [

 "audio_thread_priority",

 "audioipc2",
@@ -320,7 +320,7 @@ dependencies = [ 
[[package]]

name = "audioipc2-server"

version = "0.6.0"

source = "git+https://github.com/mozilla/audioipc?rev=e6f44a2bd1e57d11dfc737632a9e849077632330#e6f44a2bd1e57d11dfc737632a9e849077632330"

source = "git+https://github.com/mozilla/audioipc?rev=3f0d4aef7a2c06b0146384592b312a7f47ab7cea#3f0d4aef7a2c06b0146384592b312a7f47ab7cea"

dependencies = [

 "audio_thread_priority",

 "audioipc2",

third_party/rust/audioipc2-client/.cargo-checksum.json

+1 −1
Original line number Diff line number Diff line 
{"files":{"Cargo.toml":"2ff29951b7d841dd3c54a9d08440d4f2961027d31d0c1d407f47cdb6497f9af6","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/context.rs":"a0559e92b554ef3156ab2bf2f1424555c8ef4a7977b9f43ac8500a9f399f8d99","src/lib.rs":"c87d9d57a16a9286cde730978db692df0fbc70cc69dd4f4677198d6843031fd8","src/send_recv.rs":"859abe75b521eb4297c84b30423814b5b87f3c7741ad16fe72189212e123e1ac","src/stream.rs":"90dc6a85552f3569ab1847de4247a46bcff2f5aef0c4d43fa2376589df015b25"},"package":null}
 
 No newline at end of file
 
{"files":{"Cargo.toml":"2ff29951b7d841dd3c54a9d08440d4f2961027d31d0c1d407f47cdb6497f9af6","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/context.rs":"5672563c279654b8d5e743b9eaa7389662b6d219bc5b327153a5eaa24e534f79","src/lib.rs":"c87d9d57a16a9286cde730978db692df0fbc70cc69dd4f4677198d6843031fd8","src/send_recv.rs":"859abe75b521eb4297c84b30423814b5b87f3c7741ad16fe72189212e123e1ac","src/stream.rs":"f9bf0793a6bfd512bfb14b232924559605d6b3ae0b76df86920198b8c6e34d08"},"package":null}
 
 No newline at end of file

third_party/rust/audioipc2-client/src/context.rs

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ impl ContextOps for ClientContext { 
        let input_stream_params = input_stream_params.map(messages::StreamParams::from);

        let output_stream_params = output_stream_params.map(messages::StreamParams::from);



        let init_params = messages::StreamInitParams {

        let params = messages::StreamCreateParams {

            stream_name,

            input_device: input_device as usize,

            input_stream_params,
@@ -321,7 +321,7 @@ impl ContextOps for ClientContext { 
            output_stream_params,

            latency_frames,

        };

        stream::init(self, init_params, data_callback, state_callback, user_ptr)

        stream::init(self, params, data_callback, state_callback, user_ptr)

    }



    fn register_device_collection_changed(

third_party/rust/audioipc2-client/src/stream.rs

+8 −15
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


use crate::ClientContext;

use crate::{assert_not_in_callback, run_in_callback};

use audioipc::messages::StreamCreateParams;

use audioipc::messages::{self, CallbackReq, CallbackResp, ClientMessage, ServerMessage};

use audioipc::shm::SharedMem;

use audioipc::{rpccore, sys};
@@ -149,19 +148,17 @@ impl rpccore::Server for CallbackServer { 
impl<'ctx> ClientStream<'ctx> {

    fn init(

        ctx: &'ctx ClientContext,

        init_params: messages::StreamInitParams,

        params: messages::StreamCreateParams,

        data_callback: ffi::cubeb_data_callback,

        state_callback: ffi::cubeb_state_callback,

        user_ptr: *mut c_void,

    ) -> Result<Stream> {

        assert_not_in_callback();

        let has_input = params.input_stream_params.is_some();

        let has_output = params.output_stream_params.is_some();



        let rpc = ctx.rpc();

        let create_params = StreamCreateParams {

            input_stream_params: init_params.input_stream_params,

            output_stream_params: init_params.output_stream_params,

        };

        let mut data = send_recv!(rpc, StreamCreate(create_params) => StreamCreated())?;

        let mut data = send_recv!(rpc, StreamCreate(params) => StreamCreated())?;



        debug!(

            "token = {}, handle = {:?} area_size = {:?}",
@@ -180,10 +177,7 @@ impl<'ctx> ClientStream<'ctx> { 
                }

            };



        let duplex_input = if let (Some(_), Some(_)) = (

            init_params.input_stream_params,

            init_params.output_stream_params,

        ) {

        let duplex_input = if has_input && has_output {

            let mut duplex_input = Vec::new();

            match duplex_input.try_reserve_exact(data.shm_area_size) {

                Ok(()) => Some(duplex_input),
@@ -199,8 +193,7 @@ impl<'ctx> ClientStream<'ctx> { 
            None

        };



        let mut stream =

            send_recv!(rpc, StreamInit(data.token, init_params) => StreamInitialized())?;

        let mut stream = send_recv!(rpc, StreamInit(data.token) => StreamInitialized())?;

        let stream = unsafe { sys::Pipe::from_raw_handle(stream.take_handle()) };



        let user_data = user_ptr as usize;
@@ -340,12 +333,12 @@ impl StreamOps for ClientStream<'_> { 


pub fn init(

    ctx: &ClientContext,

    init_params: messages::StreamInitParams,

    params: messages::StreamCreateParams,

    data_callback: ffi::cubeb_data_callback,

    state_callback: ffi::cubeb_state_callback,

    user_ptr: *mut c_void,

) -> Result<Stream> {

    let stm = ClientStream::init(ctx, init_params, data_callback, state_callback, user_ptr)?;

    let stm = ClientStream::init(ctx, params, data_callback, state_callback, user_ptr)?;

    debug_assert_eq!(stm.user_ptr(), user_ptr);

    Ok(stm)

}