diff options
| author | Adrian Grange <agrange@google.com> | 2014-01-22 13:04:30 -0800 |
|---|---|---|
| committer | Adrian Grange <agrange@google.com> | 2014-01-22 13:04:30 -0800 |
| commit | e37eb0ade77011cad64624d05c8bbeb95a41e000 (patch) | |
| tree | 2f5b3e9e969af087e27755a93c8878c256e7ba71 /vp9/encoder | |
| parent | 82f6af600952f8924b3fd56e1f6296a74816c2c2 (diff) | |
| download | libvpx-e37eb0ade77011cad64624d05c8bbeb95a41e000.tar libvpx-e37eb0ade77011cad64624d05c8bbeb95a41e000.tar.gz libvpx-e37eb0ade77011cad64624d05c8bbeb95a41e000.tar.bz2 libvpx-e37eb0ade77011cad64624d05c8bbeb95a41e000.zip | |
Rename set_scale_factors as set_ref_ptrs
New name better describes what the function does.
Change-Id: I33be1366a81f058a9854b804bcde211061187dc7
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 4bef67501..528f250a6 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -31,11 +31,11 @@ void vp9_setup_interp_filters(MACROBLOCKD *xd, if (xd->mi_8x8 && xd->mi_8x8[0]) { MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi; - set_scale_factors(cm, xd, mbmi->ref_frame[0] - LAST_FRAME, - mbmi->ref_frame[1] - LAST_FRAME); + set_ref_ptrs(cm, xd, mbmi->ref_frame[0] - LAST_FRAME, + mbmi->ref_frame[1] - LAST_FRAME); } else { - set_scale_factors(cm, xd, -1, -1); + set_ref_ptrs(cm, xd, -1, -1); } xd->subpix.filter_x = xd->subpix.filter_y = diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 242aa8710..63042b589 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3277,7 +3277,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, continue; } - set_scale_factors(cm, xd, ref_frame - 1, second_ref_frame - 1); + set_ref_ptrs(cm, xd, ref_frame - 1, second_ref_frame - 1); mbmi->uv_mode = DC_PRED; // Evaluate all sub-pel filters irrespective of whether we can use @@ -3709,7 +3709,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, vp9_zero(best_tx_diff); } - set_scale_factors(cm, xd, mbmi->ref_frame[0] - 1, mbmi->ref_frame[1] - 1); + set_ref_ptrs(cm, xd, mbmi->ref_frame[0] - 1, mbmi->ref_frame[1] - 1); store_coding_context(x, ctx, best_mode_index, &mbmi->ref_mvs[mbmi->ref_frame[0]][0], &mbmi->ref_mvs[mbmi->ref_frame[1] < 0 ? 0 : @@ -3902,7 +3902,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, vp9_is_scaled(&cm->frame_refs[second_ref_frame - 1].sf)) continue; - set_scale_factors(cm, xd, ref_frame - 1, second_ref_frame - 1); + set_ref_ptrs(cm, xd, ref_frame - 1, second_ref_frame - 1); mbmi->uv_mode = DC_PRED; // Evaluate all sub-pel filters irrespective of whether we can use @@ -4442,7 +4442,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, vp9_zero(best_tx_diff); } - set_scale_factors(cm, xd, mbmi->ref_frame[0] - 1, mbmi->ref_frame[1] - 1); + set_ref_ptrs(cm, xd, mbmi->ref_frame[0] - 1, mbmi->ref_frame[1] - 1); store_coding_context(x, ctx, best_mode_index, &mbmi->ref_mvs[mbmi->ref_frame[0]][0], &mbmi->ref_mvs[mbmi->ref_frame[1] < 0 ? 0 : |