summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_rdopt.c
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2014-01-28 10:28:54 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-01-28 10:28:54 -0800
commit1fecc5bd2e12d4fd6e82872c43ae2fc3484205dd (patch)
tree3eb04e246e71a7175aee336ee6cadad80e0e18d8 /vp9/encoder/vp9_rdopt.c
parentaf87148a225e695fbb95e4ee9dde72e12f5d7096 (diff)
parenta0b9b050b845c2ed03f8c6405517ece0ad0e6ed1 (diff)
downloadlibvpx-1fecc5bd2e12d4fd6e82872c43ae2fc3484205dd.tar
libvpx-1fecc5bd2e12d4fd6e82872c43ae2fc3484205dd.tar.gz
libvpx-1fecc5bd2e12d4fd6e82872c43ae2fc3484205dd.tar.bz2
libvpx-1fecc5bd2e12d4fd6e82872c43ae2fc3484205dd.zip
Merge "Added a speed feature"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
-rw-r--r--vp9/encoder/vp9_rdopt.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index ebe5f80f2..83246a931 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -1840,7 +1840,8 @@ static void rd_check_segment_txsize(VP9_COMP *cpi, MACROBLOCK *x,
&bsi->ref_mv->as_mv,
cm->allow_high_precision_mv,
x->errorperbit, v_fn_ptr,
- 0, cpi->sf.subpel_iters_per_step,
+ cpi->sf.subpel_force_stop,
+ cpi->sf.subpel_iters_per_step,
x->nmvjointcost, x->mvcost,
&distortion,
&x->pred_sse[mbmi->ref_frame[0]]);
@@ -2451,7 +2452,8 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
cm->allow_high_precision_mv,
x->errorperbit,
&cpi->fn_ptr[bsize],
- 0, cpi->sf.subpel_iters_per_step,
+ cpi->sf.subpel_force_stop,
+ cpi->sf.subpel_iters_per_step,
x->nmvjointcost, x->mvcost,
&dis, &x->pred_sse[ref]);
}