From 62b334873ca1ccad05c389a0cb3dedb21b05652c Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Thu, 11 Oct 2018 17:57:31 +0200 Subject: [PATCH] format: add channel map conversion from M$ WAVE bitmask --- src/formats.rs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/formats.rs b/src/formats.rs index 5481c76..b72cd1a 100644 --- a/src/formats.rs +++ b/src/formats.rs @@ -175,6 +175,20 @@ pub struct NAChannelMap { ids: Vec, } +const MS_CHANNEL_MAP: [NAChannelType; 11] = [ + NAChannelType::L, + NAChannelType::R, + NAChannelType::C, + NAChannelType::LFE, + NAChannelType::Ls, + NAChannelType::Rs, + NAChannelType::Lss, + NAChannelType::Rss, + NAChannelType::Cs, + NAChannelType::Lc, + NAChannelType::Rc, +]; + impl NAChannelMap { pub fn new() -> Self { NAChannelMap { ids: Vec::new() } } pub fn add_channel(&mut self, ch: NAChannelType) { @@ -197,6 +211,15 @@ impl NAChannelMap { } None } + pub fn from_ms_mapping(chmap: u32) -> Self { + let mut cm = NAChannelMap::new(); + for i in 0..MS_CHANNEL_MAP.len() { + if ((chmap >> i) & 1) != 0 { + cm.add_channel(MS_CHANNEL_MAP[i]); + } + } + cm + } } impl fmt::Display for NAChannelMap { -- 2.39.5