From bf766c1d5d250e5c5b63a4b62941cc885ed5716b Mon Sep 17 00:00:00 2001 From: enfipy Date: Thu, 29 Oct 2020 19:32:11 +0200 Subject: [PATCH] Update oboe to newest version. Fix support of input/output oboe streams --- Cargo.toml | 3 ++- src/host/oboe/convert.rs | 2 +- src/host/oboe/input_callback.rs | 8 +++---- src/host/oboe/mod.rs | 38 +++++++++++++++++++++++--------- src/host/oboe/output_callback.rs | 8 +++---- 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b0a2f6b..4dc7c47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,8 @@ js-sys = { version = "0.3.35" } web-sys = { version = "0.3.35", features = [ "AudioContext", "AudioContextOptions", "AudioBuffer", "AudioBufferSourceNode", "AudioNode", "AudioDestinationNode", "Window", "AudioContextState"] } [target.'cfg(target_os = "android")'.dependencies] -oboe = { version = "0.2.1", features = [ "java-interface" ] } +oboe = { git = "https://github.com/katyo/oboe-rs", rev = "ae2f4d863ea4fde7a30628e032f4011c60f75ea5", features = [ "java-interface" ] } +# oboe = { version = "0.2.1", features = [ "java-interface" ] } ndk = "0.2" ndk-glue = "0.2" jni = "0.17" diff --git a/src/host/oboe/convert.rs b/src/host/oboe/convert.rs index 519e4c0..711d2f2 100644 --- a/src/host/oboe/convert.rs +++ b/src/host/oboe/convert.rs @@ -15,7 +15,7 @@ pub fn to_stream_instant(duration: Duration) -> StreamInstant { ) } -pub fn stream_instant(stream: &mut T) -> StreamInstant { +pub fn stream_instant(stream: &mut T) -> StreamInstant { const CLOCK_MONOTONIC: i32 = 1; let ts = stream .get_timestamp(CLOCK_MONOTONIC) diff --git a/src/host/oboe/input_callback.rs b/src/host/oboe/input_callback.rs index a7341d9..785f61f 100644 --- a/src/host/oboe/input_callback.rs +++ b/src/host/oboe/input_callback.rs @@ -31,7 +31,7 @@ impl CpalInputCallback { fn make_callback_info( &self, - audio_stream: &mut dyn oboe::AudioInputStream, + audio_stream: &mut dyn oboe::AudioInputStreamSafe, ) -> InputCallbackInfo { InputCallbackInfo { timestamp: InputStreamTimestamp { @@ -50,7 +50,7 @@ where fn on_audio_ready( &mut self, - audio_stream: &mut dyn oboe::AudioInputStream, + audio_stream: &mut dyn oboe::AudioInputStreamSafe, audio_data: &[<::FrameType as oboe::IsFrameType>::Type], ) -> oboe::DataCallbackResult { let cb_info = self.make_callback_info(audio_stream); @@ -74,7 +74,7 @@ where fn on_error_before_close( &mut self, - _audio_stream: &mut dyn oboe::AudioInputStream, + _audio_stream: &mut dyn oboe::AudioInputStreamSafe, error: oboe::Error, ) { (self.error_cb)(StreamError::from(error)) @@ -82,7 +82,7 @@ where fn on_error_after_close( &mut self, - _audio_stream: &mut dyn oboe::AudioInputStream, + _audio_stream: &mut dyn oboe::AudioInputStreamSafe, error: oboe::Error, ) { (self.error_cb)(StreamError::from(error)) diff --git a/src/host/oboe/mod.rs b/src/host/oboe/mod.rs index 0a831ad..4e245cd 100644 --- a/src/host/oboe/mod.rs +++ b/src/host/oboe/mod.rs @@ -21,6 +21,7 @@ mod output_callback; use self::android_media::{get_audio_record_min_buffer_size, get_audio_track_min_buffer_size}; use self::input_callback::CpalInputCallback; +use self::oboe::{AudioInputStream, AudioOutputStream}; use self::output_callback::CpalOutputCallback; // Android Java API supports up to 8 channels, but oboe API @@ -36,7 +37,10 @@ const SAMPLE_RATES: [i32; 13] = [ pub struct Host; pub struct Device(Option); -pub struct Stream(Box>); +pub enum Stream { + Input(Box>), + Output(Box>), +} pub type SupportedInputConfigs = VecIntoIter; pub type SupportedOutputConfigs = VecIntoIter; pub type Devices = VecIntoIter; @@ -242,7 +246,7 @@ where error_callback, )) .open_stream()?; - Ok(Stream(Box::new(RefCell::new(stream)))) + Ok(Stream::Input(Box::new(RefCell::new(stream)))) } fn build_output_stream( @@ -266,7 +270,7 @@ where error_callback, )) .open_stream()?; - Ok(Stream(Box::new(RefCell::new(stream)))) + Ok(Stream::Output(Box::new(RefCell::new(stream)))) } impl DeviceTrait for Device { @@ -472,16 +476,28 @@ impl DeviceTrait for Device { impl StreamTrait for Stream { fn play(&self) -> Result<(), PlayStreamError> { - self.0 - .borrow_mut() - .request_start() - .map_err(PlayStreamError::from) + match self { + Self::Input(stream) => stream + .borrow_mut() + .request_start() + .map_err(PlayStreamError::from), + Self::Output(stream) => stream + .borrow_mut() + .request_start() + .map_err(PlayStreamError::from), + } } fn pause(&self) -> Result<(), PauseStreamError> { - self.0 - .borrow_mut() - .request_pause() - .map_err(PauseStreamError::from) + match self { + Self::Input(_) => Err(BackendSpecificError { + description: "Pause called on the input stream.".to_owned(), + } + .into()), + Self::Output(stream) => stream + .borrow_mut() + .request_pause() + .map_err(PauseStreamError::from), + } } } diff --git a/src/host/oboe/output_callback.rs b/src/host/oboe/output_callback.rs index 7b43ce8..625854f 100644 --- a/src/host/oboe/output_callback.rs +++ b/src/host/oboe/output_callback.rs @@ -31,7 +31,7 @@ impl CpalOutputCallback { fn make_callback_info( &self, - audio_stream: &mut dyn oboe::AudioOutputStream, + audio_stream: &mut dyn oboe::AudioOutputStreamSafe, ) -> OutputCallbackInfo { OutputCallbackInfo { timestamp: OutputStreamTimestamp { @@ -50,7 +50,7 @@ where fn on_audio_ready( &mut self, - audio_stream: &mut dyn oboe::AudioOutputStream, + audio_stream: &mut dyn oboe::AudioOutputStreamSafe, audio_data: &mut [<::FrameType as oboe::IsFrameType>::Type], ) -> oboe::DataCallbackResult { let cb_info = self.make_callback_info(audio_stream); @@ -74,7 +74,7 @@ where fn on_error_before_close( &mut self, - _audio_stream: &mut dyn oboe::AudioOutputStream, + _audio_stream: &mut dyn oboe::AudioOutputStreamSafe, error: oboe::Error, ) { (self.error_cb)(StreamError::from(error)) @@ -82,7 +82,7 @@ where fn on_error_after_close( &mut self, - _audio_stream: &mut dyn oboe::AudioOutputStream, + _audio_stream: &mut dyn oboe::AudioOutputStreamSafe, error: oboe::Error, ) { (self.error_cb)(StreamError::from(error))