diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-04-19 15:40:36 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2013-04-19 16:13:53 +0100 |
| commit | de80da39dc9b7b56c180bf27ee6e47779280fa4d (patch) | |
| tree | b2cd4b73327b4d5e54610e8c8246cf13773c003c /vp9/encoder/vp9_rdopt.c | |
| parent | aa76bf3d285c00ab170f89afaa3ee0c79ba82b0e (diff) | |
| download | libvpx-de80da39dc9b7b56c180bf27ee6e47779280fa4d.tar libvpx-de80da39dc9b7b56c180bf27ee6e47779280fa4d.tar.gz libvpx-de80da39dc9b7b56c180bf27ee6e47779280fa4d.tar.bz2 libvpx-de80da39dc9b7b56c180bf27ee6e47779280fa4d.zip | |
Mv ref candidates cut to 2.
Further simplification of mvref search to return
only the top two candidates. Distance weights removed
as the test order reflects distance anyway.
Change-Id: I0518cab7280258fec2058670add4f853fab7b855
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 7b4f06a84..d2d343348 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2692,7 +2692,7 @@ 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, use_prev_in_find_best_ref; + int use_prev_in_find_mv_refs; // set up scaling factors scale[frame_type] = cpi->common.active_ref_scale[frame_type - 1]; @@ -2717,15 +2717,7 @@ static void setup_buffer_inter(VP9_COMP *cpi, MACROBLOCK *x, cpi->common.ref_frame_sign_bias); // Candidate refinement carried out at encoder and decoder - use_prev_in_find_best_ref = - scale[frame_type].x_num == scale[frame_type].x_den && - scale[frame_type].y_num == scale[frame_type].y_den && - !cm->error_resilient_mode && - !cm->frame_parallel_decoding_mode; vp9_find_best_ref_mvs(xd, - use_prev_in_find_best_ref ? - yv12_mb[frame_type].y_buffer : NULL, - yv12->y_stride, mbmi->ref_mvs[frame_type], &frame_nearest_mv[frame_type], &frame_near_mv[frame_type]); |