shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Reusing nmv_frame_counts from FRAME_COUNTS in encoder."

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

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

@@ -2074,7 +2074,7 @@

   xd->last_mi = cm->prev_mi;

-  vp9_zero(cpi->NMVcount);

+  vp9_zero(cpi->common.counts.mv);

   vp9_zero(cpi->coef_counts);

   vp9_zero(cm->counts.eob_branch);

--- a/vp9/encoder/vp9_encodemv.c

+++ b/vp9/encoder/vp9_encodemv.c

@@ -166,7 +166,7 @@

 void vp9_write_nmv_probs(VP9_COMP* const cpi, int usehp, vp9_writer *w) {

   int i, j;

   nmv_context *mvc = &cpi->common.fc.nmvc;

-  nmv_context_counts *counts = &cpi->NMVcount;

+  nmv_context_counts *counts = &cpi->common.counts.mv;

   write_mv_update(vp9_mv_joint_tree, mvc->joints, counts->joints, MV_JOINTS, w);

@@ -252,6 +252,7 @@

   MODE_INFO *mi = x->e_mbd.mi_8x8[0];

   MB_MODE_INFO *const mbmi = &mi->mbmi;

   const int is_compound = has_second_ref(mbmi);

+  nmv_context_counts *counts = &cpi->common.counts.mv;

   if (mbmi->sb_type < BLOCK_8X8) {

     const int num_4x4_w = num_4x4_blocks_wide_lookup[mbmi->sb_type];

@@ -262,11 +263,11 @@

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

         const int i = idy * 2 + idx;

         if (mi->bmi[i].as_mode == NEWMV)

-          inc_mvs(mi->bmi[i].as_mv, best_ref_mv, is_compound, &cpi->NMVcount);

+          inc_mvs(mi->bmi[i].as_mv, best_ref_mv, is_compound, counts);

       }

     }

   } else if (mbmi->mode == NEWMV) {

-    inc_mvs(mbmi->mv, best_ref_mv, is_compound, &cpi->NMVcount);

+    inc_mvs(mbmi->mv, best_ref_mv, is_compound, counts);

   }

 }

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -3107,7 +3107,6 @@

     vp9_copy(counts->comp_inter, cpi->comp_inter_count);

     vp9_copy(counts->single_ref, cpi->single_ref_count);

     vp9_copy(counts->comp_ref, cpi->comp_ref_count);

-    counts->mv = cpi->NMVcount;

     if (!cpi->common.error_resilient_mode &&

         !cpi->common.frame_parallel_decoding_mode) {

       vp9_adapt_mode_probs(&cpi->common);

--- a/vp9/encoder/vp9_onyx_int.h

+++ b/vp9/encoder/vp9_onyx_int.h

@@ -468,8 +468,6 @@

   int y_mode_count[4][INTRA_MODES];

   int y_uv_mode_count[INTRA_MODES][INTRA_MODES];

-  nmv_context_counts NMVcount;

-

   vp9_coeff_count coef_counts[TX_SIZES][PLANE_TYPES];

   vp9_coeff_probs_model frame_coef_probs[TX_SIZES][PLANE_TYPES];

   vp9_coeff_stats frame_branch_ct[TX_SIZES][PLANE_TYPES];

-- 

⑨