projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix clippy warnings
[nihav.git]
/
nihav-duck
/
src
/
codecs
/
truemotion1enc.rs
diff --git
a/nihav-duck/src/codecs/truemotion1enc.rs
b/nihav-duck/src/codecs/truemotion1enc.rs
index 72553b5f5b3f698da38509e5d3ca0c6f914c1832..d582d1e06f2891335bbdf939c40f93884b9ab130 100644
(file)
--- a/
nihav-duck/src/codecs/truemotion1enc.rs
+++ b/
nihav-duck/src/codecs/truemotion1enc.rs
@@
-3,20
+3,15
@@
use nihav_core::codecs::*;
use nihav_core::io::byteio::*;
use super::truemotion1data::*;
use nihav_core::io::byteio::*;
use super::truemotion1data::*;
-#[derive(Clone,Copy,PartialEq)]
+#[derive(Clone,Copy,PartialEq
,Default
)]
enum BlockMode {
FourByFour,
enum BlockMode {
FourByFour,
+ #[default]
TwoByTwo,
FourByTwo,
TwoByFour,
}
TwoByTwo,
FourByTwo,
TwoByFour,
}
-impl Default for BlockMode {
- fn default() -> Self {
- BlockMode::TwoByTwo
- }
-}
-
impl FromStr for BlockMode {
type Err = ();
fn from_str(s: &str) -> Result<BlockMode, Self::Err> {
impl FromStr for BlockMode {
type Err = ();
fn from_str(s: &str) -> Result<BlockMode, Self::Err> {
@@
-41,19
+36,14
@@
impl ToString for BlockMode {
}
}
}
}
-#[derive(Clone,Copy,PartialEq)]
+#[derive(Clone,Copy,PartialEq
,Default
)]
enum OptionMode {
Off,
On,
enum OptionMode {
Off,
On,
+ #[default]
Auto,
}
Auto,
}
-impl Default for OptionMode {
- fn default() -> Self {
- OptionMode::Auto
- }
-}
-
impl FromStr for OptionMode {
type Err = ();
fn from_str(s: &str) -> Result<OptionMode, Self::Err> {
impl FromStr for OptionMode {
type Err = ();
fn from_str(s: &str) -> Result<OptionMode, Self::Err> {
@@
-518,7
+508,7
@@
impl TM1Encoder {
pair[1] = self.prev_frame[x * 2 + 1 + y * self.width];
hpred[0] = pair[0] - vpred[0];
hpred[1] = pair[1] - vpred[1];
pair[1] = self.prev_frame[x * 2 + 1 + y * self.width];
hpred[0] = pair[0] - vpred[0];
hpred[1] = pair[1] - vpred[1];
- vpred.copy_from_slice(
&
pair);
+ vpred.copy_from_slice(pair);
continue;
}
let pval = [vpred[0] + hpred[0], vpred[1] + hpred[1]];
continue;
}
let pval = [vpred[0] + hpred[0], vpred[1] + hpred[1]];