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

Bug 1530715 - P14: Wrap state-callback code into a function. r=padenot

Browse Source 
The code will be clearer if we can wrap the state-callback that notify
the state changed into a function. It will hide some details about
rendering the callback to C interface.

Differential Revision: https://phabricator.services.mozilla.com/D34047

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Chun-Min Chang 2019-07-10 08:06:31 +00:00
parent c11a02e48f
commit b2fb383839
2 changed files with 22 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/libcubeb/cubeb-coreaudio-rs/README_MOZILLA
View File

@ -3,4 +3,4 @@ git repository using the update.sh script.
The cubeb-coreaudio-rs git repository is: https://github.com/ChunMinChang/cubeb-coreaudio-rs
The git commit ID used was 0171794b39498862a9d8e8ec5422207b17f4d744 (2019-06-21 14:34:58 -0700)
The git commit ID used was 17ce0163b2216eac9fa28b5bd15e703975ba18b1 (2019-06-21 14:40:05 -0700)

76
media/libcubeb/cubeb-coreaudio-rs/src/backend/mod.rs
View File

@ -29,7 +29,7 @@ use self::utils::*;
use atomic;
use cubeb_backend::{
ffi, ChannelLayout, Context, ContextOps, DeviceCollectionRef, DeviceId, DeviceRef, DeviceType,
Error, Ops, Result, SampleFormat, Stream, StreamOps, StreamParams, StreamParamsRef,
Error, Ops, Result, SampleFormat, State, Stream, StreamOps, StreamParams, StreamParamsRef,
StreamPrefs,
};
use std::cmp;
@ -289,15 +289,7 @@ extern "C" fn audiounit_input_callback(
if outframes < total_input_frames {
assert_eq!(audio_output_unit_stop(stm.input_unit), NO_ERR);
if stm.state_callback.is_some() {
unsafe {
(stm.state_callback.unwrap())(
stm as *mut AudioUnitStream as *mut ffi::cubeb_stream,
stm.user_ptr,
ffi::CUBEB_STATE_DRAINED,
);
}
}
stm.notify_state_changed(State::Drained);
return NO_ERR;
}
@ -359,15 +351,7 @@ extern "C" fn audiounit_output_callback(
if !stm.input_unit.is_null() {
assert_eq!(audio_output_unit_stop(stm.input_unit), NO_ERR);
}
if stm.state_callback.is_some() {
unsafe {
(stm.state_callback.unwrap())(
stm as *mut AudioUnitStream as *mut ffi::cubeb_stream,
stm.user_ptr,
ffi::CUBEB_STATE_DRAINED,
);
}
}
stm.notify_state_changed(State::Drained);
audiounit_make_silent(&mut buffers[0]);
return NO_ERR;
}
@ -458,15 +442,7 @@ extern "C" fn audiounit_output_callback(
if !stm.input_unit.is_null() {
assert_eq!(audio_output_unit_stop(stm.input_unit), NO_ERR);
}
if stm.state_callback.is_some() {
unsafe {
(stm.state_callback.unwrap())(
stm as *mut AudioUnitStream as *mut ffi::cubeb_stream,
stm.user_ptr,
ffi::CUBEB_STATE_ERROR,
);
}
}
stm.notify_state_changed(State::Error);
audiounit_make_silent(&mut buffers[0]);
return NO_ERR;
}
@ -2911,6 +2887,20 @@ impl<'ctx> AudioUnitStream<'ctx> {
)
}
fn notify_state_changed(&mut self, state: State) {
if self.state_callback.is_none() {
return;
}
let callback = self.state_callback.unwrap();
unsafe {
callback(
self as *const AudioUnitStream as *mut ffi::cubeb_stream,
self.user_ptr,
state.into(),
);
}
}
fn has_input(&self) -> bool {
self.input_stream_params.rate() > 0
}
@ -3196,15 +3186,7 @@ impl<'ctx> AudioUnitStream<'ctx> {
stm_ptr
);
}
if stm_guard.state_callback.is_some() {
unsafe {
(stm_guard.state_callback.unwrap())(
stm_ptr as *mut ffi::cubeb_stream,
stm_guard.user_ptr,
ffi::CUBEB_STATE_ERROR,
);
}
}
stm_guard.notify_state_changed(State::Error);
cubeb_log!(
"({:p}) Could not reopen the stream after switching.",
stm_ptr
@ -4323,15 +4305,7 @@ impl<'ctx> StreamOps for AudioUnitStream<'ctx> {
self.start_internal()?;
if self.state_callback.is_some() {
unsafe {
(self.state_callback.unwrap())(
self as *mut AudioUnitStream as *mut ffi::cubeb_stream,
self.user_ptr,
ffi::CUBEB_STATE_STARTED,
);
}
}
self.notify_state_changed(State::Started);
cubeb_log!(
"Cubeb stream ({:p}) started successfully.",
@ -4344,15 +4318,7 @@ impl<'ctx> StreamOps for AudioUnitStream<'ctx> {
self.stop_internal();
if self.state_callback.is_some() {
unsafe {
(self.state_callback.unwrap())(
self as *mut AudioUnitStream as *mut ffi::cubeb_stream,
self.user_ptr,
ffi::CUBEB_STATE_STOPPED,
);
}
}
self.notify_state_changed(State::Stopped);
cubeb_log!(
"Cubeb stream ({:p}) stopped successfully.",