diff options
| author | Hui Su <huisu@google.com> | 2018-07-27 02:19:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-27 02:19:58 +0000 |
| commit | d0ad2e25d156cf538888f9b2389361d660a0421e (patch) | |
| tree | b3078251b9707b9d144648dd04178b6d66d63d38 /vp9/encoder | |
| parent | 6a908db22a174f2852aa7a84d2b4a1eee93cc1d6 (diff) | |
| parent | 9775236ca1ca5046027da1ca031c911898b0eb4a (diff) | |
| download | libvpx-d0ad2e25d156cf538888f9b2389361d660a0421e.tar libvpx-d0ad2e25d156cf538888f9b2389361d660a0421e.tar.gz libvpx-d0ad2e25d156cf538888f9b2389361d660a0421e.tar.bz2 libvpx-d0ad2e25d156cf538888f9b2389361d660a0421e.zip | |
Merge "Fix multi-thread encoder result test"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index f3a4ae7fe..e1207fea7 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -4008,6 +4008,8 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td, if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx); pc_tree->split[i]->index = i; + if (cpi->sf.prune_ref_frame_for_rect_partitions) + pc_tree->split[i]->none.rate = INT_MAX; rd_pick_partition(cpi, td, tile_data, tp, mi_row + y_idx, mi_col + x_idx, subsize, &this_rdc, // A must split test here increases the number of sub |