ref: 40b850b4586189ab075f3123ec4f8f303667634f
parent: 13b56eeb7a6a61c599c397a3b8cd5b6f77c2f07b
parent: a39321f37e2eae6aaf07655cd78d7645e7e73e67
author: Scott LaVarnway <slavarnway@google.com>
date: Thu May 26 03:01:38 EDT 2011
Merge "Use int_mv instead of MV in vp8_mv_cont"
--- a/vp8/common/entropymode.c
+++ b/vp8/common/entropymode.c
@@ -33,11 +33,11 @@
SUBMVREF_LEFT_ABOVE_ZED
} sumvfref_t;
-int vp8_mv_cont(const MV *l, const MV *a)
+int vp8_mv_cont(const int_mv *l, const int_mv *a)
{
- int lez = (l->row == 0 && l->col == 0);
- int aez = (a->row == 0 && a->col == 0);
- int lea = (l->row == a->row && l->col == a->col);
+ int lez = (l->as_int == 0);
+ int aez = (a->as_int == 0);
+ int lea = (l->as_int == a->as_int);
if (lea && lez)
return SUBMVREF_LEFT_ABOVE_ZED;
--- a/vp8/common/entropymode.h
+++ b/vp8/common/entropymode.h
@@ -25,7 +25,7 @@
extern const vp8_prob vp8_mbsplit_probs [VP8_NUMMBSPLITS-1];
-extern int vp8_mv_cont(const MV *l, const MV *a);
+extern int vp8_mv_cont(const int_mv *l, const int_mv *a);
#define SUBMVREF_COUNT 5
extern const vp8_prob vp8_sub_mv_ref_prob2 [SUBMVREF_COUNT][VP8_SUBMVREFS-1];
--- a/vp8/decoder/decodemv.c
+++ b/vp8/decoder/decodemv.c
@@ -362,7 +362,7 @@
leftmv.as_int = left_block_mv(mi, k);
abovemv.as_int = above_block_mv(mi, k, mis);
- mv_contz = vp8_mv_cont(&(leftmv.as_mv), &(abovemv.as_mv));
+ mv_contz = vp8_mv_cont(&leftmv, &abovemv);
switch (bmi.mode = (B_PREDICTION_MODE) sub_mv_ref(bc, vp8_sub_mv_ref_prob2 [mv_contz])) /*pc->fc.sub_mv_ref_prob))*/
{
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -1020,7 +1020,7 @@
assert(0);
leftmv.as_int = left_block_mv(m, k);
abovemv.as_int = above_block_mv(m, k, mis);
- mv_contz = vp8_mv_cont(&(leftmv.as_mv), &(abovemv.as_mv));
+ mv_contz = vp8_mv_cont(&leftmv, &abovemv);
write_sub_mv_ref(w, b->mode, vp8_sub_mv_ref_prob2 [mv_contz]); //pc->fc.sub_mv_ref_prob);