diff --git a/examples/wave-deinter.rs b/examples/wave-deinter.rs index 48350df..25ece63 100644 --- a/examples/wave-deinter.rs +++ b/examples/wave-deinter.rs @@ -8,7 +8,7 @@ use std::io; use std::path::Path; extern crate bwavfile; -use bwavfile::{Error,WaveReader, WaveWriter, ChannelDescriptor, ChannelMask, WaveFmt, AudioFrameWriter}; +use bwavfile::{Error,WaveReader, WaveWriter, ChannelDescriptor, ChannelMask, WaveFmt}; #[macro_use] extern crate clap; @@ -70,7 +70,7 @@ fn process_file(infile: &str, delim : &str, numeric_channel_names : bool) -> Res let output_file = WaveWriter::create(&outfile_name, ouptut_format).expect("Failed to create new file"); let mut output_wave_writer = output_file.audio_frame_writer()?; - let mut buffer = input_format.create_frame_buffer(); + let mut buffer = input_format.create_frame_buffer(1); while input_wave_reader.read_integer_frame(&mut buffer)? > 0 { output_wave_writer.write_integer_frames(&buffer[n..=n])?; diff --git a/src/fmt.rs b/src/fmt.rs index 6d0040e..9dc6d76 100644 --- a/src/fmt.rs +++ b/src/fmt.rs @@ -3,7 +3,7 @@ use super::common_format::{CommonFormat, UUID_PCM,UUID_BFORMAT_PCM}; use std::io::Cursor; use byteorder::LittleEndian; -use byteorder::WriteBytesExt; +use byteorder::{WriteBytesExt, ReadBytesExt}; // Need more test cases for ADMAudioID #[allow(dead_code)] @@ -290,22 +290,23 @@ impl WaveFmt { CommonFormat::make( self.tag, self.extended_format.map(|ext| ext.type_guid)) } - /// Create a frame buffer sized to hold frames for a reader or writer + /// Create a frame buffer sized to hold `length` frames for a reader or + /// writer /// /// This is a conveneince method that creates a `Vec` with /// as many elements as there are channels in the underlying stream. - pub fn create_frame_buffer(&self) -> Vec { - vec![0i32; self.channel_count as usize] + pub fn create_frame_buffer(&self, length : usize) -> Vec { + vec![0i32; self.channel_count as usize * length] } - /// Calculate the size of a byte buffer needed to hold audio data of this - /// format for a given number of frames - pub fn buffer_length(&self, frame_count: u64) -> usize { - (self.block_alignment as u64 * frame_count) as usize + /// Create a raw byte buffer to hold `length` blocks from a reader or + /// writer + pub fn create_raw_buffer(&self, length : usize) -> Vec { + vec![0u8; self.block_alignment as usize * length] } - // Write frames into a byte vector - pub fn pack_frames(&self, from_frames: &[i32], into_bytes: &mut Vec) -> () { + /// Write frames into a byte vector + pub fn pack_frames(&self, from_frames: &[i32], into_bytes: &mut [u8]) -> () { let mut write_cursor = Cursor::new(into_bytes); assert!(from_frames.len() % self.channel_count as usize == 0, @@ -325,18 +326,19 @@ impl WaveFmt { } /// Read bytes into frames - // pub fn unpack_frames(&self, from_bytes: &[u8], into_frames: &mut Vec) -> () { - // for n in 0..(from_bytes.len()) { - // buffer[n] = match (self.format.bits_per_sample, framed_bits_per_sample) { - // (0..=8,8) => self.inner.read_u8()? as i32 - 0x80_i32, // EBU 3285 §A2.2 - // (9..=16,16) => self.inner.read_i16::()? as i32, - // (10..=24,24) => self.inner.read_i24::()?, - // (25..=32,32) => self.inner.read_i32::()?, - // (b,_)=> panic!("Unrecognized integer format, bits per sample {}, channels {}, block_alignment {}", - // b, self.format.channel_count, self.format.block_alignment) - // } - // } - // } + pub fn unpack_frames(&self, from_bytes: &[u8], into_frames: &mut [i32]) -> () { + let mut rdr = Cursor::new(from_bytes); + for n in 0..(into_frames.len()) { + into_frames[n] = match (self.valid_bits_per_sample(), self.bits_per_sample) { + (0..=8,8) => rdr.read_u8().unwrap() as i32 - 0x80_i32, // EBU 3285 §A2.2 + (9..=16,16) => rdr.read_i16::().unwrap() as i32, + (10..=24,24) => rdr.read_i24::().unwrap(), + (25..=32,32) => rdr.read_i32::().unwrap(), + (b,_)=> panic!("Unrecognized integer format, bits per sample {}, channels {}, block_alignment {}", + b, self.channel_count, self.block_alignment) + } + } + } /// Channel descriptors for each channel. @@ -379,3 +381,47 @@ impl WaveFmt { } } +trait ReadWavAudioData { + fn read_i32_frames(&mut self, format: WaveFmt, into: &mut [i32]) -> Result; + fn read_f32_frames(&mut self, format: WaveFmt, into: &mut [f32]) -> Result; +} + +impl ReadWavAudioData for T where T: std::io::Read { + + fn read_i32_frames(&mut self, format: WaveFmt, into: &mut [i32]) -> Result { + assert!(into.len() % format.channel_count as usize == 0); + + for n in 0..(into.len()) { + into[n] = match (format.valid_bits_per_sample(), format.bits_per_sample) { + (0..=8,8) => self.read_u8().unwrap() as i32 - 0x80_i32, // EBU 3285 §A2.2 + (9..=16,16) => self.read_i16::().unwrap() as i32, + (10..=24,24) => self.read_i24::().unwrap(), + (25..=32,32) => self.read_i32::().unwrap(), + (b,_)=> panic!("Unrecognized integer format, bits per sample {}, channels {}, block_alignment {}", + b, format.channel_count, format.block_alignment) + } + } + + todo!() + } + fn read_f32_frames(&mut self, format: WaveFmt, into: &mut [f32]) -> Result { + assert!(into.len() % format.channel_count as usize == 0); + todo!() + } + +} + +trait WriteWavAudioData { + fn write_i32_frames(&mut self, format: WaveFmt, from: &[i32]) -> Result; + fn write_f32_frames(&mut self, format: WaveFmt, from: &[f32]) -> Result; +} + +impl WriteWavAudioData for T where T: std::io::Write { + + fn write_i32_frames(&mut self, format: WaveFmt, _: &[i32]) -> Result { + todo!() + } + fn write_f32_frames(&mut self, format: WaveFmt, _: &[f32]) -> Result { + todo!() + } +} \ No newline at end of file diff --git a/src/wavereader.rs b/src/wavereader.rs index f583bba..977d798 100644 --- a/src/wavereader.rs +++ b/src/wavereader.rs @@ -133,7 +133,7 @@ impl AudioFrameReader { /// assert_eq!(format.channel_count, 1); /// /// let mut frame_reader = r.audio_frame_reader().unwrap(); -/// let mut buffer = format.create_frame_buffer(); +/// let mut buffer = format.create_frame_buffer(1); /// /// let read = frame_reader.read_integer_frame(&mut buffer).unwrap(); /// diff --git a/src/wavewriter.rs b/src/wavewriter.rs index 8a7932f..bae5f5d 100644 --- a/src/wavewriter.rs +++ b/src/wavewriter.rs @@ -26,7 +26,7 @@ impl AudioFrameWriter where W: Write + Seek { AudioFrameWriter { inner } } - fn write_integer_frames_to_buffer(&self, from_frames :&[i32], to_buffer : &mut Vec) -> () { + fn write_integer_frames_to_buffer(&self, from_frames :&[i32], to_buffer : &mut [u8]) -> () { assert!(from_frames.len() % self.inner.inner.format.channel_count as usize == 0, "frames buffer does not contain a number of samples % channel_count == 0"); self.inner.inner.format.pack_frames(&from_frames, to_buffer); @@ -40,7 +40,8 @@ impl AudioFrameWriter where W: Write + Seek { /// This function will panic if `buffer.len()` modulo the Wave file's channel count /// is not zero. pub fn write_integer_frames(&mut self, buffer: &[i32]) -> Result { - let mut write_buffer = vec![0u8; 0]; + let mut write_buffer = self.inner.inner.format + .create_raw_buffer(buffer.len() / self.inner.inner.format.channel_count as usize); self.write_integer_frames_to_buffer(&buffer, &mut write_buffer); diff --git a/tests/integration_test.rs b/tests/integration_test.rs index a8f9ca7..2560fca 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -82,7 +82,7 @@ fn test_read() { let path = "tests/media/audacity_16bit.wav"; let mut w = WaveReader::open(path).expect("Failure opening test file"); - let mut buffer = w.format().unwrap().create_frame_buffer(); + let mut buffer = w.format().unwrap().create_frame_buffer(1); let mut reader = w.audio_frame_reader().unwrap(); @@ -101,7 +101,7 @@ fn test_locate_multichannel_read() { let path = "tests/media/ff_pink.wav"; let mut w = WaveReader::open(path).expect("Failure opening test file"); - let mut buffer = w.format().unwrap().create_frame_buffer(); + let mut buffer = w.format().unwrap().create_frame_buffer(1); let mut reader = w.audio_frame_reader().unwrap();