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)
2026-05-22 09:29:57 +09:00
parent 6af4ecab0f
commit bf284018e6
37 changed files with 3676 additions and 703 deletions
@@ -10,7 +10,7 @@ import 'package:freezed_annotation/freezed_annotation.dart' hide protected;
 part 'api.freezed.dart';

 // These functions are ignored because they are not marked as `pub`: `install_panic_diagnostic_hook`, `log_file_path`, `log_sink`, `map_join_error_code`, `map_join_sync_state`, `open_log_file`, `permission_events`, `publish_permission_state`, `runtime`, `session`, `task_join_error`, `transmit_mode_from_u8`
-// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`
+// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `assert_fields_are_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`
 // These functions are ignored (category: IgnoreBecauseExplicitAttribute): `from_kotlin_str`, `to_permission_gate`

 /// Return the platform-conventional log-file path as a string, or
@@ -46,10 +46,24 @@ Future<bool> isConnected() => RustLib.instance.api.crateApiIsConnected();
 void handleRouteChange({required BridgeAudioRoute route}) =>
    RustLib.instance.api.crateApiHandleRouteChange(route: route);

-/// Handle iOS AVAudioSession media-services reset.
+/// Handle iOS AVAudioSession media-services reset (legacy, no route arg).
+///
+/// Called by the existing FRB-generated Dart binding. Uses
+/// `AudioRoute::Unknown` which triggers a route-change recompute.
+/// The AppDelegate now also calls `handle_media_services_reset_with_route`
+/// directly after rebuilding the session.
 void handleMediaServicesReset() =>
    RustLib.instance.api.crateApiHandleMediaServicesReset();

+/// Handle iOS AVAudioSession media-services reset with the current
+/// route class. Called by AppDelegate after rebuilding the session.
+///
+/// `route_class` is the Swift-side route class string (e.g. "Speaker").
+void handleMediaServicesResetWithRoute({required String routeClass}) => RustLib
+    .instance
+    .api
+    .crateApiHandleMediaServicesResetWithRoute(routeClass: routeClass);
+
 /// Handle iOS AVAudioSession interruption begin (SDD-101).
 void handleInterruptionBegan() =>
    RustLib.instance.api.crateApiHandleInterruptionBegan();
@@ -229,59 +243,27 @@ Future<BridgeAudioStats> audioStats() =>
 /// Apply the P1 audio-processing config.
 Future<void> setAudioProcessingConfig({
  required BridgeAudioProcessingConfig config,
-}) async {
-  _lastAppliedAudioConfig = config;
-  return RustLib.instance.api.crateApiSetAudioProcessingConfig(config: config);
-}
+}) => RustLib.instance.api.crateApiSetAudioProcessingConfig(config: config);
+
+/// Read the current audio-processing config.
+///
+/// Returns the live config as last applied to the audio engine.
+/// Returns a default config when no session is active.
+Future<BridgeAudioProcessingConfig> getAudioProcessingConfig() =>
+    RustLib.instance.api.crateApiGetAudioProcessingConfig();

 /// Read P1 audio-processing diagnostics.
 Future<BridgeAudioProcessingStats> audioProcessingStats() =>
    RustLib.instance.api.crateApiAudioProcessingStats();

-/// Read the current audio-processing config.
-///
-/// Derives the config from [audioProcessingStats] for the route/backend
-/// fields, and returns the last value applied via [setAudioProcessingConfig]
-/// for timing/debug fields. Falls back to P1 spec defaults on first call.
-Future<BridgeAudioProcessingConfig> getAudioProcessingConfig() async {
-  BridgeAudioProcessingStats? stats;
-  try {
-    stats = await audioProcessingStats();
-  } catch (_) {}
-
-  final last = _lastAppliedAudioConfig;
-  return BridgeAudioProcessingConfig(
-    route: stats?.audioRoute ?? last?.route ?? BridgeAudioRoute.unknown,
-    iosMode:
-        stats?.iosVoiceProcessingMode ??
-        last?.iosMode ??
-        BridgeIosVoiceProcessingMode.platformVoiceProcessing,
-    processingBackend:
-        stats?.processingBackend ??
-        last?.processingBackend ??
-        BridgeAudioBackend.platformVoiceProcessing,
-    vadBackend:
-        stats?.vadBackend ?? last?.vadBackend ?? BridgeVadBackend.sileroOnnx,
-    aec: last?.aec ?? BridgeEffectOwner.platform,
-    ns: last?.ns ?? BridgeEffectOwner.platform,
-    agc: last?.agc ?? BridgeEffectOwner.platform,
-    hpfEnabled: last?.hpfEnabled ?? true,
-    limiterEnabled: last?.limiterEnabled ?? true,
-    vadHangoverMs: last?.vadHangoverMs ?? 500,
-    vadPreRollMs: last?.vadPreRollMs ?? 160,
-    vadMinTxMs: last?.vadMinTxMs ?? 200,
-    debugWavDumpEnabled: last?.debugWavDumpEnabled ?? false,
-  );
-}
-
-/// Last config applied via [setAudioProcessingConfig]. Used by
-/// [getAudioProcessingConfig] to preserve timing/debug values across calls.
-BridgeAudioProcessingConfig? _lastAppliedAudioConfig;
-
 /// Configure the VAD model path.
 Future<void> setVadModelPath({required String path}) =>
    RustLib.instance.api.crateApiSetVadModelPath(path: path);

+/// Configure the TEN VAD ONNX model path.
+Future<void> setTenVadModelPath({required String path}) =>
+    RustLib.instance.api.crateApiSetTenVadModelPath(path: path);
+
 /// Enable or disable audio debug WAV dumping.
 Future<void> enableAudioDebugWavDump({required bool enabled}) =>
    RustLib.instance.api.crateApiEnableAudioDebugWavDump(enabled: enabled);
@@ -67,7 +67,7 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
  String get codegenVersion => '2.12.0';

  @override
-  int get rustContentHash => -1835973251;
+  int get rustContentHash => -436507436;

  static const kDefaultExternalLibraryLoaderConfig =
      ExternalLibraryLoaderConfig(
@@ -103,6 +103,8 @@ abstract class RustLibApi extends BaseApi {

  String crateApiExportDiagnostics();

+  Future<BridgeAudioProcessingConfig> crateApiGetAudioProcessingConfig();
+
  Future<(String, String)> crateApiGetPttBinding();

  Future<int> crateApiGetReleaseTailMs();
@@ -115,6 +117,8 @@ abstract class RustLibApi extends BaseApi {

  void crateApiHandleMediaServicesReset();

+  void crateApiHandleMediaServicesResetWithRoute({required String routeClass});
+
  void crateApiHandleRouteChange({required BridgeAudioRoute route});

  Future<void> crateApiInitStorage({required String dir});
@@ -159,6 +163,8 @@ abstract class RustLibApi extends BaseApi {

  Future<void> crateApiSetReleaseTailMs({required int ms});

+  Future<void> crateApiSetTenVadModelPath({required String path});
+
  Future<void> crateApiSetTransmitMode({required BridgeTransmitMode mode});

  Future<void> crateApiSetVadModelPath({required String path});
@@ -469,7 +475,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
      const TaskConstMeta(debugName: "export_diagnostics", argNames: []);

  @override
-  Future<(String, String)> crateApiGetPttBinding() {
+  Future<BridgeAudioProcessingConfig> crateApiGetAudioProcessingConfig() {
    return handler.executeNormal(
      NormalTask(
        callFfi: (port_) {
@@ -481,6 +487,36 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
            port: port_,
          );
        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_bridge_audio_processing_config,
+          decodeErrorData: sse_decode_bridge_error,
+        ),
+        constMeta: kCrateApiGetAudioProcessingConfigConstMeta,
+        argValues: [],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta get kCrateApiGetAudioProcessingConfigConstMeta =>
+      const TaskConstMeta(
+        debugName: "get_audio_processing_config",
+        argNames: [],
+      );
+
+  @override
+  Future<(String, String)> crateApiGetPttBinding() {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 12,
+            port: port_,
+          );
+        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_record_string_string,
          decodeErrorData: null,
@@ -504,7 +540,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 12,
+            funcId: 13,
            port: port_,
          );
        },
@@ -531,7 +567,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 13,
+            funcId: 14,
            port: port_,
          );
        },
@@ -555,7 +591,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
      SyncTask(
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 14)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 15)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -578,7 +614,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_bool(shouldResume, serializer);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 15)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 16)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -603,7 +639,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
      SyncTask(
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 16)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 17)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -622,6 +658,32 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        argNames: [],
      );

+  @override
+  void crateApiHandleMediaServicesResetWithRoute({required String routeClass}) {
+    return handler.executeSync(
+      SyncTask(
+        callFfi: () {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_String(routeClass, serializer);
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 18)!;
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_unit,
+          decodeErrorData: null,
+        ),
+        constMeta: kCrateApiHandleMediaServicesResetWithRouteConstMeta,
+        argValues: [routeClass],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta get kCrateApiHandleMediaServicesResetWithRouteConstMeta =>
+      const TaskConstMeta(
+        debugName: "handle_media_services_reset_with_route",
+        argNames: ["routeClass"],
+      );
+
  @override
  void crateApiHandleRouteChange({required BridgeAudioRoute route}) {
    return handler.executeSync(
@@ -629,7 +691,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_bridge_audio_route(route, serializer);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 17)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 19)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -657,7 +719,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 18,
+            funcId: 20,
            port: port_,
          );
        },
@@ -684,7 +746,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 19,
+            funcId: 21,
            port: port_,
          );
        },
@@ -711,7 +773,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 20,
+            funcId: 22,
            port: port_,
          );
        },
@@ -735,7 +797,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
      SyncTask(
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 21)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 23)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_String,
@@ -765,7 +827,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 22,
+            funcId: 24,
            port: port_,
          );
        },
@@ -794,7 +856,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 23,
+            funcId: 25,
            port: port_,
          );
        },
@@ -827,7 +889,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 24,
+            funcId: 26,
            port: port_,
          );
        },
@@ -858,7 +920,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 25,
+            funcId: 27,
            port: port_,
          );
        },
@@ -886,7 +948,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 26,
+            funcId: 28,
            port: port_,
          );
        },
@@ -916,7 +978,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 27,
+            funcId: 29,
            port: port_,
          );
        },
@@ -944,7 +1006,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
        callFfi: () {
          final serializer = SseSerializer(generalizedFrbRustBinding);
          sse_encode_bridge_network_state(state, serializer);
-          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 28)!;
+          return pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 30)!;
        },
        codec: SseCodec(
          decodeSuccessData: sse_decode_unit,
@@ -970,7 +1032,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 29,
+            funcId: 31,
            port: port_,
          );
        },
@@ -998,7 +1060,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 30,
+            funcId: 32,
            port: port_,
          );
        },
@@ -1026,7 +1088,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 31,
+            funcId: 33,
            port: port_,
          );
        },
@@ -1058,7 +1120,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 32,
+            funcId: 34,
            port: port_,
          );
        },
@@ -1088,7 +1150,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 33,
+            funcId: 35,
            port: port_,
          );
        },
@@ -1106,6 +1168,36 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
  TaskConstMeta get kCrateApiSetReleaseTailMsConstMeta =>
      const TaskConstMeta(debugName: "set_release_tail_ms", argNames: ["ms"]);

+  @override
+  Future<void> crateApiSetTenVadModelPath({required String path}) {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_String(path, serializer);
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 36,
+            port: port_,
+          );
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_unit,
+          decodeErrorData: sse_decode_bridge_error,
+        ),
+        constMeta: kCrateApiSetTenVadModelPathConstMeta,
+        argValues: [path],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta get kCrateApiSetTenVadModelPathConstMeta => const TaskConstMeta(
+    debugName: "set_ten_vad_model_path",
+    argNames: ["path"],
+  );
+
  @override
  Future<void> crateApiSetTransmitMode({required BridgeTransmitMode mode}) {
    return handler.executeNormal(
@@ -1116,7 +1208,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 34,
+            funcId: 37,
            port: port_,
          );
        },
@@ -1144,7 +1236,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 35,
+            funcId: 38,
            port: port_,
          );
        },
@@ -1171,7 +1263,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 36,
+            funcId: 39,
            port: port_,
          );
        },
@@ -1199,7 +1291,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 37,
+            funcId: 40,
            port: port_,
          );
        },
@@ -1231,7 +1323,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 38,
+            funcId: 41,
            port: port_,
          );
        },
@@ -1260,7 +1352,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
          pdeCallFfi(
            generalizedFrbRustBinding,
            serializer,
-            funcId: 39,
+            funcId: 42,
            port: port_,
          );
        },