diff options
| author | Jingning Han <jingning@google.com> | 2018-07-31 00:57:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-31 00:57:14 +0000 |
| commit | 597f56efdfcea7e14885bb975e8a9f8dc5ab0108 (patch) | |
| tree | 91dd1b6d5b5fe5b2a71e651ea2f2e79e36dc7213 | |
| parent | 871a4b69ac015d19ccf090b8b5504ef719a9efaa (diff) | |
| parent | dbe4d9c4ebac47ba39678a3f4e3953dd26891be5 (diff) | |
| download | libvpx-597f56efdfcea7e14885bb975e8a9f8dc5ab0108.tar libvpx-597f56efdfcea7e14885bb975e8a9f8dc5ab0108.tar.gz libvpx-597f56efdfcea7e14885bb975e8a9f8dc5ab0108.tar.bz2 libvpx-597f56efdfcea7e14885bb975e8a9f8dc5ab0108.zip | |
Merge "Use diamond search to build tpl model and arf frames"
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_temporal_filter.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 05128eb1f..c20cf4875 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -5578,7 +5578,7 @@ uint32_t motion_compensated_prediction(VP9_COMP *cpi, ThreadData *td, MACROBLOCK *const x = &td->mb; MACROBLOCKD *const xd = &x->e_mbd; MV_SPEED_FEATURES *const mv_sf = &cpi->sf.mv; - const SEARCH_METHODS search_method = HEX; + const SEARCH_METHODS search_method = NSTEP; int step_param; int sadpb = x->sadperbit16; uint32_t bestsme = UINT_MAX; diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c index 4db3e6f8e..9a357c105 100644 --- a/vp9/encoder/vp9_temporal_filter.c +++ b/vp9/encoder/vp9_temporal_filter.c @@ -230,7 +230,7 @@ static uint32_t temporal_filter_find_matching_mb_c(VP9_COMP *cpi, MACROBLOCK *const x = &td->mb; MACROBLOCKD *const xd = &x->e_mbd; MV_SPEED_FEATURES *const mv_sf = &cpi->sf.mv; - const SEARCH_METHODS search_method = HEX; + const SEARCH_METHODS search_method = NSTEP; int step_param; int sadpb = x->sadperbit16; uint32_t bestsme = UINT_MAX; |