This commit is contained in:
Jamie Hardt
2024-12-10 17:41:50 -08:00
parent 2dfddff0b5
commit 8e341990fa
3 changed files with 9 additions and 6 deletions

View File

@@ -1,5 +1,4 @@
/// Format tags, UUIDs and utilities /// Format tags, UUIDs and utilities
use uuid::Uuid; use uuid::Uuid;
/// Format tag for integer LPCM /// Format tag for integer LPCM
@@ -90,7 +89,9 @@ impl CommonFormat {
(WAVE_TAG_EXTENDED, Some(WAVE_UUID_PCM)) => Self::IntegerPCM, (WAVE_TAG_EXTENDED, Some(WAVE_UUID_PCM)) => Self::IntegerPCM,
(WAVE_TAG_EXTENDED, Some(WAVE_UUID_FLOAT)) => Self::IeeeFloatPCM, (WAVE_TAG_EXTENDED, Some(WAVE_UUID_FLOAT)) => Self::IeeeFloatPCM,
(WAVE_TAG_EXTENDED, Some(WAVE_UUID_BFORMAT_PCM)) => Self::AmbisonicBFormatIntegerPCM, (WAVE_TAG_EXTENDED, Some(WAVE_UUID_BFORMAT_PCM)) => Self::AmbisonicBFormatIntegerPCM,
(WAVE_TAG_EXTENDED, Some(WAVE_UUID_BFORMAT_FLOAT)) => Self::AmbisonicBFormatIeeeFloatPCM, (WAVE_TAG_EXTENDED, Some(WAVE_UUID_BFORMAT_FLOAT)) => {
Self::AmbisonicBFormatIeeeFloatPCM
}
(WAVE_TAG_EXTENDED, Some(x)) => CommonFormat::UnknownExtended(x), (WAVE_TAG_EXTENDED, Some(x)) => CommonFormat::UnknownExtended(x),
(x, _) => CommonFormat::UnknownBasic(x), (x, _) => CommonFormat::UnknownBasic(x),
} }

View File

@@ -116,7 +116,7 @@ impl ChannelMask {
/** /**
* Extended Wave Format * Extended Wave Format
* *
* Resources: * Resources:
* * [WAVEFORMATEXTENSIBLE structure](https://docs.microsoft.com/en-us/windows/win32/api/mmreg/ns-mmreg-waveformatextensible) * * [WAVEFORMATEXTENSIBLE structure](https://docs.microsoft.com/en-us/windows/win32/api/mmreg/ns-mmreg-waveformatextensible)
*/ */
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
@@ -394,10 +394,10 @@ pub trait ReadWavAudioData {
impl<T> ReadWavAudioData for T impl<T> ReadWavAudioData for T
where where
T: std::io::Read T: std::io::Read,
{ {
/// # Panics: /// # Panics:
/// * If the format's [valid bits per sample](WaveFmt::valid_bits_per_sample) is /// * If the format's [valid bits per sample](WaveFmt::valid_bits_per_sample) is
/// not compatible with the format's [bits per sample](WaveFmt::bits_per_sample). /// not compatible with the format's [bits per sample](WaveFmt::bits_per_sample).
fn read_i32_frames( fn read_i32_frames(
&mut self, &mut self,

View File

@@ -50,7 +50,9 @@ pub use common_format::{
}; };
pub use cue::Cue; pub use cue::Cue;
pub use errors::Error; pub use errors::Error;
pub use fmt::{ADMAudioID, ChannelDescriptor, ChannelMask, WaveFmt, WaveFmtExtended, ReadWavAudioData}; pub use fmt::{
ADMAudioID, ChannelDescriptor, ChannelMask, ReadWavAudioData, WaveFmt, WaveFmtExtended,
};
pub use sample::{Sample, I24}; pub use sample::{Sample, I24};
pub use wavereader::{AudioFrameReader, WaveReader}; pub use wavereader::{AudioFrameReader, WaveReader};
pub use wavewriter::{AudioFrameWriter, WaveWriter}; pub use wavewriter::{AudioFrameWriter, WaveWriter};