bd69b7d459
This commit adjusted slightly the 4x4 coefficents band definition to better classify coefficients with similar distributions and usages. It helps derf set about .1%, it is alos slightly positive for std-hd set, where 4x4 blocks are used less frequently. The commit also removed a const array not in use. Change-Id: I78d16905d4036641ec905b0c32c190c1def5b249
212 lines
6.4 KiB
C
212 lines
6.4 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "entropy.h"
|
|
#include "string.h"
|
|
#include "blockd.h"
|
|
#include "onyxc_int.h"
|
|
#include "vpx_mem/vpx_mem.h"
|
|
|
|
#define uchar unsigned char /* typedefs can clash */
|
|
#define uint unsigned int
|
|
|
|
typedef const uchar cuchar;
|
|
typedef const uint cuint;
|
|
|
|
typedef vp8_prob Prob;
|
|
|
|
#include "coefupdateprobs.h"
|
|
|
|
DECLARE_ALIGNED(16, const unsigned char, vp8_norm[256]) =
|
|
{
|
|
0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
|
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
|
};
|
|
|
|
DECLARE_ALIGNED(16, cuchar, vp8_coef_bands[16]) =
|
|
{ 0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7};
|
|
|
|
DECLARE_ALIGNED(16, cuchar, vp8_prev_token_class[MAX_ENTROPY_TOKENS]) =
|
|
{ 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0};
|
|
|
|
DECLARE_ALIGNED(16, const int, vp8_default_zig_zag1d[16]) =
|
|
{
|
|
0, 1, 4, 8,
|
|
5, 2, 3, 6,
|
|
9, 12, 13, 10,
|
|
7, 11, 14, 15,
|
|
};
|
|
DECLARE_ALIGNED(64, cuchar, vp8_coef_bands_8x8[64]) = { 0, 1, 2, 3, 5, 4, 4, 5,
|
|
5, 3, 6, 3, 5, 4, 6, 6,
|
|
6, 5, 5, 6, 6, 6, 6, 6,
|
|
6, 6, 6, 6, 6, 6, 6, 6,
|
|
6, 6, 6, 6, 7, 7, 7, 7,
|
|
7, 7, 7, 7, 7, 7, 7, 7,
|
|
7, 7, 7, 7, 7, 7, 7, 7,
|
|
7, 7, 7, 7, 7, 7, 7, 7
|
|
};
|
|
DECLARE_ALIGNED(64, const int, vp8_default_zig_zag1d_8x8[64]) =
|
|
{
|
|
0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5,
|
|
12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28,
|
|
35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51,
|
|
58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63,
|
|
};
|
|
|
|
|
|
DECLARE_ALIGNED(16, short, vp8_default_zig_zag_mask[16]);
|
|
DECLARE_ALIGNED(64, short, vp8_default_zig_zag_mask_8x8[64]);//int64_t
|
|
|
|
/* Array indices are identical to previously-existing CONTEXT_NODE indices */
|
|
|
|
const vp8_tree_index vp8_coef_tree[ 22] = /* corresponding _CONTEXT_NODEs */
|
|
{
|
|
-DCT_EOB_TOKEN, 2, /* 0 = EOB */
|
|
-ZERO_TOKEN, 4, /* 1 = ZERO */
|
|
-ONE_TOKEN, 6, /* 2 = ONE */
|
|
8, 12, /* 3 = LOW_VAL */
|
|
-TWO_TOKEN, 10, /* 4 = TWO */
|
|
-THREE_TOKEN, -FOUR_TOKEN, /* 5 = THREE */
|
|
14, 16, /* 6 = HIGH_LOW */
|
|
-DCT_VAL_CATEGORY1, -DCT_VAL_CATEGORY2, /* 7 = CAT_ONE */
|
|
18, 20, /* 8 = CAT_THREEFOUR */
|
|
-DCT_VAL_CATEGORY3, -DCT_VAL_CATEGORY4, /* 9 = CAT_THREE */
|
|
-DCT_VAL_CATEGORY5, -DCT_VAL_CATEGORY6 /* 10 = CAT_FIVE */
|
|
};
|
|
|
|
struct vp8_token_struct vp8_coef_encodings[MAX_ENTROPY_TOKENS];
|
|
|
|
/* Trees for extra bits. Probabilities are constant and
|
|
do not depend on previously encoded bits */
|
|
|
|
static const Prob Pcat1[] = { 159};
|
|
static const Prob Pcat2[] = { 165, 145};
|
|
static const Prob Pcat3[] = { 173, 148, 140};
|
|
static const Prob Pcat4[] = { 176, 155, 140, 135};
|
|
static const Prob Pcat5[] = { 180, 157, 141, 134, 130};
|
|
static const Prob Pcat6[] =
|
|
{ 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129};
|
|
|
|
static vp8_tree_index cat1[2], cat2[4], cat3[6], cat4[8], cat5[10], cat6[26];
|
|
|
|
void vp8_init_scan_order_mask()
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < 16; i++)
|
|
{
|
|
vp8_default_zig_zag_mask[vp8_default_zig_zag1d[i]] = 1 << i;
|
|
}
|
|
for (i = 0; i < 64; i++)
|
|
{
|
|
vp8_default_zig_zag_mask_8x8[vp8_default_zig_zag1d_8x8[i]] = 1 << i;
|
|
}
|
|
}
|
|
|
|
static void init_bit_tree(vp8_tree_index *p, int n)
|
|
{
|
|
int i = 0;
|
|
|
|
while (++i < n)
|
|
{
|
|
p[0] = p[1] = i << 1;
|
|
p += 2;
|
|
}
|
|
|
|
p[0] = p[1] = 0;
|
|
}
|
|
|
|
static void init_bit_trees()
|
|
{
|
|
init_bit_tree(cat1, 1);
|
|
init_bit_tree(cat2, 2);
|
|
init_bit_tree(cat3, 3);
|
|
init_bit_tree(cat4, 4);
|
|
init_bit_tree(cat5, 5);
|
|
init_bit_tree(cat6, 13);
|
|
}
|
|
|
|
vp8_extra_bit_struct vp8_extra_bits[12] =
|
|
{
|
|
{ 0, 0, 0, 0},
|
|
{ 0, 0, 0, 1},
|
|
{ 0, 0, 0, 2},
|
|
{ 0, 0, 0, 3},
|
|
{ 0, 0, 0, 4},
|
|
{ cat1, Pcat1, 1, 5},
|
|
{ cat2, Pcat2, 2, 7},
|
|
{ cat3, Pcat3, 3, 11},
|
|
{ cat4, Pcat4, 4, 19},
|
|
{ cat5, Pcat5, 5, 35},
|
|
{ cat6, Pcat6, 13, 67},
|
|
{ 0, 0, 0, 0}
|
|
};
|
|
|
|
#if CONFIG_NEWUPDATE
|
|
const vp8_prob updprobs[4] = {128, 136, 120, 112};
|
|
#endif
|
|
|
|
#include "default_coef_probs.h"
|
|
#include "defaultcoefcounts.h"
|
|
|
|
void vp8_default_coef_probs(VP8_COMMON *pc)
|
|
{
|
|
int h;
|
|
vpx_memcpy(pc->fc.coef_probs, default_coef_probs,
|
|
sizeof(default_coef_probs));
|
|
h = 0;
|
|
do
|
|
{
|
|
int i = 0;
|
|
|
|
do
|
|
{
|
|
int k = 0;
|
|
|
|
do
|
|
{
|
|
unsigned int branch_ct [ENTROPY_NODES] [2];
|
|
vp8_tree_probs_from_distribution(
|
|
MAX_ENTROPY_TOKENS, vp8_coef_encodings, vp8_coef_tree,
|
|
pc->fc.coef_probs_8x8 [h][i][k], branch_ct, vp8_default_coef_counts_8x8 [h][i][k],
|
|
256, 1);
|
|
|
|
}
|
|
while (++k < PREV_COEF_CONTEXTS);
|
|
}
|
|
while (++i < COEF_BANDS);
|
|
}
|
|
while (++h < BLOCK_TYPES);
|
|
|
|
}
|
|
|
|
void vp8_coef_tree_initialize()
|
|
{
|
|
init_bit_trees();
|
|
vp8_tokens_from_tree(vp8_coef_encodings, vp8_coef_tree);
|
|
}
|