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] = [
[
struct Indeo2Decoder {
info: NACodecInfoRef,
cb: Codebook<u8>,
- frmmgr: HAMShuffler,
+ frmmgr: HAMShuffler<u8>,
}
impl Indeo2Decoder {
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 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);
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);
}
}
-pub fn get_decoder() -> Box<dyn NADecoder> {
+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<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_decoders;
+ use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_indeo2() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- indeo_register_all_codecs(&mut dec_reg);
+ indeo_register_all_decoders(&mut dec_reg);
- test_file_decoding("avi", "assets/Indeo/laser05.avi", Some(10), true, false, None, &dmx_reg, &dec_reg);
+ // sample: https://samples.mplayerhq.hu/V-codecs/RT21/320x240/laser05.avi
+ 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]]));
}
}