feat: Android Oboe voice backend — WebRTC APM, VAD, HW/SW toggle, BBCode welcome, link trust, foreground task
Audio engine (Rust): - Android Oboe: WebRTC APM (AEC/NS/AGC/HPF) + TEN/Silero ONNX VAD - Hardware effects (JNI) with software fallback per-effect - Render reference buffer for AEC between output/capture callbacks - Voice activity gate: suppress transmission when speaker muted (all platforms) - Audio focus (SDD-109) + Bluetooth SCO (SDD-110) via JNI - ONNX Runtime 1.26 via ort 2.0.0-rc.12 (down from rc.10, ndarray 0.17) - VAD worker channel capacity 8→32, initial seq u64::MAX (warm-up fix) - TEN VAD default backend (was Silero) - Platform→WebrtcApm resolution after hardware binding - oboe-rs edisonjwa fork with get_raw_session_id() Android Kotlin: - AndroidAudioFocusController + AndroidBluetoothScoController - AndroidAudioLifecycleController (route changes to Flutter) - ProGuard rules for new controllers Flutter UI: - VoiceSettings: Android HW/SW toggle (Platform auto / WebRTC APM) - VoiceStatusChip: mute warning border + Speaker muted label - BBCode welcome message parser (BbCodeText, case-insensitive) - Welcome message foldable (expanded by default) - Link trust dialog (domain wildcards, SharedPreferences) - HapticFeedback on voice sheet opener - Server name in AppBar, version v0.1.0 - Default channel (id=1) visible, serverquery clients hidden - flutter_foreground_task integration Config: - ort load-dynamic on all non-iOS (Android/Linux/Windows) - ONNX Runtime AAR 1.26.0 - ndarray moved to common deps (was Apple-only)
This commit is contained in:
Edison Jwa
@@ -40,6 +40,8 @@ class VoiceStatusChip extends StatelessWidget {
|
||||
required this.audioStats,
|
||||
required this.isTouchOnly,
|
||||
required this.onTap,
|
||||
this.inputMuted = false,
|
||||
this.outputMuted = false,
|
||||
});
|
||||
|
||||
/// Current transmit mode.
|
||||
@@ -57,6 +59,12 @@ class VoiceStatusChip extends StatelessWidget {
|
||||
/// True on iOS / iPadOS / Android.
|
||||
final bool isTouchOnly;
|
||||
|
||||
/// True when local mic is muted (hard mute or permission mute).
|
||||
final bool inputMuted;
|
||||
|
||||
/// True when local speaker is muted.
|
||||
final bool outputMuted;
|
||||
|
||||
/// Open the voice details modal.
|
||||
final VoidCallback onTap;
|
||||
|
||||
@@ -95,9 +103,15 @@ class VoiceStatusChip extends StatelessWidget {
|
||||
final tailText = transmitMode == rust.BridgeTransmitMode.ptt
|
||||
? '$releaseTailMs${l10n.voiceReleaseTailHint} ${l10n.voiceReleaseTailLabel.toLowerCase()}'
|
||||
: null;
|
||||
final micText = micOn ? l10n.voiceMicOn : l10n.voiceMicOff;
|
||||
final micText = inputMuted
|
||||
? '${l10n.voiceMicOff} (muted)'
|
||||
: outputMuted
|
||||
? 'Speaker muted'
|
||||
: (micOn ? l10n.voiceMicOn : l10n.voiceMicOff);
|
||||
final line2 = tailText == null ? micText : '$tailText \u00b7 $micText';
|
||||
|
||||
final muted = inputMuted || outputMuted;
|
||||
|
||||
return Semantics(
|
||||
button: true,
|
||||
label: '${l10n.voiceSheetTitle}: $line1, $line2',
|
||||
@@ -105,17 +119,24 @@ class VoiceStatusChip extends StatelessWidget {
|
||||
child: Material(
|
||||
type: MaterialType.transparency,
|
||||
child: InkWell(
|
||||
onTap: onTap,
|
||||
onTap: () {
|
||||
HapticFeedback.lightImpact();
|
||||
onTap();
|
||||
},
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
child: ExcludeSemantics(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||
decoration: BoxDecoration(
|
||||
color: theme.colorScheme.surfaceContainerHigh,
|
||||
color: muted
|
||||
? theme.colorScheme.errorContainer.withValues(alpha: 0.35)
|
||||
: theme.colorScheme.surfaceContainerHigh,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: theme.colorScheme.outlineVariant,
|
||||
width: 0.5,
|
||||
color: muted
|
||||
? theme.colorScheme.error
|
||||
: theme.colorScheme.outlineVariant,
|
||||
width: muted ? 1.5 : 0.5,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
@@ -394,6 +415,7 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
|
||||
late bool _aecEnabled;
|
||||
late bool _agcEnabled;
|
||||
late bool _hpfEnabled;
|
||||
late bool _preferHardware;
|
||||
late rust.BridgeVadBackend _vadBackend;
|
||||
|
||||
@override
|
||||
@@ -404,6 +426,7 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
|
||||
_aecEnabled = c.aec != rust.BridgeEffectOwner.off;
|
||||
_agcEnabled = c.agc != rust.BridgeEffectOwner.off;
|
||||
_hpfEnabled = c.hpfEnabled;
|
||||
_preferHardware = c.aec == rust.BridgeEffectOwner.platform;
|
||||
_vadBackend = c.vadBackend == rust.BridgeVadBackend.disabled
|
||||
? rust.BridgeVadBackend.webrtcVad
|
||||
: c.vadBackend;
|
||||
@@ -440,23 +463,51 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
|
||||
final c = widget.initialAudioConfig;
|
||||
final isSonora =
|
||||
c.iosMode == rust.BridgeIosVoiceProcessingMode.sonoraExperimental;
|
||||
// VPIO owns enabled effects on the default path. Sonora owns them only in
|
||||
// the experimental raw path.
|
||||
final isAndroid = Platform.isAndroid;
|
||||
|
||||
if (isAndroid) {
|
||||
final owner = _preferHardware
|
||||
? rust.BridgeEffectOwner.platform
|
||||
: rust.BridgeEffectOwner.webrtcApm;
|
||||
return rust.BridgeAudioProcessingConfig(
|
||||
route: c.route,
|
||||
iosMode: c.iosMode,
|
||||
processingBackend: _preferHardware
|
||||
? rust.BridgeAudioBackend.platformVoiceProcessing
|
||||
: rust.BridgeAudioBackend.webrtcApm,
|
||||
vadBackend: _vadBackend == rust.BridgeVadBackend.disabled
|
||||
? rust.BridgeVadBackend.webrtcVad
|
||||
: _vadBackend,
|
||||
aec: _aecEnabled ? owner : rust.BridgeEffectOwner.off,
|
||||
ns: _nsEnabled ? owner : rust.BridgeEffectOwner.off,
|
||||
agc: _agcEnabled ? owner : rust.BridgeEffectOwner.off,
|
||||
hpfEnabled: _hpfEnabled,
|
||||
limiterEnabled: c.limiterEnabled,
|
||||
vadHangoverMs: c.vadHangoverMs,
|
||||
vadPreRollMs: c.vadPreRollMs,
|
||||
vadMinTxMs: c.vadMinTxMs,
|
||||
debugWavDumpEnabled: c.debugWavDumpEnabled,
|
||||
);
|
||||
}
|
||||
|
||||
// iOS / macOS: VPIO vs Sonora paths.
|
||||
// VPIO owns enabled effects on the default path. The experimental raw path
|
||||
// delegates app-side processing to WebRTC APM.
|
||||
final aecOwner = isSonora
|
||||
? (_aecEnabled
|
||||
? rust.BridgeEffectOwner.sonora
|
||||
? rust.BridgeEffectOwner.webrtcApm
|
||||
: rust.BridgeEffectOwner.off)
|
||||
: rust.BridgeEffectOwner.platform;
|
||||
final nsOwner = isSonora
|
||||
? (_nsEnabled
|
||||
? rust.BridgeEffectOwner.sonora
|
||||
? rust.BridgeEffectOwner.webrtcApm
|
||||
: rust.BridgeEffectOwner.off)
|
||||
: (_nsEnabled
|
||||
? rust.BridgeEffectOwner.platform
|
||||
: rust.BridgeEffectOwner.off);
|
||||
final agcOwner = isSonora
|
||||
? (_agcEnabled
|
||||
? rust.BridgeEffectOwner.sonora
|
||||
? rust.BridgeEffectOwner.webrtcApm
|
||||
: rust.BridgeEffectOwner.off)
|
||||
: (_agcEnabled
|
||||
? rust.BridgeEffectOwner.platform
|
||||
@@ -631,6 +682,22 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
|
||||
// Android: hardware (JNI) vs software (WebRTC APM)
|
||||
if (Platform.isAndroid) ...[
|
||||
_AudioToggleRow(
|
||||
label: 'Prefer hardware effects',
|
||||
subtitle: _preferHardware
|
||||
? 'Try JNI hardware · software fallback'
|
||||
: 'Software WebRTC AEC3 · NS · AGC2',
|
||||
value: _preferHardware,
|
||||
onChanged: (v) {
|
||||
setState(() => _preferHardware = v);
|
||||
_notifyAudioConfig();
|
||||
},
|
||||
),
|
||||
],
|
||||
|
||||
_AudioToggleRow(
|
||||
label: 'Noise suppression',
|
||||
subtitle: 'Wiener filter',
|
||||
@@ -642,25 +709,40 @@ class _VoiceSheetBodyState extends State<_VoiceSheetBody> {
|
||||
),
|
||||
_AudioToggleRow(
|
||||
label: 'Echo cancellation',
|
||||
subtitle:
|
||||
widget.initialAudioConfig.iosMode ==
|
||||
rust.BridgeIosVoiceProcessingMode.platformVoiceProcessing
|
||||
? 'Always on · managed by platform VPIO'
|
||||
: 'AEC3 adaptive filter · 80 ms tail',
|
||||
subtitle: () {
|
||||
if (Platform.isAndroid) {
|
||||
return 'WebRTC AEC3 · adaptive filter';
|
||||
}
|
||||
return widget.initialAudioConfig.iosMode ==
|
||||
rust.BridgeIosVoiceProcessingMode.platformVoiceProcessing
|
||||
? 'Always on · managed by platform VPIO'
|
||||
: 'AEC3 adaptive filter · 80 ms tail';
|
||||
}(),
|
||||
value:
|
||||
widget.initialAudioConfig.iosMode ==
|
||||
rust.BridgeIosVoiceProcessingMode.platformVoiceProcessing
|
||||
? true // always on in VPIO
|
||||
: _aecEnabled,
|
||||
() {
|
||||
if (Platform.isAndroid) return _aecEnabled;
|
||||
return widget.initialAudioConfig.iosMode ==
|
||||
rust.BridgeIosVoiceProcessingMode.platformVoiceProcessing
|
||||
? true
|
||||
: _aecEnabled;
|
||||
}(),
|
||||
// AEC is always on in VPIO — disable the toggle.
|
||||
onChanged:
|
||||
widget.initialAudioConfig.iosMode ==
|
||||
rust.BridgeIosVoiceProcessingMode.platformVoiceProcessing
|
||||
? null
|
||||
: (v) {
|
||||
setState(() => _aecEnabled = v);
|
||||
_notifyAudioConfig();
|
||||
},
|
||||
// On Android, AEC is user-selectable.
|
||||
onChanged: () {
|
||||
if (Platform.isAndroid) {
|
||||
return (v) {
|
||||
setState(() => _aecEnabled = v);
|
||||
_notifyAudioConfig();
|
||||
};
|
||||
}
|
||||
return widget.initialAudioConfig.iosMode ==
|
||||
rust.BridgeIosVoiceProcessingMode.platformVoiceProcessing
|
||||
? null
|
||||
: (v) {
|
||||
setState(() => _aecEnabled = v);
|
||||
_notifyAudioConfig();
|
||||
};
|
||||
}(),
|
||||
),
|
||||
_AudioToggleRow(
|
||||
label: 'Auto gain control',
|
||||
|
||||
Reference in New Issue
Block a user