jamie/bwavfile
1
0
Fork 0
mirror of https://github.com/iluvcapra/bwavfile.git synced 2026-01-01 09:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed audio_frame_reader interface

Browse Source 
to hide RawChunkReader
This commit is contained in:
Jamie Hardt
2020-12-02 12:21:20 -08:00
parent 016f5e3e3b
commit 09a9413ff2
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/audio_frame_reader.rs
View File

@@ -7,6 +7,7 @@ use byteorder::ReadBytesExt;
use super::fmt::{WaveFmt};
use super::errors::Error;
use super::CommonFormat;
use super::raw_chunk_reader::RawChunkReader;
/// Read audio frames
///
@@ -14,12 +15,12 @@ use super::CommonFormat;
/// bitstream having a format specified by `format`.
///
#[derive(Debug)]
pub struct AudioFrameReader<R: Read + Seek> {
inner : R,
pub struct AudioFrameReader<'a, R: Read + Seek> {
inner : RawChunkReader<'a,R>,
format: WaveFmt
}
impl<R: Read + Seek> AudioFrameReader<R> {
impl<'a, R: Read + Seek> AudioFrameReader<'a, R> {
/// Create a new `AudioFrameReader`
///
@@ -29,7 +30,7 @@ impl<R: Read + Seek> AudioFrameReader<R> {
/// parameter to confirm the `block_alignment` law is fulfilled
/// and the format tag is readable by this implementation (only
/// format 0x01 is supported at this time.)
pub fn new(inner: R, format: WaveFmt) -> Self {
pub fn new(inner: RawChunkReader<'a, R>, format: WaveFmt) -> Self {
assert!(format.block_alignment * 8 == format.bits_per_sample * format.channel_count,
"Unable to read audio frames from packed formats: block alignment is {}, should be {}",
format.block_alignment, (format.bits_per_sample / 8 ) * format.channel_count);

3
src/wavereader.rs
View File

@@ -103,7 +103,7 @@ impl<R: Read + Seek> WaveReader<R> {
/**
* Create an `AudioFrameReader` for reading each audio frame.
*/
pub fn audio_frame_reader(&mut self) -> Result<AudioFrameReader<RawChunkReader<R>>, ParserError> {
pub fn audio_frame_reader(&mut self) -> Result<AudioFrameReader<R>, ParserError> {
let format = self.format()?;
let audio_chunk_reader = self.chunk_reader(DATA_SIG, 0)?;
Ok(AudioFrameReader::new(audio_chunk_reader, format))
@@ -349,3 +349,4 @@ impl<R:Read+Seek> WaveReader<R> { /* Private Implementation */
}
}
}