#[allow(dead_code)]
pub enum DecoderError {
NoFrame,
+ AllocError,
TryAgain,
InvalidData,
ShortData,
Bug,
}
-type DecoderResult<T> = Result<T, DecoderError>;
+pub type DecoderResult<T> = Result<T, DecoderError>;
impl From<ByteIOError> for DecoderError {
fn from(_: ByteIOError) -> Self { DecoderError::ShortData }
fn from(_: CodebookError) -> Self { DecoderError::InvalidData }
}
+impl From<AllocatorError> for DecoderError {
+ fn from(_: AllocatorError) -> Self { DecoderError::AllocError }
+}
+
+macro_rules! validate {
+ ($a:expr) => { if !$a { return Err(DecoderError::InvalidData); } };
+}
+
#[allow(dead_code)]
struct HAMShuffler {
lastframe: Option<NAVideoBuffer<u8>>,
get_decoder: fn () -> Box<NADecoder>,
}
-macro_rules! validate {
- ($a:expr) => { if !$a { return Err(DecoderError::InvalidData); } };
-}
+#[cfg(feature="h263")]
+mod blockdsp;
#[cfg(feature="decoder_gdvvid")]
mod gremlinvideo;
-#[cfg(feature="decoder_indeo2")]
-mod indeo2;
-#[cfg(feature="decoder_indeo3")]
-mod indeo3;
+#[cfg(any(feature="decoder_indeo2", feature="decoder_indeo3", feature="decoder_indeo4", feature="decoder_indeo5", feature="decoder_imc"))]
+mod indeo;
+#[cfg(feature="h263")]
+mod h263;
+
#[cfg(feature="decoder_pcm")]
mod pcm;
#[cfg(feature="decoder_gdvvid")]
DecoderInfo { name: "gdv-video", get_decoder: gremlinvideo::get_decoder },
#[cfg(feature="decoder_indeo2")]
- DecoderInfo { name: "indeo2", get_decoder: indeo2::get_decoder },
+ DecoderInfo { name: "indeo2", get_decoder: indeo::indeo2::get_decoder },
#[cfg(feature="decoder_indeo3")]
- DecoderInfo { name: "indeo3", get_decoder: indeo3::get_decoder },
+ DecoderInfo { name: "indeo3", get_decoder: indeo::indeo3::get_decoder },
+#[cfg(feature="decoder_indeo4")]
+ DecoderInfo { name: "indeo4", get_decoder: indeo::indeo4::get_decoder },
+#[cfg(feature="decoder_indeo5")]
+ DecoderInfo { name: "indeo5", get_decoder: indeo::indeo5::get_decoder },
+#[cfg(feature="decoder_intel263")]
+ DecoderInfo { name: "intel263", get_decoder: h263::intel263::get_decoder },
#[cfg(feature="decoder_pcm")]
DecoderInfo { name: "pcm", get_decoder: pcm::get_decoder },
+#[cfg(feature="decoder_imc")]
+ DecoderInfo { name: "imc", get_decoder: indeo::imc::get_decoder_imc },
+#[cfg(feature="decoder_imc")]
+ DecoderInfo { name: "iac", get_decoder: indeo::imc::get_decoder_iac },
];
pub fn find_decoder(name: &str) -> Option<fn () -> Box<NADecoder>> {
}
None
}
-
-#[cfg(test)]
-use std::fs::{File, OpenOptions};
-#[cfg(test)]
-use std::io::prelude::*;
-
-#[cfg(test)]
-#[allow(dead_code)]
-fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
- let frm = frmref.borrow();
- let name = format!("assets/{}out{:02}_{:04}.pgm", pfx, strno, num);
- let mut ofile = File::create(name).unwrap();
- let buf = frm.get_buffer().get_vbuf().unwrap();
- let (w, h) = buf.get_dimensions(0);
- let (w2, h2) = buf.get_dimensions(1);
- let tot_h = h + h2;
- let hdr = format!("P5\n{} {}\n255\n", w, tot_h);
- ofile.write_all(hdr.as_bytes()).unwrap();
- let dta = buf.get_data();
- let ls = buf.get_stride(0);
- let mut idx = 0;
- let mut idx2 = w;
- let mut pad: Vec<u8> = Vec::with_capacity((w - w2 * 2) / 2);
- pad.resize((w - w2 * 2) / 2, 0xFF);
- for _ in 0..h {
- let line = &dta[idx..idx2];
- ofile.write_all(line).unwrap();
- idx += ls;
- idx2 += ls;
- }
- let mut base1 = buf.get_offset(1);
- let stride1 = buf.get_stride(1);
- let mut base2 = buf.get_offset(2);
- let stride2 = buf.get_stride(2);
- for _ in 0..h2 {
- let bend1 = base1 + w2;
- let line = &dta[base1..bend1];
- ofile.write_all(line).unwrap();
- ofile.write_all(pad.as_slice()).unwrap();
-
- let bend2 = base2 + w2;
- let line = &dta[base2..bend2];
- ofile.write_all(line).unwrap();
- ofile.write_all(pad.as_slice()).unwrap();
-
- base1 += stride1;
- base2 += stride2;
- }
-}
-
-#[cfg(test)]
-#[allow(dead_code)]
-fn write_palppm(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
- let frm = frmref.borrow();
- let name = format!("assets/{}out{:02}_{:04}.ppm", pfx, strno, num);
- let mut ofile = File::create(name).unwrap();
- let buf = frm.get_buffer().get_vbuf().unwrap();
- let (w, h) = buf.get_dimensions(0);
- let paloff = buf.get_offset(1);
- let hdr = format!("P6\n{} {}\n255\n", w, h);
- ofile.write_all(hdr.as_bytes()).unwrap();
- let dta = buf.get_data();
- let ls = buf.get_stride(0);
- let mut idx = 0;
- let mut line: Vec<u8> = Vec::with_capacity(w * 3);
- line.resize(w * 3, 0);
- for _ in 0..h {
- let src = &dta[idx..(idx+w)];
- for x in 0..w {
- let pix = src[x] as usize;
- line[x * 3 + 0] = dta[paloff + pix * 3 + 2];
- line[x * 3 + 1] = dta[paloff + pix * 3 + 1];
- line[x * 3 + 2] = dta[paloff + pix * 3 + 0];
- }
- ofile.write_all(line.as_slice()).unwrap();
- idx += ls;
- }
-}
-
-#[cfg(test)]
-#[allow(dead_code)]
-fn write_sound(pfx: &str, strno: usize, frmref: NAFrameRef, first: bool) {
- let frm = frmref.borrow();
- let name = format!("assets/{}out{:02}.raw", pfx, strno);
- let mut file = if first { File::create(name).unwrap() } else { OpenOptions::new().write(true).append(true).open(name).unwrap() };
- let btype = frm.get_buffer();
- let _ = match btype {
- NABufferType::AudioU8(ref ab) => file.write_all(ab.get_data().as_ref()),
- NABufferType::AudioPacked(ref ab) => file.write_all(ab.get_data().as_ref()),
- _ => Ok(()),
- };
-}
projects / nihav.git / blobdiff