Commit 981c5f2e authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Rearranging and removing unused defines."

parents 8cb59992 66bf9496
...@@ -56,6 +56,13 @@ ...@@ -56,6 +56,13 @@
#define DISABLE_RC_LONG_TERM_MEM 0 #define DISABLE_RC_LONG_TERM_MEM 0
#if CONFIG_MULTIPLE_ARF
// Set MIN_GF_INTERVAL to 1 for the full decomposition.
#define MIN_GF_INTERVAL 2
#else
#define MIN_GF_INTERVAL 4
#endif
static void swap_yv12(YV12_BUFFER_CONFIG *a, YV12_BUFFER_CONFIG *b) { static void swap_yv12(YV12_BUFFER_CONFIG *a, YV12_BUFFER_CONFIG *b) {
YV12_BUFFER_CONFIG temp = *a; YV12_BUFFER_CONFIG temp = *a;
*a = *b; *a = *b;
......
...@@ -40,22 +40,11 @@ extern "C" { ...@@ -40,22 +40,11 @@ extern "C" {
// #define MODE_TEST_HIT_STATS // #define MODE_TEST_HIT_STATS
#if CONFIG_MULTIPLE_ARF
// Set MIN_GF_INTERVAL to 1 for the full decomposition.
#define MIN_GF_INTERVAL 2
#else
#define MIN_GF_INTERVAL 4
#endif
#define DEFAULT_GF_INTERVAL 10 #define DEFAULT_GF_INTERVAL 10
#define KEY_FRAME_CONTEXT 5
#define MAX_MODES 30 #define MAX_MODES 30
#define MAX_REFS 6 #define MAX_REFS 6
#define MIN_THRESHMULT 32
#define MAX_THRESHMULT 512
typedef struct { typedef struct {
int nmvjointcost[MV_JOINTS]; int nmvjointcost[MV_JOINTS];
int nmvcosts[2][MV_VALS]; int nmvcosts[2][MV_VALS];
......
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
#include "vp9/encoder/vp9_tokenize.h" #include "vp9/encoder/vp9_tokenize.h"
#include "vp9/encoder/vp9_variance.h" #include "vp9/encoder/vp9_variance.h"
#define RD_THRESH_MAX_FACT 64
#define RD_THRESH_INC 1
#define RD_THRESH_POW 1.25
#define RD_MULT_EPB_RATIO 64
/* Factor to weigh the rate for switchable interp filters */ /* Factor to weigh the rate for switchable interp filters */
#define SWITCHABLE_INTERP_RATE_FACTOR 1 #define SWITCHABLE_INTERP_RATE_FACTOR 1
......
...@@ -23,11 +23,6 @@ extern "C" { ...@@ -23,11 +23,6 @@ extern "C" {
(((128 + ((int64_t)R) * (RM)) >> 8) + (D << DM)) (((128 + ((int64_t)R) * (RM)) >> 8) + (D << DM))
#define QIDX_SKIP_THRESH 115 #define QIDX_SKIP_THRESH 115
#define RD_THRESH_MAX_FACT 64
#define RD_THRESH_INC 1
#define RD_THRESH_POW 1.25
#define RD_MULT_EPB_RATIO 64
#define MV_COST_WEIGHT 108 #define MV_COST_WEIGHT 108
#define MV_COST_WEIGHT_SUB 120 #define MV_COST_WEIGHT_SUB 120
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment