ref: 3dca0d44d2615e2fd45870fea90621244f6ed6bb
parent: 98466e896269f454ed59779e78f5d1e8a6266791
parent: 9780d58e9413407017788f7aaf5523f51d1b7ab0
author: Yaowu Xu <yaowu@google.com>
date: Fri Apr 5 09:34:45 EDT 2013
Merge "make one_shot_q an experiment" into experimental
--- a/configure
+++ b/configure
@@ -251,6 +251,7 @@
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