diff options
author | Kostya Shishkov <kostya.shiskov@gmail.com> | 2020-09-27 13:24:03 +0200 |
---|---|---|
committer | Kostya Shishkov <kostya.shiskov@gmail.com> | 2020-09-27 13:24:03 +0200 |
commit | ac818eac7671fa8ddfea5aa4fb86fc0b5ab82d2e (patch) | |
tree | 5ac952c45b747fbe5df9c71b08237a409d9f1d7a /nihav-duck/src | |
parent | 73f0f89ff3a3616a8e65b5a31c2303725994c56a (diff) | |
download | nihav-ac818eac7671fa8ddfea5aa4fb86fc0b5ab82d2e.tar.gz |
fix some warnings (unneeded parentheses, missing dyn keyword)
Diffstat (limited to 'nihav-duck/src')
-rw-r--r-- | nihav-duck/src/codecs/vp3.rs | 4 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp5.rs | 2 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp6.rs | 4 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp7.rs | 2 | ||||
-rw-r--r-- | nihav-duck/src/codecs/vp7dsp.rs | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs index 9d6ef6a..9d56936 100644 --- a/nihav-duck/src/codecs/vp3.rs +++ b/nihav-duck/src/codecs/vp3.rs @@ -1872,11 +1872,11 @@ impl NAOptionHandler for VP34Decoder { fn query_option_value(&self, _name: &str) -> Option<NAValue> { None } } -pub fn get_decoder_vp3() -> Box<NADecoder + Send> { +pub fn get_decoder_vp3() -> Box<dyn NADecoder + Send> { Box::new(VP34Decoder::new(3)) } -pub fn get_decoder_vp4() -> Box<NADecoder + Send> { +pub fn get_decoder_vp4() -> Box<dyn NADecoder + Send> { Box::new(VP34Decoder::new(4)) } diff --git a/nihav-duck/src/codecs/vp5.rs b/nihav-duck/src/codecs/vp5.rs index 70c26c6..48fda2d 100644 --- a/nihav-duck/src/codecs/vp5.rs +++ b/nihav-duck/src/codecs/vp5.rs @@ -284,7 +284,7 @@ impl NAOptionHandler for VP5Decoder { fn query_option_value(&self, _name: &str) -> Option<NAValue> { None } } -pub fn get_decoder() -> Box<NADecoder + Send> { +pub fn get_decoder() -> Box<dyn NADecoder + Send> { Box::new(VP5Decoder::new()) } diff --git a/nihav-duck/src/codecs/vp6.rs b/nihav-duck/src/codecs/vp6.rs index 93722d3..3dda67b 100644 --- a/nihav-duck/src/codecs/vp6.rs +++ b/nihav-duck/src/codecs/vp6.rs @@ -720,11 +720,11 @@ impl NAOptionHandler for VP6Decoder { fn query_option_value(&self, _name: &str) -> Option<NAValue> { None } } -pub fn get_decoder_vp6() -> Box<NADecoder + Send> { +pub fn get_decoder_vp6() -> Box<dyn NADecoder + Send> { Box::new(VP6Decoder::new(false)) } -pub fn get_decoder_vp6_alpha() -> Box<NADecoder + Send> { +pub fn get_decoder_vp6_alpha() -> Box<dyn NADecoder + Send> { Box::new(VP6Decoder::new(true)) } diff --git a/nihav-duck/src/codecs/vp7.rs b/nihav-duck/src/codecs/vp7.rs index 2632b40..9243f93 100644 --- a/nihav-duck/src/codecs/vp7.rs +++ b/nihav-duck/src/codecs/vp7.rs @@ -1430,7 +1430,7 @@ impl NAOptionHandler for VP7Decoder { fn query_option_value(&self, _name: &str) -> Option<NAValue> { None } } -pub fn get_decoder() -> Box<NADecoder + Send> { +pub fn get_decoder() -> Box<dyn NADecoder + Send> { Box::new(VP7Decoder::new()) } diff --git a/nihav-duck/src/codecs/vp7dsp.rs b/nihav-duck/src/codecs/vp7dsp.rs index 27d6fb4..57acc33 100644 --- a/nihav-duck/src/codecs/vp7dsp.rs +++ b/nihav-duck/src/codecs/vp7dsp.rs @@ -575,8 +575,8 @@ fn mc_block(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize, ypos: usiz return; } let (w, h) = reffrm.get_dimensions(plane); - let wa = if plane == 0 { ((w + 15) & !15) } else { ((w + 7) & !7) } as isize; - let ha = if plane == 0 { ((h + 15) & !15) } else { ((h + 7) & !7) } as isize; + let wa = if plane == 0 { (w + 15) & !15 } else { (w + 7) & !7 } as isize; + let ha = if plane == 0 { (h + 15) & !15 } else { (h + 7) & !7 } as isize; let bsize = (size as isize) + (EDGE_PRE as isize) + (EDGE_POST as isize); let ref_x = (xpos as isize) + ((mvx >> 3) as isize) - (EDGE_PRE as isize); let ref_y = (ypos as isize) + ((mvy >> 3) as isize) - (EDGE_PRE as isize); @@ -621,8 +621,8 @@ pub fn mc_block_special(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize }; let (w, h) = reffrm.get_dimensions(plane); - let wa = if plane == 0 { ((w + 15) & !15) } else { ((w + 7) & !7) } as isize; - let ha = if plane == 0 { ((h + 15) & !15) } else { ((h + 7) & !7) } as isize; + let wa = if plane == 0 { (w + 15) & !15 } else { (w + 7) & !7 } as isize; + let ha = if plane == 0 { (h + 15) & !15 } else { (h + 7) & !7 } as isize; let mut start_x = (xpos as isize) + ((mvx >> 3) as isize) - (EDGE_PRE as isize); let mut end_x = (xpos as isize) + ((mvx >> 3) as isize) + ((size + EDGE_POST) as isize); if xstep < 0 { |