Jerry/voice-bridge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use tinier voice frames

Browse source 
Signed-off-by: Aron Heinecke <aron.heinecke@t-online.de>
This commit is contained in:
Aron Heinecke 2021-05-11 01:40:44 +02:00
parent b4bbf5e777
commit 52e4a5306d
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main.rs
View file

@ -65,7 +65,7 @@ impl TypeMapKey for ListenerHolder {
type Value = AudioBufferDiscord; type Value = AudioBufferDiscord;
} }
const TICK_TIME: u64 = 20; const TICK_TIME: u64 = 15;
const FRAME_SIZE_MS: usize = 20; const FRAME_SIZE_MS: usize = 20;
const STEREO_20MS: usize = 48000 * 2 * FRAME_SIZE_MS / 1000; const STEREO_20MS: usize = 48000 * 2 * FRAME_SIZE_MS / 1000;
@ -173,20 +173,20 @@ async fn main() -> Result<()> {
loop { loop {
let t2a = audiodata.ts2a.clone(); let t2a = audiodata.ts2a.clone();
let events = con.events().try_for_each(|e| async { let events = con.events().try_for_each(|e| async {
// if let StreamItem::Audio(packet) = e { if let StreamItem::Audio(packet) = e {
// let from = ClientId(match packet.data().data() { let from = ClientId(match packet.data().data() {
// AudioData::S2C { from, .. } => *from, AudioData::S2C { from, .. } => *from,
// AudioData::S2CWhisper { from, .. } => *from, AudioData::S2CWhisper { from, .. } => *from,
// _ => panic!("Can only handle S2C packets but got a C2S packet"), _ => panic!("Can only handle S2C packets but got a C2S packet"),
// }); });
// let mut t2a = t2a.lock().unwrap(); let mut t2a = t2a.lock().unwrap();
// if let Err(e) = t2a.play_packet((con_id, from), packet) { if let Err(e) = t2a.play_packet((con_id, from), packet) {
// debug!(logger, "Failed to play packet"; "error" => %e); debug!(logger, "Failed to play packet"; "error" => %e);
// } }
// } }
Ok(()) Ok(())
}); });
let start = std::time::Instant::now(); // let start = std::time::Instant::now();
// Wait for ctrl + c // Wait for ctrl + c
tokio::select! { tokio::select! {
// send_audio = recv.recv() => { // send_audio = recv.recv() => {
@ -207,10 +207,10 @@ async fn main() -> Result<()> {
// } // }
// } // }
_send = interval.tick() => { _send = interval.tick() => {
let dur = start.elapsed(); // let dur = start.elapsed();
if dur.as_millis() > TICK_TIME as u128 { // if dur.as_millis() > TICK_TIME as u128 {
// eprintln!("Tick took {}ms",dur.as_millis()); // eprintln!("Tick took {}ms",dur.as_millis());
} // }
let start = std::time::Instant::now(); let start = std::time::Instant::now();
if let Some(processed) = process_audio(&voice_buffer,&encoder).await { if let Some(processed) = process_audio(&voice_buffer,&encoder).await {
con.send_audio(processed)?; con.send_audio(processed)?;