Skip to content
GitLab
Commit 340f0c96 authored by Adrian Grange's avatar Adrian Grange Committed by Gerrit Code Review
Browse files

Merge "Remove delete_first_pass_file."

parents 37114919 2554d573
v1.14.0-linphone 1.4.X feature/update_to_v1.9.0-linphone feature/uwp_nuget frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck nextgen nextgenv2 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 7 deletions
vp8/vp8_cx_iface.c
+ 0
− 2
View file @ 340f0c96
...@@ -414,7 +414,6 @@ static vpx_codec_err_t set_vp8e_config(VP8_CONFIG *oxcf, ...@@ -414,7 +414,6 @@ static vpx_codec_err_t set_vp8e_config(VP8_CONFIG *oxcf,
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("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);
printf("end_usage: %d\n", oxcf->end_usage); printf("end_usage: %d\n", oxcf->end_usage);
...@@ -1263,7 +1262,6 @@ static vpx_codec_enc_cfg_map_t vp8e_usage_cfg_map[] = ...@@ -1263,7 +1262,6 @@ static vpx_codec_enc_cfg_map_t vp8e_usage_cfg_map[] =
128, /* kf_max_dist */ 128, /* kf_max_dist */
#if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION) #if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION)
1, /* g_delete_first_pass_file */
"vp8.fpf" /* first pass filename */ "vp8.fpf" /* first pass filename */
#endif #endif
VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */ VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */
......
vp9/vp9_cx_iface.c
+ 0
− 5
View file @ 340f0c96
...@@ -316,9 +316,6 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, ...@@ -316,9 +316,6 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
// oxcf->kf_min_dist = cfg.kf_min_dis; // oxcf->kf_min_dist = cfg.kf_min_dis;
oxcf->key_freq = cfg.kf_max_dist; oxcf->key_freq = cfg.kf_max_dist;
// oxcf->delete_first_pass_file = cfg.g_delete_firstpassfile;
// strcpy(oxcf->first_pass_file, cfg.g_firstpass_file);
oxcf->cpu_used = vp8_cfg.cpu_used; oxcf->cpu_used = vp8_cfg.cpu_used;
oxcf->encode_breakout = vp8_cfg.static_thresh; oxcf->encode_breakout = vp8_cfg.static_thresh;
oxcf->play_alternate = vp8_cfg.enable_auto_alt_ref; oxcf->play_alternate = vp8_cfg.enable_auto_alt_ref;
...@@ -352,7 +349,6 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, ...@@ -352,7 +349,6 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
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("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);
printf("end_usage: %d\n", oxcf->end_usage); printf("end_usage: %d\n", oxcf->end_usage);
...@@ -1132,7 +1128,6 @@ static vpx_codec_enc_cfg_map_t vp9e_usage_cfg_map[] = { ...@@ -1132,7 +1128,6 @@ static vpx_codec_enc_cfg_map_t vp9e_usage_cfg_map[] = {
VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */ VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */
#if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION) #if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION)
1, /* g_delete_first_pass_file */
"vp8.fpf" /* first pass filename */ "vp8.fpf" /* first pass filename */
#endif #endif
} }
......
Supports Markdown
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