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

Merge "Cleaning up vp9_entropymv.c."

parents 95cca0c2 49bb6df0
...@@ -8,14 +8,13 @@ ...@@ -8,14 +8,13 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_entropymv.h" #include "vp9/common/vp9_entropymv.h"
#define MV_COUNT_SAT 20 #define MV_COUNT_SAT 20
#define MV_MAX_UPDATE_FACTOR 128 #define MV_MAX_UPDATE_FACTOR 128
/* Integer pel reference mv threshold for use of high-precision 1/8 mv */ // Integer pel reference mv threshold for use of high-precision 1/8 mv
#define COMPANDED_MVREF_THRESH 8 #define COMPANDED_MVREF_THRESH 8
const vp9_tree_index vp9_mv_joint_tree[TREE_SIZE(MV_JOINTS)] = { const vp9_tree_index vp9_mv_joint_tree[TREE_SIZE(MV_JOINTS)] = {
...@@ -49,32 +48,30 @@ const vp9_tree_index vp9_mv_fp_tree[TREE_SIZE(MV_FP_SIZE)] = { ...@@ -49,32 +48,30 @@ const vp9_tree_index vp9_mv_fp_tree[TREE_SIZE(MV_FP_SIZE)] = {
static const nmv_context default_nmv_context = { static const nmv_context default_nmv_context = {
{32, 64, 96}, {32, 64, 96},
{ // NOLINT {
{ /* vert component */ // NOLINT { // Vertical component
128, /* sign */ 128, // sign
{224, 144, 192, 168, 192, 176, 192, 198, 198, 245}, /* class */ {224, 144, 192, 168, 192, 176, 192, 198, 198, 245}, // class
{216}, /* class0 */ {216}, // class0
{136, 140, 148, 160, 176, 192, 224, 234, 234, 240}, /* bits */ {136, 140, 148, 160, 176, 192, 224, 234, 234, 240}, // bits
{{128, 128, 64}, {96, 112, 64}}, /* class0_fp */ {{128, 128, 64}, {96, 112, 64}}, // class0_fp
{64, 96, 64}, /* fp */ {64, 96, 64}, // fp
160, /* class0_hp bit */ 160, // class0_hp bit
128, /* hp */ 128, // hp
}, },
{ /* hor component */ // NOLINT { // Horizontal component
128, /* sign */ 128, // sign
{216, 128, 176, 160, 176, 176, 192, 198, 198, 208}, /* class */ {216, 128, 176, 160, 176, 176, 192, 198, 198, 208}, // class
{208}, /* class0 */ {208}, // class0
{136, 140, 148, 160, 176, 192, 224, 234, 234, 240}, /* bits */ {136, 140, 148, 160, 176, 192, 224, 234, 234, 240}, // bits
{{128, 128, 64}, {96, 112, 64}}, /* class0_fp */ {{128, 128, 64}, {96, 112, 64}}, // class0_fp
{64, 96, 64}, /* fp */ {64, 96, 64}, // fp
160, /* class0_hp bit */ 160, // class0_hp bit
128, /* hp */ 128, // hp
} }
}, },
}; };
#define mv_class_base(c) ((c) ? (CLASS0_SIZE << (c + 2)) : 0)
static const uint8_t log_in_base_2[] = { static const uint8_t log_in_base_2[] = {
0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
...@@ -121,9 +118,13 @@ static const uint8_t log_in_base_2[] = { ...@@ -121,9 +118,13 @@ static const uint8_t log_in_base_2[] = {
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10
}; };
static INLINE int mv_class_base(MV_CLASS_TYPE c) {
return c ? CLASS0_SIZE << (c + 2) : 0;
}
MV_CLASS_TYPE vp9_get_mv_class(int z, int *offset) { MV_CLASS_TYPE vp9_get_mv_class(int z, int *offset) {
const MV_CLASS_TYPE c = (z >= CLASS0_SIZE * 4096) ? MV_CLASS_10 : const MV_CLASS_TYPE c = (z >= CLASS0_SIZE * 4096) ?
(MV_CLASS_TYPE)log_in_base_2[z >> 3]; MV_CLASS_10 : (MV_CLASS_TYPE)log_in_base_2[z >> 3];
if (offset) if (offset)
*offset = z - mv_class_base(c); *offset = z - mv_class_base(c);
return c; return c;
......
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