Moving #defines to *.c from *.h.

Change-Id: I7cc6f441f414ca1b4d95dad3f789fff6faf8c3c4

diff --git a/vp9/encoder/vp9_lookahead.c b/vp9/encoder/vp9_lookahead.c
index a298f1c207af9b4ccdeff0c82b22e8b1a7a4afe1..abe71e681d313e08c871e2138940e2eb4c531a8c 100644 (file)
--- a/vp9/encoder/vp9_lookahead.c
+++ b/vp9/encoder/vp9_lookahead.c
@@ -18,6 +18,9 @@
 #include "vp9/encoder/vp9_extend.h"
 #include "vp9/encoder/vp9_lookahead.h"
 
+// The max of past frames we want to keep in the queue.
+#define MAX_PRE_FRAMES 1
+
 struct lookahead_ctx {
   unsigned int max_sz;         /* Absolute size of the queue */
   unsigned int sz;             /* Number of buffers currently in the queue */

diff --git a/vp9/encoder/vp9_lookahead.h b/vp9/encoder/vp9_lookahead.h
index 046c533cc1c975bc52188117513b967350e929f0..ff63c0d0d753cc4dec59d814c33ef1f59c3ff148 100644 (file)
--- a/vp9/encoder/vp9_lookahead.h
+++ b/vp9/encoder/vp9_lookahead.h
@@ -20,9 +20,6 @@ extern "C" {
 
 #define MAX_LAG_BUFFERS 25
 
-// The max of past frames we want to keep in the queue.
-#define MAX_PRE_FRAMES 1
-
 struct lookahead_entry {
   YV12_BUFFER_CONFIG  img;
   int64_t             ts_start;

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 6ebd9f3fa4f7e88b23794a1253d85d49d9c29b99..3658ee69b05af0eb4528661dd4a67fe068c6af12 100644 (file)
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -40,6 +40,8 @@
 #define MIN_BPB_FACTOR 0.005
 #define MAX_BPB_FACTOR 50
 
+#define FRAME_OVERHEAD_BITS 200
+
 // Tables relating active max Q to active min Q
 static int kf_low_motion_minq[QINDEX_RANGE];
 static int kf_high_motion_minq[QINDEX_RANGE];

diff --git a/vp9/encoder/vp9_ratectrl.h b/vp9/encoder/vp9_ratectrl.h
index 820366119dea444f7f06b8fd54e8148f59490c81..b1cc676091fabc8ff46b721f51102c7ef74416d9 100644 (file)
--- a/vp9/encoder/vp9_ratectrl.h
+++ b/vp9/encoder/vp9_ratectrl.h
@@ -20,8 +20,6 @@
 extern "C" {
 #endif
 
-#define FRAME_OVERHEAD_BITS 200
-
 // Bits Per MB at different Q (Multiplied by 512)
 #define BPER_MB_NORMBITS    9