ref: da798043c512182f8fcf3cdc04b9f6c64617e741
parent: 0bbc7f9825516e8e59a8a701e43df1aa967fd70a
parent: 24c7ee78c59eb2237d12658f8ca01ad0862bc444
author: Jingning Han <jingning@google.com>
date: Fri Feb 28 07:14:10 EST 2014
Merge "Skip some mode SAD calculation in non-RD mode"
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -270,12 +270,21 @@
&frame_mv[NEWMV][ref_frame]);
}
- mbmi->mode = this_mode;
- mbmi->mv[0].as_int = frame_mv[this_mode][ref_frame].as_int;
- vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);
+ if (frame_mv[this_mode][ref_frame].as_int == 0) {
+ dist = x->mode_sad[ref_frame][INTER_OFFSET(ZEROMV)];
+ } else if (this_mode != NEARESTMV &&
+ frame_mv[NEARESTMV][ref_frame].as_int ==
+ frame_mv[this_mode][ref_frame].as_int) {
+ dist = x->mode_sad[ref_frame][INTER_OFFSET(NEARESTMV)];
+ } else {
+ mbmi->mode = this_mode;
+ mbmi->mv[0].as_int = frame_mv[this_mode][ref_frame].as_int;
+ vp9_build_inter_predictors_sby(xd, mi_row, mi_col, bsize);
+ dist = x->mode_sad[ref_frame][INTER_OFFSET(this_mode)] =
+ cpi->fn_ptr[bsize].sdf(p->src.buf, p->src.stride,
+ pd->dst.buf, pd->dst.stride, INT_MAX);
+ }
- dist = cpi->fn_ptr[bsize].sdf(p->src.buf, p->src.stride,
- pd->dst.buf, pd->dst.stride, INT_MAX);
this_rd = rate + dist;
if (this_rd < best_rd) {
--
⑨