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];
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 {
fn new() -> Self {
Indeo4Decoder {
info: NACodecInfo::new_dummy(),
- dec: IVIDecoder::new(),
+ dec: IVIDecoder::new(false),
}
}
}
}
}
+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]
];
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_codec_support::test::dec_video::*;
- use crate::indeo_register_all_codecs;
+ 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);
+ 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],
[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],