Feature/12 bit aiff

symphonia-codec-pcm/src/lib.rs

@@ -117,6 +117,21 @@ macro_rules! read_pcm_signed {
     };
 }
 
+macro_rules! read_pcm_signed_be {
+    ($buf:expr, $fmt:tt, $read:expr, $width:expr, $coded_width:expr) => {{
+        let mask = !((1 << ($width - $coded_width)) - 1);
+        match $buf {
+            GenericAudioBuffer::$fmt(ref mut buf) => buf.fill(|audio_planes, idx| -> Result<()> {
+                for plane in audio_planes.planes() {
+                    plane[idx] = ($read & mask).into_sample();
+                }
+                Ok(())
+            }),
+            _ => unreachable!(),
+        }
+    }};
+}
+
 macro_rules! read_pcm_unsigned {
     ($buf:expr, $fmt:tt, $read:expr, $width:expr, $coded_width:expr) => {
         // Get buffer of the correct sample format.
@@ -136,6 +151,21 @@ macro_rules! read_pcm_unsigned {
     };
 }
 
+macro_rules! read_pcm_unsigned_be {
+    ($buf:expr, $fmt:tt, $read:expr, $width:expr, $coded_width:expr) => {{
+        let mask = !((1 << ($width - $coded_width)) - 1);
+        match $buf {
+            GenericAudioBuffer::$fmt(ref mut buf) => buf.fill(|audio_planes, idx| -> Result<()> {
+                for plane in audio_planes.planes() {
+                    plane[idx] = ($read & mask).into_sample();
+                }
+                Ok(())
+            }),
+            _ => unreachable!(),
+        }
+    }};
+}
+
 macro_rules! read_pcm_floating {
     ($buf:expr, $fmt:tt, $read:expr) => {
         // Get buffer of the correct sample format.
@@ -259,19 +289,19 @@ impl PcmDecoder {
                 read_pcm_signed!(self.buf, S32, reader.read_i32()?, 32, self.coded_width)
             }
             CODEC_TYPE_PCM_S32BE => {
-                read_pcm_signed!(self.buf, S32, reader.read_be_i32()?, 32, self.coded_width)
+                read_pcm_signed_be!(self.buf, S32, reader.read_be_i32()?, 32, self.coded_width)
             }
             CODEC_TYPE_PCM_S24LE => {
                 read_pcm_signed!(self.buf, S24, reader.read_i24()? << 8, 24, self.coded_width)
             }
             CODEC_TYPE_PCM_S24BE => {
-                read_pcm_signed!(self.buf, S24, reader.read_be_i24()? << 8, 24, self.coded_width)
+                read_pcm_signed_be!(self.buf, S24, reader.read_be_i24()? << 8, 24, self.coded_width)
             }
             CODEC_TYPE_PCM_S16LE => {
                 read_pcm_signed!(self.buf, S16, reader.read_i16()?, 16, self.coded_width)
             }
             CODEC_TYPE_PCM_S16BE => {
-                read_pcm_signed!(self.buf, S16, reader.read_be_i16()?, 16, self.coded_width)
+                read_pcm_signed_be!(self.buf, S16, reader.read_be_i16()?, 16, self.coded_width)
             }
             CODEC_TYPE_PCM_S8 => {
                 read_pcm_signed!(self.buf, S8, reader.read_i8()?, 8, self.coded_width)
@@ -280,19 +310,25 @@ impl PcmDecoder {
                 read_pcm_unsigned!(self.buf, U32, reader.read_u32()?, 32, self.coded_width)
             }
             CODEC_TYPE_PCM_U32BE => {
-                read_pcm_unsigned!(self.buf, U32, reader.read_be_u32()?, 32, self.coded_width)
+                read_pcm_unsigned_be!(self.buf, U32, reader.read_be_u32()?, 32, self.coded_width)
             }
             CODEC_TYPE_PCM_U24LE => {
                 read_pcm_unsigned!(self.buf, U24, reader.read_u24()? << 8, 24, self.coded_width)
             }
             CODEC_TYPE_PCM_U24BE => {
-                read_pcm_unsigned!(self.buf, U24, reader.read_be_u24()? << 8, 24, self.coded_width)
+                read_pcm_unsigned_be!(
+                    self.buf,
+                    U24,
+                    reader.read_be_u24()? << 8,
+                    24,
+                    self.coded_width
+                )
             }
             CODEC_TYPE_PCM_U16LE => {
                 read_pcm_unsigned!(self.buf, U16, reader.read_u16()?, 16, self.coded_width)
             }
             CODEC_TYPE_PCM_U16BE => {
-                read_pcm_unsigned!(self.buf, U16, reader.read_be_u16()?, 16, self.coded_width)
+                read_pcm_unsigned_be!(self.buf, U16, reader.read_be_u16()?, 16, self.coded_width)
             }
             CODEC_TYPE_PCM_U8 => {
                 read_pcm_unsigned!(self.buf, U8, reader.read_u8()?, 8, self.coded_width)

symphonia-format-riff/src/aiff/chunks.rs

@@ -44,16 +44,16 @@ impl CommonChunk {
         // error if not a multiple of 8 or greater than 32-bits.
         //
         // It is possible though for AIFF to have a sample size not divisible by 8.
-        // Data is left justified, with the remaining bits zeroed. Currently not supported.
+        // Data is left justified, with the remaining bits zeroed.
         //
         // Select the appropriate codec using bits per sample. Samples are always interleaved and
         // little-endian encoded for the PCM format.
         let codec = match bits_per_sample {
-            8 => CODEC_TYPE_PCM_S8,
-            16 => CODEC_TYPE_PCM_S16BE,
-            24 => CODEC_TYPE_PCM_S24BE,
-            32 => CODEC_TYPE_PCM_S32BE,
-            _ => return decode_error("aiff: bits per sample for pcm must be 8, 16, 24 or 32 bits"),
+            1..=8 => CODEC_TYPE_PCM_S8,
+            9..=16 => CODEC_TYPE_PCM_S16BE,
+            17..=24 => CODEC_TYPE_PCM_S24BE,
+            25..=32 => CODEC_TYPE_PCM_S32BE,
+            _ => return decode_error("aiff: bits per sample unsupported for pcm"),
         };
 
         let channels = try_channel_count_to_mask(n_channels)?;

symphonia-format-riff/src/wave/chunks.rs

@@ -78,15 +78,11 @@ impl WaveFormatChunk {
         // Select the appropriate codec using bits per sample. Samples are always interleaved and
         // little-endian encoded for the PCM format.
         let codec = match bits_per_sample {
-            8 => CODEC_TYPE_PCM_U8,
-            16 => CODEC_TYPE_PCM_S16LE,
-            24 => CODEC_TYPE_PCM_S24LE,
-            32 => CODEC_TYPE_PCM_S32LE,
-            _ => {
-                return decode_error(
-                    "wav: bits per sample for fmt_pcm must be 8, 16, 24 or 32 bits",
-                )
-            }
+            1..=8 => CODEC_TYPE_PCM_U8,
+            9..=16 => CODEC_TYPE_PCM_S16LE,
+            17..=24 => CODEC_TYPE_PCM_S24LE,
+            25..=32 => CODEC_TYPE_PCM_S32LE,
+            _ => return decode_error("wav: bits per sample unsupported for pcm"),
         };
 
         let channels = try_channel_count_to_mask(n_channels)?;