move voice decoding to users

Author: LaihoE

examples/voice_to_wav/index.js

@@ -1,11 +1,28 @@
 from demoparser2 import DemoParser
+import wave
+import opuslib
+import time
+# pip install opuslib
+# pip install wave
 
+
+# Writes one wav per player
+
+decoder = opuslib.Decoder(48000, 1)
 parser = DemoParser("path/to/demo.dem")
-# returns steamid, bytes
-# bytes include a wav header in the beginning so
-# it can be written directly
-steamid_bytes_dict = parser.parse_voice()
-
-for steamid, raw_bytes in steamid_bytes_dict.items():    
-    with open(f"{steamid}.wav", "wb") as f:
-        f.write(raw_bytes)
+out = parser.parse_voice()
+
+unique_players = set([p["steamid"] for p in out])
+for player in unique_players:
+    bytes_this_player = [x["bytes"] for x in out if x["steamid"] == player]
+
+    frames = []
+    for b in bytes_this_player:
+        frames.append(decoder.decode(b, frame_size=960, decode_fec=False))
+    pcm_data = b"".join(frames)
+
+    with wave.open(f"{player}.wav", "wb") as f:
+        f.setnchannels(1)
+        f.setsampwidth(2)
+        f.setframerate(48000)
+        f.writeframes(pcm_data)

examples/voice_to_wav/main.py

@@ -10908,6 +10908,26 @@ pub static STICKER_ID_TO_NAME: phf::Map<u32, &'static str> = phf_map! {
     9428_u32 => "paper_drukhari_2",
     9429_u32 => "paper_aeldari_1",
     9430_u32 => "paper_aeldari_2",
+    9431_u32 => "aus2025_signature_apex_32",
+    9432_u32 => "aus2025_signature_apex_32_foil",
+    9433_u32 => "aus2025_signature_apex_32_holo",
+    9434_u32 => "aus2025_signature_apex_32_gold",
+    9435_u32 => "aus2025_signature_zywoo_32",
+    9436_u32 => "aus2025_signature_zywoo_32_foil",
+    9437_u32 => "aus2025_signature_zywoo_32_holo",
+    9438_u32 => "aus2025_signature_zywoo_32_gold",
+    9439_u32 => "aus2025_signature_flamez_32",
+    9440_u32 => "aus2025_signature_flamez_32_foil",
+    9441_u32 => "aus2025_signature_flamez_32_holo",
+    9442_u32 => "aus2025_signature_flamez_32_gold",
+    9443_u32 => "aus2025_signature_mezii_32",
+    9444_u32 => "aus2025_signature_mezii_32_foil",
+    9445_u32 => "aus2025_signature_mezii_32_holo",
+    9446_u32 => "aus2025_signature_mezii_32_gold",
+    9447_u32 => "aus2025_signature_ropz_32",
+    9448_u32 => "aus2025_signature_ropz_32_foil",
+    9449_u32 => "aus2025_signature_ropz_32_holo",
+    9450_u32 => "aus2025_signature_ropz_32_gold",
 };
 
 pub static WEAPINDICIES: phf::Map<u32, &'static str> = phf_map! {

src/csgoproto/src/maps.rs

@@ -84,7 +84,6 @@ pub enum NetMessageType {
     UM_AnimGraphUpdate,
     UM_HapticsManagerPulse,
     UM_HapticsManagerEffect,
-    UM_CommandQueueState,
     UM_UpdateCssClasses,
     UM_ServerFrameTime,
     UM_LagCompensationError,
@@ -276,7 +275,6 @@ impl From<i32> for NetMessageType {
             149 => UM_AnimGraphUpdate,
             150 => UM_HapticsManagerPulse,
             151 => UM_HapticsManagerEffect,
-            152 => UM_CommandQueueState,
             153 => UM_UpdateCssClasses,
             154 => UM_ServerFrameTime,
             155 => UM_LagCompensationError,

src/csgoproto/src/message_type.rs

@@ -20,7 +20,6 @@ use parser::second_pass::variants::soa_to_aos;
 use parser::second_pass::variants::BytesVariant;
 use parser::second_pass::variants::OutputSerdeHelperStruct;
 use parser::second_pass::variants::Variant;
-use parser::second_pass::voice_data::convert_voice_data_to_wav;
 use serde_json::Value;
 use std::collections::HashMap;
 use std::fs::File;
@@ -141,8 +140,15 @@ fn parse_demo(bytes: BytesVariant, parser: &mut Parser) -> Result<DemoOutput, Er
     },
   }
 }
+#[napi(object)]
+pub struct VoiceData {
+  pub tick: i32,
+  pub data: Buffer,
+  pub steamid: String,
+}
+
 #[napi]
-pub fn parse_voice(path_or_buf: Either<String, Buffer>) -> napi::Result<HashMap<String, Vec<u8>>> {
+pub fn parse_voice(path_or_buf: Either<String, Buffer>) -> napi::Result<Vec<VoiceData>> {
   let bytes = resolve_byte_type(path_or_buf).unwrap();
   let settings = ParserInputs {
     wanted_players: vec![],
@@ -164,15 +170,18 @@ pub fn parse_voice(path_or_buf: Either<String, Buffer>) -> napi::Result<HashMap<
   };
   let mut parser = Parser::new(settings, parser::parse_demo::ParsingMode::Normal);
   let output = parse_demo(bytes, &mut parser)?;
-  let out = match convert_voice_data_to_wav(output.voice_data) {
-    Ok(out) => out,
-    Err(e) => return Err(Error::new(Status::InvalidArg, format!("{}", e).to_owned())),
-  };
-  let mut out_hm = HashMap::default();
-  for (steamid, bytes) in out {
-    out_hm.insert(steamid, bytes);
+  let mut out = vec![];
+
+  for (tick, packet) in output.voice_data {
+    if let Some(data) = &packet.audio {
+      out.push(VoiceData {
+        data: data.voice_data().into(),
+        steamid: packet.xuid().to_string(),
+        tick: tick,
+      });
+    }
   }
-  Ok(out_hm)
+  return Ok(out);
 }
 
 #[napi]

src/csgoproto/src/protobuf.rs

@@ -35,7 +35,7 @@ pub struct DemoOutput {
     pub game_events_counter: AHashSet<String>,
     pub uniq_prop_names: Vec<String>,
     pub projectiles: Vec<ProjectileRecord>,
-    pub voice_data: Vec<CsvcMsgVoiceData>,
+    pub voice_data: Vec<(i32, CsvcMsgVoiceData)>,
     pub prop_controller: PropController,
     pub df_per_player: AHashMap<u64, AHashMap<u32, PropColumn>>,
 }

src/node/src/lib.rs

@@ -281,9 +281,7 @@ impl<'a> SecondPassParser<'a> {
         _entity_id: &i32,
     ) {
         if let Field::Value(_v) = field {
-            if _v.full_name.contains("Angl") && _v.full_name != "CCSPlayerPawn.m_angEyeAngles" {
-                println!("{:?} {:?} {:?} {:?} {:?}", _path, field_info, _v.full_name, _result, _cls.name);
-            }
+            println!("{:?} {:?} {:?} {:?} {:?}", _path, field_info, _v.full_name, _result, _cls.name);
         }
     }
 

src/parser/src/parse_demo.rs

@@ -7,4 +7,3 @@ pub mod parser;
 pub mod parser_settings;
 pub mod path_ops;
 pub mod variants;
-pub mod voice_data;

src/parser/src/second_pass/entities.rs

@@ -50,7 +50,7 @@ pub struct SecondPassOutput {
     pub prop_info: PropController,
     pub projectiles: Vec<ProjectileRecord>,
     pub ptr: usize,
-    pub voice_data: Vec<CsvcMsgVoiceData>,
+    pub voice_data: Vec<(i32, CsvcMsgVoiceData)>,
     pub df_per_player: AHashMap<u64, AHashMap<u32, PropColumn>>,
     pub entities: Vec<Option<Entity>>,
     pub last_tick: i32,
@@ -62,7 +62,9 @@ impl<'a> SecondPassParser<'a> {
         let mut buf = vec![0_u8; INNER_BUF_DEFAULT_LEN];
         let mut buf2 = vec![0_u8; OUTER_BUF_DEFAULT_LEN];
         loop {
-            if demo_bytes.len() < self.ptr { break; }
+            if demo_bytes.len() < self.ptr {
+                break;
+            }
             let frame = self.read_frame(demo_bytes)?;
             if frame.demo_cmd == DemAnimationData || frame.demo_cmd == DemSendTables || frame.demo_cmd == DemStringTables {
                 self.ptr += frame.size as usize;
@@ -289,7 +291,7 @@ impl<'a> SecondPassParser<'a> {
 
     pub fn parse_voice_data(&mut self, bytes: &[u8]) -> Result<(), DemoParserError> {
         if let Ok(m) = CsvcMsgVoiceData::decode(bytes) {
-            self.voice_data.push(m);
+            self.voice_data.push((self.tick, m));
         }
         Ok(())
     }