}
impl IndeoXParser for Indeo4Parser {
-#[allow(unused_variables,unused_assignments)]
fn decode_picture_header(&mut self, br: &mut BitReader) -> DecoderResult<PictureHeader> {
let sync = br.read(18)?;
validate!(sync == 0x3FFF8);
let ftype = INDEO4_FRAME_TYPE[ftype_idx as usize];
let transparent = br.read_bool()?;
br.skip(1)?;
- let data_size;
- if br.read_bool()? {
- data_size = br.read(24)? as usize;
- } else {
- data_size = 0;
- }
+ let _data_size = if br.read_bool()? { br.read(24)? as usize } else { 0 };
if ftype.is_null() {
return Ok(PictureHeader::new_null(ftype));
}
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;
_ => { return Err(DecoderError::InvalidData); }
};
let chroma_bands = if sc_idx == 2 { 4 } else { 1 };
- let frame_no;
- if br.read_bool()? {
- frame_no = br.read(20)?;
- } else {
- frame_no = 0;
- }
+ let _frame_no = if br.read_bool()? { br.read(20)? } else { 0 };
if br.read_bool()? {
br.skip(8)?; // decTimeEst
}
self.mb_cb = br.read_ivi_codebook_desc(true, desc_coded)?;
let desc_coded = br.read_bool()?;
self.blk_cb = br.read_ivi_codebook_desc(false, desc_coded)?;
- let rvmap = if br.read_bool()? { br.read(3)? as usize } else { 8 };
- let in_imf = br.read_bool()?;
+ let _rvmap = if br.read_bool()? { br.read(3)? as usize } else { 8 };
+ let _in_imf = br.read_bool()?;
let in_q = br.read_bool()?;
- let glob_q = br.read(5)? as u8;
+ let _glob_q = br.read(5)? as u8;
if br.read_bool()? {
br.skip(3)?;
}
- let checksum = if br.read_bool()? { br.read(16)? } else { 0 };
+ let _checksum = if br.read_bool()? { br.read(16)? } else { 0 };
if br.read_bool()? {
br.skip(8)?; // pic hdr extension
}
Ok(PictureHeader::new(ftype, width, height, slice_w, slice_h, transparent, luma_bands, chroma_bands, in_q))
}
-#[allow(unused_variables,unused_assignments)]
+ #[allow(clippy::manual_range_contains)]
fn decode_band_header(&mut self, br: &mut BitReader, pic_hdr: &PictureHeader, plane: usize, band: usize) -> DecoderResult<BandHeader> {
let plane_no = br.read(2)? as usize;
let band_no = br.read(4)? as usize;
br.align();
return Ok(BandHeader::new_empty(plane_no, band_no));
}
- let hdr_size;
- if br.read_bool()? {
- hdr_size = br.read(16)? as usize;
- } else {
- hdr_size = 32;
- }
+ let _hdr_size = if br.read_bool()? { br.read(16)? as usize } else { 32 };
let mv_mode = br.read(2)?;
validate!(mv_mode < 2);
if br.read_bool()? {
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];
txtype = TxType::None;
}
- let blk_cb;
- if br.read_bool()? {
- blk_cb = br.read_ivi_codebook_desc(false, true)?;
- } else {
- blk_cb = self.blk_cb;
- }
- let rvmap_idx;
- if br.read_bool()? {
- rvmap_idx = br.read(3)? as usize;
- } else {
- rvmap_idx = 8;
- }
+ let blk_cb = if br.read_bool()? {
+ br.read_ivi_codebook_desc(false, true)?
+ } else {
+ self.blk_cb
+ };
+ let rvmap_idx = if br.read_bool()? { br.read(3)? as usize } else { 8 };
let num_corr;
let mut corr_map: [u8; CORR_MAP_SIZE] = [0; CORR_MAP_SIZE];
if br.read_bool()? {
num_corr = br.read(8)? as usize;
validate!(num_corr*2 <= CORR_MAP_SIZE);
- for i in 0..num_corr*2 {
- corr_map[i] = br.read(8)? as u8;
+ for el in corr_map[..num_corr*2].iter_mut() {
+ *el = br.read(8)? as u8;
}
} else {
num_corr = 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);
}
+ } else if !pic_hdr.ftype.is_bidir() {
+ mb.mtype = if br.read_bool()? { MBType::Inter } else { MBType::Intra };
} else {
- if !pic_hdr.ftype.is_bidir() {
- mb.mtype = if br.read_bool()? { MBType::Inter } else { MBType::Intra };
- } else {
- mb.mtype = match br.read(2)? {
- 0 => { MBType::Intra },
- 1 => { MBType::Inter },
- 2 => { MBType::Backward },
- _ => { MBType::Bidir },
- };
- }
+ mb.mtype = match br.read(2)? {
+ 0 => { MBType::Intra },
+ 1 => { MBType::Inter },
+ 2 => { MBType::Backward },
+ _ => { MBType::Bidir },
+ };
}
if band.mb_size == band.blk_size {
mb.cbp = br.read(1)? as u8;
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),
}
}
}
projects / nihav.git / blobdiff