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

Merge "Moving defines from vp9_onyx_int.h to suitable *.c files."

parents c8e84dd2 8228ead7
...@@ -34,13 +34,18 @@ ...@@ -34,13 +34,18 @@
#include "vp9/encoder/vp9_encodemb.h" #include "vp9/encoder/vp9_encodemb.h"
#include "vp9/encoder/vp9_encodemv.h" #include "vp9/encoder/vp9_encodemv.h"
#include "vp9/encoder/vp9_extend.h" #include "vp9/encoder/vp9_extend.h"
#include "vp9/encoder/vp9_onyx_int.h"
#include "vp9/encoder/vp9_pickmode.h" #include "vp9/encoder/vp9_pickmode.h"
#include "vp9/encoder/vp9_rdopt.h" #include "vp9/encoder/vp9_rdopt.h"
#include "vp9/encoder/vp9_segmentation.h" #include "vp9/encoder/vp9_segmentation.h"
#include "vp9/encoder/vp9_tokenize.h" #include "vp9/encoder/vp9_tokenize.h"
#include "vp9/encoder/vp9_vaq.h" #include "vp9/encoder/vp9_vaq.h"
#define GF_ZEROMV_ZBIN_BOOST 0
#define LF_ZEROMV_ZBIN_BOOST 0
#define MV_ZBIN_BOOST 0
#define SPLIT_MV_ZBIN_BOOST 0
#define INTRA_ZBIN_BOOST 0
static INLINE uint8_t *get_sb_index(MACROBLOCK *x, BLOCK_SIZE subsize) { static INLINE uint8_t *get_sb_index(MACROBLOCK *x, BLOCK_SIZE subsize) {
switch (subsize) { switch (subsize) {
case BLOCK_64X64: case BLOCK_64X64:
......
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
#include "vp9/encoder/vp9_resize.h" #include "vp9/encoder/vp9_resize.h"
#include "vp9/encoder/vp9_svc_layercontext.h" #include "vp9/encoder/vp9_svc_layercontext.h"
#define ALL_INTRA_MODES 0x3FF
#define INTRA_DC_ONLY 0x01
#define INTRA_DC_TM ((1 << TM_PRED) | (1 << DC_PRED))
#define INTRA_DC_H_V ((1 << DC_PRED) | (1 << V_PRED) | (1 << H_PRED))
#define INTRA_DC_TM_H_V (INTRA_DC_TM | (1 << V_PRED) | (1 << H_PRED))
void vp9_coef_tree_initialize(); void vp9_coef_tree_initialize();
#define DEFAULT_INTERP_FILTER SWITCHABLE #define DEFAULT_INTERP_FILTER SWITCHABLE
......
...@@ -47,8 +47,6 @@ extern "C" { ...@@ -47,8 +47,6 @@ extern "C" {
#define MIN_GF_INTERVAL 4 #define MIN_GF_INTERVAL 4
#endif #endif
#define DEFAULT_GF_INTERVAL 10 #define DEFAULT_GF_INTERVAL 10
#define DEFAULT_KF_BOOST 2000
#define DEFAULT_GF_BOOST 2000
#define KEY_FRAME_CONTEXT 5 #define KEY_FRAME_CONTEXT 5
...@@ -58,12 +56,6 @@ extern "C" { ...@@ -58,12 +56,6 @@ extern "C" {
#define MIN_THRESHMULT 32 #define MIN_THRESHMULT 32
#define MAX_THRESHMULT 512 #define MAX_THRESHMULT 512
#define GF_ZEROMV_ZBIN_BOOST 0
#define LF_ZEROMV_ZBIN_BOOST 0
#define MV_ZBIN_BOOST 0
#define SPLIT_MV_ZBIN_BOOST 0
#define INTRA_ZBIN_BOOST 0
typedef struct { typedef struct {
int nmvjointcost[MV_JOINTS]; int nmvjointcost[MV_JOINTS];
int nmvcosts[2][MV_VALS]; int nmvcosts[2][MV_VALS];
...@@ -188,12 +180,6 @@ typedef enum { ...@@ -188,12 +180,6 @@ typedef enum {
// Other methods to come // Other methods to come
} SUBPEL_SEARCH_METHODS; } SUBPEL_SEARCH_METHODS;
#define ALL_INTRA_MODES 0x3FF
#define INTRA_DC_ONLY 0x01
#define INTRA_DC_TM ((1 << TM_PRED) | (1 << DC_PRED))
#define INTRA_DC_H_V ((1 << DC_PRED) | (1 << V_PRED) | (1 << H_PRED))
#define INTRA_DC_TM_H_V (INTRA_DC_TM | (1 << V_PRED) | (1 << H_PRED))
typedef enum { typedef enum {
LAST_FRAME_PARTITION_OFF = 0, LAST_FRAME_PARTITION_OFF = 0,
LAST_FRAME_PARTITION_LOW_MOTION = 1, LAST_FRAME_PARTITION_LOW_MOTION = 1,
......
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
#include "vp9/encoder/vp9_encodemv.h" #include "vp9/encoder/vp9_encodemv.h"
#include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_ratectrl.h"
#define DEFAULT_KF_BOOST 2000
#define DEFAULT_GF_BOOST 2000
#define LIMIT_QRANGE_FOR_ALTREF_AND_KEY 1 #define LIMIT_QRANGE_FOR_ALTREF_AND_KEY 1
#define MIN_BPB_FACTOR 0.005 #define MIN_BPB_FACTOR 0.005
......
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