refactor(bridge): remove SonoraExperimental from bridge API and regenerate FRB
Remove SonoraExperimental variant from BridgeIosVoiceProcessingMode and collapse all match arms in the bridge config builder. Regenerate flutter_rust_bridge bindings and update Podfile.lock.
This commit is contained in:
@@ -23,7 +23,7 @@ EXTERNAL SOURCES:
|
|||||||
:path: ".symlinks/plugins/haptic_kit/ios"
|
:path: ".symlinks/plugins/haptic_kit/ios"
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
chanora_bridge: 26252acdf9ca660ce9c132ad25cd5ad5af467b16
|
chanora_bridge: 27a03592058709f6f38701343eb51c3a55b02da0
|
||||||
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
|
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
|
||||||
flutter_foreground_task: a159d2c2173b33699ddb3e6c2a067045d7cebb89
|
flutter_foreground_task: a159d2c2173b33699ddb3e6c2a067045d7cebb89
|
||||||
haptic_kit: b22c4fbb2aa7b0d66f2891f81a9e950ad2de5758
|
haptic_kit: b22c4fbb2aa7b0d66f2891f81a9e950ad2de5758
|
||||||
|
|||||||
@@ -1339,11 +1339,8 @@ sealed class BridgeEvent with _$BridgeEvent {
|
|||||||
|
|
||||||
/// Bridge iOS voice-processing mode.
|
/// Bridge iOS voice-processing mode.
|
||||||
enum BridgeIosVoiceProcessingMode {
|
enum BridgeIosVoiceProcessingMode {
|
||||||
/// Shipping VPIO path.
|
/// Apple VoiceProcessingIO path.
|
||||||
platformVoiceProcessing,
|
platformVoiceProcessing,
|
||||||
|
|
||||||
/// Experimental Sonora path.
|
|
||||||
sonoraExperimental,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@freezed
|
@freezed
|
||||||
|
|||||||
@@ -1062,10 +1062,8 @@ pub enum BridgeAudioRoute {
|
|||||||
/// Bridge iOS voice-processing mode.
|
/// Bridge iOS voice-processing mode.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum BridgeIosVoiceProcessingMode {
|
pub enum BridgeIosVoiceProcessingMode {
|
||||||
/// Shipping VPIO path.
|
/// Apple VoiceProcessingIO path.
|
||||||
PlatformVoiceProcessing,
|
PlatformVoiceProcessing,
|
||||||
/// Experimental Sonora path.
|
|
||||||
SonoraExperimental,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Bridge processing backend.
|
/// Bridge processing backend.
|
||||||
@@ -1223,7 +1221,6 @@ impl From<BridgeIosVoiceProcessingMode> for chanora_core::IosVoiceProcessingMode
|
|||||||
fn from(mode: BridgeIosVoiceProcessingMode) -> Self {
|
fn from(mode: BridgeIosVoiceProcessingMode) -> Self {
|
||||||
match mode {
|
match mode {
|
||||||
BridgeIosVoiceProcessingMode::PlatformVoiceProcessing => Self::PlatformVoiceProcessing,
|
BridgeIosVoiceProcessingMode::PlatformVoiceProcessing => Self::PlatformVoiceProcessing,
|
||||||
BridgeIosVoiceProcessingMode::SonoraExperimental => Self::SonoraExperimental,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1234,7 +1231,6 @@ impl From<chanora_core::IosVoiceProcessingMode> for BridgeIosVoiceProcessingMode
|
|||||||
chanora_core::IosVoiceProcessingMode::PlatformVoiceProcessing => {
|
chanora_core::IosVoiceProcessingMode::PlatformVoiceProcessing => {
|
||||||
Self::PlatformVoiceProcessing
|
Self::PlatformVoiceProcessing
|
||||||
}
|
}
|
||||||
chanora_core::IosVoiceProcessingMode::SonoraExperimental => Self::SonoraExperimental,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2361,25 +2357,11 @@ pub async fn set_ios_voice_processing_mode(
|
|||||||
let config = BridgeAudioProcessingConfig {
|
let config = BridgeAudioProcessingConfig {
|
||||||
route: BridgeAudioRoute::Speaker,
|
route: BridgeAudioRoute::Speaker,
|
||||||
ios_mode: mode,
|
ios_mode: mode,
|
||||||
processing_backend: match mode {
|
processing_backend: BridgeAudioBackend::PlatformVoiceProcessing,
|
||||||
BridgeIosVoiceProcessingMode::PlatformVoiceProcessing => {
|
|
||||||
BridgeAudioBackend::PlatformVoiceProcessing
|
|
||||||
}
|
|
||||||
BridgeIosVoiceProcessingMode::SonoraExperimental => BridgeAudioBackend::WebrtcApm,
|
|
||||||
},
|
|
||||||
vad_backend: BridgeVadBackend::SileroOnnx,
|
vad_backend: BridgeVadBackend::SileroOnnx,
|
||||||
aec: match mode {
|
aec: BridgeEffectOwner::Platform,
|
||||||
BridgeIosVoiceProcessingMode::PlatformVoiceProcessing => BridgeEffectOwner::Platform,
|
ns: BridgeEffectOwner::Platform,
|
||||||
BridgeIosVoiceProcessingMode::SonoraExperimental => BridgeEffectOwner::WebrtcApm,
|
agc: BridgeEffectOwner::Platform,
|
||||||
},
|
|
||||||
ns: match mode {
|
|
||||||
BridgeIosVoiceProcessingMode::PlatformVoiceProcessing => BridgeEffectOwner::Platform,
|
|
||||||
BridgeIosVoiceProcessingMode::SonoraExperimental => BridgeEffectOwner::WebrtcApm,
|
|
||||||
},
|
|
||||||
agc: match mode {
|
|
||||||
BridgeIosVoiceProcessingMode::PlatformVoiceProcessing => BridgeEffectOwner::Platform,
|
|
||||||
BridgeIosVoiceProcessingMode::SonoraExperimental => BridgeEffectOwner::WebrtcApm,
|
|
||||||
},
|
|
||||||
hpf_enabled: true,
|
hpf_enabled: true,
|
||||||
limiter_enabled: true,
|
limiter_enabled: true,
|
||||||
vad_hangover_ms: 500,
|
vad_hangover_ms: 500,
|
||||||
|
|||||||
@@ -2409,7 +2409,6 @@ impl SseDecode for crate::api::BridgeIosVoiceProcessingMode {
|
|||||||
let mut inner = <i32>::sse_decode(deserializer);
|
let mut inner = <i32>::sse_decode(deserializer);
|
||||||
return match inner {
|
return match inner {
|
||||||
0 => crate::api::BridgeIosVoiceProcessingMode::PlatformVoiceProcessing,
|
0 => crate::api::BridgeIosVoiceProcessingMode::PlatformVoiceProcessing,
|
||||||
1 => crate::api::BridgeIosVoiceProcessingMode::SonoraExperimental,
|
|
||||||
_ => unreachable!(
|
_ => unreachable!(
|
||||||
"Invalid variant for BridgeIosVoiceProcessingMode: {}",
|
"Invalid variant for BridgeIosVoiceProcessingMode: {}",
|
||||||
inner
|
inner
|
||||||
@@ -3445,7 +3444,6 @@ impl flutter_rust_bridge::IntoDart for crate::api::BridgeIosVoiceProcessingMode
|
|||||||
fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
|
fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
|
||||||
match self {
|
match self {
|
||||||
Self::PlatformVoiceProcessing => 0.into_dart(),
|
Self::PlatformVoiceProcessing => 0.into_dart(),
|
||||||
Self::SonoraExperimental => 1.into_dart(),
|
|
||||||
_ => unreachable!(),
|
_ => unreachable!(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4215,7 +4213,6 @@ impl SseEncode for crate::api::BridgeIosVoiceProcessingMode {
|
|||||||
<i32>::sse_encode(
|
<i32>::sse_encode(
|
||||||
match self {
|
match self {
|
||||||
crate::api::BridgeIosVoiceProcessingMode::PlatformVoiceProcessing => 0,
|
crate::api::BridgeIosVoiceProcessingMode::PlatformVoiceProcessing => 0,
|
||||||
crate::api::BridgeIosVoiceProcessingMode::SonoraExperimental => 1,
|
|
||||||
_ => {
|
_ => {
|
||||||
unimplemented!("");
|
unimplemented!("");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user