From 962647afeaeb3fc909d734dfadf787f64d5189ef Mon Sep 17 00:00:00 2001 From: Del Wang Date: Mon, 29 Dec 2025 16:58:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=9A=E8=AE=BE=E5=A4=87=E7=BB=84?= =?UTF-8?q?=E7=AB=8B=E4=BD=93=E5=A3=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/hello/Makefile | 20 ++ apps/hello/build.sh | 25 +- apps/hello/src/bin/stereo.rs | 418 +++++++++++++++++++++++++ apps/hello/src/config.rs | 1 + apps/hello/src/config/asound.lx06.conf | 140 +++++++++ apps/hello/src/config/asound.oh2p.conf | 147 +++++++++ 6 files changed, 741 insertions(+), 10 deletions(-) create mode 100644 apps/hello/Makefile create mode 100644 apps/hello/src/bin/stereo.rs create mode 100644 apps/hello/src/config/asound.lx06.conf create mode 100644 apps/hello/src/config/asound.oh2p.conf diff --git a/apps/hello/Makefile b/apps/hello/Makefile new file mode 100644 index 0000000..3c2952c --- /dev/null +++ b/apps/hello/Makefile @@ -0,0 +1,20 @@ +BIN ?= server + +build-stereo: + $(MAKE) build-arm32 BIN=stereo + +build-client: + $(MAKE) build-arm32 BIN=client + +build-server: + cargo build --release --bin server + +run: + ./target/release/$(BIN) + +build-arm32: + docker run --rm -v $(shell pwd):/app open-xiaoai-runtime \ + cargo build --target armv7-unknown-linux-gnueabihf --release --bin $(BIN) + +build-arm64: + cargo build --release --bin $(BIN) \ No newline at end of file diff --git a/apps/hello/build.sh b/apps/hello/build.sh index f3fa505..2059ed5 100755 --- a/apps/hello/build.sh +++ b/apps/hello/build.sh @@ -4,10 +4,10 @@ set -e SSH_PASSWORD=open-xiaoai -# 1. 编译 client -echo "Compiling client..." -docker run --rm -v $(pwd):/app/hello open-xiaoai-runtime \ - cargo build --manifest-path hello/Cargo.toml --target armv7-unknown-linux-gnueabihf --bin client --release +# # 1. 编译 client +# echo "Compiling client..." +# docker run --rm -v $(pwd):/app/hello open-xiaoai-runtime \ +# cargo build --manifest-path hello/Cargo.toml --target armv7-unknown-linux-gnueabihf --bin client --release # 2. 上传 client 到小爱音箱 function upload_to_xiaoai() { @@ -18,11 +18,16 @@ function upload_to_xiaoai() { && echo "✅ Uploaded $binary_name to $ip" } -upload_to_xiaoai client 192.168.31.153 # left -upload_to_xiaoai client 192.168.31.235 # right +upload_to_xiaoai stereo 192.168.31.153 # left +upload_to_xiaoai stereo 192.168.31.235 # right -# 3. 编译 server -cargo build --bin server --release -./target/release/server +# # 3. 编译 server +# cargo build --bin server --release +# ./target/release/server -# dd if=test.wav | sshpass -p open-xiaoai ssh -o HostKeyAlgorithms=+ssh-rsa root@192.168.31.235 "dd of=/tmp/test.wav" \ No newline at end of file +# # dd if=test.wav | sshpass -p open-xiaoai ssh -o HostKeyAlgorithms=+ssh-rsa root@192.168.31.235 "dd of=/tmp/test.wav" + + +# /data/stereo slave left + +# /data/stereo master right diff --git a/apps/hello/src/bin/stereo.rs b/apps/hello/src/bin/stereo.rs new file mode 100644 index 0000000..3e9fb38 --- /dev/null +++ b/apps/hello/src/bin/stereo.rs @@ -0,0 +1,418 @@ +use anyhow::{Context, Result}; +#[cfg(target_os = "linux")] +use hello::audio::{AudioPlayer, OpusCodec}; +use hello::config::AudioConfig; +use hello::net::{AudioPacket, ChannelRole, ControlPacket, DISCOVERY_PORT, SERVER_PORT}; +use hello::sync::{ClockSync, now_us}; +use std::collections::VecDeque; +use std::env; +use std::fs; +use std::io::Read; +use std::net::SocketAddr; +use std::process::Command; +use std::time::Duration; +use tokio::io::{AsyncReadExt, AsyncWriteExt}; +use tokio::net::{TcpListener, TcpStream, UdpSocket}; +use tokio::signal; + +#[cfg(target_os = "linux")] +const FIFO_PATH: &str = "/tmp/stereo_out.fifo"; +#[cfg(target_os = "linux")] +const TEMP_ASOUND_CONF: &str = "/tmp/asound.stereo.conf"; +#[cfg(target_os = "linux")] +const REAL_ASOUND_CONF: &str = "/etc/asound.conf"; + +#[cfg(target_os = "linux")] +#[derive(Debug, Clone, Copy, PartialEq)] +enum DeviceModel { + Lx06, + Oh2p, + Unknown, +} + +#[cfg(target_os = "linux")] +fn detect_model() -> DeviceModel { + let model = Command::new("sh") + .args(["-c", "micocfg_model"]) + .output() + .map(|o| String::from_utf8_lossy(&o.stdout).into_owned()) // 转换为独立的 String + .unwrap_or_default() + .to_uppercase(); + if model.contains("LX06") { + return DeviceModel::Lx06; + } else if model.contains("OH2P") { + return DeviceModel::Oh2p; + } + DeviceModel::Unknown +} + +#[cfg(target_os = "linux")] +fn setup_alsa_config(model: DeviceModel) -> Result<()> { + let original_conf = match model { + DeviceModel::Lx06 => include_str!("../config/asound.lx06.conf"), + DeviceModel::Oh2p => include_str!("../config/asound.oh2p.conf"), + DeviceModel::Unknown => return Err(anyhow::anyhow!("Unsupported device model")), + }; + + // 重命名原有的 default 逻辑，插入 interceptor + let mut new_conf = original_conf.replace("pcm.!default", "pcm.original_default"); + new_conf.push_str(&format!( + r#" +pcm.!default {{ + type plug + slave.pcm "stereo_interceptor" +}} + +pcm.stereo_interceptor {{ + type file + slave.pcm "null" + file "{}" + format "raw" +}} +"#, + FIFO_PATH + )); + + fs::write(TEMP_ASOUND_CONF, new_conf)?; + + // 创建 FIFO + let _ = Command::new("mkfifo").arg(FIFO_PATH).status(); + let _ = Command::new("chmod").arg("666").arg(FIFO_PATH).status(); + + // 挂载覆盖 /etc/asound.conf + let status = Command::new("mount") + .arg("--bind") + .arg(TEMP_ASOUND_CONF) + .arg(REAL_ASOUND_CONF) + .status() + .context("Failed to execute mount command")?; + + if !status.success() { + return Err(anyhow::anyhow!("Failed to mount asound.conf, need root?")); + } + + println!("Successfully redirected ALSA output to {}", FIFO_PATH); + Ok(()) +} + +#[cfg(target_os = "linux")] +fn cleanup_alsa_config() { + println!("\nCleaning up ALSA configurations..."); + let _ = Command::new("umount").arg(REAL_ASOUND_CONF).status(); + let _ = fs::remove_file(TEMP_ASOUND_CONF); + let _ = fs::remove_file(FIFO_PATH); +} + +#[tokio::main] +async fn main() -> Result<()> { + #[cfg(not(target_os = "linux"))] + { + println!("Stereo 模式仅支持 Linux (需要 ALSA)"); + return Ok(()); + } + + #[cfg(target_os = "linux")] + { + let args: Vec = env::args().collect(); + if args.len() < 3 { + eprintln!("用法: {} [master|slave] [left|right]", args[0]); + eprintln!("示例:"); + eprintln!(" 主设备: {} master left", args[0]); + eprintln!(" 从设备: {} slave right", args[0]); + return Ok(()); + } + + let mode = &args[1]; + let role = if args[2].to_lowercase() == "left" { + ChannelRole::Left + } else { + ChannelRole::Right + }; + + if mode == "master" { + let model = detect_model(); + if model == DeviceModel::Unknown { + eprintln!("警告: 无法识别设备型号，尝试使用默认配置"); + } + setup_alsa_config(model)?; + + // 监听退出信号进行清理 + let result = tokio::select! { + res = run_master(role) => res, + _ = signal::ctrl_c() => { + println!("收到退出信号"); + Ok(()) + } + }; + + cleanup_alsa_config(); + return result; + } else { + run_slave(role).await?; + } + + Ok(()) + } +} + +#[cfg(target_os = "linux")] +async fn run_master(role: ChannelRole) -> Result<()> { + let config = AudioConfig { + sample_rate: 48000, + channels: 2, // 拦截的是立体声 + frame_size: 960, + bitrate: 48000, + ..AudioConfig::default() + }; + + println!("--- 主设备模式 ---"); + println!("本地声道: {:?}", role); + println!("正在启动发现服务 (UDP Broadcast)..."); + + // 1. 启动发现广播 + let socket = UdpSocket::bind("0.0.0.0:0").await?; + socket.set_broadcast(true)?; + let target_addr: SocketAddr = format!("255.255.255.255:{}", DISCOVERY_PORT).parse()?; + let hello = ControlPacket::ServerHello { port: SERVER_PORT }; + let msg = postcard::to_allocvec(&hello)?; + + let broadcast_handle = tokio::spawn(async move { + loop { + let _ = socket.send_to(&msg, target_addr).await; + tokio::time::sleep(Duration::from_secs(1)).await; + } + }); + + // 2. 等待从设备连接 + let listener = TcpListener::bind(format!("0.0.0.0:{}", SERVER_PORT)).await?; + println!("等待从设备连接于端口 {}...", SERVER_PORT); + let (mut slave_stream, addr) = listener.accept().await?; + println!("从设备已连接: {}", addr); + broadcast_handle.abort(); + + // 3. 握手与时间同步 + let mut buf = [0u8; 1024]; + let n = slave_stream.read(&mut buf).await?; + if let Ok(ControlPacket::ClientIdentify { role: slave_role }) = + postcard::from_bytes::(&buf[..n]) + { + println!("从设备识别为: {:?}", slave_role); + } + + let n = slave_stream.read(&mut buf).await?; + if let Ok(ControlPacket::Ping { client_ts }) = postcard::from_bytes::(&buf[..n]) + { + let pong = ControlPacket::Pong { + client_ts, + server_ts: now_us(), + }; + slave_stream + .write_all(&postcard::to_allocvec(&pong)?) + .await?; + println!("时钟同步完成"); + } + + // 4. 初始化音频 + // 打开 FIFO + let mut fifo = fs::File::open(FIFO_PATH).context("Failed to open FIFO for reading")?; + + // 使用 plug:original_default 以支持系统主音量控制 + // 由于我们在拦截器里把 slave 设为了 null，这里播放 original_default 会直接走原来的 softvol -> 硬件 + let playback_config = AudioConfig { + channels: 1, + playback_device: "plug:original_default".to_string(), + ..config.clone() + }; + let player = AudioPlayer::new(&playback_config).context("无法打开本地播放设备")?; + let mono_config = AudioConfig { + channels: 1, + ..config.clone() + }; + let mut codec = OpusCodec::new(&mono_config).context("无法初始化编码器")?; + + let mut stereo_raw_buf = vec![0i16; config.frame_size * 2]; + let mut opus_buf = vec![0u8; 2048]; + + let delay_us = 100_000; // 100ms 缓冲 + let mut current_ts = now_us() + delay_us; + let frame_duration = + (config.frame_size as f64 / config.sample_rate as f64 * 1_000_000.0) as u128; + + println!("开始拦截并分发立体声音频..."); + + let mut byte_buf = vec![0u8; config.frame_size * 2 * 2]; + + loop { + // 从 FIFO 读取 (这是同步源) + if let Err(e) = fifo.read_exact(&mut byte_buf) { + if e.kind() == std::io::ErrorKind::UnexpectedEof { + tokio::time::sleep(Duration::from_millis(10)).await; + continue; + } + return Err(e.into()); + } + + for i in 0..stereo_raw_buf.len() { + stereo_raw_buf[i] = i16::from_le_bytes([byte_buf[i * 2], byte_buf[i * 2 + 1]]); + } + + let mut local_pcm = Vec::with_capacity(config.frame_size); + let mut remote_pcm = Vec::with_capacity(config.frame_size); + + for i in 0..config.frame_size { + let (l, r) = (stereo_raw_buf[i * 2], stereo_raw_buf[i * 2 + 1]); + if role == ChannelRole::Left { + local_pcm.push(l); + remote_pcm.push(r); + } else { + local_pcm.push(r); + remote_pcm.push(l); + } + } + + // 先发送网络包，再进行本地播放 + // 这样可以确保远程设备更早收到数据，减少右声道卡顿 + let opus_len = codec.encode(&remote_pcm, &mut opus_buf)?; + let packet = AudioPacket { + timestamp: current_ts, + data: opus_buf[..opus_len].to_vec(), + }; + let packet_data = postcard::to_allocvec(&packet)?; + + if slave_stream + .write_all(&(packet_data.len() as u32).to_be_bytes()) + .await + .is_err() + || slave_stream.write_all(&packet_data).await.is_err() + { + println!("从设备断开连接"); + break; + } + + // 本地播放 (此操作可能阻塞，但不会影响已发出的网络包) + player.write(&local_pcm)?; + + current_ts += frame_duration; + + // 漂移校正：如果由于某种原因 current_ts 严重落后于现在时间，进行强制跳跃 + let now = now_us(); + if now > current_ts + 200_000 { + current_ts = now + 50_000; + } + } + + Ok(()) +} + +#[cfg(target_os = "linux")] +async fn run_slave(role: ChannelRole) -> Result<()> { + let config = AudioConfig { + sample_rate: 48000, + channels: 1, + frame_size: 960, + bitrate: 32000, + ..AudioConfig::default() + }; + + println!("--- 从设备模式 ---"); + println!("本地声道: {:?}", role); + + // 1. 发现主设备 + println!("正在搜索主设备..."); + let master_addr = hello::net::Discovery::client_discover_server().await?; + println!("发现主设备: {}", master_addr); + + let mut stream = TcpStream::connect(master_addr).await?; + + // 2. 身份识别 + stream + .write_all(&postcard::to_allocvec(&ControlPacket::ClientIdentify { + role: role.clone(), + })?) + .await?; + + // 3. 时间同步 + let mut clock = ClockSync::new(); + let t1 = now_us(); + stream + .write_all(&postcard::to_allocvec(&ControlPacket::Ping { + client_ts: t1, + })?) + .await?; + + let mut buf = [0u8; 1024]; + let n = stream.read(&mut buf).await?; + if let Ok(ControlPacket::Pong { + client_ts, + server_ts, + }) = postcard::from_bytes::(&buf[..n]) + { + let t4 = now_us(); + clock.update(client_ts, server_ts, t4); + println!("时钟同步完成. 偏移: {}us, RTT: {}us", clock.offset, t4 - t1); + } + + // 4. 音频处理 + let player = AudioPlayer::new(&config).context("无法打开播放设备")?; + let mut codec = OpusCodec::new(&config).context("无法初始化解码器")?; + let mut jitter_buffer: VecDeque = VecDeque::new(); + let mut pcm_buf = vec![0i16; config.frame_size]; + + let (tx, mut rx) = tokio::sync::mpsc::channel(100); + + // 网络接收线程 + let mut stream_read = stream; + tokio::spawn(async move { + loop { + let mut s_buf = [0u8; 4]; + if stream_read.read_exact(&mut s_buf).await.is_err() { + break; + } + let size = u32::from_be_bytes(s_buf) as usize; + let mut data = vec![0u8; size]; + if stream_read.read_exact(&mut data).await.is_err() { + break; + } + if let Ok(p) = postcard::from_bytes::(&data) { + let _ = tx.send(p).await; + } + } + }); + + println!("开始接收并播放音频..."); + + loop { + while let Ok(p) = rx.try_recv() { + jitter_buffer.push_back(p); + } + + if let Some(p) = jitter_buffer.front() { + let target_client_time = clock.to_client_time(p.timestamp); + let now = now_us(); + + if now >= target_client_time { + let packet = jitter_buffer.pop_front().unwrap(); + + // 如果包太旧了（延迟超过150ms），跳过以赶上进度，防止累积卡顿 + if now > target_client_time + 150_000 { + continue; + } + + let len = codec.decode(&packet.data, &mut pcm_buf)?; + player.write(&pcm_buf[..len])?; + } else { + let wait = (target_client_time - now) as u64; + if wait > 1000 { + // 如果时间差太大，可能是时钟跳变，清空缓冲重新同步 + if wait > 1_000_000 { + jitter_buffer.clear(); + } else { + tokio::time::sleep(Duration::from_micros(wait)).await; + } + } + } + } else { + tokio::time::sleep(Duration::from_millis(5)).await; + } + } +} diff --git a/apps/hello/src/config.rs b/apps/hello/src/config.rs index 28ba5c1..8ce1907 100644 --- a/apps/hello/src/config.rs +++ b/apps/hello/src/config.rs @@ -1,3 +1,4 @@ +#[derive(Debug, Clone)] pub struct AudioConfig { pub capture_device: String, pub playback_device: String, diff --git a/apps/hello/src/config/asound.lx06.conf b/apps/hello/src/config/asound.lx06.conf new file mode 100644 index 0000000..fa80069 --- /dev/null +++ b/apps/hello/src/config/asound.lx06.conf @@ -0,0 +1,140 @@ +pcm.!default { + type plug + slave { + pcm { + type softvol + slave.pcm dtsaudio + control{ + name "mysoftvol" + card 0 + } + min_dB -51.0 + max_dB 0.0 + } + channels 2 + format S16_LE + rate 48000 + } +} + +pcm.bluetooth { + type plug + slave { + pcm { + type softvol + slave.pcm dmixer + control{ + name "bluetooth" + card 0 + } + min_dB -51.0 + max_dB 0.0 + } + channels 2 + format S16_LE + rate 48000 + } +} + +pcm.notify { + type plug + slave { + pcm { + type softvol + slave.pcm dmixer + control{ + name "notifyvol" + card 0 + } + min_dB -51.0 + max_dB 0.0 + } + channels 2 + format S16_LE + rate 48000 + } +} + +pcm.dtsaudio { + type plug + slave.pcm "dtsladspa" +} + +pcm.dtsladspa { + type ladspa + slave.pcm plug:dmixer + channels 2 + path "/usr/lib/" + playback_plugins [{ + label dts_process + input { + controls [4] + } + }] +} + +pcm.dmixer { + type dmix + ipc_key 1024 + slave { + pcm "hw:0,2" + format S16_LE + period_size 1920 + buffer_size 7680 + rate 48000 + } + bindings { + 0 0 + 1 1 + } +} + +ctl.dmixer { + type hw + card 0 + device 1 +} + +pcm.dsp { + type plug + slave.pcm "dmixer" # use our new PCM here +} + +ctl.mixer { + type hw + card 0 +} + +pcm.dis { + type plug + slave.pcm noop +} + +pcm.mico_record { + type plug + slave.pcm Capture +} + +pcm.noop { + type plug + slave.pcm Capture +} + +pcm.Capture { + type plug + slave.pcm { + type dsnoop + ipc_key 1024 + ipc_perm 0666 + slave { + pcm "hw:0,3" + rate 48000 + format S32_LE + channels 8 + period_size 384 + buffer_size 6144 + } + } +} + +defaults.pcm.rate_converter "speexrate_medium" \ No newline at end of file diff --git a/apps/hello/src/config/asound.oh2p.conf b/apps/hello/src/config/asound.oh2p.conf new file mode 100644 index 0000000..e37cd0f --- /dev/null +++ b/apps/hello/src/config/asound.oh2p.conf @@ -0,0 +1,147 @@ +pcm.!default { + type plug + slave { + pcm "vis" + format S16_LE + rate 48000 + } +} + +pcm.vis { + type file + slave.pcm "tocopy" + file "|safe_fifo /tmp/vis_audio.fifo /tmp/mis_audio.fifo" +} + +pcm.tocopy { + type copy + slave { + pcm "Playback" + } +} + +pcm.Playback { + type plug + slave.pcm { + type softvol + slave.pcm "dmixer" + control { + name "mysoftvol" + card 0 + } + min_dB -51.0 + max_dB 0.0 + } +} + +pcm.usb_up { + type plug + slave { + pcm "hw:UAC2Gadget" + rate 48000 + format S16_LE + channels 2 + } +} + +pcm.CaptureUsbDown { + type plug + slave.pcm { + type dsnoop + ipc_key 3333 + ipc_perm 0666 + slave { + pcm "hw:UAC2Gadget" + rate 48000 + format S16_LE + channels 2 + period_size 480 + periods 8 + } + } +} + +pcm.notify { + type plug + slave { + pcm { + type softvol + slave.pcm dmixer + control { + name "notifyvol" + card 0 + } + min_dB -51.0 + max_dB 0.0 + } + channels 2 + format S16_LE + rate 48000 + } +} + +pcm.dmixer { + type dmix + ipc_key 1024 + slave { + pcm "hw:0,2" + format S16_LE + period_size 480 + buffer_size 4800 + rate 48000 + } + bindings { + 0 0 + 1 1 + } +} + +ctl.dmixer { + type hw + card 0 + device 1 +} + +pcm.dsp { + type plug + slave.pcm "dmixer" # use our new PCM here +} + +ctl.mixer { + type hw + card 0 +} + +pcm.dis { + type plug + slave.pcm noop +} + +pcm.mico_record { + type plug + slave.pcm Capture +} + +pcm.noop { + type plug + slave.pcm Capture +} + +pcm.Capture { + type plug + slave.pcm { + type dsnoop + ipc_key 1024 + ipc_perm 0666 + slave { + pcm "hw:0,3" + rate 48000 + format S32_LE + channels 4 + period_size 384 + buffer_size 6144 + } + } +} + +defaults.pcm.rate_converter "speexrate_medium" \ No newline at end of file