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

some more timing measurements

Browse source 
Signed-off-by: Aron Heinecke <aron.heinecke@t-online.de>
This commit is contained in:
Aron Heinecke 2021-05-10 22:44:15 +02:00
parent fc14e3e48a
commit 8a8c21bdca
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/discord.rs
View file

@ -391,7 +391,12 @@ impl VoiceEventHandler for Receiver {
// } // }
if let Some(audio) = audio { if let Some(audio) = audio {
{ {
let time = std::time::Instant::now();
let mut lock = self.sink.lock().await; let mut lock = self.sink.lock().await;
let dur = time.elapsed();
if dur > Duration::from_nanos(500) {
eprintln!("Akquiring lock took {}ms",dur.as_millis());
}
if let Some(buffer) = lock.get_mut(&packet.ssrc) { if let Some(buffer) = lock.get_mut(&packet.ssrc) {
buffer.extend(audio); buffer.extend(audio);
} else { } else {

48
src/main.rs
View file

@ -65,6 +65,10 @@ impl TypeMapKey for ListenerHolder {
type Value = AudioBufferDiscord; type Value = AudioBufferDiscord;
} }
const TICK_TIME: u64 = 20;
const FRAME_SIZE_MS: usize = 20;
const STEREO_20MS: usize = 48000 * 2 * FRAME_SIZE_MS / 1000;
#[tokio::main] #[tokio::main]
async fn main() -> Result<()> { async fn main() -> Result<()> {
tracing_subscriber::fmt::init(); tracing_subscriber::fmt::init();
@ -149,8 +153,8 @@ async fn main() -> Result<()> {
// a2t.set_volume(config.volume); // a2t.set_volume(config.volume);
// a2t.set_playing(true); // a2t.set_playing(true);
// } // }
let mut interval = tokio::time::interval(Duration::from_millis(20)); let mut interval = tokio::time::interval(Duration::from_millis(TICK_TIME));
// tokio::spawn(async { // tokio::spawn(async {
// loop { // loop {
@ -160,24 +164,24 @@ 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();
// Wait for ctrl + c // Wait for ctrl + c
tokio::select! { tokio::select! {
// send_audio = recv.recv() => { // send_audio = recv.recv() => {
@ -198,9 +202,19 @@ async fn main() -> Result<()> {
// } // }
// } // }
_send = interval.tick() => { _send = interval.tick() => {
let dur = start.elapsed();
if dur.as_millis() > TICK_TIME as u128 {
//eprintln!("Tick took {}ms",dur.as_millis());
}
let start = std::time::Instant::now();
if let Some(processed) = process_audio(&voice_buffer).await { if let Some(processed) = process_audio(&voice_buffer).await {
con.send_audio(processed)?; con.send_audio(processed)?;
let dur = start.elapsed();
if dur >= Duration::from_millis(1) {
eprintln!("Audio pipeline took {}ms",dur.as_millis());
}
} }
} }
_ = tokio::signal::ctrl_c() => { break; } _ = tokio::signal::ctrl_c() => { break; }
r = events => { r = events => {
@ -217,7 +231,7 @@ async fn main() -> Result<()> {
Ok(()) Ok(())
} }
const STEREO_20MS: usize = 48000 * 2 * 20 / 1000;
async fn process_audio(voice_buffer: &AudioBufferDiscord) -> Option<OutPacket> { async fn process_audio(voice_buffer: &AudioBufferDiscord) -> Option<OutPacket> {
let mut buffer_map; let mut buffer_map;
@ -254,7 +268,7 @@ async fn process_audio(voice_buffer: &AudioBufferDiscord) -> Option<OutPacket> {
Err(e) => {eprintln!("Failed to encode voice: {}",e); return None;}, Err(e) => {eprintln!("Failed to encode voice: {}",e); return None;},
Ok(size) => size, Ok(size) => size,
}; };
println!("Data size: {}/{} enc-length: {}",data.len(),STEREO_20MS,length); //println!("Data size: {}/{} enc-length: {}",data.len(),STEREO_20MS,length);
//println!("length size: {}",length); //println!("length size: {}",length);
let duration = start.elapsed().as_millis(); let duration = start.elapsed().as_millis();
if duration > 15 { if duration > 15 {