Remove use_quant_fp speed feature

Change-Id: I22f1299545d4c75d80e72d479be66f66ea142ef1

diff --git a/vp10/encoder/block.h b/vp10/encoder/block.h
index 9ee499c8fa3b04ba01b7c8b3b3176cdcacbdb7fc..88f1236ec55e239f6d52d1623d5a2c0b6f7eeb0e 100644 (file)
--- a/vp10/encoder/block.h
+++ b/vp10/encoder/block.h
@@ -162,9 +162,6 @@ struct macroblock {
   // indicate if it is in the rd search loop or encoding process
   int use_lp32x32fdct;
 
-  // use fast quantization process
-  int quant_fp;
-
   // Used to store sub partition's choices.
   MV pred_mv[MAX_REF_FRAMES];
 

diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c
index 06be7b7733f85c137f297c02e0584a0dcb65030c..69f766a02de721792cfba80c41bb156856ef5929 100644 (file)
--- a/vp10/encoder/encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -4605,7 +4605,6 @@ static void encode_frame_internal(VP10_COMP *cpi) {
   cm->prev_mi = cm->use_prev_frame_mvs ?
                 cm->prev_mip + cm->mi_stride + 1 : NULL;
 
-  x->quant_fp = cpi->sf.use_quant_fp;
 #if CONFIG_VAR_TX
 #if CONFIG_REF_MV
   vp10_zero(x->blk_skip_drl);

diff --git a/vp10/encoder/speed_features.c b/vp10/encoder/speed_features.c
index bd0cb818908e513811297e0b9a5a0e28fc58a5cd..8f4f11d0c635789efcddda6ecab467abecc8d01c 100644 (file)
--- a/vp10/encoder/speed_features.c
+++ b/vp10/encoder/speed_features.c
@@ -370,7 +370,6 @@ static void set_rt_speed_feature(VP10_COMP *cpi, SPEED_FEATURES *sf,
   }
 
   if (speed >= 5) {
-    sf->use_quant_fp = !is_keyframe;
     sf->auto_min_max_partition_size = is_keyframe ? RELAXED_NEIGHBORING_MIN_MAX
                                                   : STRICT_NEIGHBORING_MIN_MAX;
     sf->default_max_partition_size = BLOCK_32X32;
@@ -492,7 +491,6 @@ void vp10_set_speed_features_framesize_independent(VP10_COMP *cpi) {
   sf->cb_pred_filter_search = 0;
   sf->cb_partition_search = 0;
   sf->alt_ref_search_fp = 0;
-  sf->use_quant_fp = 0;
   sf->partition_search_type = SEARCH_PARTITION;
   sf->tx_type_search.prune_mode = NO_PRUNE;
   sf->tx_type_search.fast_intra_tx_type_search = 0;

diff --git a/vp10/encoder/speed_features.h b/vp10/encoder/speed_features.h
index 2ddf4be674fb851a96861c444afc62b81ad8fcbf..c1d1f8148946bbfc10d1d6e2527bf72e0ed1241a 100644 (file)
--- a/vp10/encoder/speed_features.h
+++ b/vp10/encoder/speed_features.h
@@ -383,9 +383,6 @@ typedef struct SPEED_FEATURES {
 
   int alt_ref_search_fp;
 
-  // Fast quantization process path
-  int use_quant_fp;
-
   // Use finer quantizer in every other few frames that run variable block
   // partition type search.
   int force_frame_boost;