binkaud: fix monaural RDFT decoding (and add a test while at it)

[nihav.git] / src / codecs / pcm.rs

diff --git a/src/codecs/pcm.rs b/src/codecs/pcm.rs
deleted file mode 100644 (file)
index 288930b..0000000
--- a/src/codecs/pcm.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use formats::*;
-use super::*;
-
-struct PCMDecoder { chmap: NAChannelMap }
-
-impl PCMDecoder {
-    fn new() -> Self {
-        PCMDecoder { chmap: NAChannelMap::new() }
-    }
-}
-
-const CHMAP_MONO: [NAChannelType; 1] = [NAChannelType::C];
-const CHMAP_STEREO: [NAChannelType; 2] = [NAChannelType::L, NAChannelType::R];
-
-fn get_default_chmap(nch: u8) -> NAChannelMap {
-    let mut chmap = NAChannelMap::new();
-    match nch {
-        1 => chmap.add_channels(&CHMAP_MONO),
-        2 => chmap.add_channels(&CHMAP_STEREO),
-        _ => (),
-    }
-    chmap
-}
-
-fn get_duration(ainfo: &NAAudioInfo, duration: Option<u64>, data_size: usize) -> u64 {
-    if duration == None {
-        let size_bits = (data_size as u64) * 8;
-        let blk_size = (ainfo.get_channels() as u64) * (ainfo.get_format().get_bits() as u64);
-        size_bits / blk_size
-    } else {
-        duration.unwrap() as u64
-    }
-}
-
-impl NADecoder for PCMDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
-        if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
-            self.chmap = get_default_chmap(ainfo.get_channels());
-            if self.chmap.num_channels() == 0 { return Err(DecoderError::InvalidData); }
-            Ok(())
-        } else {
-            Err(DecoderError::InvalidData)
-        }
-    }
-    fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
-        let info = pkt.get_stream().get_info();
-        if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
-            let duration = get_duration(&ainfo, pkt.get_duration(), pkt.get_buffer().len());
-            let pktbuf = pkt.get_buffer();
-            let mut buf: Vec<u8> = Vec::with_capacity(pktbuf.len());
-            buf.clone_from(&pktbuf);
-            let abuf = NAAudioBuffer::new_from_buf(ainfo, Rc::new(RefCell::new(buf)), self.chmap.clone());
-            let mut frm = NAFrame::new_from_pkt(pkt, info, NABufferType::AudioPacked(abuf));
-            frm.set_duration(Some(duration));
-            frm.set_keyframe(true);
-            Ok(Rc::new(RefCell::new(frm)))
-        } else {
-            Err(DecoderError::InvalidData)
-        }
-    }
-}
-
-pub fn get_decoder() -> Box<NADecoder> {
-    Box::new(PCMDecoder::new())
-}