shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- 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 */

--- a/vp9/encoder/vp9_lookahead.h

+++ b/vp9/encoder/vp9_lookahead.h

@@ -20,9 +20,6 @@

 #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;

--- 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];

--- 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