diff options
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 95eba500a..aa2b80cf7 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -30,6 +30,7 @@ #include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_systemdependent.h" +#include "vp9/encoder/vp9_cost.h" #include "vp9/encoder/vp9_encodemb.h" #include "vp9/encoder/vp9_encodemv.h" #include "vp9/encoder/vp9_mcomp.h" @@ -38,7 +39,6 @@ #include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_rdopt.h" #include "vp9/encoder/vp9_tokenize.h" -#include "vp9/encoder/vp9_treewriter.h" #include "vp9/encoder/vp9_variance.h" /* Factor to weigh the rate for switchable interp filters */ @@ -282,8 +282,6 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi) { x->errorperbit = cpi->RDMULT / RD_MULT_EPB_RATIO; x->errorperbit += (x->errorperbit == 0); - vp9_set_speed_features(cpi); - x->select_txfm_size = (cpi->sf.tx_size_search_method == USE_LARGESTALL && cm->frame_type != KEY_FRAME) ? 0 : 1; @@ -1459,12 +1457,6 @@ static int cost_mv_ref(VP9_COMP *cpi, MB_PREDICTION_MODE mode, } } -void vp9_set_mbmode_and_mvs(MACROBLOCKD *xd, MB_PREDICTION_MODE mode, - const MV *mv) { - xd->mi_8x8[0]->mbmi.mode = mode; - xd->mi_8x8[0]->mbmi.mv[0].as_mv = *mv; -} - static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, int_mv *frame_mv, |