EdisonJwa
ba444d94bd
Implement the SDD-094 / SDD-095 / SDD-096 / SDD-097 detailed designs
committed in dfa84ee.
Rust side
- chanora_audio::TransmitMode enum (Ptt/Continuous/VoiceActivity) with
serde-friendly u8 repr (SDD-095).
- chanora_audio::TransmitModeSelector: lock-free Atomic-backed selector
that is the sole writer of transmit_active (per SAD-083), applying
hard_mute as a final clamp. VoiceActivity falls through to Continuous
for v1 (DEC-030 placeholder).
- chanora_audio::ReleaseTailTimer: tokio-task-owning struct driving the
selector's ptt_held input; default 200 ms tail, configurable 0–500 ms
with AtomicU32 hot read; pending JoinHandle held in a std::sync::Mutex
touched only on PTT edge transitions (SDD-096).
- chanora_storage: AudioMeta persisted as audio_meta.json next to
identity.dek; get/set_transmit_mode + get/set_release_tail_ms with
0..=500 clamp on write.
- chanora_core::ChanoraSession: voice_join(channel, password) and
voice_leave() are the new lifecycle entry points; ensure_audio_running
and shutdown_audio_if_idle are private helpers around the existing
Option<AudioEngine> field. SessionEvent::VoiceState carries the
in_channel / transmit_mode / mute / release_tail_ms tuple. Selector
state survives reconnect; supervisor rewires it to each fresh engine
gate.
- chanora_bridge: drop start_audio; add voice_join, voice_leave,
set/get_transmit_mode, set/get_release_tail_ms, set_hard_mute.
BridgeEvent::VoiceState mirrors the core event. AudioStarted/Stopped
kept for backwards compat but Flutter ignores them in the new UI.
Flutter side
- New apps/chanora_flutter/lib/widgets/voice_bar.dart replaces the
legacy _AudioControls widget. Renders channel pill, mode badge,
mute toggle, level meter, PttCapabilityBadge, leave button. No
manual Start affordance anywhere.
- New apps/chanora_flutter/lib/widgets/voice_settings.dart dialog with
TransmitMode radio group (VoiceActivity disabled with 'Coming soon'
trailing label per DEC-030), bind-key button, release-tail slider
0–500 ms step 25.
- main.dart: state fields _inChannel, _transmitMode, _hardMute,
_releaseTailMs driven by BridgeEvent_VoiceState. Channel-tap now
calls voiceJoin instead of moveToChannel. Removed _onStartAudio,
_audioStarted-gated branch, and the FilledButton.
- l10n: 11 new strings in app_en.arb + app_zh.arb.
Verification
- cargo check --workspace: clean.
- cargo test --workspace --lib: 72 passed / 0 failed / 1 ignored
(chanora_audio: +12 new tests for TransmitMode/Selector/ReleaseTail;
chanora_storage: +2 new tests for audio_meta round-trip).
- flutter analyze: 0 errors, 0 warnings; 6 infos are the Flutter 3.32
Radio.groupValue deprecation (pre-existing API usage).
- FRB Dart/Rust bindings regenerated via flutter_rust_bridge_codegen.
Follow-up (intentionally deferred)
- PttController and per-platform PTT backends still drive AudioTransmitGate
directly via the legacy set_ptt path; routing those key edges through
ChanoraSession::release_tail_timer().{key_down,key_up} so the tail
applies to native PTT input is a contained wiring change in a follow-up.
- Real audio-level RMS in BridgeAudioStats (current meter is binary).
- VoiceActivity backend (DEC-030).
91 lines
2.6 KiB
Rust
91 lines
2.6 KiB
Rust
//! Voice transmit mode (SDD-095).
|
|
//!
|
|
//! Selects how `transmit_active` is driven from the user's input
|
|
//! signals. Persisted per-identity in
|
|
//! [`chanora_storage::IdentityFileStore`] under the `transmit_mode`
|
|
//! metadata key (default [`TransmitMode::Ptt`]).
|
|
//!
|
|
//! `VoiceActivity` is reserved per DEC-030 — for v1 the
|
|
//! [`crate::transmit_selector::TransmitModeSelector`] treats it
|
|
//! exactly like [`TransmitMode::Continuous`] until a real VAD
|
|
//! implementation lands.
|
|
|
|
/// User-visible voice transmit mode.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
|
|
#[repr(u8)]
|
|
pub enum TransmitMode {
|
|
/// Push-to-talk: transmit only while the bound key is held
|
|
/// (with release-tail per SDD-096).
|
|
Ptt = 0,
|
|
/// Continuous: transmit whenever the user is in a voice
|
|
/// channel and not hard-muted.
|
|
Continuous = 1,
|
|
/// Voice activity detection. Reserved per DEC-030; v1 behaves
|
|
/// as [`TransmitMode::Continuous`] until a VAD implementation
|
|
/// is allocated.
|
|
VoiceActivity = 2,
|
|
}
|
|
|
|
impl Default for TransmitMode {
|
|
fn default() -> Self {
|
|
Self::Ptt
|
|
}
|
|
}
|
|
|
|
impl TransmitMode {
|
|
/// Encode as the persisted single-byte value.
|
|
pub fn as_u8(self) -> u8 {
|
|
self as u8
|
|
}
|
|
|
|
/// Decode from the persisted single-byte value. Returns
|
|
/// `None` for unknown encodings (the storage layer should
|
|
/// fall back to [`TransmitMode::default`] in that case).
|
|
pub fn from_u8(v: u8) -> Option<Self> {
|
|
match v {
|
|
0 => Some(Self::Ptt),
|
|
1 => Some(Self::Continuous),
|
|
2 => Some(Self::VoiceActivity),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
/// Stable diagnostic identifier (never localised).
|
|
pub fn as_str(self) -> &'static str {
|
|
match self {
|
|
Self::Ptt => "ptt",
|
|
Self::Continuous => "continuous",
|
|
Self::VoiceActivity => "voice-activity",
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn default_is_ptt() {
|
|
assert_eq!(TransmitMode::default(), TransmitMode::Ptt);
|
|
}
|
|
|
|
#[test]
|
|
fn round_trip_u8() {
|
|
for m in [
|
|
TransmitMode::Ptt,
|
|
TransmitMode::Continuous,
|
|
TransmitMode::VoiceActivity,
|
|
] {
|
|
assert_eq!(TransmitMode::from_u8(m.as_u8()), Some(m));
|
|
}
|
|
assert_eq!(TransmitMode::from_u8(99), None);
|
|
}
|
|
|
|
#[test]
|
|
fn as_str_is_stable() {
|
|
assert_eq!(TransmitMode::Ptt.as_str(), "ptt");
|
|
assert_eq!(TransmitMode::Continuous.as_str(), "continuous");
|
|
assert_eq!(TransmitMode::VoiceActivity.as_str(), "voice-activity");
|
|
}
|
|
}
|