diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-05-21 10:35:12 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-21 10:35:12 -0700 |
| commit | a7b3ed07df3d2e73b986cc3bb78a1c26fcf2d353 (patch) | |
| tree | 839dadc61402a6e6d20bf12364f9fd61a0f174d3 /vp9/encoder/vp9_rdopt.c | |
| parent | e9950b0768c55e94159f66545a0cd430acb7ef57 (diff) | |
| parent | 4ac70bd7d3378d5caa3a610c9c2dcda65fcfe026 (diff) | |
| download | libvpx-a7b3ed07df3d2e73b986cc3bb78a1c26fcf2d353.tar libvpx-a7b3ed07df3d2e73b986cc3bb78a1c26fcf2d353.tar.gz libvpx-a7b3ed07df3d2e73b986cc3bb78a1c26fcf2d353.tar.bz2 libvpx-a7b3ed07df3d2e73b986cc3bb78a1c26fcf2d353.zip | |
Merge "Adding get_ref_frame_idx function." into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index e6330047e..78bbc3639 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3080,28 +3080,12 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, mbmi->mode = this_mode; } else { YV12_BUFFER_CONFIG *scaled_ref_frame[2] = {NULL, NULL}; - int fb; - - if (mbmi->ref_frame == LAST_FRAME) { - fb = cpi->lst_fb_idx; - } else if (mbmi->ref_frame == GOLDEN_FRAME) { - fb = cpi->gld_fb_idx; - } else { - fb = cpi->alt_fb_idx; - } - + int fb = get_ref_frame_idx(cpi, mbmi->ref_frame); if (cpi->scaled_ref_idx[fb] != cm->ref_frame_map[fb]) scaled_ref_frame[0] = &cm->yv12_fb[cpi->scaled_ref_idx[fb]]; if (comp_pred) { - if (mbmi->second_ref_frame == LAST_FRAME) { - fb = cpi->lst_fb_idx; - } else if (mbmi->second_ref_frame == GOLDEN_FRAME) { - fb = cpi->gld_fb_idx; - } else { - fb = cpi->alt_fb_idx; - } - + fb = get_ref_frame_idx(cpi, mbmi->second_ref_frame); if (cpi->scaled_ref_idx[fb] != cm->ref_frame_map[fb]) scaled_ref_frame[1] = &cm->yv12_fb[cpi->scaled_ref_idx[fb]]; } |