rav1e/a6e98603cf4ada059fa3b715f0412e3ad83bb7fc.patch

From a6e98603cf4ada059fa3b715f0412e3ad83bb7fc Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Mon, 17 Feb 2020 14:01:33 +0100
Subject: [PATCH] Remove more unnecessary parentheses

---
 src/context.rs     | 40 ++++++++++++++++++++--------------------
 src/entropymode.rs |  4 ++--
 src/lrf.rs         |  2 +-
 src/partition.rs   |  6 +++---
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/context.rs b/src/context.rs
index 6795d8442..ae5e07d27 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -47,16 +47,16 @@ pub const PARTITION_CONTEXTS: usize = PARTITION_CONTEXTS_PRIMARY;
 pub const PARTITION_TYPES: usize = 4;
 
 pub const MI_SIZE_LOG2: usize = 2;
-pub const MI_SIZE: usize = (1 << MI_SIZE_LOG2);
-pub const MAX_MIB_SIZE_LOG2: usize = (MAX_SB_SIZE_LOG2 - MI_SIZE_LOG2);
-pub const MIB_SIZE_LOG2: usize = (SB_SIZE_LOG2 - MI_SIZE_LOG2);
-pub const MIB_SIZE: usize = (1 << MIB_SIZE_LOG2);
-pub const MIB_MASK: usize = (MIB_SIZE - 1);
+pub const MI_SIZE: usize = 1 << MI_SIZE_LOG2;
+pub const MAX_MIB_SIZE_LOG2: usize = MAX_SB_SIZE_LOG2 - MI_SIZE_LOG2;
+pub const MIB_SIZE_LOG2: usize = SB_SIZE_LOG2 - MI_SIZE_LOG2;
+pub const MIB_SIZE: usize = 1 << MIB_SIZE_LOG2;
+pub const MIB_MASK: usize = MIB_SIZE - 1;
 
 const MAX_SB_SIZE_LOG2: usize = 7;
 const SB_SIZE_LOG2: usize = 6;
-pub const SB_SIZE: usize = (1 << SB_SIZE_LOG2);
-const SB_SQUARE: usize = (SB_SIZE * SB_SIZE);
+pub const SB_SIZE: usize = 1 << SB_SIZE_LOG2;
+const SB_SQUARE: usize = SB_SIZE * SB_SIZE;
 
 pub const MAX_TX_SIZE: usize = 64;
 
@@ -87,7 +87,7 @@ pub const TX_SETS_INTRA: usize = 3;
 pub const TX_SETS_INTER: usize = 4;
 
 pub const TXFM_PARTITION_CONTEXTS: usize =
-  ((TxSize::TX_SIZES - TxSize::TX_8X8 as usize) * 6 - 3);
+  (TxSize::TX_SIZES - TxSize::TX_8X8 as usize) * 6 - 3;
 
 const MAX_VARTX_DEPTH: usize = 2;
 
@@ -254,12 +254,12 @@ const TX_PAD_HOR: usize = 4;
 // check.
 const TX_PAD_TOP: usize = 2;
 const TX_PAD_BOTTOM: usize = 4;
-const TX_PAD_VER: usize = (TX_PAD_TOP + TX_PAD_BOTTOM);
+const TX_PAD_VER: usize = TX_PAD_TOP + TX_PAD_BOTTOM;
 // Pad 16 extra bytes to avoid reading overflow in SIMD optimization.
 const TX_PAD_END: usize = 16;
-const TX_PAD_2D: usize = ((MAX_CODED_TX_SIZE + TX_PAD_HOR)
+const TX_PAD_2D: usize = (MAX_CODED_TX_SIZE + TX_PAD_HOR)
   * (MAX_CODED_TX_SIZE + TX_PAD_VER)
-  + TX_PAD_END);
+  + TX_PAD_END;
 
 const TX_CLASSES: usize = 3;
 
@@ -491,8 +491,8 @@ static av1_nz_map_ctx_offset: [[[i8; 5]; 5]; TxSize::TX_SIZES_ALL] = [
 ];
 
 const NZ_MAP_CTX_0: usize = SIG_COEF_CONTEXTS_2D;
-const NZ_MAP_CTX_5: usize = (NZ_MAP_CTX_0 + 5);
-const NZ_MAP_CTX_10: usize = (NZ_MAP_CTX_0 + 10);
+const NZ_MAP_CTX_5: usize = NZ_MAP_CTX_0 + 5;
+const NZ_MAP_CTX_10: usize = NZ_MAP_CTX_0 + 10;
 
 static nz_map_ctx_offset_1d: [usize; 32] = [
   NZ_MAP_CTX_0,
@@ -4330,18 +4330,18 @@ const MV_CLASS_9: usize = 9; /* (512, 1024] integer pel */
 const MV_CLASS_10: usize = 10; /* (1024,2048] integer pel */
 
 const CLASS0_BITS: usize = 1; /* bits at integer precision for class 0 */
-const CLASS0_SIZE: usize = (1 << CLASS0_BITS);
-const MV_OFFSET_BITS: usize = (MV_CLASSES + CLASS0_BITS - 2);
+const CLASS0_SIZE: usize = 1 << CLASS0_BITS;
+const MV_OFFSET_BITS: usize = MV_CLASSES + CLASS0_BITS - 2;
 const MV_BITS_CONTEXTS: usize = 6;
 const MV_FP_SIZE: usize = 4;
 
-const MV_MAX_BITS: usize = (MV_CLASSES + CLASS0_BITS + 2);
-const MV_MAX: usize = ((1 << MV_MAX_BITS) - 1);
-const MV_VALS: usize = ((MV_MAX << 1) + 1);
+const MV_MAX_BITS: usize = MV_CLASSES + CLASS0_BITS + 2;
+const MV_MAX: usize = (1 << MV_MAX_BITS) - 1;
+const MV_VALS: usize = (MV_MAX << 1) + 1;
 
 const MV_IN_USE_BITS: usize = 14;
-const MV_UPP: i32 = (1 << MV_IN_USE_BITS);
-const MV_LOW: i32 = (-(1 << MV_IN_USE_BITS));
+const MV_UPP: i32 = 1 << MV_IN_USE_BITS;
+const MV_LOW: i32 = -(1 << MV_IN_USE_BITS);
 
 #[inline(always)]
 pub fn av1_get_mv_joint(mv: MotionVector) -> MvJointType {
diff --git a/src/entropymode.rs b/src/entropymode.rs
index 8e4eba150..85aefde29 100644
--- a/src/entropymode.rs
+++ b/src/entropymode.rs
@@ -30,8 +30,8 @@ const SEG_TEMPORAL_PRED_CTXS: usize = 3;
 
 // enums.h
 const TX_SIZE_LUMA_MIN: usize = TxSize::TX_4X4 as usize;
-const TX_SIZE_CTX_MIN: usize = (TX_SIZE_LUMA_MIN + 1);
-pub const MAX_TX_CATS: usize = (TxSize::TX_SIZES - TX_SIZE_CTX_MIN);
+const TX_SIZE_CTX_MIN: usize = TX_SIZE_LUMA_MIN + 1;
+pub const MAX_TX_CATS: usize = TxSize::TX_SIZES - TX_SIZE_CTX_MIN;
 pub const MAX_TX_DEPTH: usize = 2;
 pub const TXFM_PARTITION_CONTEXTS: usize = 21; // (TxSize::TX_SIZES - TxSize::TX_8X8) * 6 - 3;
 
diff --git a/src/lrf.rs b/src/lrf.rs
index 18d70f7fa..0831c5232 100644
--- a/src/lrf.rs
+++ b/src/lrf.rs
@@ -99,7 +99,7 @@ pub fn get_sgr_sets(complexity: SGRComplexityLevel) -> &'static [u8] {
   }
 }
 
-pub const SOLVE_IMAGE_MAX: usize = (1 << RESTORATION_TILESIZE_MAX_LOG2);
+pub const SOLVE_IMAGE_MAX: usize = 1 << RESTORATION_TILESIZE_MAX_LOG2;
 pub const SOLVE_IMAGE_STRIDE: usize = SOLVE_IMAGE_MAX + 6 + 2;
 pub const SOLVE_IMAGE_HEIGHT: usize = SOLVE_IMAGE_STRIDE;
 pub const SOLVE_IMAGE_SIZE: usize = SOLVE_IMAGE_STRIDE * SOLVE_IMAGE_HEIGHT;
diff --git a/src/partition.rs b/src/partition.rs
index 8a058e1a4..24632c307 100644
--- a/src/partition.rs
+++ b/src/partition.rs
@@ -444,10 +444,10 @@ pub const INTER_COMPOUND_MODES: usize = 1 + PredictionMode::NEW_NEWMV as usize
 
 pub const REFMV_OFFSET: usize = 4;
 pub const GLOBALMV_OFFSET: usize = 3;
-pub const NEWMV_CTX_MASK: usize = ((1 << GLOBALMV_OFFSET) - 1);
+pub const NEWMV_CTX_MASK: usize = (1 << GLOBALMV_OFFSET) - 1;
 pub const GLOBALMV_CTX_MASK: usize =
-  ((1 << (REFMV_OFFSET - GLOBALMV_OFFSET)) - 1);
-pub const REFMV_CTX_MASK: usize = ((1 << (8 - REFMV_OFFSET)) - 1);
+  (1 << (REFMV_OFFSET - GLOBALMV_OFFSET)) - 1;
+pub const REFMV_CTX_MASK: usize = (1 << (8 - REFMV_OFFSET)) - 1;
 
 pub static RAV1E_PARTITION_TYPES: &[PartitionType] = &[
   PartitionType::PARTITION_NONE,