shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Adding best_mv[2] array instead of two variables."

--- a/vp9/common/vp9_blockd.h

+++ b/vp9/common/vp9_blockd.h

@@ -137,7 +137,7 @@

   TX_SIZE tx_size;

   int_mv mv[2];                // for each reference frame used

   int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REF_CANDIDATES];

-  int_mv best_mv, best_second_mv;

+  int_mv best_mv[2];

   uint8_t mode_context[MAX_REF_FRAMES];

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

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

@@ -484,17 +484,13 @@

     }

     if (bsize < BLOCK_8X8) {

-      int j;

-      MB_PREDICTION_MODE blockmode;

-      int_mv blockmv;

       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) {

-          j = idy * 2 + idx;

-          blockmode = x->partition_info->bmi[j].mode;

-          blockmv = m->bmi[j].as_mv[0];

+          const int j = idy * 2 + idx;

+          const MB_PREDICTION_MODE blockmode = x->partition_info->bmi[j].mode;

           write_sb_mv_ref(bc, blockmode, mv_ref_p);

           ++cm->counts.inter_mode[mi->mode_context[rf]]

                                  [inter_mode_offset(blockmode)];

@@ -503,14 +499,12 @@

 #ifdef ENTROPY_STATS

             active_section = 11;

 #endif

-            vp9_encode_mv(cpi, bc, &blockmv.as_mv, &mi->best_mv.as_mv,

-                          nmvc, allow_hp);

+            vp9_encode_mv(cpi, bc, &m->bmi[j].as_mv[0].as_mv,

+                          &mi->best_mv[0].as_mv, nmvc, allow_hp);

-            if (mi->ref_frame[1] > INTRA_FRAME)

-              vp9_encode_mv(cpi, bc,

-                            &m->bmi[j].as_mv[1].as_mv,

-                            &mi->best_second_mv.as_mv,

-                            nmvc, allow_hp);

+            if (has_second_ref(mi))

+              vp9_encode_mv(cpi, bc, &m->bmi[j].as_mv[1].as_mv,

+                            &mi->best_mv[1].as_mv, nmvc, allow_hp);

           }

         }

       }

@@ -518,12 +512,12 @@

 #ifdef ENTROPY_STATS

       active_section = 5;

 #endif

-      vp9_encode_mv(cpi, bc, &mi->mv[0].as_mv, &mi->best_mv.as_mv,

-                    nmvc, allow_hp);

+      vp9_encode_mv(cpi, bc, &mi->mv[0].as_mv,

+                    &mi->best_mv[0].as_mv, nmvc, allow_hp);

-      if (mi->ref_frame[1] > INTRA_FRAME)

-        vp9_encode_mv(cpi, bc, &mi->mv[1].as_mv, &mi->best_second_mv.as_mv,

-                      nmvc, allow_hp);

+      if (has_second_ref(mi))

+        vp9_encode_mv(cpi, bc, &mi->mv[1].as_mv,

+                      &mi->best_mv[1].as_mv, nmvc, allow_hp);

     }

   }

 }

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

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

@@ -441,8 +441,8 @@

         if (rf2 > 0)

           best_second_mv.as_int = mbmi->ref_mvs[rf2][0].as_int;

       }

-      mbmi->best_mv.as_int = best_mv.as_int;

-      mbmi->best_second_mv.as_int = best_second_mv.as_int;

+      mbmi->best_mv[0].as_int = best_mv.as_int;

+      mbmi->best_mv[1].as_int = best_second_mv.as_int;

       vp9_update_nmv_count(cpi, x, &best_mv, &best_second_mv);

     }