|
|
|
@ -334,15 +334,13 @@ int vp56_rac_get_tree(VP56RangeCoder *c, |
|
|
|
|
return -tree->val; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* This is identical to vp8_rac_get_tree except for the possibility of starting |
|
|
|
|
* on a node other than the root node, needed for coeff decode where this is |
|
|
|
|
* used to save a bit after a 0 token (by disallowing EOB to immediately follow.) |
|
|
|
|
*/ |
|
|
|
|
static av_always_inline |
|
|
|
|
int vp8_rac_get_tree_with_offset(VP56RangeCoder *c, const int8_t (*tree)[2], |
|
|
|
|
const uint8_t *probs, int i) |
|
|
|
|
// how probabilities are associated with decisions is different I think
|
|
|
|
|
// well, the new scheme fits in the old but this way has one fewer branches per decision
|
|
|
|
|
static av_always_inline int vp8_rac_get_tree(VP56RangeCoder *c, const int8_t (*tree)[2], |
|
|
|
|
const uint8_t *probs) |
|
|
|
|
{ |
|
|
|
|
int i = 0; |
|
|
|
|
|
|
|
|
|
do { |
|
|
|
|
i = tree[i][vp56_rac_get_prob(c, probs[i])]; |
|
|
|
|
} while (i > 0); |
|
|
|
@ -350,15 +348,6 @@ int vp8_rac_get_tree_with_offset(VP56RangeCoder *c, const int8_t (*tree)[2], |
|
|
|
|
return -i; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// how probabilities are associated with decisions is different I think
|
|
|
|
|
// well, the new scheme fits in the old but this way has one fewer branches per decision
|
|
|
|
|
static av_always_inline |
|
|
|
|
int vp8_rac_get_tree(VP56RangeCoder *c, const int8_t (*tree)[2], |
|
|
|
|
const uint8_t *probs) |
|
|
|
|
{ |
|
|
|
|
return vp8_rac_get_tree_with_offset(c, tree, probs, 0); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// DCTextra
|
|
|
|
|
static av_always_inline int vp8_rac_get_coeff(VP56RangeCoder *c, const uint8_t *prob) |
|
|
|
|
{ |
|
|
|
|