Have created read tests

This commit is contained in:
Jamie Hardt
2020-11-27 21:42:53 -08:00
parent 3c221bce40
commit b40e8edf23
4 changed files with 107 additions and 1 deletions

View File

@@ -6,6 +6,7 @@ use byteorder::ReadBytesExt;
use super::fmt::{WaveFmt}; use super::fmt::{WaveFmt};
use super::errors::Error; use super::errors::Error;
use super::CommonFormat;
/// Read audio frames /// Read audio frames
/// ///
@@ -34,7 +35,7 @@ impl<R: Read + Seek> AudioFrameReader<R> {
format.block_alignment, (format.bits_per_sample / 8 ) * format.channel_count); format.block_alignment, (format.bits_per_sample / 8 ) * format.channel_count);
assert!(format.tag == 0x01 , assert!(format.common_format() == CommonFormat::IntegerPCM ,
"Unsupported format tag {:?}", format.tag); "Unsupported format tag {:?}", format.tag);
AudioFrameReader { inner , format } AudioFrameReader { inner , format }
@@ -43,6 +44,8 @@ impl<R: Read + Seek> AudioFrameReader<R> {
/// Locate the read position to a different frame /// Locate the read position to a different frame
/// ///
/// Seeks within the audio stream. /// Seeks within the audio stream.
///
/// Returns the new location of the read position.
pub fn locate(&mut self, to :u64) -> Result<u64,Error> { pub fn locate(&mut self, to :u64) -> Result<u64,Error> {
let position = to * self.format.block_alignment as u64; let position = to * self.format.block_alignment as u64;
let seek_result = self.inner.seek(Start(position))?; let seek_result = self.inner.seek(Start(position))?;
@@ -62,6 +65,15 @@ impl<R: Read + Seek> AudioFrameReader<R> {
/// A single frame is read from the audio stream and the read location /// A single frame is read from the audio stream and the read location
/// is advanced one frame. /// is advanced one frame.
/// ///
/// Regardless of the number of bits in the audio sample, this method
/// always writes `i32` samples back to the buffer. These samples are
/// written back "left-aligned" so samples that are shorter than i32
/// will leave the MSB bits empty.
///
/// For example: A full-code sample in 16 bit (0xFFFF) will be written
/// back to the buffer as 0x0000FFFF.
///
///
/// ### Panics /// ### Panics
/// ///
/// The `buffer` must have a number of elements equal to the number of /// The `buffer` must have a number of elements equal to the number of

View File

@@ -1,4 +1,57 @@
[ [
{
"streams": [
{
"index": 0,
"codec_name": "pcm_s24le",
"codec_long_name": "PCM signed 24-bit little-endian",
"codec_type": "audio",
"codec_time_base": "1/48000",
"codec_tag_string": "[1][0][0][0]",
"codec_tag": "0x0001",
"sample_fmt": "s32",
"sample_rate": "48000",
"channels": 2,
"channel_layout": "stereo",
"bits_per_sample": 24,
"r_frame_rate": "0/0",
"avg_frame_rate": "0/0",
"time_base": "1/48000",
"duration_ts": 4800,
"duration": "0.100000",
"bit_rate": "2304000",
"bits_per_raw_sample": "24",
"disposition": {
"default": 0,
"dub": 0,
"original": 0,
"comment": 0,
"lyrics": 0,
"karaoke": 0,
"forced": 0,
"hearing_impaired": 0,
"visual_impaired": 0,
"clean_effects": 0,
"attached_pic": 0,
"timed_thumbnails": 0
}
}
],
"format": {
"filename": "tests/media/ff_pink.wav",
"nb_streams": 1,
"nb_programs": 0,
"format_name": "wav",
"format_long_name": "WAV / WAVE (Waveform Audio)",
"duration": "0.100000",
"size": "28902",
"bit_rate": "2312160",
"probe_score": 99,
"tags": {
"encoder": "Lavf58.45.100"
}
}
},
{ {
"streams": [ "streams": [
{ {

View File

@@ -74,4 +74,45 @@ fn test_minimal_wave() {
} else { } else {
assert!(true); assert!(true);
} }
}
#[test]
fn test_read() {
let path = "tests/media/audacity_16bit.wav";
let mut w = WaveReader::open(path).expect("Failure opening test file");
let mut reader = w.audio_frame_reader().unwrap();
let mut buffer = reader.create_frame_buffer();
assert_eq!(reader.read_integer_frame(&mut buffer).unwrap(), 1);
assert_eq!(buffer[0], -2823_i32);
assert_eq!(reader.read_integer_frame(&mut buffer).unwrap(), 1);
assert_eq!(buffer[0], 2012_i32);
assert_eq!(reader.read_integer_frame(&mut buffer).unwrap(), 1);
assert_eq!(buffer[0], 4524_i32);
}
#[test]
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 reader = w.audio_frame_reader().unwrap();
let mut buffer = reader.create_frame_buffer();
assert_eq!(reader.read_integer_frame(&mut buffer).unwrap(), 1);
assert_eq!(buffer[0], 332702_i32);
assert_eq!(buffer[1], 3258791_i32);
assert_eq!(reader.read_integer_frame(&mut buffer).unwrap(), 1);
assert_eq!(buffer[0], -258742_i32); // 0x800000 = 8388608 // 8129866 - 8388608
assert_eq!(buffer[1], 0x0D7EF9_i32);
assert_eq!(reader.locate(100).unwrap(), 100);
assert_eq!(reader.read_integer_frame(&mut buffer).unwrap(), 1);
assert_eq!(buffer[0], 0x109422_i32);
assert_eq!(buffer[1], -698901_i32); // 7689707 - 8388608
} }

Binary file not shown.