Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wav: add ambisonic bformat subtypes #263

Merged
merged 1 commit into from
Mar 2, 2024
Merged

wav: add ambisonic bformat subtypes #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions symphonia-format-riff/src/wave/chunks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,20 @@ impl WaveFormatChunk {
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71,
];
#[rustfmt::skip]
const KSDATAFORMAT_SUBTYPE_AMBISONIC_B_FORMAT_PCM: [u8; 16] = [
0x01, 0x00, 0x00, 0x00, 0x21, 0x07, 0xd3, 0x11,
0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00,
];
#[rustfmt::skip]
const KSDATAFORMAT_SUBTYPE_AMBISONIC_B_FORMAT_IEE_FLOAT: [u8; 16] = [
0x03, 0x00, 0x00, 0x00, 0x21, 0x07, 0xd3, 0x11,
0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00,
];

// Verify support based on the format GUID.
let codec = match sub_format_guid {
KSDATAFORMAT_SUBTYPE_PCM => {
KSDATAFORMAT_SUBTYPE_PCM | KSDATAFORMAT_SUBTYPE_AMBISONIC_B_FORMAT_PCM => {
// Only support up-to 32-bit integer samples.
if bits_per_coded_sample > 32 {
return decode_error(
Expand All @@ -260,7 +270,7 @@ impl WaveFormatChunk {
_ => unreachable!(),
}
}
KSDATAFORMAT_SUBTYPE_IEEE_FLOAT => {
KSDATAFORMAT_SUBTYPE_IEEE_FLOAT | KSDATAFORMAT_SUBTYPE_AMBISONIC_B_FORMAT_IEE_FLOAT => {
// IEEE floating formats do not support truncated sample widths.
if bits_per_sample != bits_per_coded_sample {
return decode_error(
Expand Down
14 changes: 12 additions & 2 deletions symphonia-format-wav/src/chunks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,20 @@ impl WaveFormatChunk {
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71,
];
#[rustfmt::skip]
const KSDATAFORMAT_SUBTYPE_AMBISONIC_B_FORMAT_PCM: [u8; 16] = [
0x01, 0x00, 0x00, 0x00, 0x21, 0x07, 0xd3, 0x11,
0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00,
];
#[rustfmt::skip]
const KSDATAFORMAT_SUBTYPE_AMBISONIC_B_FORMAT_IEE_FLOAT: [u8; 16] = [
0x03, 0x00, 0x00, 0x00, 0x21, 0x07, 0xd3, 0x11,
0x86, 0x44, 0xc8, 0xc1, 0xca, 0x00, 0x00, 0x00,
];

// Verify support based on the format GUID.
let codec = match sub_format_guid {
KSDATAFORMAT_SUBTYPE_PCM => {
KSDATAFORMAT_SUBTYPE_PCM | KSDATAFORMAT_SUBTYPE_AMBISONIC_B_FORMAT_PCM => {
// Only support up-to 32-bit integer samples.
if bits_per_coded_sample > 32 {
return decode_error(
Expand All @@ -496,7 +506,7 @@ impl WaveFormatChunk {
_ => unreachable!(),
}
}
KSDATAFORMAT_SUBTYPE_IEEE_FLOAT => {
KSDATAFORMAT_SUBTYPE_IEEE_FLOAT | KSDATAFORMAT_SUBTYPE_AMBISONIC_B_FORMAT_IEE_FLOAT => {
// IEEE floating formats do not support truncated sample widths.
if bits_per_sample != bits_per_coded_sample {
return decode_error(
Expand Down