generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replacing magic constants with expressions.

Browse Source 
Change-Id: I434682bbd4cb2089cd213d77ed5a5e06256dc45d
This commit is contained in:
Dmitry Kovalev 2014-04-01 17:42:14 -07:00
parent 7c7fc719c9
commit 5f3773d0f7
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
vp9/encoder/vp9_speed_features.c
View File

@ -13,17 +13,32 @@
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_onyx_int.h"
#include "vp9/encoder/vp9_speed_features.h" #include "vp9/encoder/vp9_speed_features.h"
#define ALL_INTRA_MODES 0x3FF #define ALL_INTRA_MODES ((1 << DC_PRED) | \
#define INTRA_DC_ONLY 0x01 (1 << V_PRED) | (1 << H_PRED) | \
#define INTRA_DC_TM ((1 << TM_PRED) | (1 << DC_PRED)) (1 << D45_PRED) | (1 << D135_PRED) | \
#define INTRA_DC_H_V ((1 << DC_PRED) | (1 << V_PRED) | (1 << H_PRED)) (1 << D117_PRED) | (1 << D153_PRED) | \
(1 << D207_PRED) | (1 << D63_PRED) | \
(1 << TM_PRED))
#define INTRA_DC_ONLY (1 << DC_PRED)
#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)) #define INTRA_DC_TM_H_V (INTRA_DC_TM | (1 << V_PRED) | (1 << H_PRED))
// Masks for partially or completely disabling split mode // Masks for partially or completely disabling split mode
#define DISABLE_ALL_SPLIT 0x3F #define DISABLE_ALL_INTER_SPLIT ((1 << THR_COMP_GA) | \
#define DISABLE_ALL_INTER_SPLIT 0x1F (1 << THR_COMP_LA) | \
#define DISABLE_COMPOUND_SPLIT 0x18 (1 << THR_ALTR) | \
#define LAST_AND_INTRA_SPLIT_ONLY 0x1E (1 << THR_GOLD) | \
(1 << THR_LAST))
#define DISABLE_ALL_SPLIT ((1 << THR_INTRA) | DISABLE_ALL_INTER_SPLIT)
#define DISABLE_COMPOUND_SPLIT ((1 << THR_COMP_GA) | (1 << THR_COMP_LA))
#define LAST_AND_INTRA_SPLIT_ONLY ((1 << THR_COMP_GA) | \
(1 << THR_COMP_LA) | \
(1 << THR_ALTR) | \
(1 << THR_GOLD))
// Intra only frames, golden frames (except alt ref overlays) and // Intra only frames, golden frames (except alt ref overlays) and
// alt ref frames tend to be coded at a higher than ambient quality // alt ref frames tend to be coded at a higher than ambient quality