From f3739f905226bfaa8e0e1eb7ce16b1adc86f3895 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Mon, 14 Apr 2014 14:09:39 -0700 Subject: Consistent mode names. Change-Id: Icb4851d98c951506fe5d73d8d5a8ac7e53fecfd0 --- vp9/encoder/vp9_speed_features.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'vp9/encoder/vp9_speed_features.c') diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index adad800b6..bc1093070 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -346,16 +346,16 @@ void vp9_set_speed_features(VP9_COMP *cpi) { sf->recode_tolerance = 25; switch (oxcf->mode) { - case MODE_BESTQUALITY: - case MODE_SECONDPASS_BEST: // This is the best quality mode. + case ONE_PASS_BEST: + case TWO_PASS_SECOND_BEST: // This is the best quality mode. cpi->diamond_search_sad = vp9_full_range_search; break; - case MODE_FIRSTPASS: - case MODE_GOODQUALITY: - case MODE_SECONDPASS: + case TWO_PASS_FIRST: + case ONE_PASS_GOOD: + case TWO_PASS_SECOND_GOOD: set_good_speed_feature(cpi, cm, sf, speed); break; - case MODE_REALTIME: + case REALTIME: set_rt_speed_feature(cm, sf, speed); break; } @@ -378,7 +378,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) { cpi->mb.optimize = sf->optimize_coefficients == 1 && cpi->pass != 1; - if (cpi->encode_breakout && oxcf->mode == MODE_REALTIME && + if (cpi->encode_breakout && oxcf->mode == REALTIME && sf->encode_breakout_thresh > cpi->encode_breakout) cpi->encode_breakout = sf->encode_breakout_thresh; -- cgit v1.2.3