diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-06-06 09:27:31 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-06 09:27:31 -0700 |
| commit | 02590a5b1be96dcf52666051d1fa9376669678bd (patch) | |
| tree | f69821952103d4884dea75417ef1407cb53800b2 /vp9/encoder/vp9_rdopt.c | |
| parent | b4c4f6486244cc5e6817b37ef4a2e6983d0301c5 (diff) | |
| parent | c880e02f97df6f7ccd3a99b66dfc97113d5a65fa (diff) | |
| download | libvpx-02590a5b1be96dcf52666051d1fa9376669678bd.tar libvpx-02590a5b1be96dcf52666051d1fa9376669678bd.tar.gz libvpx-02590a5b1be96dcf52666051d1fa9376669678bd.tar.bz2 libvpx-02590a5b1be96dcf52666051d1fa9376669678bd.zip | |
Merge "Turn off compound inter search refinement for good quality." into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index c2fa480fc..60badaddd 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1402,7 +1402,7 @@ static void rd_check_segment_txsize(VP9_COMP *cpi, MACROBLOCK *x, // adjust src pointers mi_buf_shift(x, i); - if (cpi->compressor_speed == 0 && cpi->sf.comp_inter_joint_search) { + if (cpi->sf.comp_inter_joint_search_thresh < bsize) { iterative_motion_search(cpi, x, bsize, frame_mv[this_mode], scaled_ref_frame, mi_row, mi_col, seg_mvs[i]); @@ -2114,7 +2114,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, frame_mv[refs[0]].as_int = single_newmv[refs[0]].as_int; frame_mv[refs[1]].as_int = single_newmv[refs[1]].as_int; - if (cpi->sf.comp_inter_joint_search) + if (cpi->sf.comp_inter_joint_search_thresh < bsize) iterative_motion_search(cpi, x, bsize, frame_mv, scaled_ref_frame, mi_row, mi_col, single_newmv); |