Commit c6d90f05 authored by James Zern's avatar James Zern
Browse files

vp9_entropymv: remove vp9_get_mv_mag()

inline the code directly in read_mv_component(), the only place where it
was being used; this removes a function call in a hot function

Change-Id: I66f99c0c9ce3bc310101dbca4a470f023cc6fb55
parent 33a0deb9
......@@ -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;
......
......@@ -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];
......
......@@ -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;
}
......
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