Start adaptive threshold for each mode at max.

Each frame we reset all adaptive thresholds to MAX
rather than base. As modes are picked their thresholds
drop down.

Change-Id: Ia37f03a73003c2d9bfcda57edea07205e9a0e5e8

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 54629415d8f9843f1b4f25e4a8de9fbc7e052bea..e800582dc61ee4231c00c3e8e1711d4599914931 100644 (file)
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -397,24 +397,6 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx,
     cpi->mode_chosen_counts[kf_mode_index[mb_mode]]++;
 #endif
   } else {
-    /*
-     // Reduce the activation RD thresholds for the best choice mode
-     if ((cpi->rd_baseline_thresh[mb_mode_index] > 0) &&
-     (cpi->rd_baseline_thresh[mb_mode_index] < (INT_MAX >> 2)))
-     {
-     int best_adjustment = (cpi->rd_thresh_mult[mb_mode_index] >> 2);
-
-     cpi->rd_thresh_mult[mb_mode_index] =
-     (cpi->rd_thresh_mult[mb_mode_index]
-     >= (MIN_THRESHMULT + best_adjustment)) ?
-     cpi->rd_thresh_mult[mb_mode_index] - best_adjustment :
-     MIN_THRESHMULT;
-     cpi->rd_threshes[mb_mode_index] =
-     (cpi->rd_baseline_thresh[mb_mode_index] >> 7)
-     * cpi->rd_thresh_mult[mb_mode_index];
-
-     }
-     */
     // Note how often each mode chosen as best
     cpi->mode_chosen_counts[mb_mode_index]++;
     if (mbmi->ref_frame[0] != INTRA_FRAME

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 20080884cc5ab51805ed7d81f148928250c1b8d4..dc3536387b8d5df6655e4ab1eba659559c1b67b2 100644 (file)
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -227,7 +227,8 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi, int qindex) {
           cpi->rd_threshes[bsize][i] = INT_MAX;
         }
         cpi->rd_baseline_thresh[bsize][i] = cpi->rd_threshes[bsize][i];
-        cpi->rd_thresh_freq_fact[bsize][i] = BASE_RD_THRESH_FREQ_FACT;
+
+        cpi->rd_thresh_freq_fact[bsize][i] = MAX_RD_THRESH_FREQ_FACT;
       }
     }
   } else {
@@ -247,7 +248,7 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi, int qindex) {
           cpi->rd_threshes[bsize][i] = INT_MAX;
         }
         cpi->rd_baseline_thresh[bsize][i] = cpi->rd_threshes[bsize][i];
-        cpi->rd_thresh_freq_fact[bsize][i] = BASE_RD_THRESH_FREQ_FACT;
+        cpi->rd_thresh_freq_fact[bsize][i] = MAX_RD_THRESH_FREQ_FACT;
       }
     }
   }