diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-07-03 12:53:36 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2013-07-03 16:58:34 +0100 |
| commit | f58b44ad627b93f88f9c1a76d9d2b66b39c7edf8 (patch) | |
| tree | c9b8fb195b3c7efb670d296dcf863091671ad3a9 /vp9 | |
| parent | 72c5778ec580dea0b22fc9b53d3d3efb17587659 (diff) | |
| download | libvpx-f58b44ad627b93f88f9c1a76d9d2b66b39c7edf8.tar libvpx-f58b44ad627b93f88f9c1a76d9d2b66b39c7edf8.tar.gz libvpx-f58b44ad627b93f88f9c1a76d9d2b66b39c7edf8.tar.bz2 libvpx-f58b44ad627b93f88f9c1a76d9d2b66b39c7edf8.zip | |
Fix to comp_inter_joint_search_thresh feature.
When this is 0 (BLOCK_SIZE_AB4X4) we want to do
the inter joint search for all sizes.
Change-Id: Id40cd6fe7790e7e1165352b9cef5e12fa8c0bc88
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 6fa9f8e5e..e3a627e12 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -746,6 +746,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) { sf->auto_mv_step_size = 1; sf->use_avoid_tested_higherror = 1; sf->adaptive_rd_thresh = 1; + if (speed == 1) { sf->comp_inter_joint_search_thresh = BLOCK_SIZE_TYPES; sf->less_rectangular_check = 1; diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a3710f45f..3e53b3931 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1892,7 +1892,7 @@ static void rd_check_segment_txsize(VP9_COMP *cpi, MACROBLOCK *x, // adjust src pointers mi_buf_shift(x, i); - if (cpi->sf.comp_inter_joint_search_thresh < bsize) { + if (cpi->sf.comp_inter_joint_search_thresh <= bsize) { int rate_mv; joint_motion_search(cpi, x, bsize, frame_mv[this_mode], mi_row, mi_col, seg_mvs[i], @@ -2551,7 +2551,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_thresh < bsize) { + if (cpi->sf.comp_inter_joint_search_thresh <= bsize) { joint_motion_search(cpi, x, bsize, frame_mv, mi_row, mi_col, single_newmv, &rate_mv); } else { |