summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_speed_features.c
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2014-04-14 14:09:39 -0700
committerDmitry Kovalev <dkovalev@google.com>2014-04-14 14:09:39 -0700
commitf3739f905226bfaa8e0e1eb7ce16b1adc86f3895 (patch)
treef4173101935c121433075e7e4a8b3559252bf9c1 /vp9/encoder/vp9_speed_features.c
parent07dddfa3fdf11c08c8b91b96fe94907be228f2cc (diff)
downloadlibvpx-f3739f905226bfaa8e0e1eb7ce16b1adc86f3895.tar
libvpx-f3739f905226bfaa8e0e1eb7ce16b1adc86f3895.tar.gz
libvpx-f3739f905226bfaa8e0e1eb7ce16b1adc86f3895.tar.bz2
libvpx-f3739f905226bfaa8e0e1eb7ce16b1adc86f3895.zip
Consistent mode names.
Change-Id: Icb4851d98c951506fe5d73d8d5a8ac7e53fecfd0
Diffstat (limited to 'vp9/encoder/vp9_speed_features.c')
-rw-r--r--vp9/encoder/vp9_speed_features.c14
1 files changed, 7 insertions, 7 deletions
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;