SVQ3_RUNLEVEL_ALT[val as usize]
} else {
let run = (val & 0x7) as usize;
- (run, ((val >> 3) as i16) + RUN_ADD_ALT[(run as usize).min(RUN_ADD_ALT.len() - 1)])
+ (run, ((val >> 3) as i16) + RUN_ADD_ALT[run.min(RUN_ADD_ALT.len() - 1)])
};
idx += run;
validate!(idx < end);
SVQ3_RUNLEVEL[val as usize]
} else {
let run = (val & 0xF) as usize;
- (run, ((val >> 4) as i16) + RUN_ADD[(run as usize).min(RUN_ADD.len() - 1)])
+ (run, ((val >> 4) as i16) + RUN_ADD[run.min(RUN_ADD.len() - 1)])
};
idx += run;
validate!(idx < blk.len());
let mbs = self.mb_w * self.mb_h;
let mb_bits = if mbs < 64 { 6 } else { 32 - (mbs - 1).leading_zeros() } as u8;
let _offset = br.read(mb_bits)?;
-println!("slice offset {}", _offset);
+//println!("slice offset {}", _offset);
}
let ts = br.read(8)? as u8;
let quant = br.read(5)? as u8;
} else {
MCMode::Pixel
};
- let (bw, bh) = SVQ3_PART_SIZES[mb_type as usize];
+ let (bw, bh) = SVQ3_PART_SIZES[mb_type];
let bw = (bw >> 2) as usize;
let bh = (bh >> 2) as usize;
}
let ret = self.decode_slice(&mut br, &hdr, &mut dframe);
std::mem::swap(&mut sbuf, &mut self.slice_buf);
- if let Err(err) = ret {
- return Err(err);
- }
+ ret?;
slice_prepared = false;
off += slice_len;
}