diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-05-01 18:28:34 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-01 18:28:34 -0700 |
| commit | 53888035f9325c31f6e8e84ebb62d5ca944e9444 (patch) | |
| tree | ae91541ee4960671347565e6746c8c6461f14c3a /vp9 | |
| parent | 2cba07c66051d3ded6a14d3c747187c136cf40fc (diff) | |
| parent | 042274739c29f33626a996755a1bc3527bef0e65 (diff) | |
| download | libvpx-53888035f9325c31f6e8e84ebb62d5ca944e9444.tar libvpx-53888035f9325c31f6e8e84ebb62d5ca944e9444.tar.gz libvpx-53888035f9325c31f6e8e84ebb62d5ca944e9444.tar.bz2 libvpx-53888035f9325c31f6e8e84ebb62d5ca944e9444.zip | |
Merge "Moving #defines to *.c from *.h."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_lookahead.c | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_lookahead.h | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_lookahead.c b/vp9/encoder/vp9_lookahead.c index a298f1c20..abe71e681 100644 --- 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 046c533cc..ff63c0d0d 100644 --- 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 b123bfdcb..24e75aedb 100644 --- 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 820366119..b1cc67609 100644 --- 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 |