Commit 707474f5 authored by Vladimir Kazakov's avatar Vladimir Kazakov Committed by Josh Holmer
parent 5cdd2b2b
...@@ -42,4 +42,4 @@ jobs: ...@@ -42,4 +42,4 @@ jobs:
- cargo doc --verbose - cargo doc --verbose
- rustup component add clippy - rustup component add clippy
- cargo clippy --version - cargo clippy --version
- cargo clippy -- -D warnings -A clippy::complexity -A clippy::correctness -A clippy::perf -A clippy::get_unwrap -A clippy::len_zero -A clippy::let_and_return -A clippy::needless_range_loop -A clippy::needless_return -A clippy::neg_multiply -A clippy::new_without_default -A clippy::new_without_default_derive -A clippy::ptr_arg -A clippy::single_match -A clippy::unreadable_literal -A clippy::useless_let_if_seq -A clippy::verbose_bit_mask --verbose - cargo clippy -- -D warnings -A clippy::complexity -A clippy::correctness -A clippy::perf -A clippy::get_unwrap -A clippy::len_zero -A clippy::needless_range_loop -A clippy::neg_multiply -A clippy::new_without_default -A clippy::new_without_default_derive -A clippy::ptr_arg -A clippy::single_match -A clippy::unreadable_literal -A clippy::useless_let_if_seq -A clippy::verbose_bit_mask --verbose
...@@ -231,7 +231,8 @@ pub fn cdef_analyze_superblock(in_frame: &mut Frame, ...@@ -231,7 +231,8 @@ pub fn cdef_analyze_superblock(in_frame: &mut Frame,
pub fn cdef_sb_frame(fi: &FrameInvariants, f: &Frame) -> Frame { pub fn cdef_sb_frame(fi: &FrameInvariants, f: &Frame) -> Frame {
let sb_size = if fi.sequence.use_128x128_superblock {128} else {64}; let sb_size = if fi.sequence.use_128x128_superblock {128} else {64};
let out = Frame {
Frame {
planes: [ planes: [
Plane::new(sb_size >> f.planes[0].cfg.xdec, sb_size >> f.planes[0].cfg.ydec, Plane::new(sb_size >> f.planes[0].cfg.xdec, sb_size >> f.planes[0].cfg.ydec,
f.planes[0].cfg.xdec, f.planes[0].cfg.ydec, 0, 0), f.planes[0].cfg.xdec, f.planes[0].cfg.ydec, 0, 0),
...@@ -240,8 +241,7 @@ pub fn cdef_sb_frame(fi: &FrameInvariants, f: &Frame) -> Frame { ...@@ -240,8 +241,7 @@ pub fn cdef_sb_frame(fi: &FrameInvariants, f: &Frame) -> Frame {
Plane::new(sb_size >> f.planes[2].cfg.xdec, sb_size >> f.planes[2].cfg.ydec, Plane::new(sb_size >> f.planes[2].cfg.xdec, sb_size >> f.planes[2].cfg.ydec,
f.planes[2].cfg.xdec, f.planes[2].cfg.ydec, 0, 0), f.planes[2].cfg.xdec, f.planes[2].cfg.ydec, 0, 0),
] ]
}; }
out
} }
pub fn cdef_sb_padded_frame_copy(fi: &FrameInvariants, sbo: &SuperBlockOffset, pub fn cdef_sb_padded_frame_copy(fi: &FrameInvariants, sbo: &SuperBlockOffset,
......
...@@ -1812,6 +1812,7 @@ pub struct ContextWriter { ...@@ -1812,6 +1812,7 @@ pub struct ContextWriter {
} }
impl ContextWriter { impl ContextWriter {
#[allow(clippy::let_and_return)]
pub fn new(fc: CDFContext, bc: BlockContext) -> Self { pub fn new(fc: CDFContext, bc: BlockContext) -> Self {
#[allow(unused_mut)] #[allow(unused_mut)]
let mut cw = ContextWriter { let mut cw = ContextWriter {
......
...@@ -87,7 +87,7 @@ mod nasm { ...@@ -87,7 +87,7 @@ mod nasm {
sum += func(org_ptr, org_stride, ref_ptr, ref_stride); sum += func(org_ptr, org_stride, ref_ptr, ref_stride);
} }
} }
return sum; sum
} }
#[inline(always)] #[inline(always)]
......
...@@ -1703,15 +1703,15 @@ impl Txfm2DFlipCfg { ...@@ -1703,15 +1703,15 @@ impl Txfm2DFlipCfg {
assert_ne!(txfm_type_col, TxfmType::Invalid); assert_ne!(txfm_type_col, TxfmType::Invalid);
assert_ne!(txfm_type_row, TxfmType::Invalid); assert_ne!(txfm_type_row, TxfmType::Invalid);
let (ud_flip, lr_flip) = Self::get_flip_cfg(tx_type); let (ud_flip, lr_flip) = Self::get_flip_cfg(tx_type);
let cfg = Txfm2DFlipCfg {
Txfm2DFlipCfg {
tx_size, tx_size,
ud_flip, ud_flip,
lr_flip, lr_flip,
shift: FWD_TXFM_SHIFT_LS[tx_size as usize][(bd - 8) / 2], shift: FWD_TXFM_SHIFT_LS[tx_size as usize][(bd - 8) / 2],
txfm_type_col, txfm_type_col,
txfm_type_row txfm_type_row
}; }
cfg
} }
/// Determine the flip config, returning (ud_flip, lr_flip) /// Determine the flip config, returning (ud_flip, lr_flip)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment