summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2015-09-29 20:55:14 -0700
committerJames Zern <jzern@google.com>2015-09-30 12:12:53 -0700
commita18cc591a5944464e1c53b2e3d0ea6bdd7fdbca5 (patch)
tree8cd33ddc76cd82caa88a5000f1a8be40ad328f4a /vp9
parenta1914dbb3169f1a5ecf0981ac197abb7f76f55e8 (diff)
downloadlibvpx-a18cc591a5944464e1c53b2e3d0ea6bdd7fdbca5.tar
libvpx-a18cc591a5944464e1c53b2e3d0ea6bdd7fdbca5.tar.gz
libvpx-a18cc591a5944464e1c53b2e3d0ea6bdd7fdbca5.tar.bz2
libvpx-a18cc591a5944464e1c53b2e3d0ea6bdd7fdbca5.zip
vp9_loopfilter: remove unnecessary masks
Change-Id: I264e75bf3ddd083ee5311c50a37fb18fe634ddc3
Diffstat (limited to 'vp9')
-rw-r--r--vp9/common/vp9_loopfilter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c
index d0c26fb01..2e057d6ec 100644
--- a/vp9/common/vp9_loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -776,7 +776,7 @@ static void build_masks(const loop_filter_info_n *const lfi_n,
// an 8x8 in that the internal ones can be skipped and don't depend on
// the prediction block size.
if (tx_size_y == TX_4X4)
- *int_4x4_y |= (size_mask[block_size] & 0xffffffffffffffffULL) << shift_y;
+ *int_4x4_y |= size_mask[block_size] << shift_y;
if (tx_size_uv == TX_4X4)
*int_4x4_uv |= (size_mask_uv[block_size] & 0xffff) << shift_uv;
@@ -822,7 +822,7 @@ static void build_y_mask(const loop_filter_info_n *const lfi_n,
left_64x64_txform_mask[tx_size_y]) << shift_y;
if (tx_size_y == TX_4X4)
- *int_4x4_y |= (size_mask[block_size] & 0xffffffffffffffffULL) << shift_y;
+ *int_4x4_y |= size_mask[block_size] << shift_y;
}
void vp9_adjust_mask(VP9_COMMON *const cm, const int mi_row,
@@ -1720,7 +1720,7 @@ void vp9_build_mask(VP9_COMMON *cm, const MB_MODE_INFO *mbmi, int mi_row,
// differ from the 4x4 boundaries on the outside edge of an 8x8 in that the
// internal ones can be skipped and don't depend on the prediction block size.
if (tx_size_y == TX_4X4)
- *int_4x4_y |= (size_mask[block_size] & -1ULL) << shift_y;
+ *int_4x4_y |= size_mask[block_size] << shift_y;
if (build_uv && tx_size_uv == TX_4X4)
*int_4x4_uv |= (size_mask_uv[block_size] & 0xffff) << shift_uv;