projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix or silence clippy warnings
[nihav.git]
/
nihav-itu
/
src
/
codecs
/
h264
/
cabac_coder.rs
diff --git
a/nihav-itu/src/codecs/h264/cabac_coder.rs
b/nihav-itu/src/codecs/h264/cabac_coder.rs
index 453ebc9fcb1d140565efcddb3404f861ab3fe6f3..0e148092ff93385c67abde41f53267124e437f7d 100644
(file)
--- a/
nihav-itu/src/codecs/h264/cabac_coder.rs
+++ b/
nihav-itu/src/codecs/h264/cabac_coder.rs
@@
-143,13
+143,13
@@
impl<'a> CABAC<'a> {
val_mps
};
self.states[idx] = if bit == val_mps {
val_mps
};
self.states[idx] = if bit == val_mps {
- TRANS_IDX_MPS[state_idx]
+ TRANS_IDX_MPS[state_idx]
+ (if val_mps { 0x80 } else { 0 })
} else {
if state_idx == 0 {
val_mps = !val_mps;
}
} else {
if state_idx == 0 {
val_mps = !val_mps;
}
- TRANS_IDX_LPS[state_idx]
- }
+ (if val_mps { 0x80 } else { 0 })
;
+ TRANS_IDX_LPS[state_idx]
+ (if val_mps { 0x80 } else { 0 })
+ };
self.renorm();
bit
}
self.renorm();
bit
}
@@
-188,7
+188,7
@@
impl<'a> CABAC<'a> {
}
self.cod_range <<= shift;
self.cod_offset <<= shift;
}
self.cod_range <<= shift;
self.cod_offset <<= shift;
- self.cod_offset |=
u16::from(self.bitbuf >> (16 - shift)
);
+ self.cod_offset |=
self.bitbuf >> (16 - shift
);
self.bitbuf <<= shift;
self.bits -= shift;
}
self.bitbuf <<= shift;
self.bits -= shift;
}