diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-06-27 02:28:36 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-27 02:28:36 -0700 |
| commit | 59af9049d37eefa77787e3f10dd3143aecf03f14 (patch) | |
| tree | ba19c734c91160f2c407e1803df531c5a8802eab /vp9/encoder/vp9_encodeframe.c | |
| parent | 5bcf069c6bb73b95437b9071540cab77ca30983b (diff) | |
| parent | 689957e3ad60b46ec8e22665f0d95d03c50f100e (diff) | |
| download | libvpx-59af9049d37eefa77787e3f10dd3143aecf03f14.tar libvpx-59af9049d37eefa77787e3f10dd3143aecf03f14.tar.gz libvpx-59af9049d37eefa77787e3f10dd3143aecf03f14.tar.bz2 libvpx-59af9049d37eefa77787e3f10dd3143aecf03f14.zip | |
Merge "Start adaptive threshold for each mode at max."
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index b07c21f30..4b1ff103a 100644 --- 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 |