ref: 0404a5a7e171908e619586b72d89d8894a1eb754
parent: 82d99257f2f2a009bd3f9cde4375e141fbf85827
author: Yaowu Xu <yaowu@google.com>
date: Tue Dec 6 02:09:08 EST 2011
corrected an enum name CNT_INTRA has been used for counting (0,0) motion vectos, this commit renames it to CNT_ZEROMV Change-Id: I8f67c5468370090525faf84ba5b3f780d302443f
--- a/vp8/common/findnearmv.c
+++ b/vp8/common/findnearmv.c
@@ -174,7 +174,7 @@
int_mv near_mvs[4];
int_mv *mv = near_mvs;
int *cntx = cnt;
- enum {CNT_INTRA, CNT_NEAREST, CNT_NEAR, CNT_SPLITMV};+ enum {CNT_ZEROMV, CNT_NEAREST, CNT_NEAR, CNT_SPLITMV};/* Zero accumulators */
mv[0].as_int = mv[1].as_int = mv[2].as_int = 0;
@@ -213,7 +213,7 @@
*cntx += 2;
}
else
- cnt[CNT_INTRA] += 2;
+ cnt[CNT_ZEROMV] += 2;
}
/* Process above left */
if (aboveleft->mbmi.ref_frame != INTRA_FRAME)
@@ -235,7 +235,7 @@
*cntx += 1;
}
else
- cnt[CNT_INTRA] += 1;
+ cnt[CNT_ZEROMV] += 1;
}
/* If we have three distinct MV's ... */
@@ -263,8 +263,8 @@
}
/* Use near_mvs[0] to store the "best" MV */
- if (cnt[CNT_NEAREST] >= cnt[CNT_INTRA])
- near_mvs[CNT_INTRA] = near_mvs[CNT_NEAREST];
+ if (cnt[CNT_NEAREST] >= cnt[CNT_ZEROMV])
+ near_mvs[CNT_ZEROMV] = near_mvs[CNT_NEAREST];
/* Set up return values */
best_mv->as_int = near_mvs[0].as_int;
@@ -286,8 +286,6 @@
p[1] = vp8_mode_contexts [near_mv_ref_ct[1]] [1];
p[2] = vp8_mode_contexts [near_mv_ref_ct[2]] [2];
p[3] = vp8_mode_contexts [near_mv_ref_ct[3]] [3];
- /*p[3] = vp8_mode_contexts [near_mv_ref_ct[1]
- + near_mv_ref_ct[2] + near_mv_ref_ct[3]] [3];*/
return p;
}