diff options
| author | Jingning Han <jingning@google.com> | 2013-12-13 11:10:39 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-13 11:10:39 -0800 |
| commit | 2f9d118f216e40c71130efc9e0f4f296273b4439 (patch) | |
| tree | ada59121ce6729b6f579bb6c40a501b96bb23751 /vp9/encoder | |
| parent | 2ec473bb0ad231ae6e2e24241ee7978cbb5d27bd (diff) | |
| parent | 1c3e04bb94c6fede746e31bd3a48b2079d111abb (diff) | |
| download | libvpx-2f9d118f216e40c71130efc9e0f4f296273b4439.tar libvpx-2f9d118f216e40c71130efc9e0f4f296273b4439.tar.gz libvpx-2f9d118f216e40c71130efc9e0f4f296273b4439.tar.bz2 libvpx-2f9d118f216e40c71130efc9e0f4f296273b4439.zip | |
Merge "Remove some dead code"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index cdba1e867..b813f0649 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3811,8 +3811,6 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, int skip_uv[TX_SIZES]; MB_PREDICTION_MODE mode_uv[TX_SIZES] = { 0 }; struct scale_factors scale_factor[4]; - unsigned int ref_frame_mask = 0; - unsigned int mode_mask = 0; int intra_cost_penalty = 20 * vp9_dc_quant(cpi->common.base_qindex, cpi->common.y_dc_delta_q); int_mv seg_mvs[4][MAX_REF_FRAMES]; @@ -3842,15 +3840,6 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, *returnrate = INT_MAX; - // Create a mask set to 1 for each reference frame used by a smaller - // resolution. - if (cpi->sf.use_avoid_tested_higherror) { - ref_frame_mask = 0; - mode_mask = 0; - ref_frame_mask = ~ref_frame_mask; - mode_mask = ~mode_mask; - } - for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ref_frame++) { if (cpi->ref_frame_flags & flag_list[ref_frame]) { setup_buffer_inter(cpi, x, tile, idx_list[ref_frame], ref_frame, |