From: Kostya Shishkov Date: Wed, 28 May 2025 16:07:32 +0000 (+0200) Subject: remove unused fields/methods/traits or suppress warnings about them X-Git-Url: https://git.nihav.org/?a=commitdiff_plain;h=802930e62165f133af3031cde2ca3bddca961765;p=nihav.git remove unused fields/methods/traits or suppress warnings about them --- diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs index 7eeb4e3..ba5db75 100644 --- a/nihav-duck/src/codecs/vp3.rs +++ b/nihav-duck/src/codecs/vp3.rs @@ -1539,7 +1539,7 @@ impl VP34Decoder { let mut biter = self.blocks.iter_mut(); for by in 0..self.mb_h*2 { for bx in 0..self.mb_w*2 { - let mut blk = biter.next().unwrap(); + let blk = biter.next().unwrap(); let qmat = &self.qmat_y; blk.coeffs[0] *= qmat[0]; if blk.has_ac { @@ -1553,7 +1553,7 @@ impl VP34Decoder { for plane in 1..3 { for by in 0..self.mb_h { for bx in 0..self.mb_w { - let mut blk = biter.next().unwrap(); + let blk = biter.next().unwrap(); let qmat = &self.qmat_c; blk.coeffs[0] *= qmat[0]; if blk.has_ac { @@ -1612,7 +1612,7 @@ impl VP34Decoder { let mut biter = self.blocks.iter_mut(); for by in 0..self.mb_h*2 { for bx in 0..self.mb_w*2 { - let mut blk = biter.next().unwrap(); + let blk = biter.next().unwrap(); // do MC for whole macroblock if !blk.btype.is_intra() && (((bx | by) & 1) == 0) && (blk.btype != VPMBType::InterFourMV) { let src = if blk.btype.get_ref_id() == 1 { @@ -1680,7 +1680,7 @@ impl VP34Decoder { for plane in 1..3 { for by in 0..self.mb_h { for bx in 0..self.mb_w { - let mut blk = biter.next().unwrap(); + let blk = biter.next().unwrap(); let qmat = if blk.btype.is_intra() { &self.qmat_c } else { &self.qmat_c_p }; blk.coeffs[0] *= qmat[0]; if blk.has_ac { diff --git a/nihav-duck/src/codecs/vp56.rs b/nihav-duck/src/codecs/vp56.rs index 52de1c9..7066e89 100644 --- a/nihav-duck/src/codecs/vp56.rs +++ b/nihav-duck/src/codecs/vp56.rs @@ -41,7 +41,6 @@ pub struct VP56MBTypeModel { pub struct VP56CoeffModel { pub dc_token_probs: [[[u8; 5]; 6]; 6], pub dc_value_probs: [u8; 11], - pub ac_ctype_probs: [[[[u8; 5]; 5]; 6]; 3], pub ac_type_probs: [[[[u8; 5]; 6]; 3]; 3], pub ac_val_probs: [[[u8; 11]; 6]; 3], } diff --git a/nihav-duck/src/codecs/vp6enc/models.rs b/nihav-duck/src/codecs/vp6enc/models.rs index fe2416e..85b02ce 100644 --- a/nihav-duck/src/codecs/vp6enc/models.rs +++ b/nihav-duck/src/codecs/vp6enc/models.rs @@ -246,7 +246,6 @@ pub struct VP56MVModelStat { #[derive(Clone,Copy,Default)] pub struct VP56CoeffModelStat { - pub dc_token_probs: [[[ProbCounter; 5]; 6]; 6], pub dc_value_probs: [ProbCounter; 11], pub ac_val_probs: [[[ProbCounter; 11]; 6]; 3], } diff --git a/nihav-duck/src/codecs/vpenc/motion_est.rs b/nihav-duck/src/codecs/vpenc/motion_est.rs index 149588d..42adbc3 100644 --- a/nihav-duck/src/codecs/vpenc/motion_est.rs +++ b/nihav-duck/src/codecs/vpenc/motion_est.rs @@ -41,17 +41,6 @@ impl std::fmt::Display for MVSearchMode { } } -#[allow(clippy::wrong_self_convention)] -trait FromPixels { - fn from_pixels(self) -> Self; -} - -impl FromPixels for MV { - fn from_pixels(self) -> MV { - MV { x: self.x * 4, y: self.y * 4 } - } -} - pub const DIA_PATTERN: [MV; 9] = [ ZERO_MV, MV {x: -2, y: 0}, diff --git a/nihav-indeo/src/codecs/ivi.rs b/nihav-indeo/src/codecs/ivi.rs index ecfab92..d37e50a 100644 --- a/nihav-indeo/src/codecs/ivi.rs +++ b/nihav-indeo/src/codecs/ivi.rs @@ -147,6 +147,7 @@ pub enum TxType { pub const CORR_MAP_SIZE: usize = 122; #[derive(Clone)] +#[allow(dead_code)] pub struct BandHeader { pub plane_no: usize, pub band_no: usize, @@ -205,6 +206,7 @@ pub enum MBType { } #[derive(Clone,Copy)] +#[allow(dead_code)] pub struct MB { pub mtype: MBType, pub pos_x: usize, diff --git a/nihav-itu/src/codecs/h264/mod.rs b/nihav-itu/src/codecs/h264/mod.rs index fffe710..cc71f3c 100644 --- a/nihav-itu/src/codecs/h264/mod.rs +++ b/nihav-itu/src/codecs/h264/mod.rs @@ -107,7 +107,6 @@ pub struct CurrentMBInfo { pub sub_mb_type: [SubMBType; 4], pub ipred: [IntraPredMode; 16], pub chroma_ipred: u8, - pub luma_ipred: [u8; 16], pub mv_l0: [MV; 16], pub ref_l0: [PicRef; 4], pub mv_l1: [MV; 16], diff --git a/nihav-mpeg/src/codecs/mpeg4asp/types.rs b/nihav-mpeg/src/codecs/mpeg4asp/types.rs index f765480..ddb9e26 100644 --- a/nihav-mpeg/src/codecs/mpeg4asp/types.rs +++ b/nihav-mpeg/src/codecs/mpeg4asp/types.rs @@ -87,6 +87,7 @@ impl Default for QuantInfo { } } +#[allow(dead_code)] pub struct VideoObjectLayer { pub vol_type: u8, pub version: u8, @@ -149,6 +150,7 @@ impl Macroblock { } } +#[allow(dead_code)] pub struct PicState { pub timestamp: u32, pub mb_type: Vec, diff --git a/nihav-ms/src/codecs/msvideo1enc.rs b/nihav-ms/src/codecs/msvideo1enc.rs index d1074e0..f9d1f6f 100644 --- a/nihav-ms/src/codecs/msvideo1enc.rs +++ b/nihav-ms/src/codecs/msvideo1enc.rs @@ -25,9 +25,6 @@ fn map_quality_15bit(quality: u8) -> (u32, u32) { trait PixelOps { fn unpack(&self) -> UnpackedPixel; - fn dist(&self, val: T) -> u32 { - dist_core(self.unpack(), &val.unpack()) - } } impl PixelOps for u16 {