use nihav_core::formats;
use nihav_core::frame::*;
use nihav_core::codecs::*;
+use nihav_codec_support::codecs::ZIGZAG;
use super::ivi::*;
use super::ivibr::*;
let slice_h;
if br.read_bool()? {
let idx = br.read(4)? as usize;
- if idx < 15 {
- slice_w = INDEO4_SLICE_SIZE_TAB[idx];
- slice_h = INDEO4_SLICE_SIZE_TAB[idx];
- } else {
- slice_w = width;
- slice_h = height;
- }
+ slice_h = if idx < 15 { INDEO4_SLICE_SIZE_TAB[idx] } else { height };
+ let idx = br.read(4)? as usize;
+ slice_w = if idx < 15 { INDEO4_SLICE_SIZE_TAB[idx] } else { width };
} else {
slice_w = width;
slice_h = height;
txtype = TxType::Transform8(TxParams8x8::new(qintra, qinter, scan));
} else if scan_idx < 10 {
validate!(!tr.is_8x8());
- validate!((qmat_idx >= 15) && (qmat_idx < 22));
+ validate!((15..22).contains(&qmat_idx));
let scan = INDEO4_SCANS_4X4[scan_idx - 5];
let qidx = INDEO4_Q4X4_IDX[qmat_idx - 15];
let qintra = INDEO4_Q4_INTRA[qidx];
Ok(BandHeader::new(plane_no, band_no, mb_size, blk_size, mv_mode == 1, inherit_mv, false, inherit_qd, quant, rvmap_idx, num_corr, corr_map, blk_cb, tr, txtype))
}
- fn decode_mb_info(&mut self, br: &mut BitReader, pic_hdr: &PictureHeader, band: &BandHeader, tile: &mut IVITile, ref_tile: Option<Ref<IVITile>>, mv_scale: u8) -> DecoderResult<()> {
+ fn decode_mb_info(&mut self, br: &mut BitReader, pic_hdr: &PictureHeader, band: &BandHeader, tile: &mut IVITile, ref_tile: Option<&IVITile>, mv_scale: u8) -> DecoderResult<()> {
let mut mv_x = 0;
let mut mv_y = 0;
let mut mb_idx = 0;
if pic_hdr.ftype.is_intra() {
mb.mtype = MBType::Intra;
} else if band.inherit_mv {
- if let Some(ref tileref) = ref_tile {
+ if let Some(tileref) = ref_tile {
mb.mtype = tileref.mb[mb_idx].mtype;
} else {
return Err(DecoderError::MissingReference);
mb.cbp = br.read(4)? as u8;
}
if band.inherit_qd {
- if let Some(ref tileref) = ref_tile {
+ if let Some(tileref) = ref_tile {
mb.qd = tileref.mb[mb_idx].qd;
mb.q = calc_quant(band.quant, mb.qd);
} else {
if mb.mtype != MBType::Intra {
if band.inherit_mv {
- if let Some(ref tileref) = ref_tile {
+ if let Some(tileref) = ref_tile {
let mx = tileref.mb[mb_idx].mv_x;
let my = tileref.mb[mb_idx].mv_y;
if mv_scale == 0 {
mb.q = calc_quant(band.quant, mb.qd);
}
if band.inherit_mv {
- if let Some(ref tileref) = ref_tile {
+ if let Some(tileref) = ref_tile {
let mx = tileref.mb[mb_idx].mv_x;
let my = tileref.mb[mb_idx].mv_y;
if mv_scale == 0 {
let hh = (h / 2) as isize;
let mut band0 = src.as_ptr();
let mut band1 = band0.offset(hw);
- let mut band2 = band0.offset(((h / 2) * sstride) as isize);
+ let mut band2 = band0.add((h / 2) * sstride);
let mut band3 = band2.offset(hw);
let mut dst0 = dst.as_mut_ptr();
- let mut dst1 = dst0.offset(dstride as isize);
+ let mut dst1 = dst0.add(dstride);
for _ in 0..hh {
let mut b0_ptr = band0;
let mut b1_ptr = band1;
let mut d0_ptr = dst0;
let mut d1_ptr = dst1;
for _ in 0..hw {
- let p0 = *b0_ptr as i32;
- let p1 = *b1_ptr as i32;
- let p2 = *b2_ptr as i32;
- let p3 = *b3_ptr as i32;
+ let p0 = i32::from(*b0_ptr);
+ let p1 = i32::from(*b1_ptr);
+ let p2 = i32::from(*b2_ptr);
+ let p3 = i32::from(*b3_ptr);
let s0 = p0.wrapping_add(p2);
let s1 = p1.wrapping_add(p3);
let d0 = p0.wrapping_sub(p2);
d0_ptr = d0_ptr.offset(2);
d1_ptr = d1_ptr.offset(2);
}
- band0 = band0.offset(sstride as isize);
- band1 = band1.offset(sstride as isize);
- band2 = band2.offset(sstride as isize);
- band3 = band3.offset(sstride as isize);
- dst0 = dst0.offset((dstride * 2) as isize);
- dst1 = dst1.offset((dstride * 2) as isize);
+ band0 = band0.add(sstride);
+ band1 = band1.add(sstride);
+ band2 = band2.add(sstride);
+ band3 = band3.add(sstride);
+ dst0 = dst0.add(dstride * 2);
+ dst1 = dst1.add(dstride * 2);
}
}
}
fn new() -> Self {
Indeo4Decoder {
info: NACodecInfo::new_dummy(),
- dec: IVIDecoder::new(),
+ dec: IVIDecoder::new(false),
}
}
}
impl NADecoder for Indeo4Decoder {
- fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
+ fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let w = vinfo.get_width();
let h = vinfo.get_height();
Err(DecoderError::InvalidData)
}
}
- fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+ fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
- let mut br = BitReader::new(src.as_slice(), src.len(), BitReaderMode::LE);
+ let mut br = BitReader::new(src.as_slice(), BitReaderMode::LE);
let mut ip = Indeo4Parser::new();
let bufinfo = self.dec.decode_frame(&mut ip, &mut br)?;
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
frm.set_keyframe(self.dec.is_intra());
frm.set_frame_type(self.dec.get_frame_type());
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
+ }
+ fn flush(&mut self) {
+ self.dec.flush();
}
}
+impl NAOptionHandler for Indeo4Decoder {
+ fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+ fn set_options(&mut self, _options: &[NAOption]) { }
+ fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
const INDEO4_PICTURE_SIZE_TAB: [[usize; 2]; 7] = [
[640, 480], [320, 240], [160, 120], [704, 480], [352, 240], [352, 288], [176, 144]
];
const INDEO4_SCAN_4X4_HOR: [usize; 16] = [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ];
const INDEO4_SCANS_8X8: [&[usize; 64]; 5] = [
- &IVI_ZIGZAG, &INDEO4_SCAN_8X8_ALT, &IVI_SCAN_8X8_HOR, &IVI_SCAN_8X8_VER, &IVI_ZIGZAG
+ &ZIGZAG, &INDEO4_SCAN_8X8_ALT, &IVI_SCAN_8X8_HOR, &IVI_SCAN_8X8_VER, &ZIGZAG
];
const INDEO4_SCANS_4X4: [&[usize; 16]; 5] = [
&IVI_SCAN_4X4, &INDEO4_SCAN_4X4_ALT, &INDEO4_SCAN_4X4_VER, &INDEO4_SCAN_4X4_HOR, &IVI_SCAN_4X4
&INDEO4_QUANT4X4_INTER[3], &INDEO4_QUANT4X4_INTER[4]
];
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(Indeo4Decoder::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_indeo4() {
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);
-
- test_file_decoding("avi", "assets/Indeo/IV4/volcano.avi", /*None*/Some(16), true, false, None/*Some("iv4")*/, &dmx_reg, &dec_reg);
-//panic!("the end");
+ indeo_register_all_decoders(&mut dec_reg);
+
+ // sample: https://samples.mplayerhq.hu/V-codecs/IV41/indeo4-avi/volcano.avi
+ test_decoding("avi", "indeo4", "assets/Indeo/IV4/volcano.avi", Some(16),
+ &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+ [0x194f626b, 0x023fdfd0, 0x9809665a, 0xd68f6f47],
+ [0x194f626b, 0x023fdfd0, 0x9809665a, 0xd68f6f47],
+ [0x194f626b, 0x023fdfd0, 0x9809665a, 0xd68f6f47],
+ [0x194f626b, 0x023fdfd0, 0x9809665a, 0xd68f6f47],
+ [0x46c6719d, 0xe6415ac0, 0x3e4d9799, 0xd2f5747d],
+ [0xe0278b0f, 0x3e4763d5, 0x88033344, 0xc9c2e6de],
+ [0xd962be7f, 0xafc1ac64, 0x0647cdcc, 0xd06465c6],
+ [0xedef0e19, 0xec75eed2, 0x955a2ae2, 0xd6145b4c],
+ [0x89ec8d4b, 0x3d446d74, 0xbd3d681d, 0x2d219dca],
+ [0x89e81643, 0x77fb2f1b, 0x2aa0782f, 0xb1b9b7ef],
+ [0xea283aec, 0x94d7cdf9, 0x961bbb69, 0x2b38162a],
+ [0x1d1b315c, 0x6613c5fa, 0xeff36485, 0x5025fbf2],
+ [0x4145c6a8, 0xd8d513b1, 0x34a5d353, 0x07750cd5],
+ [0xace12feb, 0x468754f3, 0xa72327f5, 0x1a6f6350],
+ [0x4b04dc0e, 0x684533a7, 0x6a4e4b16, 0x0b8a5e68],
+ [0xa3eb64fc, 0x5e02a31b, 0x6b484eae, 0xbb6e6c49],
+ [0x7d4ef46e, 0x6761c447, 0x02e002f5, 0x02d0231c]]));
+ // a sample from Civilization II
+ test_decoding("avi", "indeo4", "assets/Indeo/IV4/HRLDVIK.AVI", Some(8),
+ &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+ [0x239b8b87, 0x6dbec08c, 0x82bae1f0, 0x868e00c2],
+ [0xe2298beb, 0x4e08866d, 0x00cb6201, 0x6b0a6df3],
+ [0x9d7f4cf0, 0xed33df12, 0x2677be16, 0xce7e99b0],
+ [0x0c8d7489, 0x2b3ac56e, 0x36d75559, 0x70550903],
+ [0xc32b4b78, 0x2fc81737, 0xe4d7722b, 0xbcbbb35e],
+ [0x20bfd5e8, 0x6cfad540, 0xfc6c6b6c, 0xa4f39a7d],
+ [0xc327428d, 0x4e817b56, 0x4376eba2, 0xebafd04a],
+ [0x6a53a6ec, 0x7477a471, 0xd55bc98e, 0x7498de0f],
+ [0x398eba3a, 0x3cf3cce1, 0x90211dfe, 0x82c906f0]]));
}
}