shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Merging best_ref_mv and second_best_ref_mv into best_ref_mv[2]."

--- a/vp9/encoder/vp9_block.h

+++ b/vp9/encoder/vp9_block.h

@@ -41,8 +41,7 @@

   int is_coded;

   int num_4x4_blk;

   int skip;

-  int_mv best_ref_mv;

-  int_mv second_best_ref_mv;

+  int_mv best_ref_mv[2];

   int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REF_CANDIDATES];

   int rate;

   int distortion;

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

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

@@ -513,8 +513,8 @@

       int_mv best_mv[2];

       const MV_REFERENCE_FRAME rf1 = mbmi->ref_frame[0];

       const MV_REFERENCE_FRAME rf2 = mbmi->ref_frame[1];

-      best_mv[0].as_int = ctx->best_ref_mv.as_int;

-      best_mv[1].as_int = ctx->second_best_ref_mv.as_int;

+      best_mv[0].as_int = ctx->best_ref_mv[0].as_int;

+      best_mv[1].as_int = ctx->best_ref_mv[1].as_int;

       if (mbmi->mode == NEWMV) {

         best_mv[0].as_int = mbmi->ref_mvs[rf1][0].as_int;

         if (rf2 > 0)

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

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

@@ -2217,8 +2217,8 @@

   ctx->best_mode_index = mode_index;

   ctx->mic = *xd->mi_8x8[0];

-  ctx->best_ref_mv.as_int = ref_mv->as_int;

-  ctx->second_best_ref_mv.as_int = second_ref_mv->as_int;

+  ctx->best_ref_mv[0].as_int = ref_mv->as_int;

+  ctx->best_ref_mv[1].as_int = second_ref_mv->as_int;

   ctx->single_pred_diff = (int)comp_pred_diff[SINGLE_REFERENCE];

   ctx->comp_pred_diff   = (int)comp_pred_diff[COMPOUND_REFERENCE];