ref: 1df7ef297411d99299eaca3b4b735e95adeeba52
parent: b26ce8b1bead574613fa20212bd6f15cc9613e2e
author: Deb Mukherjee <[email protected]>
date: Wed Oct 30 20:20:55 EDT 2013
Remove one shot q experiment The experiment is no longer used and can be removed. Change-Id: I9feab378fc895c120aa375353c68f93cad090609
--- a/configure
+++ b/configure
@@ -249,7 +249,6 @@
unistd_h
"
EXPERIMENT_LIST="
- oneshotq
multiple_arf
non420
alpha
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -2169,7 +2169,6 @@
cpi->ni_av_qi = tmp_q;
cpi->avg_q = vp9_convert_qindex_to_q(tmp_q);
-#ifndef ONE_SHOT_Q_ESTIMATE
// Limit the maxq value returned subsequently.
// This increases the risk of overspend or underspend if the initial
// estimate for the clip is bad, but helps prevent excessive
@@ -2176,10 +2175,8 @@
// variation in Q, especially near the end of a clip
// where for example a small overspend may cause Q to crash
adjust_maxq_qrange(cpi);
-#endif
}
-#ifndef ONE_SHOT_Q_ESTIMATE
// The last few frames of a clip almost always have to few or too many
// bits and for the sake of over exact rate control we dont want to make
// radical adjustments to the allowed quantizer range just to use up a
@@ -2202,7 +2199,6 @@
cpi->active_worst_quality =
adjust_active_maxq(cpi->active_worst_quality, tmp_q);
}
-#endif
}
vp9_zero(this_frame);
if (EOF == input_stats(cpi, &this_frame))
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -2856,19 +2856,11 @@
if (cpi->oxcf.end_usage == USAGE_CONSTANT_QUALITY) {cpi->active_best_quality = cpi->cq_target_quality;
} else {-#ifdef ONE_SHOT_Q_ESTIMATE
-#ifdef STRICT_ONE_SHOT_Q
- cpi->active_best_quality = q;
-#else
cpi->active_best_quality = inter_minq[q];
-#endif
-#else
- cpi->active_best_quality = inter_minq[q];
// 1-pass: for now, use the average Q for the active_best, if its lower
// than active_worst.
if (cpi->pass == 0 && (cpi->avg_frame_qindex < q))
cpi->active_best_quality = inter_minq[cpi->avg_frame_qindex];
-#endif
// For the constrained quality mode we don't want
// q to fall below the cq level.
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -29,11 +29,6 @@
#include "vp9/common/vp9_findnearmv.h"
#include "vp9/encoder/vp9_lookahead.h"
-// Experimental rate control switches
-#if CONFIG_ONESHOTQ
-#define ONE_SHOT_Q_ESTIMATE 0
-#define STRICT_ONE_SHOT_Q 0
-#endif
#define DISABLE_RC_LONG_TERM_MEM 0
// #define MODE_TEST_HIT_STATS