audio: Add G.711 decoder

ruffle-rs · Aug 22, 2024 · ac46cfb · ac46cfb
1 parent 9f8b891
commit ac46cfb
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 3 deletions.
diff --git a/core/src/backend/audio/decoders.rs b/core/src/backend/audio/decoders.rs
@@ -1,13 +1,18 @@
 //! Audio decoders.
 
 mod adpcm;
+mod g711;
 #[cfg(feature = "mp3")]
 mod mp3;
 #[cfg(feature = "nellymoser")]
 mod nellymoser;
 mod pcm;
 
 pub use adpcm::AdpcmDecoder;
+
+pub use g711::G711ALawDecoder;
+pub use g711::G711MuLawDecoder;
+
 #[cfg(feature = "mp3")]
 pub use mp3::{mp3_metadata, Mp3Decoder};
 #[cfg(feature = "nellymoser")]
@@ -74,6 +79,8 @@ pub fn make_decoder<R: 'static + Read + Send + Sync>(
             format.is_stereo,
             format.sample_rate,
         )?),
+        AudioCompression::G711ALawPCM => Box::new(G711ALawDecoder::new(data)),
+        AudioCompression::G711MuLawPCM => Box::new(G711MuLawDecoder::new(data)),
         #[cfg(feature = "mp3")]
         AudioCompression::Mp3 => Box::new(Mp3Decoder::new(data)?),
         #[cfg(feature = "nellymoser")]

diff --git a/core/src/backend/audio/decoders/g711.rs b/core/src/backend/audio/decoders/g711.rs
@@ -0,0 +1,144 @@
+use super::{Decoder, SeekableDecoder};
+use byteorder::ReadBytesExt;
+use std::io::{Cursor, Read};
+
+const ALAW_TABLE: [i16; 256] = [
+    -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736, -7552, -7296, -8064, -7808, -6528,
+    -6272, -7040, -6784, -2752, -2624, -3008, -2880, -2240, -2112, -2496, -2368, -3776, -3648,
+    -4032, -3904, -3264, -3136, -3520, -3392, -22016, -20992, -24064, -23040, -17920, -16896,
+    -19968, -18944, -30208, -29184, -32256, -31232, -26112, -25088, -28160, -27136, -11008, -10496,
+    -12032, -11520, -8960, -8448, -9984, -9472, -15104, -14592, -16128, -15616, -13056, -12544,
+    -14080, -13568, -344, -328, -376, -360, -280, -264, -312, -296, -472, -456, -504, -488, -408,
+    -392, -440, -424, -88, -72, -120, -104, -24, -8, -56, -40, -216, -200, -248, -232, -152, -136,
+    -184, -168, -1376, -1312, -1504, -1440, -1120, -1056, -1248, -1184, -1888, -1824, -2016, -1952,
+    -1632, -1568, -1760, -1696, -688, -656, -752, -720, -560, -528, -624, -592, -944, -912, -1008,
+    -976, -816, -784, -880, -848, 5504, 5248, 6016, 5760, 4480, 4224, 4992, 4736, 7552, 7296, 8064,
+    7808, 6528, 6272, 7040, 6784, 2752, 2624, 3008, 2880, 2240, 2112, 2496, 2368, 3776, 3648, 4032,
+    3904, 3264, 3136, 3520, 3392, 22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944, 30208,
+    29184, 32256, 31232, 26112, 25088, 28160, 27136, 11008, 10496, 12032, 11520, 8960, 8448, 9984,
+    9472, 15104, 14592, 16128, 15616, 13056, 12544, 14080, 13568, 344, 328, 376, 360, 280, 264,
+    312, 296, 472, 456, 504, 488, 408, 392, 440, 424, 88, 72, 120, 104, 24, 8, 56, 40, 216, 200,
+    248, 232, 152, 136, 184, 168, 1376, 1312, 1504, 1440, 1120, 1056, 1248, 1184, 1888, 1824, 2016,
+    1952, 1632, 1568, 1760, 1696, 688, 656, 752, 720, 560, 528, 624, 592, 944, 912, 1008, 976, 816,
+    784, 880, 848,
+];
+
+const MULAW_TABLE: [i16; 256] = [
+    -32124, -31100, -30076, -29052, -28028, -27004, -25980, -24956, -23932, -22908, -21884, -20860,
+    -19836, -18812, -17788, -16764, -15996, -15484, -14972, -14460, -13948, -13436, -12924, -12412,
+    -11900, -11388, -10876, -10364, -9852, -9340, -8828, -8316, -7932, -7676, -7420, -7164, -6908,
+    -6652, -6396, -6140, -5884, -5628, -5372, -5116, -4860, -4604, -4348, -4092, -3900, -3772,
+    -3644, -3516, -3388, -3260, -3132, -3004, -2876, -2748, -2620, -2492, -2364, -2236, -2108,
+    -1980, -1884, -1820, -1756, -1692, -1628, -1564, -1500, -1436, -1372, -1308, -1244, -1180,
+    -1116, -1052, -988, -924, -876, -844, -812, -780, -748, -716, -684, -652, -620, -588, -556,
+    -524, -492, -460, -428, -396, -372, -356, -340, -324, -308, -292, -276, -260, -244, -228, -212,
+    -196, -180, -164, -148, -132, -120, -112, -104, -96, -88, -80, -72, -64, -56, -48, -40, -32,
+    -24, -16, -8, 0, 32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956, 23932, 22908, 21884,
+    20860, 19836, 18812, 17788, 16764, 15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412,
+    11900, 11388, 10876, 10364, 9852, 9340, 8828, 8316, 7932, 7676, 7420, 7164, 6908, 6652, 6396,
+    6140, 5884, 5628, 5372, 5116, 4860, 4604, 4348, 4092, 3900, 3772, 3644, 3516, 3388, 3260, 3132,
+    3004, 2876, 2748, 2620, 2492, 2364, 2236, 2108, 1980, 1884, 1820, 1756, 1692, 1628, 1564, 1500,
+    1436, 1372, 1308, 1244, 1180, 1116, 1052, 988, 924, 876, 844, 812, 780, 748, 716, 684, 652,
+    620, 588, 556, 524, 492, 460, 428, 396, 372, 356, 340, 324, 308, 292, 276, 260, 244, 228, 212,
+    196, 180, 164, 148, 132, 120, 112, 104, 96, 88, 80, 72, 64, 56, 48, 40, 32, 24, 16, 8, 0,
+];
+
+pub struct G711ALawDecoder<R: Read> {
+    reader: R,
+}
+
+impl<R: Read> G711ALawDecoder<R> {
+    pub fn new(reader: R) -> Self {
+        Self { reader }
+    }
+
+    #[inline]
+    fn read_sample(&mut self) -> Option<i16> {
+        let sample = self.reader.read_u8().ok()?;
+        Some(ALAW_TABLE[sample as usize])
+    }
+}
+
+impl<R: Read> Iterator for G711ALawDecoder<R> {
+    type Item = [i16; 2];
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let sample = self.read_sample()?;
+        Some([sample, sample])
+    }
+}
+
+impl<R: Read + Send + Sync> Decoder for G711ALawDecoder<R> {
+    #[inline]
+    fn num_channels(&self) -> u8 {
+        1
+    }
+
+    #[inline]
+    fn sample_rate(&self) -> u16 {
+        8000
+    }
+}
+
+impl<R: AsRef<[u8]> + Send + Sync> SeekableDecoder for G711ALawDecoder<Cursor<R>> {
+    #[inline]
+    fn reset(&mut self) {
+        self.reader.set_position(0);
+    }
+
+    #[inline]
+    fn seek_to_sample_frame(&mut self, frame: u32) {
+        let pos = u64::from(frame);
+        self.reader.set_position(pos);
+    }
+}
+
+pub struct G711MuLawDecoder<R: Read> {
+    reader: R,
+}
+
+impl<R: Read> G711MuLawDecoder<R> {
+    pub fn new(reader: R) -> Self {
+        Self { reader }
+    }
+
+    #[inline]
+    fn read_sample(&mut self) -> Option<i16> {
+        let sample = self.reader.read_u8().ok()?;
+        Some(MULAW_TABLE[sample as usize])
+    }
+}
+
+impl<R: Read> Iterator for G711MuLawDecoder<R> {
+    type Item = [i16; 2];
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let sample = self.read_sample()?;
+        Some([sample, sample])
+    }
+}
+
+impl<R: Read + Send + Sync> Decoder for G711MuLawDecoder<R> {
+    #[inline]
+    fn num_channels(&self) -> u8 {
+        1
+    }
+
+    #[inline]
+    fn sample_rate(&self) -> u16 {
+        8000
+    }
+}
+
+impl<R: AsRef<[u8]> + Send + Sync> SeekableDecoder for G711MuLawDecoder<Cursor<R>> {
+    #[inline]
+    fn reset(&mut self) {
+        self.reader.set_position(0);
+    }
+
+    #[inline]
+    fn seek_to_sample_frame(&mut self, frame: u32) {
+        let pos: u64 = u64::from(frame);
+        self.reader.set_position(pos);
+    }
+}
diff --git a/core/src/backend/audio/mixer.rs b/core/src/backend/audio/mixer.rs
@@ -1,4 +1,6 @@
-use super::decoders::{self, AdpcmDecoder, Decoder, PcmDecoder, SeekableDecoder};
+use super::decoders::{
+    self, AdpcmDecoder, Decoder, G711ALawDecoder, G711MuLawDecoder, PcmDecoder, SeekableDecoder,
+};
 use super::{SoundHandle, SoundInstanceHandle, SoundStreamInfo, SoundTransform};
 use crate::backend::audio::{DecodeError, RegisterError};
 use crate::buffer::Substream;
@@ -319,6 +321,8 @@ impl AudioMixer {
                 format.is_stereo,
                 format.sample_rate,
             )?),
+            AudioCompression::G711ALawPCM => Box::new(G711ALawDecoder::new(data)),
+            AudioCompression::G711MuLawPCM => Box::new(G711MuLawDecoder::new(data)),
             #[cfg(feature = "mp3")]
             AudioCompression::Mp3 => Box::new(decoders::Mp3Decoder::new_seekable(data)?),
             #[cfg(feature = "nellymoser")]

diff --git a/core/src/streams.rs b/core/src/streams.rs
@@ -689,15 +689,17 @@ impl<'gc> NetStream<'gc> {
                         FlvSoundFormat::Nellymoser16kHz => AudioCompression::Nellymoser16Khz,
                         FlvSoundFormat::Nellymoser8kHz => AudioCompression::Nellymoser8Khz,
                         FlvSoundFormat::Nellymoser => AudioCompression::Nellymoser,
-                        FlvSoundFormat::G711ALawPCM => return Err(NetstreamError::UnknownCodec),
-                        FlvSoundFormat::G711MuLawPCM => return Err(NetstreamError::UnknownCodec),
+                        FlvSoundFormat::G711ALawPCM => AudioCompression::G711ALawPCM,
+                        FlvSoundFormat::G711MuLawPCM => AudioCompression::G711MuLawPCM,
                         FlvSoundFormat::Aac => return Err(NetstreamError::UnknownCodec),
                         FlvSoundFormat::Speex => AudioCompression::Speex,
                         FlvSoundFormat::MP38kHz => AudioCompression::Mp3,
                         FlvSoundFormat::DeviceSpecific => return Err(NetstreamError::UnknownCodec),
                     },
                     sample_rate: match (audio_data.format, audio_data.rate) {
                         (FlvSoundFormat::MP38kHz, _) => 8_000,
+                        (FlvSoundFormat::G711ALawPCM, _) => 8_000,
+                        (FlvSoundFormat::G711MuLawPCM, _) => 8_000,
                         (_, FlvSoundRate::R5_500) => 5_500,
                         (_, FlvSoundRate::R11_000) => 11_000,
                         (_, FlvSoundRate::R22_000) => 22_000,

diff --git a/swf/src/types.rs b/swf/src/types.rs
@@ -1026,6 +1026,8 @@ pub enum AudioCompression {
     Nellymoser16Khz = 4,
     Nellymoser8Khz = 5,
     Nellymoser = 6,
+    G711ALawPCM = 7,
+    G711MuLawPCM = 8,
     Speex = 11,
 }