diff options
| author | Jingning Han <jingning@google.com> | 2014-09-15 09:59:20 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2014-09-15 09:59:20 -0700 |
| commit | cc00eea676ae1201949036a1ce1e87bfb7b7f75e (patch) | |
| tree | a9ed33c1a9998bfef470e22bdc2cbe66ca55030a /vp9 | |
| parent | 73805bfa706994fe8f430e2328527de6e9f1107b (diff) | |
| download | libvpx-cc00eea676ae1201949036a1ce1e87bfb7b7f75e.tar libvpx-cc00eea676ae1201949036a1ce1e87bfb7b7f75e.tar.gz libvpx-cc00eea676ae1201949036a1ce1e87bfb7b7f75e.tar.bz2 libvpx-cc00eea676ae1201949036a1ce1e87bfb7b7f75e.zip | |
Replace best_ref_index table fetch with best_mbmode
This commit replaces the best_ref_index table fetch with the use
of best_mbmode in vp9_rd_pick_inter_mode_sub8x8.
Change-Id: I882ee9ee6a8c0e61befcca1f4dba6d2ea8de8f13
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 2514cfc65..f80b12396 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3369,7 +3369,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, // skip mask to look at a subset of the remaining modes. if (ref_index > 2 && cpi->sf.mode_skip_start < MAX_MODES) { if (ref_index == 3) { - switch (vp9_ref_order[best_ref_index].ref_frame[0]) { + switch (best_mbmode.ref_frame[0]) { case INTRA_FRAME: break; case LAST_FRAME: @@ -3418,7 +3418,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, if (vp9_segfeature_active(seg, segment_id, SEG_LVL_REF_FRAME)) continue; if ((cpi->sf.mode_search_skip_flags & FLAG_SKIP_COMP_BESTINTRA) && - vp9_ref_order[best_ref_index].ref_frame[0] == INTRA_FRAME) + best_mbmode.ref_frame[0] == INTRA_FRAME) continue; } @@ -3806,7 +3806,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, // If we used an estimate for the uv intra rd in the loop above... if (cpi->sf.use_uv_intra_rd_estimate) { // Do Intra UV best rd mode selection if best mode choice above was intra. - if (vp9_ref_order[best_ref_index].ref_frame[0] == INTRA_FRAME) { + if (best_mbmode.ref_frame[0] == INTRA_FRAME) { *mbmi = best_mbmode; rd_pick_intra_sbuv_mode(cpi, x, ctx, &rate_uv_intra, &rate_uv_tokenonly, |