jamie/bwavfile
1
0
Fork 0
mirror of https://github.com/iluvcapra/bwavfile.git synced 2025-12-31 08:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expose and rename the supported wave tags and UUIDs

Browse Source
This commit is contained in:
Ian Hobson
2023-05-12 16:52:06 +02:00
parent bd09ed207a
commit 72fea1a493
3 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/common_format.rs
View File

@@ -1,9 +1,9 @@
use uuid::Uuid; use uuid::Uuid;
const BASIC_PCM: u16 = 0x0001; pub const WAVE_TAG_PCM: u16 = 0x0001;
const BASIC_FLOAT: u16 = 0x0003; pub const WAVE_TAG_FLOAT: u16 = 0x0003;
const BASIC_MPEG: u16 = 0x0050; pub const WAVE_TAG_MPEG: u16 = 0x0050;
const BASIC_EXTENDED: u16 = 0xFFFE; pub const WAVE_TAG_EXTENDED: u16 = 0xFFFE;
/* RC 2361 §4: /* RC 2361 §4:
@@ -15,23 +15,23 @@ const BASIC_EXTENDED: u16 = 0xFFFE;
*/ */
pub const UUID_PCM: Uuid = Uuid::from_bytes([ pub const WAVE_UUID_PCM: Uuid = Uuid::from_bytes([
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71,
]); ]);
pub const UUID_FLOAT: Uuid = Uuid::from_bytes([ pub const WAVE_UUID_FLOAT: Uuid = Uuid::from_bytes([
0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71,
]); ]);
pub const UUID_MPEG: Uuid = Uuid::from_bytes([ pub const WAVE_UUID_MPEG: Uuid = Uuid::from_bytes([
0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71,
]); ]);
pub const UUID_BFORMAT_PCM: Uuid = Uuid::from_bytes([ pub const WAVE_UUID_BFORMAT_PCM: Uuid = Uuid::from_bytes([
0x01, 0x00, 0x00, 0x00, 0x21, 0x07, 0xd3, 0x11, 0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x21, 0x07, 0xd3, 0x11, 0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00,
]); ]);
pub const UUID_BFORMAT_FLOAT: Uuid = Uuid::from_bytes([ pub const WAVE_UUID_BFORMAT_FLOAT: Uuid = Uuid::from_bytes([
0x03, 0x00, 0x00, 0x00, 0x21, 0x07, 0xd3, 0x11, 0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x21, 0x07, 0xd3, 0x11, 0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00,
]); ]);
@@ -71,14 +71,14 @@ impl CommonFormat {
/// Resolve a tag and Uuid to a `CommonFormat`. /// Resolve a tag and Uuid to a `CommonFormat`.
pub fn make(basic: u16, uuid: Option<Uuid>) -> Self { pub fn make(basic: u16, uuid: Option<Uuid>) -> Self {
match (basic, uuid) { match (basic, uuid) {
(BASIC_PCM, _) => Self::IntegerPCM, (WAVE_TAG_PCM, _) => Self::IntegerPCM,
(BASIC_FLOAT, _) => Self::IeeeFloatPCM, (WAVE_TAG_FLOAT, _) => Self::IeeeFloatPCM,
(BASIC_MPEG, _) => Self::Mpeg, (WAVE_TAG_MPEG, _) => Self::Mpeg,
(BASIC_EXTENDED, Some(UUID_PCM)) => Self::IntegerPCM, (WAVE_TAG_EXTENDED, Some(WAVE_UUID_PCM)) => Self::IntegerPCM,
(BASIC_EXTENDED, Some(UUID_FLOAT)) => Self::IeeeFloatPCM, (WAVE_TAG_EXTENDED, Some(WAVE_UUID_FLOAT)) => Self::IeeeFloatPCM,
(BASIC_EXTENDED, Some(UUID_BFORMAT_PCM)) => Self::AmbisonicBFormatIntegerPCM, (WAVE_TAG_EXTENDED, Some(WAVE_UUID_BFORMAT_PCM)) => Self::AmbisonicBFormatIntegerPCM,
(BASIC_EXTENDED, Some(UUID_BFORMAT_FLOAT)) => Self::AmbisonicBFormatIeeeFloatPCM, (WAVE_TAG_EXTENDED, Some(WAVE_UUID_BFORMAT_FLOAT)) => Self::AmbisonicBFormatIeeeFloatPCM,
(BASIC_EXTENDED, Some(x)) => CommonFormat::UnknownExtended(x), (WAVE_TAG_EXTENDED, Some(x)) => CommonFormat::UnknownExtended(x),
(x, _) => CommonFormat::UnknownBasic(x), (x, _) => CommonFormat::UnknownBasic(x),
} }
} }
@@ -89,13 +89,13 @@ impl CommonFormat {
/// returned tag will be 0xFFFE and the `Uuid` will describe the format. /// returned tag will be 0xFFFE and the `Uuid` will describe the format.
pub fn take(self) -> (u16, Uuid) { pub fn take(self) -> (u16, Uuid) {
match self { match self {
Self::IntegerPCM => (BASIC_PCM, UUID_PCM), Self::IntegerPCM => (WAVE_TAG_PCM, WAVE_UUID_PCM),
Self::IeeeFloatPCM => (BASIC_FLOAT, UUID_FLOAT), Self::IeeeFloatPCM => (WAVE_TAG_FLOAT, WAVE_UUID_FLOAT),
Self::Mpeg => (BASIC_MPEG, UUID_MPEG), Self::Mpeg => (WAVE_TAG_MPEG, WAVE_UUID_MPEG),
Self::AmbisonicBFormatIntegerPCM => (BASIC_EXTENDED, UUID_BFORMAT_PCM), Self::AmbisonicBFormatIntegerPCM => (WAVE_TAG_EXTENDED, WAVE_UUID_BFORMAT_PCM),
Self::AmbisonicBFormatIeeeFloatPCM => (BASIC_EXTENDED, UUID_BFORMAT_FLOAT), Self::AmbisonicBFormatIeeeFloatPCM => (WAVE_TAG_EXTENDED, WAVE_UUID_BFORMAT_FLOAT),
Self::UnknownBasic(x) => (x, uuid_from_basic_tag(x)), Self::UnknownBasic(x) => (x, uuid_from_basic_tag(x)),
Self::UnknownExtended(x) => (BASIC_EXTENDED, x), Self::UnknownExtended(x) => (WAVE_TAG_EXTENDED, x),
} }
} }
} }

8
src/fmt.rs
View File

@@ -1,4 +1,4 @@
use crate::common_format::{CommonFormat, UUID_BFORMAT_PCM, UUID_PCM}; use crate::common_format::{CommonFormat, WAVE_UUID_BFORMAT_PCM, WAVE_UUID_PCM};
use crate::Sample; use crate::Sample;
use std::io::Cursor; use std::io::Cursor;
@@ -240,7 +240,7 @@ impl WaveFmt {
extended_format: Some(WaveFmtExtended { extended_format: Some(WaveFmtExtended {
valid_bits_per_sample: bits_per_sample, valid_bits_per_sample: bits_per_sample,
channel_mask: ChannelMask::DirectOut as u32, channel_mask: ChannelMask::DirectOut as u32,
type_guid: UUID_BFORMAT_PCM, type_guid: WAVE_UUID_BFORMAT_PCM,
}), }),
} }
} }
@@ -268,7 +268,7 @@ impl WaveFmt {
Some(WaveFmtExtended { Some(WaveFmtExtended {
valid_bits_per_sample: bits_per_sample, valid_bits_per_sample: bits_per_sample,
channel_mask: ch, channel_mask: ch,
type_guid: UUID_PCM, type_guid: WAVE_UUID_PCM,
}), }),
), ),
0b0100 => (0x0001, None), 0b0100 => (0x0001, None),
@@ -278,7 +278,7 @@ impl WaveFmt {
Some(WaveFmtExtended { Some(WaveFmtExtended {
valid_bits_per_sample: bits_per_sample, valid_bits_per_sample: bits_per_sample,
channel_mask: ch, channel_mask: ch,
type_guid: UUID_PCM, type_guid: WAVE_UUID_PCM,
}), }),
), ),
}; };

5
src/lib.rs
View File

@@ -58,7 +58,10 @@ mod wavereader;
mod wavewriter; mod wavewriter;
pub use bext::Bext; pub use bext::Bext;
pub use common_format::CommonFormat; pub use common_format::{
CommonFormat, WAVE_TAG_EXTENDED, WAVE_TAG_FLOAT, WAVE_TAG_MPEG, WAVE_TAG_PCM,
WAVE_UUID_BFORMAT_FLOAT, WAVE_UUID_BFORMAT_PCM, WAVE_UUID_FLOAT, WAVE_UUID_MPEG, WAVE_UUID_PCM,
};
pub use cue::Cue; pub use cue::Cue;
pub use errors::Error; pub use errors::Error;
pub use fmt::{ADMAudioID, ChannelDescriptor, ChannelMask, WaveFmt, WaveFmtExtended}; pub use fmt::{ADMAudioID, ChannelDescriptor, ChannelMask, WaveFmt, WaveFmtExtended};