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-itu
/
src
/
codecs
/
h264
/
types.rs
diff --git
a/nihav-itu/src/codecs/h264/types.rs
b/nihav-itu/src/codecs/h264/types.rs
index 9df866e829348526c92e92f7f1d6d91903560354..6fe5aea9f00f40f4612e38dece654d24ccb4a029 100644
(file)
--- a/
nihav-itu/src/codecs/h264/types.rs
+++ b/
nihav-itu/src/codecs/h264/types.rs
@@
-12,8
+12,9
@@
pub enum BMode {
Bi,
}
Bi,
}
-#[derive(Clone,Copy,Debug,PartialEq)]
+#[derive(Clone,Copy,Debug,PartialEq
,Default
)]
pub enum MBType {
pub enum MBType {
+ #[default]
Intra4x4,
Intra8x8,
Intra16x16(u8, u8, u8),
Intra4x4,
Intra8x8,
Intra16x16(u8, u8, u8),
@@
-106,16
+107,13
@@
impl MBType {
}
}
}
}
-impl Default for MBType {
- fn default() -> Self { MBType::Intra4x4 }
-}
-
-#[derive(Clone,Copy,Debug,PartialEq)]
+#[derive(Clone,Copy,Debug,PartialEq,Default)]
pub enum SubMBType {
P8x8,
P8x4,
P4x8,
P4x4,
pub enum SubMBType {
P8x8,
P8x4,
P4x8,
P4x4,
+ #[default]
Direct8x8,
B8x8(BMode),
B8x4(BMode),
Direct8x8,
B8x8(BMode),
B8x4(BMode),
@@
-159,12
+157,8
@@
impl SubMBType {
}
}
}
}
-impl Default for SubMBType {
- fn default() -> Self { SubMBType::Direct8x8 }
-}
-
#[repr(u8)]
#[repr(u8)]
-#[derive(Clone,Copy,Debug,PartialEq)]
+#[derive(Clone,Copy,Debug,PartialEq
,Default
)]
pub enum CompactMBType {
Intra4x4,
Intra8x8,
pub enum CompactMBType {
Intra4x4,
Intra8x8,
@@
-185,6
+179,7
@@
pub enum CompactMBType {
B8x8,
BSkip,
B8x8,
BSkip,
+ #[default]
None,
}
None,
}
@@
-215,10
+210,6
@@
impl CompactMBType {
}
}
}
}
-impl Default for CompactMBType {
- fn default() -> Self { CompactMBType::None }
-}
-
impl From<MBType> for CompactMBType {
fn from(mbtype: MBType) -> Self {
match mbtype {
impl From<MBType> for CompactMBType {
fn from(mbtype: MBType) -> Self {
match mbtype {
@@
-243,7
+234,7
@@
impl From<MBType> for CompactMBType {
}
#[repr(u8)]
}
#[repr(u8)]
-#[derive(Clone,Copy,Debug,PartialEq)]
+#[derive(Clone,Copy,Debug,PartialEq
,Default
)]
pub enum IntraPredMode {
Vertical,
Horizontal,
pub enum IntraPredMode {
Vertical,
Horizontal,
@@
-254,6
+245,7
@@
pub enum IntraPredMode {
HorDown,
VerLeft,
HorUp,
HorDown,
VerLeft,
HorUp,
+ #[default]
None,
}
None,
}
@@
-268,10
+260,6
@@
impl IntraPredMode {
}
}
}
}
-impl Default for IntraPredMode {
- fn default() -> Self { IntraPredMode::None }
-}
-
impl From<u8> for IntraPredMode {
fn from(val: u8) -> Self {
match val {
impl From<u8> for IntraPredMode {
fn from(val: u8) -> Self {
match val {