shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Moves inter mode count updates to update_stats"

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

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

@@ -297,7 +297,6 @@

     if (!vp9_segfeature_active(seg, segment_id, SEG_LVL_SKIP)) {

       if (bsize >= BLOCK_8X8) {

         write_inter_mode(w, mode, inter_probs);

-        ++cpi->td.counts->inter_mode[mode_ctx][INTER_OFFSET(mode)];

       }

     }

@@ -320,7 +319,6 @@

           const int j = idy * 2 + idx;

           const PREDICTION_MODE b_mode = mi->bmi[j].as_mode;

           write_inter_mode(w, b_mode, inter_probs);

-          ++cpi->td.counts->inter_mode[mode_ctx][INTER_OFFSET(b_mode)];

           if (b_mode == NEWMV) {

             for (ref = 0; ref < 1 + is_compound; ++ref)

               vp9_encode_mv(cpi, w, &mi->bmi[j].as_mv[ref].as_mv,

@@ -1171,8 +1169,6 @@

     for (i = 0; i < INTER_MODE_CONTEXTS; ++i)

       prob_diff_update(vp9_inter_mode_tree, cm->fc->inter_mode_probs[i],

                        counts->inter_mode[i], INTER_MODES, &header_bc);

-

-    vp9_zero(counts->inter_mode);

     if (cm->interp_filter == SWITCHABLE)

       update_switchable_interp_probs(cm, &header_bc, counts);

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

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

@@ -1007,22 +1007,20 @@

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

   const MODE_INFO *const mi = xd->mi[0].src_mi;

   const MB_MODE_INFO *const mbmi = &mi->mbmi;

+  const BLOCK_SIZE bsize = mbmi->sb_type;

   if (!frame_is_intra_only(cm)) {

+    FRAME_COUNTS *const counts = td->counts;

+    const int inter_block = is_inter_block(mbmi);

     const int seg_ref_active = vp9_segfeature_active(&cm->seg, mbmi->segment_id,

                                                      SEG_LVL_REF_FRAME);

     if (!seg_ref_active) {

-      FRAME_COUNTS *const counts = td->counts;

-      const int inter_block = is_inter_block(mbmi);

-

       counts->intra_inter[vp9_get_intra_inter_context(xd)][inter_block]++;

-

       // If the segment reference feature is enabled we have only a single

       // reference frame allowed for the segment so exclude it from

       // the reference frame counts used to work out probabilities.

       if (inter_block) {

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

-

         if (cm->reference_mode == REFERENCE_MODE_SELECT)

           counts->comp_inter[vp9_get_reference_mode_context(cm, xd)]

                             [has_second_ref(mbmi)]++;

@@ -1036,6 +1034,25 @@

           if (ref0 != LAST_FRAME)

             counts->single_ref[vp9_get_pred_context_single_ref_p2(xd)][1]

                               [ref0 != GOLDEN_FRAME]++;

+        }

+      }

+    }

+    if (inter_block &&

+        !vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) {

+      const int mode_ctx = mbmi->mode_context[mbmi->ref_frame[0]];

+      if (bsize >= BLOCK_8X8) {

+        const PREDICTION_MODE mode = mbmi->mode;

+        ++counts->inter_mode[mode_ctx][INTER_OFFSET(mode)];

+      } else {

+        const int num_4x4_w = num_4x4_blocks_wide_lookup[bsize];

+        const int num_4x4_h = num_4x4_blocks_high_lookup[bsize];

+        int idx, idy;

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

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

+            const int j = idy * 2 + idx;

+            const PREDICTION_MODE b_mode = mi->bmi[j].as_mode;

+            ++counts->inter_mode[mode_ctx][INTER_OFFSET(b_mode)];

+          }

         }

       }

     }