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

Merge "Formatting vp9_pareto8_full array."

Browse Source
This commit is contained in:
Dmitry Kovalev
2013-12-04 12:22:50 -08:00
committed by Gerrit Code Review
parent f6582d6928 ff6d6a9f07
commit da2da79012
2 changed files with 259 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/common/vp9_entropy.c
View File

@@ -133,7 +133,7 @@ const vp9_tree_index vp9_coefmodel_tree[6] = {
// by averaging : // by averaging :
// vp9_pareto8_full[l][node] = ( vp9_pareto8_full[l-1][node] + // vp9_pareto8_full[l][node] = ( vp9_pareto8_full[l-1][node] +
// vp9_pareto8_full[l+1][node] ) >> 1; // vp9_pareto8_full[l+1][node] ) >> 1;
const vp9_prob vp9_pareto8_full[256][MODEL_NODES] = { const vp9_prob vp9_pareto8_full[COEFF_PROB_MODELS][MODEL_NODES] = {
{ 3, 86, 128, 6, 86, 23, 88, 29}, { 3, 86, 128, 6, 86, 23, 88, 29},
{ 6, 86, 128, 11, 87, 42, 91, 52}, { 6, 86, 128, 11, 87, 42, 91, 52},
{ 9, 86, 129, 17, 88, 61, 94, 76}, { 9, 86, 129, 17, 88, 61, 94, 76},

4
vp9/common/vp9_entropy.h
View File

@@ -130,14 +130,14 @@ static const uint8_t *get_band_translate(TX_SIZE tx_size) {
// 1, 3, 5, 7, ..., 253, 255 // 1, 3, 5, 7, ..., 253, 255
// In between probabilities are interpolated linearly // In between probabilities are interpolated linearly
#define COEFPROB_MODELS 128 #define COEFF_PROB_MODELS 256
#define UNCONSTRAINED_NODES 3 #define UNCONSTRAINED_NODES 3
#define PIVOT_NODE 2 // which node is pivot #define PIVOT_NODE 2 // which node is pivot
#define MODEL_NODES (ENTROPY_NODES - UNCONSTRAINED_NODES) #define MODEL_NODES (ENTROPY_NODES - UNCONSTRAINED_NODES)
extern const vp9_prob vp9_pareto8_full[256][MODEL_NODES]; extern const vp9_prob vp9_pareto8_full[COEFF_PROB_MODELS][MODEL_NODES];
typedef vp9_prob vp9_coeff_probs_model[REF_TYPES][COEF_BANDS] typedef vp9_prob vp9_coeff_probs_model[REF_TYPES][COEF_BANDS]
[PREV_COEF_CONTEXTS] [PREV_COEF_CONTEXTS]