Merge "make one_shot_q an experiment" into experimental

3dca0d44 · Yaowu Xu · Gerrit Code Review · 98466e89 · 9780d58e · 3dca0d44
Commit 3dca0d44 authored Apr 05, 2013 by Yaowu Xu Committed by Gerrit Code Review Apr 05, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

configure configure +1 -0

vp9/encoder/vp9_onyx_int.h vp9/encoder/vp9_onyx_int.h +5 -4

No files found.
--- a/configure
+++ b/configure
@@ -251,6 +251,7 @@ EXPERIMENT_LIST="
    loop_dering
    implicit_compoundinter_weight
    scatterscan
+    oneshotq
 "
 CONFIG_LIST="
    external_build

--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -30,10 +30,11 @@
 #include "vp9/encoder/vp9_lookahead.h"

 // Experimental rate control switches
-// #define ONE_SHOT_Q_ESTIMATE 1
-// #define STRICT_ONE_SHOT_Q 1
-// #define DISABLE_RC_LONG_TERM_MEM 1
-
+#if CONFIG_ONESHOTQ
+#define ONE_SHOT_Q_ESTIMATE 1
+#define STRICT_ONE_SHOT_Q 1
+#define DISABLE_RC_LONG_TERM_MEM 1
+#endif
 // #define SPEEDSTATS 1
 #define MIN_GF_INTERVAL             4
 #define DEFAULT_GF_INTERVAL         7