ref: 85bf6914cf627ab2c1e3ccd8fe11d3109e0ebc04
parent: 3b8d00449c4c226dd820ba8314fb7a9b81d64a2c
parent: de8fd6f48addd94034cdfd9170bdfe52d9481e30
author: Yaowu Xu <yaowu@google.com>
date: Wed Mar 26 05:53:32 EDT 2014
Merge "Removed redundant settings"
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -762,7 +762,6 @@
int speed) {
sf->static_segmentation = 0;
sf->adaptive_rd_thresh = 1;
- sf->recode_loop = ((speed < 1) ? ALLOW_RECODE : ALLOW_RECODE_KFMAXBW);
sf->encode_breakout_thresh = 1;
sf->use_fast_coef_costing = 1;
@@ -783,7 +782,6 @@
sf->adaptive_pred_interp_filter = 1;
sf->auto_mv_step_size = 1;
sf->adaptive_rd_thresh = 2;
- sf->recode_loop = ALLOW_RECODE_KFARFGF;
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_H_V;
sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC_H_V;
sf->intra_uv_mode_mask[TX_16X16] = INTRA_DC_H_V;
@@ -820,7 +818,6 @@
sf->last_partitioning_redo_frequency = 3;
sf->adaptive_rd_thresh = 2;
- sf->recode_loop = ALLOW_RECODE_KFARFGF;
sf->use_lp32x32fdct = 1;
sf->mode_skip_start = 11;
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_H_V;
--
⑨