diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2013-05-31 09:35:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-31 09:35:51 -0700 |
| commit | 1e025dbfd118578081a7433c19fc7877ac5ad1db (patch) | |
| tree | 1784f3fa4c4644e4c10c7f5ddda1bc5c62f9b3e2 /vp9/encoder/vp9_rdopt.c | |
| parent | 5da753bef9522fa042b8491240358a80e521a76d (diff) | |
| parent | 353642bc53de23e3e51940960c8c2b8f6602566e (diff) | |
| download | libvpx-1e025dbfd118578081a7433c19fc7877ac5ad1db.tar libvpx-1e025dbfd118578081a7433c19fc7877ac5ad1db.tar.gz libvpx-1e025dbfd118578081a7433c19fc7877ac5ad1db.tar.bz2 libvpx-1e025dbfd118578081a7433c19fc7877ac5ad1db.zip | |
Merge "Moved use_prev_in_find_mv_refs check to frame level" into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 22bd2d191..862e72f24 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1833,7 +1833,6 @@ static void setup_buffer_inter(VP9_COMP *cpi, MACROBLOCK *x, YV12_BUFFER_CONFIG *yv12 = &cm->yv12_fb[cpi->common.ref_frame_map[idx]]; MACROBLOCKD *const xd = &x->e_mbd; MB_MODE_INFO *const mbmi = &xd->mode_info_context->mbmi; - int use_prev_in_find_mv_refs; // set up scaling factors scale[frame_type] = cpi->common.active_ref_scale[frame_type - 1]; @@ -1850,11 +1849,8 @@ static void setup_buffer_inter(VP9_COMP *cpi, MACROBLOCK *x, &scale[frame_type], &scale[frame_type]); // Gets an initial list of candidate vectors from neighbours and orders them - use_prev_in_find_mv_refs = cm->width == cm->last_width && - cm->height == cm->last_height && - !cpi->common.error_resilient_mode; vp9_find_mv_refs(&cpi->common, xd, xd->mode_info_context, - use_prev_in_find_mv_refs ? xd->prev_mode_info_context : NULL, + xd->prev_mode_info_context, frame_type, mbmi->ref_mvs[frame_type], cpi->common.ref_frame_sign_bias); |