diff options
| author | Hui Su <huisu@google.com> | 2018-08-06 23:00:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-06 23:00:35 +0000 |
| commit | 1907d91c42e25b9bc78d0f7c04963109bb3e4d8f (patch) | |
| tree | 7ffeabeb4bc3329abb5249ec5389e48e1afa68fc /vp9/encoder/vp9_encodeframe.c | |
| parent | e1acea5a2843deb8628e9211ae2ff40cdc1818e7 (diff) | |
| parent | bc37fc0fec0390357a50bf4d05b29d6982d0b680 (diff) | |
| download | libvpx-1907d91c42e25b9bc78d0f7c04963109bb3e4d8f.tar libvpx-1907d91c42e25b9bc78d0f7c04963109bb3e4d8f.tar.gz libvpx-1907d91c42e25b9bc78d0f7c04963109bb3e4d8f.tar.bz2 libvpx-1907d91c42e25b9bc78d0f7c04963109bb3e4d8f.zip | |
Merge "Remove unnecessary calls to load_pred_mv()"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 253716379..a172af30b 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3978,6 +3978,7 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td, // the starting point of motion search in the following partition type check. if (do_split || must_split) { subsize = get_subsize(bsize, PARTITION_SPLIT); + if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx); if (bsize == BLOCK_8X8) { i = 4; if (cpi->sf.adaptive_pred_interp_filter && partition_none_allowed) @@ -4005,8 +4006,6 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td, if (mi_row + y_idx >= cm->mi_rows || mi_col + x_idx >= cm->mi_cols) continue; - 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; @@ -4109,8 +4108,6 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td, PICK_MODE_CONTEXT *ctx = &pc_tree->horizontal[0]; update_state(cpi, td, ctx, mi_row, mi_col, subsize, 0); encode_superblock(cpi, td, tp, 0, mi_row, mi_col, subsize, ctx); - - if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx); if (cpi->sf.adaptive_pred_interp_filter && bsize == BLOCK_8X8 && partition_none_allowed) pc_tree->horizontal[1].pred_interp_filter = pred_interp_filter; @@ -4160,8 +4157,6 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td, update_state(cpi, td, &pc_tree->vertical[0], mi_row, mi_col, subsize, 0); encode_superblock(cpi, td, tp, 0, mi_row, mi_col, subsize, &pc_tree->vertical[0]); - - if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx); if (cpi->sf.adaptive_pred_interp_filter && bsize == BLOCK_8X8 && partition_none_allowed) pc_tree->vertical[1].pred_interp_filter = pred_interp_filter; |