shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I264e75bf,Ifb0f41fb

* changes:
  vp9_loopfilter: remove unnecessary masks
  vp9_reset_lfm: harmonize function signature

--- a/vp9/common/vp9_loopfilter.c

+++ b/vp9/common/vp9_loopfilter.c

@@ -776,7 +776,7 @@

   // 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 @@

               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 @@

   // 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;

@@ -1737,7 +1737,7 @@

   memcpy(lf_data->planes, planes, sizeof(lf_data->planes));

 }

-void vp9_reset_lfm(VP9_COMMON *cm) {

+void vp9_reset_lfm(VP9_COMMON *const cm) {

   if (cm->lf.filter_level) {

     memset(cm->lf.lfm, 0,

            ((cm->mi_rows + (MI_BLOCK_SIZE - 1)) >> 3) * cm->lf.lfm_stride *