Removing MV_GROUP_UPDATE define and corresponding code.
Change-Id: I4884cdc2557d25d50c7c4f7e19b1ad8bdb93cd63
diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h
index 0df92d0..895df30 100644
--- a/vp9/common/vp9_entropymv.h
+++ b/vp9/common/vp9_entropymv.h
@@ -25,9 +25,6 @@
int vp9_use_mv_hp(const MV *ref);
#define VP9_NMV_UPDATE_PROB 252
-
-//#define MV_GROUP_UPDATE
-
#define LOW_PRECISION_MV_UPDATE /* Use 7 bit forward update */
/* Symbols for coding which components are zero jointly */
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c
index 1387a89..5fb572e 100644
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -274,11 +274,6 @@
static void read_mv_probs(vp9_reader *r, nmv_context *mvc, int usehp) {
int i, j, k;
-#ifdef MV_GROUP_UPDATE
- if (!vp9_read_bit(r))
- return;
-#endif
-
for (j = 0; j < MV_JOINTS - 1; ++j)
update_mv(r, &mvc->joints[j], VP9_NMV_UPDATE_PROB);
diff --git a/vp9/encoder/vp9_encodemv.c b/vp9/encoder/vp9_encodemv.c
index 84a9cd6..8adad9d 100644
--- a/vp9/encoder/vp9_encodemv.c
+++ b/vp9/encoder/vp9_encodemv.c
@@ -417,10 +417,6 @@
unsigned int branch_ct_hp[2][2];
nmv_context *mvc = &cpi->common.fc.nmvc;
-#ifdef MV_GROUP_UPDATE
- int savings = 0;
-#endif
-
#ifdef NMV_STATS
if (!cpi->dummy_packing)
add_nmvcount(&tnmvcounts, &cpi->NMVcount);
@@ -430,73 +426,6 @@
branch_ct_class0, branch_ct_bits,
branch_ct_class0_fp, branch_ct_fp,
branch_ct_class0_hp, branch_ct_hp);
- /* write updates if they help */
-#ifdef MV_GROUP_UPDATE
- for (j = 0; j < MV_JOINTS - 1; ++j) {
- savings += update_nmv_savings(branch_ct_joint[j],
- cpi->common.fc.nmvc.joints[j],
- prob.joints[j],
- VP9_NMV_UPDATE_PROB);
- }
- for (i = 0; i < 2; ++i) {
- savings += update_nmv_savings(branch_ct_sign[i],
- cpi->common.fc.nmvc.comps[i].sign,
- prob.comps[i].sign,
- VP9_NMV_UPDATE_PROB);
- for (j = 0; j < MV_CLASSES - 1; ++j) {
- savings += update_nmv_savings(branch_ct_classes[i][j],
- cpi->common.fc.nmvc.comps[i].classes[j],
- prob.comps[i].classes[j],
- VP9_NMV_UPDATE_PROB);
- }
- for (j = 0; j < CLASS0_SIZE - 1; ++j) {
- savings += update_nmv_savings(branch_ct_class0[i][j],
- cpi->common.fc.nmvc.comps[i].class0[j],
- prob.comps[i].class0[j],
- VP9_NMV_UPDATE_PROB);
- }
- for (j = 0; j < MV_OFFSET_BITS; ++j) {
- savings += update_nmv_savings(branch_ct_bits[i][j],
- cpi->common.fc.nmvc.comps[i].bits[j],
- prob.comps[i].bits[j],
- VP9_NMV_UPDATE_PROB);
- }
- }
- for (i = 0; i < 2; ++i) {
- for (j = 0; j < CLASS0_SIZE; ++j) {
- int k;
- for (k = 0; k < 3; ++k) {
- savings += update_nmv_savings(branch_ct_class0_fp[i][j][k],
- cpi->common.fc.nmvc.comps[i].class0_fp[j][k],
- prob.comps[i].class0_fp[j][k],
- VP9_NMV_UPDATE_PROB);
- }
- }
- for (j = 0; j < 3; ++j) {
- savings += update_nmv_savings(branch_ct_fp[i][j],
- cpi->common.fc.nmvc.comps[i].fp[j],
- prob.comps[i].fp[j],
- VP9_NMV_UPDATE_PROB);
- }
- }
- if (usehp) {
- for (i = 0; i < 2; ++i) {
- savings += update_nmv_savings(branch_ct_class0_hp[i],
- cpi->common.fc.nmvc.comps[i].class0_hp,
- prob.comps[i].class0_hp,
- VP9_NMV_UPDATE_PROB);
- savings += update_nmv_savings(branch_ct_hp[i],
- cpi->common.fc.nmvc.comps[i].hp,
- prob.comps[i].hp,
- VP9_NMV_UPDATE_PROB);
- }
- }
- if (savings <= 0) {
- vp9_write_bit(bc, 0);
- return;
- }
- vp9_write_bit(bc, 1);
-#endif
for (j = 0; j < MV_JOINTS - 1; ++j)
update_mv(bc, branch_ct_joint[j], &mvc->joints[j], prob.joints[j],
