X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-itu%2Fsrc%2Fcodecs%2Fh264%2Fdsp.rs;h=87dc8d9fd97b301003d89fe52488eb71d0192f2c;hp=2cd08fcb38e0c6359801b3f923d16ddb59261438;hb=4a1ca15c9298340e8f2cb2ad6016109375cc45b9;hpb=5317ee9cf0160ca62988c898526f3e4018bb6f27 diff --git a/nihav-itu/src/codecs/h264/dsp.rs b/nihav-itu/src/codecs/h264/dsp.rs index 2cd08fc..87dc8d9 100644 --- a/nihav-itu/src/codecs/h264/dsp.rs +++ b/nihav-itu/src/codecs/h264/dsp.rs @@ -46,12 +46,12 @@ pub fn chroma_dc_transform(blk: &mut [i16; 4], qp: u8) { blk[2] = t1 + t3; blk[3] = t1 - t3; if qp < 6 { - let mul = i16::from(LEVEL_SCALE[0][qp as usize]); + let mul = LEVEL_SCALE[0][qp as usize]; for el in blk.iter_mut() { *el = el.wrapping_mul(mul) >> 1; } } else { - let mul = i16::from(LEVEL_SCALE[0][(qp % 6) as usize]); + let mul = LEVEL_SCALE[0][(qp % 6) as usize]; let shift = qp / 6 - 1; for el in blk.iter_mut() { *el = el.wrapping_mul(mul) << shift; @@ -113,14 +113,14 @@ macro_rules! transform { pub fn idct_luma_dc(blk: &mut [i16; 16], qp: u8) { if qp < 12 { - let mul = i16::from(LEVEL_SCALE[0][(qp % 6) as usize]); + let mul = LEVEL_SCALE[0][(qp % 6) as usize]; let shift = 2 - qp / 6; let bias = 1 << shift >> 1; for el in blk.iter_mut() { *el = el.wrapping_mul(mul).wrapping_add(bias) >> shift; } } else { - let mul = i16::from(LEVEL_SCALE[0][(qp % 6) as usize]); + let mul = LEVEL_SCALE[0][(qp % 6) as usize]; let shift = qp / 6 - 2; for el in blk.iter_mut() { *el = el.wrapping_mul(mul) << shift;