1e9e9ce2dc
The counts didn't take usehp into account, which means that if the scope of the refmv is too large for the hp bit to be coded, the value (always 1) is still included in the stats. Therefore, the final counts will not reflect the entropy of the coded bits, but rather the entropy of the combination of coded bits and the implied value (which is always 1). Fix that by only including counts if the hp bit is actually coded. See issue 1060. Change-Id: I19a3adda4a8662a05f08a9e58d7e56ff979be11e
221 lines
8.8 KiB
C
221 lines
8.8 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 "vp10/common/onyxc_int.h"
|
|
#include "vp10/common/entropymv.h"
|
|
|
|
// Integer pel reference mv threshold for use of high-precision 1/8 mv
|
|
#define COMPANDED_MVREF_THRESH 8
|
|
|
|
const vpx_tree_index vp10_mv_joint_tree[TREE_SIZE(MV_JOINTS)] = {
|
|
-MV_JOINT_ZERO, 2,
|
|
-MV_JOINT_HNZVZ, 4,
|
|
-MV_JOINT_HZVNZ, -MV_JOINT_HNZVNZ
|
|
};
|
|
|
|
const vpx_tree_index vp10_mv_class_tree[TREE_SIZE(MV_CLASSES)] = {
|
|
-MV_CLASS_0, 2,
|
|
-MV_CLASS_1, 4,
|
|
6, 8,
|
|
-MV_CLASS_2, -MV_CLASS_3,
|
|
10, 12,
|
|
-MV_CLASS_4, -MV_CLASS_5,
|
|
-MV_CLASS_6, 14,
|
|
16, 18,
|
|
-MV_CLASS_7, -MV_CLASS_8,
|
|
-MV_CLASS_9, -MV_CLASS_10,
|
|
};
|
|
|
|
const vpx_tree_index vp10_mv_class0_tree[TREE_SIZE(CLASS0_SIZE)] = {
|
|
-0, -1,
|
|
};
|
|
|
|
const vpx_tree_index vp10_mv_fp_tree[TREE_SIZE(MV_FP_SIZE)] = {
|
|
-0, 2,
|
|
-1, 4,
|
|
-2, -3
|
|
};
|
|
|
|
static const nmv_context default_nmv_context = {
|
|
{32, 64, 96},
|
|
{
|
|
{ // Vertical component
|
|
128, // sign
|
|
{224, 144, 192, 168, 192, 176, 192, 198, 198, 245}, // class
|
|
{216}, // class0
|
|
{136, 140, 148, 160, 176, 192, 224, 234, 234, 240}, // bits
|
|
{{128, 128, 64}, {96, 112, 64}}, // class0_fp
|
|
{64, 96, 64}, // fp
|
|
160, // class0_hp bit
|
|
128, // hp
|
|
},
|
|
{ // Horizontal component
|
|
128, // sign
|
|
{216, 128, 176, 160, 176, 176, 192, 198, 198, 208}, // class
|
|
{208}, // class0
|
|
{136, 140, 148, 160, 176, 192, 224, 234, 234, 240}, // bits
|
|
{{128, 128, 64}, {96, 112, 64}}, // class0_fp
|
|
{64, 96, 64}, // fp
|
|
160, // class0_hp bit
|
|
128, // hp
|
|
}
|
|
},
|
|
};
|
|
|
|
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,
|
|
4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
|
|
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6,
|
|
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
|
|
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 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, 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, 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, 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,
|
|
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
|
8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
|
|
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 vp10_get_mv_class(int z, int *offset) {
|
|
const MV_CLASS_TYPE c = (z >= CLASS0_SIZE * 4096) ?
|
|
MV_CLASS_10 : (MV_CLASS_TYPE)log_in_base_2[z >> 3];
|
|
if (offset)
|
|
*offset = z - mv_class_base(c);
|
|
return c;
|
|
}
|
|
|
|
int vp10_use_mv_hp(const MV *ref) {
|
|
return (abs(ref->row) >> 3) < COMPANDED_MVREF_THRESH &&
|
|
(abs(ref->col) >> 3) < COMPANDED_MVREF_THRESH;
|
|
}
|
|
|
|
static void inc_mv_component(int v, nmv_component_counts *comp_counts,
|
|
int incr, int usehp) {
|
|
int s, z, c, o, d, e, f;
|
|
assert(v != 0); /* should not be zero */
|
|
s = v < 0;
|
|
comp_counts->sign[s] += incr;
|
|
z = (s ? -v : v) - 1; /* magnitude - 1 */
|
|
|
|
c = vp10_get_mv_class(z, &o);
|
|
comp_counts->classes[c] += incr;
|
|
|
|
d = (o >> 3); /* int mv data */
|
|
f = (o >> 1) & 3; /* fractional pel mv data */
|
|
e = (o & 1); /* high precision mv data */
|
|
|
|
if (c == MV_CLASS_0) {
|
|
comp_counts->class0[d] += incr;
|
|
comp_counts->class0_fp[d][f] += incr;
|
|
comp_counts->class0_hp[e] += usehp * incr;
|
|
} else {
|
|
int i;
|
|
int b = c + CLASS0_BITS - 1; // number of bits
|
|
for (i = 0; i < b; ++i)
|
|
comp_counts->bits[i][((d >> i) & 1)] += incr;
|
|
comp_counts->fp[f] += incr;
|
|
comp_counts->hp[e] += usehp * incr;
|
|
}
|
|
}
|
|
|
|
void vp10_inc_mv(const MV *mv, nmv_context_counts *counts, const int usehp) {
|
|
if (counts != NULL) {
|
|
const MV_JOINT_TYPE j = vp10_get_mv_joint(mv);
|
|
++counts->joints[j];
|
|
|
|
if (mv_joint_vertical(j)) {
|
|
inc_mv_component(mv->row, &counts->comps[0], 1,
|
|
!CONFIG_MISC_FIXES || usehp);
|
|
}
|
|
|
|
if (mv_joint_horizontal(j)) {
|
|
inc_mv_component(mv->col, &counts->comps[1], 1,
|
|
!CONFIG_MISC_FIXES || usehp);
|
|
}
|
|
}
|
|
}
|
|
|
|
void vp10_adapt_mv_probs(VP10_COMMON *cm, int allow_hp) {
|
|
int i, j;
|
|
|
|
nmv_context *fc = &cm->fc->nmvc;
|
|
const nmv_context *pre_fc = &cm->frame_contexts[cm->frame_context_idx].nmvc;
|
|
const nmv_context_counts *counts = &cm->counts.mv;
|
|
|
|
vpx_tree_merge_probs(vp10_mv_joint_tree, pre_fc->joints, counts->joints,
|
|
fc->joints);
|
|
|
|
for (i = 0; i < 2; ++i) {
|
|
nmv_component *comp = &fc->comps[i];
|
|
const nmv_component *pre_comp = &pre_fc->comps[i];
|
|
const nmv_component_counts *c = &counts->comps[i];
|
|
|
|
comp->sign = mode_mv_merge_probs(pre_comp->sign, c->sign);
|
|
vpx_tree_merge_probs(vp10_mv_class_tree, pre_comp->classes, c->classes,
|
|
comp->classes);
|
|
vpx_tree_merge_probs(vp10_mv_class0_tree, pre_comp->class0, c->class0,
|
|
comp->class0);
|
|
|
|
for (j = 0; j < MV_OFFSET_BITS; ++j)
|
|
comp->bits[j] = mode_mv_merge_probs(pre_comp->bits[j], c->bits[j]);
|
|
|
|
for (j = 0; j < CLASS0_SIZE; ++j)
|
|
vpx_tree_merge_probs(vp10_mv_fp_tree, pre_comp->class0_fp[j],
|
|
c->class0_fp[j], comp->class0_fp[j]);
|
|
|
|
vpx_tree_merge_probs(vp10_mv_fp_tree, pre_comp->fp, c->fp, comp->fp);
|
|
|
|
if (allow_hp) {
|
|
comp->class0_hp = mode_mv_merge_probs(pre_comp->class0_hp, c->class0_hp);
|
|
comp->hp = mode_mv_merge_probs(pre_comp->hp, c->hp);
|
|
}
|
|
}
|
|
}
|
|
|
|
void vp10_init_mv_probs(VP10_COMMON *cm) {
|
|
cm->fc->nmvc = default_nmv_context;
|
|
}
|