ref: 875041436837bc40379ea0858700251af6c833e6
parent: e2c696a7aa4d4545336e60bd609f226b1b799b0a
parent: fdf8654189720d3de06095167885f9f1a15ab958
author: Yaowu Xu <yaowu@google.com>
date: Mon Jan 14 09:40:38 EST 2013
Merge "change to evaluate reference mvs using above only" into experimental
--- a/configure
+++ b/configure
@@ -251,6 +251,7 @@
newcoefcontext
enable_6tap
widerlpf
+ abovesprefmv
"
CONFIG_LIST="
external_build
--- a/vp9/common/vp9_findnearmv.c
+++ b/vp9/common/vp9_findnearmv.c
@@ -131,9 +131,11 @@
int_mv *near) {int i, j;
uint8_t *above_src;
- uint8_t *left_src;
uint8_t *above_ref;
+#if !CONFIG_ABOVESPREFMV
+ uint8_t *left_src;
uint8_t *left_ref;
+#endif
unsigned int score;
#if CONFIG_SUBPELREFMV
unsigned int sse;
@@ -148,15 +150,25 @@
#if CONFIG_SUBPELREFMV
above_src = xd->dst.y_buffer - xd->dst.y_stride * 2;
- left_src = xd->dst.y_buffer - 2;
above_ref = ref_y_buffer - ref_y_stride * 2;
+#if CONFIG_ABOVESPREFMV
+ above_src -= 4;
+ above_ref -= 4;
+#else
+ left_src = xd->dst.y_buffer - 2;
left_ref = ref_y_buffer - 2;
+#endif
#else
above_src = xd->dst.y_buffer - xd->dst.y_stride * 3;
- left_src = xd->dst.y_buffer - 3;
above_ref = ref_y_buffer - ref_y_stride * 3;
+#if CONFIG_ABOVESPREFMV
+ above_src -= 4;
+ above_ref -= 4;
+#else
+ left_src = xd->dst.y_buffer - 3;
left_ref = ref_y_buffer - 3;
#endif
+#endif
// Limit search to the predicted best few candidates
for(i = 0; i < MAX_MV_REF_CANDIDATES; ++i) {@@ -173,11 +185,19 @@
zero_seen = zero_seen || !this_mv.as_int;
+#if !CONFIG_ABOVESPREFMV
clamp_mv(&this_mv,
xd->mb_to_left_edge - LEFT_TOP_MARGIN + 24,
xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN,
xd->mb_to_top_edge - LEFT_TOP_MARGIN + 24,
xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN);
+#else
+ clamp_mv(&this_mv,
+ xd->mb_to_left_edge - LEFT_TOP_MARGIN + 32,
+ xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN,
+ xd->mb_to_top_edge - LEFT_TOP_MARGIN + 24,
+ xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN);
+#endif
#if CONFIG_SUBPELREFMV
row_offset = this_mv.as_mv.row >> 3;
@@ -213,6 +233,7 @@
score += sse;
}
}
+#if !CONFIG_ABOVESPREFMV
if (xd->left_available) {vp9_sub_pixel_variance2x16_c(left_ref + offset, ref_y_stride,
SP(this_mv.as_mv.col),
@@ -245,6 +266,7 @@
score += sse;
}
}
+#endif
#else
row_offset = (this_mv.as_mv.row > 0) ?
((this_mv.as_mv.row + 3) >> 3):((this_mv.as_mv.row + 4) >> 3);
@@ -266,6 +288,7 @@
above_ref + offset + 48, ref_y_stride);
}
}
+#if !CONFIG_ABOVESPREFMV
if (xd->left_available) {score += vp9_sad3x16(left_src, xd->dst.y_stride,
left_ref + offset, ref_y_stride);
@@ -286,6 +309,7 @@
ref_y_stride);
}
}
+#endif
#endif
// Add the entry to our list and then resort the list on score.
ref_scores[i] = score;
--
⑨