Commit 4fbe54d2 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Renaming 'Mode' to 'mode'."

parents 8fcb74e6 962c8b24
...@@ -106,7 +106,7 @@ extern "C" ...@@ -106,7 +106,7 @@ extern "C"
// were generated in the first encoding pass to create the compressed // were generated in the first encoding pass to create the compressed
// output using the highest possible quality, and taking a // output using the highest possible quality, and taking a
// longer amount of time to encode.. ( speed setting ignored ) // longer amount of time to encode.. ( speed setting ignored )
int Mode; int mode;
// Key Framing Operations // Key Framing Operations
int auto_key; // autodetect cut scenes and set the keyframes int auto_key; // autodetect cut scenes and set the keyframes
......
...@@ -1314,7 +1314,7 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { ...@@ -1314,7 +1314,7 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
cpi->oxcf = *oxcf; cpi->oxcf = *oxcf;
switch (cpi->oxcf.Mode) { switch (cpi->oxcf.mode) {
// Real time and one pass deprecated in test code base // Real time and one pass deprecated in test code base
case MODE_GOODQUALITY: case MODE_GOODQUALITY:
cpi->pass = 0; cpi->pass = 0;
......
...@@ -261,13 +261,13 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, ...@@ -261,13 +261,13 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
switch (cfg.g_pass) { switch (cfg.g_pass) {
case VPX_RC_ONE_PASS: case VPX_RC_ONE_PASS:
oxcf->Mode = MODE_GOODQUALITY; oxcf->mode = MODE_GOODQUALITY;
break; break;
case VPX_RC_FIRST_PASS: case VPX_RC_FIRST_PASS:
oxcf->Mode = MODE_FIRSTPASS; oxcf->mode = MODE_FIRSTPASS;
break; break;
case VPX_RC_LAST_PASS: case VPX_RC_LAST_PASS:
oxcf->Mode = MODE_SECONDPASS_BEST; oxcf->mode = MODE_SECONDPASS_BEST;
break; break;
} }
...@@ -351,7 +351,7 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, ...@@ -351,7 +351,7 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
printf("noise_sensitivity: %d\n", oxcf->noise_sensitivity); printf("noise_sensitivity: %d\n", oxcf->noise_sensitivity);
printf("Sharpness: %d\n", oxcf->Sharpness); printf("Sharpness: %d\n", oxcf->Sharpness);
printf("cpu_used: %d\n", oxcf->cpu_used); printf("cpu_used: %d\n", oxcf->cpu_used);
printf("Mode: %d\n", oxcf->Mode); printf("Mode: %d\n", oxcf->mode);
// printf("delete_first_pass_file: %d\n", oxcf->delete_first_pass_file); // printf("delete_first_pass_file: %d\n", oxcf->delete_first_pass_file);
printf("auto_key: %d\n", oxcf->auto_key); printf("auto_key: %d\n", oxcf->auto_key);
printf("key_freq: %d\n", oxcf->key_freq); printf("key_freq: %d\n", oxcf->key_freq);
...@@ -577,8 +577,8 @@ static void pick_quickcompress_mode(vpx_codec_alg_priv_t *ctx, ...@@ -577,8 +577,8 @@ static void pick_quickcompress_mode(vpx_codec_alg_priv_t *ctx,
? MODE_SECONDPASS_BEST ? MODE_SECONDPASS_BEST
: MODE_SECONDPASS; : MODE_SECONDPASS;
if (ctx->oxcf.Mode != new_qc) { if (ctx->oxcf.mode != new_qc) {
ctx->oxcf.Mode = new_qc; ctx->oxcf.mode = new_qc;
vp9_change_config(ctx->cpi, &ctx->oxcf); vp9_change_config(ctx->cpi, &ctx->oxcf);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment