diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-15 22:59:37 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-15 22:59:37 -0700 |
| commit | 617a367c54826718ed055cdc3f789660c08b55f9 (patch) | |
| tree | 72d4aaf06b8cd4a1fe62d9605ffe6dd0801be35c /vp9/encoder/vp9_onyx_if.c | |
| parent | 003376fc8b6930ba65ee5a35f2f579fdc3307465 (diff) | |
| parent | f3739f905226bfaa8e0e1eb7ce16b1adc86f3895 (diff) | |
| download | libvpx-617a367c54826718ed055cdc3f789660c08b55f9.tar libvpx-617a367c54826718ed055cdc3f789660c08b55f9.tar.gz libvpx-617a367c54826718ed055cdc3f789660c08b55f9.tar.bz2 libvpx-617a367c54826718ed055cdc3f789660c08b55f9.zip | |
Merge "Consistent mode names."
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 21df24530..f51c90d59 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -376,7 +376,7 @@ static void update_reference_segmentation_map(VP9_COMP *cpi) { } } static int is_slowest_mode(int mode) { - return (mode == MODE_SECONDPASS_BEST || mode == MODE_BESTQUALITY); + return (mode == TWO_PASS_SECOND_BEST || mode == ONE_PASS_BEST); } static void set_rd_speed_thresholds(VP9_COMP *cpi) { @@ -670,7 +670,7 @@ static void init_config(struct VP9_COMP *cpi, VP9_CONFIG *oxcf) { if ((cpi->svc.number_temporal_layers > 1 && cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) || (cpi->svc.number_spatial_layers > 1 && - cpi->oxcf.mode == MODE_SECONDPASS_BEST)) { + cpi->oxcf.mode == TWO_PASS_SECOND_BEST)) { vp9_init_layer_context(cpi); } @@ -710,29 +710,29 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9_CONFIG *oxcf) { switch (cpi->oxcf.mode) { // Real time and one pass deprecated in test code base - case MODE_GOODQUALITY: + case ONE_PASS_GOOD: cpi->pass = 0; cpi->oxcf.cpu_used = clamp(cpi->oxcf.cpu_used, -5, 5); break; - case MODE_BESTQUALITY: + case ONE_PASS_BEST: cpi->pass = 0; break; - case MODE_FIRSTPASS: + case TWO_PASS_FIRST: cpi->pass = 1; break; - case MODE_SECONDPASS: + case TWO_PASS_SECOND_GOOD: cpi->pass = 2; cpi->oxcf.cpu_used = clamp(cpi->oxcf.cpu_used, -5, 5); break; - case MODE_SECONDPASS_BEST: + case TWO_PASS_SECOND_BEST: cpi->pass = 2; break; - case MODE_REALTIME: + case REALTIME: cpi->pass = 0; break; } |