use nihav_core::io::codebook::*;
use nihav_core::formats;
use nihav_core::codecs::*;
+use nihav_codec_support::codecs::HAMShuffler;
static INDEO2_DELTA_TABLE: [[u8; 256]; 4] = [
[
impl CodebookDescReader<u8> for IR2CodeReader {
fn bits(&mut self, idx: usize) -> u8 { INDEO2_CODE_LENGTHS[idx] }
- fn code(&mut self, idx: usize) -> u32 { INDEO2_CODE_CODES[idx] as u32 }
+ fn code(&mut self, idx: usize) -> u32 { u32::from(INDEO2_CODE_CODES[idx]) }
fn sym (&mut self, idx: usize) -> u8 {
if idx < 0x7F { (idx + 1) as u8 } else { (idx + 2) as u8 }
}
struct Indeo2Decoder {
info: NACodecInfoRef,
cb: Codebook<u8>,
- frmmgr: HAMShuffler,
+ frmmgr: HAMShuffler<u8>,
}
impl Indeo2Decoder {
let dummy_info = NACodecInfo::new_dummy();
let mut coderead = IR2CodeReader{};
let cb = Codebook::new(&mut coderead, CodebookMode::LSB).unwrap();
- Indeo2Decoder { info: dummy_info, cb: cb, frmmgr: HAMShuffler::new() }
+ Indeo2Decoder { info: dummy_info, cb, frmmgr: HAMShuffler::new() }
}
fn decode_plane_intra(&self, br: &mut BitReader,
let stride = buf.get_stride(planeno);
let cb = &self.cb;
- let data = buf.get_data_mut().unwrap();
+ let data = buf.get_data_mut().unwrap();
let framebuf: &mut [u8] = data.as_mut_slice();
let table = &INDEO2_DELTA_TABLE[tableno];
}
x += run;
} else {
- let delta0 = (table[idx * 2 + 0] as i16) - 0x80;
- let delta1 = (table[idx * 2 + 1] as i16) - 0x80;
- let mut pix0 = framebuf[base + x + 0 - stride] as i16;
- let mut pix1 = framebuf[base + x + 1 - stride] as i16;
+ let delta0 = i16::from(table[idx * 2 + 0]) - 0x80;
+ let delta1 = i16::from(table[idx * 2 + 1]) - 0x80;
+ let mut pix0 = i16::from(framebuf[base + x + 0 - stride]);
+ let mut pix1 = i16::from(framebuf[base + x + 1 - stride]);
pix0 += delta0;
pix1 += delta1;
if pix0 < 0 { pix0 = 0; }
if x + run > w { return Err(DecoderError::InvalidData); }
x += run;
} else {
- let delta0 = (table[idx * 2 + 0] as i16) - 0x80;
- let delta1 = (table[idx * 2 + 1] as i16) - 0x80;
- let mut pix0 = framebuf[base + x + 0] as i16;
- let mut pix1 = framebuf[base + x + 1] as i16;
- pix0 += delta0 * 3 >> 2;
- pix1 += delta1 * 3 >> 2;
+ let delta0 = i16::from(table[idx * 2 + 0]) - 0x80;
+ let delta1 = i16::from(table[idx * 2 + 1]) - 0x80;
+ let mut pix0 = i16::from(framebuf[base + x + 0]);
+ let mut pix1 = i16::from(framebuf[base + x + 1]);
+ pix0 += (delta0 * 3) >> 2;
+ pix1 += (delta1 * 3) >> 2;
if pix0 < 0 { pix0 = 0; }
if pix1 < 0 { pix1 = 0; }
if pix0 > 255 { pix0 = 255; }
if src.len() <= IR2_START { return Err(DecoderError::ShortData); }
let interframe = src[18];
let tabs = src[34];
- let mut br = BitReader::new(&src[IR2_START..], src.len() - IR2_START, BitReaderMode::LE);
+ let mut br = BitReader::new(&src[IR2_START..], BitReaderMode::LE);
let luma_tab = tabs & 3;
let chroma_tab = (tabs >> 2) & 3;
if interframe != 0 {
let vinfo = self.info.get_properties().get_video_info().unwrap();
- let bufret = alloc_video_buffer(vinfo, 2);
- if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
- let bufinfo = bufret.unwrap();
+ let bufinfo = alloc_video_buffer(vinfo, 2)?;
let mut buf = bufinfo.get_vbuf().unwrap();
for plane in 0..3 {
let tabidx = (if plane == 0 { luma_tab } else { chroma_tab }) as usize;
- self.decode_plane_intra(&mut br, &mut buf, plane, tabidx)?;
+ let planeno = if plane == 0 { 0 } else { plane ^ 3 };
+ self.decode_plane_intra(&mut br, &mut buf, planeno, tabidx)?;
}
self.frmmgr.add_frame(buf);
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
Ok(frm.into_ref())
} else {
let bufret = self.frmmgr.clone_ref();
- if let None = bufret { return Err(DecoderError::MissingReference); }
+ if bufret.is_none() { return Err(DecoderError::MissingReference); }
let mut buf = bufret.unwrap();
for plane in 0..3 {
let tabidx = (if plane == 0 { luma_tab } else { chroma_tab }) as usize;
- self.decode_plane_inter(&mut br, &mut buf, plane, tabidx)?;
+ let planeno = if plane == 0 { 0 } else { plane ^ 3 };
+ self.decode_plane_inter(&mut br, &mut buf, planeno, tabidx)?;
}
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), NABufferType::Video(buf));
frm.set_keyframe(false);
Ok(frm.into_ref())
}
}
+ fn flush(&mut self) {
+ self.frmmgr.clear();
+ }
+}
+
+impl NAOptionHandler for Indeo2Decoder {
+ fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+ fn set_options(&mut self, _options: &[NAOption]) { }
+ fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
}
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(Indeo2Decoder::new())
}
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_core::test::dec_video::*;
- use crate::codecs::indeo_register_all_codecs;
- use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+ use nihav_codec_support::test::dec_video::*;
+ use crate::indeo_register_all_codecs;
+ use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_indeo2() {
let mut dmx_reg = RegisteredDemuxers::new();
let mut dec_reg = RegisteredDecoders::new();
indeo_register_all_codecs(&mut dec_reg);
- test_file_decoding("avi", "assets/Indeo/laser05.avi", Some(10), true, false, None, &dmx_reg, &dec_reg);
+ test_decoding("avi", "indeo2", "assets/Indeo/laser05.avi", Some(10),
+ &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+ [0x55f509ad, 0x62fb52d5, 0x6e9a86b2, 0x3910ce74],
+ [0x76a2b95d, 0x97bd2eca, 0xc9815f99, 0xe196b47a],
+ [0x4ce19793, 0x46ff7429, 0x89d5c3aa, 0x822b8825],
+ [0xb9cd338f, 0x3d4884a7, 0x5a9e978d, 0xc5abcfe8],
+ [0xc4c6997a, 0x7dbb3a97, 0x1e4e65f6, 0xb5b6fba5],
+ [0xe315980e, 0x817f51e5, 0xf9a45363, 0x943c94b9],
+ [0x09b8c723, 0xb39aa17e, 0x6de2a61b, 0xaceca224],
+ [0xdc1b1966, 0xba5a13b3, 0x3a7fbdab, 0xdebb504c],
+ [0xd33eed2a, 0x7b3834a6, 0x2d57cd23, 0x73644cd9],
+ [0xd7bd2ade, 0x114f973e, 0xe9a9cf45, 0x3c04297e],
+ [0x4d851f61, 0x519c41df, 0x325dc9f9, 0xdf88b57a]]));
}
}
projects / nihav.git / blobdiff