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

Merge "vp9_entropymv: remove vp9_get_mv_mag()"

Browse Source
This commit is contained in:
James Zern 2015-07-08 01:27:11 +00:00 committed by Gerrit Code Review
commit 892128f6ca
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vp9/common/vp9_entropymv.c
View File

@ -132,10 +132,6 @@ int vp9_use_mv_hp(const MV *ref) {
(abs(ref->col) >> 3) < COMPANDED_MVREF_THRESH;
}
int vp9_get_mv_mag(MV_CLASS_TYPE c, int offset) {
return mv_class_base(c) + offset;
}
static void inc_mv_component(int v, nmv_component_counts *comp_counts,
int incr, int usehp) {
int s, z, c, o, d, e, f;

2
vp9/common/vp9_entropymv.h
View File

@ -106,8 +106,6 @@ static INLINE MV_JOINT_TYPE vp9_get_mv_joint(const MV *mv) {
}
MV_CLASS_TYPE vp9_get_mv_class(int z, int *offset);
int vp9_get_mv_mag(MV_CLASS_TYPE c, int offset);
typedef struct {
unsigned int sign[2];

4
vp9/decoder/vp9_decodemv.c
View File

@ -242,6 +242,7 @@ static int read_mv_component(vp9_reader *r,
// Integer part
if (class0) {
d = vp9_read_tree(r, vp9_mv_class0_tree, mvcomp->class0);
mag = 0;
} else {
int i;
const int n = mv_class + CLASS0_BITS - 1; // number of bits
@ -249,6 +250,7 @@ static int read_mv_component(vp9_reader *r,
d = 0;
for (i = 0; i < n; ++i)
d |= vp9_read(r, mvcomp->bits[i]) << i;
mag = CLASS0_SIZE << (mv_class + 2);
}
// Fractional part
@ -260,7 +262,7 @@ static int read_mv_component(vp9_reader *r,
: 1;
// Result
mag = vp9_get_mv_mag(mv_class, (d << 3) | (fr << 1) | hp) + 1;
mag += ((d << 3) | (fr << 1) | hp) + 1;
return sign ? -mag : mag;
}