ref: ee5d0335ca2caeba4e3537160764da54e326947f
parent: 6c0a2692e4c564a108a6a66ec8b10cf95afacc29
parent: 3bc119320103e9afa4033370df8a141c68cbbe60
author: Yunqing Wang <yunqingwang@google.com>
date: Wed Jul 2 09:06:41 EDT 2014
Merge "Fix rd threshold overflow issue"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -4289,6 +4289,10 @@
rd->thresh_mult[THR_NEWA] += 1000;
rd->thresh_mult[THR_NEWG] += 1000;
+ // Adjust threshold only in real time mode, which only use last reference
+ // frame.
+ rd->thresh_mult[THR_NEWMV] += sf->elevate_newmv_thresh;
+
rd->thresh_mult[THR_NEARMV] += 1000;
rd->thresh_mult[THR_NEARA] += 1000;
rd->thresh_mult[THR_COMP_NEARESTLA] += 1000;
@@ -4351,10 +4355,6 @@
rd->thresh_mult[THR_COMP_NEARGA ] = INT_MAX;
rd->thresh_mult[THR_COMP_NEWGA ] = INT_MAX;
}
-
- // Adjust threshold only in real time mode, which only use last reference
- // frame.
- rd->thresh_mult[THR_NEWMV] += sf->elevate_newmv_thresh;
}
void vp9_set_rd_speed_thresholds_sub8x8(VP9_COMP *cpi) {