Deprecate the newbintramode experiment.

Clean out code relating to newbintramode.

Change-Id: Ie91f4f156cdf60ce0da8ca407c1c9cb00c7d0705

4 files changed, 2 insertions, 77 deletions

diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c
index 6eaa4d542..2c7483d5a 100644
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -37,11 +37,6 @@ extern int dec_debug;
 
 static B_PREDICTION_MODE read_bmode(vp9_reader *r, const vp9_prob *p) {
   B_PREDICTION_MODE m = treed_read(r, vp9_bmode_tree, p);
-#if CONFIG_NEWBINTRAMODES
-  if (m == B_CONTEXT_PRED - CONTEXT_PRED_REPLACEMENTS)
-    m = B_CONTEXT_PRED;
-  assert(m < B_CONTEXT_PRED - CONTEXT_PRED_REPLACEMENTS || m == B_CONTEXT_PRED);
-#endif
   return m;
 }
 
@@ -879,9 +874,6 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
       do {
         int m = read_bmode(r, cm->fc.bmode_prob);
         mi->bmi[j].as_mode.first = m;
-#if CONFIG_NEWBINTRAMODES
-        if (m == B_CONTEXT_PRED) m -= CONTEXT_PRED_REPLACEMENTS;
-#endif
         cm->fc.bmode_counts[m]++;
       } while (++j < 4);
     }
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c
index 15ff16ce9..dc1db514e 100644
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -254,21 +254,13 @@ static void decode_atom_intra(VP9D_COMP *pbi, MACROBLOCKD *xd,
     dst = raster_block_offset_uint8(xd, bsize, 0, i,
                                     xd->plane[0].dst.buf,
                                     xd->plane[0].dst.stride);
-#if CONFIG_NEWBINTRAMODES
-    xd->mode_info_context->bmi[i].as_mode.context =
-        vp9_find_bpred_context(xd, i, dst, xd->plane[0].dst.stride);
-    if (!xd->mode_info_context->mbmi.mb_skip_coeff)
-      vp9_decode_coefs_4x4(pbi, xd, r, PLANE_TYPE_Y_WITH_DC, i);
-#endif
+
     vp9_intra4x4_predict(xd, i, bsize, b_mode, dst, xd->plane[0].dst.stride);
     // TODO(jingning): refactor to use foreach_transformed_block_in_plane_
     tx_type = get_tx_type_4x4(xd, i);
     dequant_add_y(xd, tx_type, i, bsize);
   }
-#if CONFIG_NEWBINTRAMODES
-  if (!xd->mode_info_context->mbmi.mb_skip_coeff)
-    vp9_decode_mb_tokens_4x4_uv(pbi, xd, r);
-#endif
+
   foreach_transformed_block_uv(xd, bsize, decode_block, xd);
 }
 
@@ -294,9 +286,6 @@ static void decode_atom(VP9D_COMP *pbi, MACROBLOCKD *xd,
       mb_init_dequantizer(&pbi->common, xd);
 
     if (!vp9_reader_has_error(r)) {
-#if CONFIG_NEWBINTRAMODES
-    if (mbmi->mode != I4X4_PRED)
-#endif
       vp9_decode_tokens(pbi, xd, r, bsize);
     }
   }
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c
index 0ef25bafd..e69844196 100644
--- a/vp9/decoder/vp9_detokenize.c
+++ b/vp9/decoder/vp9_detokenize.c
@@ -388,51 +388,3 @@ int vp9_decode_tokens(VP9D_COMP* const pbi,
   foreach_transformed_block(xd, bsize, decode_block, &args);
   return eobtotal;
 }
-
-#if CONFIG_NEWBINTRAMODES
-static int decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd,
-                            vp9_reader *r,
-                            PLANE_TYPE type, int i, int seg_eob) {
-  const struct plane_block_idx pb_idx = plane_block_idx(16, i);
-  const int mod = 2 - xd->plane[pb_idx.plane].subsampling_x;
-  const int aoff = pb_idx.block & ((1 << mod) - 1);
-  const int loff = pb_idx.block >> mod;
-  ENTROPY_CONTEXT *A = xd->plane[pb_idx.plane].above_context;
-  ENTROPY_CONTEXT *L = xd->plane[pb_idx.plane].left_context;
-  const int c = decode_coefs(dx, xd, r, i, type, seg_eob,
-      BLOCK_OFFSET(xd->plane[pb_idx.plane].qcoeff, pb_idx.block, 16), TX_4X4,
-      xd->plane[pb_idx.plane].dequant, A + aoff, L + loff);
-  xd->plane[pb_idx.plane].eobs[pb_idx.block] = c;
-  return c;
-}
-
-static int decode_mb_tokens_4x4_uv(VP9D_COMP* const dx,
-                                   MACROBLOCKD* const xd,
-                                   vp9_reader *r,
-                                   int seg_eob) {
-  int i, eobtotal = 0;
-
-  // chroma blocks
-  for (i = 16; i < 24; i++)
-    eobtotal += decode_coefs_4x4(dx, xd, r, PLANE_TYPE_UV, i, seg_eob);
-
-  return eobtotal;
-}
-
-int vp9_decode_mb_tokens_4x4_uv(VP9D_COMP* const dx,
-                                MACROBLOCKD* const xd,
-                                vp9_reader *r) {
-  const int segment_id = xd->mode_info_context->mbmi.segment_id;
-  const int seg_eob = get_eob(xd, segment_id, 16);
-
-  return decode_mb_tokens_4x4_uv(dx, xd, r, seg_eob);
-}
-
-int vp9_decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd,
-                         vp9_reader *r,
-                         PLANE_TYPE type, int i) {
-  const int segment_id = xd->mode_info_context->mbmi.segment_id;
-  const int seg_eob = get_eob(xd, segment_id, 16);
-  return decode_coefs_4x4(dx, xd, r, type, i, seg_eob);
-}
-#endif
diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h
index 0e53c0ecb..13235bda1 100644
--- a/vp9/decoder/vp9_detokenize.h
+++ b/vp9/decoder/vp9_detokenize.h
@@ -19,12 +19,4 @@ int vp9_decode_tokens(VP9D_COMP* const pbi,
                       vp9_reader *r,
                       BLOCK_SIZE_TYPE bsize);
 
-#if CONFIG_NEWBINTRAMODES
-int vp9_decode_mb_tokens_4x4_uv(VP9D_COMP* const dx, MACROBLOCKD* const xd,
-                                vp9_reader *r);
-int vp9_decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd,
-                         vp9_reader *r,
-                         PLANE_TYPE type, int i);
-#endif
-
 #endif  // VP9_DECODER_VP9_DETOKENIZE_H_