shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "cleanups after bw bh code"

--- a/vp9/common/vp9_common_data.c

+++ b/vp9/common/vp9_common_data.c

@@ -48,25 +48,25 @@

     PARTITION_INVALID, PARTITION_INVALID, PARTITION_INVALID,

     PARTITION_INVALID

   }, {  // 8X8

-  // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64

+    // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64

     PARTITION_SPLIT, PARTITION_VERT, PARTITION_HORZ, PARTITION_NONE,

     PARTITION_INVALID, PARTITION_INVALID, PARTITION_INVALID,

     PARTITION_INVALID, PARTITION_INVALID, PARTITION_INVALID,

     PARTITION_INVALID, PARTITION_INVALID, PARTITION_INVALID

   }, {  // 16X16

-  // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64

+    // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64

     PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_SPLIT,

     PARTITION_VERT, PARTITION_HORZ, PARTITION_NONE, PARTITION_INVALID,

     PARTITION_INVALID, PARTITION_INVALID, PARTITION_INVALID,

     PARTITION_INVALID, PARTITION_INVALID

   }, {  // 32X32

-  // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64

+    // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64

     PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_SPLIT,

     PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_VERT,

     PARTITION_HORZ, PARTITION_NONE, PARTITION_INVALID,

     PARTITION_INVALID, PARTITION_INVALID

   }, {  // 64X64

-  // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64

+    // 4X4, 4X8,8X4,8X8,8X16,16X8,16X16,16X32,32X16,32X32,32X64,64X32,64X64

     PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_SPLIT,

     PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_SPLIT,

     PARTITION_SPLIT, PARTITION_SPLIT, PARTITION_VERT, PARTITION_HORZ,

--- a/vp9/common/vp9_common_data.h

+++ b/vp9/common/vp9_common_data.h

@@ -23,10 +23,7 @@

 extern const int num_4x4_blocks_wide_lookup[BLOCK_SIZE_TYPES];

 extern const int size_group_lookup[BLOCK_SIZE_TYPES];

 extern const int num_pels_log2_lookup[BLOCK_SIZE_TYPES];

-

 extern const PARTITION_TYPE partition_lookup[][BLOCK_SIZE_TYPES];

-

-

 extern const BLOCK_SIZE_TYPE subsize_lookup[PARTITION_TYPES][BLOCK_SIZE_TYPES];

 extern const TX_SIZE max_txsize_lookup[BLOCK_SIZE_TYPES];

 extern const TX_SIZE max_uv_txsize_lookup[BLOCK_SIZE_TYPES];

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -449,13 +449,14 @@

       write_intra_mode(bc, mode, pc->fc.y_mode_prob[size_group_lookup[bsize]]);

     } else {

       int idx, idy;

-      int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

-      int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

-      for (idy = 0; idy < 2; idy += num_4x4_blocks_high)

+      const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

+      const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

+      for (idy = 0; idy < 2; idy += num_4x4_blocks_high) {

         for (idx = 0; idx < 2; idx += num_4x4_blocks_wide) {

           const MB_PREDICTION_MODE bm = m->bmi[idy * 2 + idx].as_mode;

           write_intra_mode(bc, bm, pc->fc.y_mode_prob[0]);

         }

+      }

     }

     write_intra_mode(bc, mi->uv_mode, pc->fc.uv_mode_prob[mode]);

   } else {

@@ -489,8 +490,8 @@

       int j;

       MB_PREDICTION_MODE blockmode;

       int_mv blockmv;

-      int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

-      int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

+      const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

+      const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

       int idx, idy;

       for (idy = 0; idy < 2; idy += num_4x4_blocks_high) {

         for (idx = 0; idx < 2; idx += num_4x4_blocks_wide) {

@@ -553,11 +554,11 @@

     write_intra_mode(bc, ym, vp9_kf_y_mode_prob[A][L]);

   } else {

     int idx, idy;

-    int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[m->mbmi.sb_type];

-    int num_4x4_blocks_high = num_4x4_blocks_high_lookup[m->mbmi.sb_type];

+    const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[m->mbmi.sb_type];

+    const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[m->mbmi.sb_type];

     for (idy = 0; idy < 2; idy += num_4x4_blocks_high) {

       for (idx = 0; idx < 2; idx += num_4x4_blocks_wide) {

-        int i = idy * 2 + idx;

+        const int i = idy * 2 + idx;

         const MB_PREDICTION_MODE A = above_block_mode(m, i, mis);

         const MB_PREDICTION_MODE L = (xd->left_available || idx) ?

                                      left_block_mode(m, i) : DC_PRED;

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -340,8 +340,8 @@

   int mb_mode_index = ctx->best_mode_index;

   const int mis = cpi->common.mode_info_stride;

-  const int mi_height = num_8x8_blocks_high_lookup[bsize];

   const int mi_width = num_8x8_blocks_wide_lookup[bsize];

+  const int mi_height = num_8x8_blocks_high_lookup[bsize];

   assert(mi->mbmi.mode < MB_MODE_COUNT);

   assert(mb_mode_index < MAX_MODES);

@@ -697,12 +697,12 @@

                             ENTROPY_CONTEXT l[16 * MAX_MB_PLANE],

                             PARTITION_CONTEXT sa[8], PARTITION_CONTEXT sl[8],

                             BLOCK_SIZE_TYPE bsize) {

-  VP9_COMMON * const cm = &cpi->common;

-  MACROBLOCK * const x = &cpi->mb;

-  MACROBLOCKD * const xd = &x->e_mbd;

+  VP9_COMMON *const cm = &cpi->common;

+  MACROBLOCK *const x = &cpi->mb;

+  MACROBLOCKD *const xd = &x->e_mbd;

   int p;

-  int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

-  int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

+  const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

+  const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

   int mi_width = num_8x8_blocks_wide_lookup[bsize];

   int mi_height = num_8x8_blocks_high_lookup[bsize];

   for (p = 0; p < MAX_MB_PLANE; p++) {

@@ -728,12 +728,12 @@

                          ENTROPY_CONTEXT l[16 * MAX_MB_PLANE],

                          PARTITION_CONTEXT sa[8], PARTITION_CONTEXT sl[8],

                          BLOCK_SIZE_TYPE bsize) {

-  VP9_COMMON * const cm = &cpi->common;

-  MACROBLOCK * const x = &cpi->mb;

-  MACROBLOCKD * const xd = &x->e_mbd;

+  const VP9_COMMON *const cm = &cpi->common;

+  const MACROBLOCK *const x = &cpi->mb;

+  const MACROBLOCKD *const xd = &x->e_mbd;

   int p;

-  int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

-  int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

+  const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

+  const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

   int mi_width = num_8x8_blocks_wide_lookup[bsize];

   int mi_height = num_8x8_blocks_high_lookup[bsize];

@@ -1199,8 +1199,8 @@

   MACROBLOCKD *xd = &cpi->mb.e_mbd;

   const int mis = cm->mode_info_stride;

   int bsl = b_width_log2(bsize);

-  int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

-  int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

+  const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

+  const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

   int ms = num_4x4_blocks_wide / 2;

   int mh = num_4x4_blocks_high / 2;

   int bss = (1 << bsl) / 4;

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -1199,8 +1199,8 @@

   ENTROPY_CONTEXT ta[2], tempa[2];

   ENTROPY_CONTEXT tl[2], templ[2];

   TX_TYPE tx_type = DCT_DCT;

-  int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

-  int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

+  const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

+  const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

   int idx, idy, block;

   uint8_t best_dst[8 * 8];

@@ -1313,8 +1313,8 @@

   int i, j;

   MACROBLOCKD *const xd = &mb->e_mbd;

   BLOCK_SIZE_TYPE bsize = xd->mode_info_context->mbmi.sb_type;

-  int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

-  int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

+  const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

+  const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

   int idx, idy;

   int cost = 0;

   int64_t total_distortion = 0;

@@ -1598,8 +1598,8 @@

   MB_MODE_INFO * mbmi = &mic->mbmi;

   int cost = 0, thismvcost = 0;

   int idx, idy;

-  int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[mbmi->sb_type];

-  int num_4x4_blocks_high = num_4x4_blocks_high_lookup[mbmi->sb_type];

+  const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[mbmi->sb_type];

+  const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[mbmi->sb_type];

   /* We have to be careful retrieving previously-encoded motion vectors.

    Ones from this macroblock have to be pulled from the BLOCKD array

@@ -1818,8 +1818,8 @@

   int label_mv_thresh;

   int segmentyrate = 0;

   BLOCK_SIZE_TYPE bsize = mbmi->sb_type;

-  int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

-  int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

+  const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[bsize];

+  const int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize];

   vp9_variance_fn_ptr_t *v_fn_ptr;

   ENTROPY_CONTEXT t_above[2], t_left[2];

   BEST_SEG_INFO *bsi = bsi_buf + filter_idx;

-- 

⑨