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

Merge "Minor change in forward updates" into experimental

Browse Source
This commit is contained in:
Deb Mukherjee
2013-06-11 12:48:41 -07:00
committed by Gerrit Code Review
parent 47f10df899 a4d906c132
commit e3d3ace314
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/decoder/vp9_decodframe.c
View File

@@ -156,13 +156,14 @@ static int merge_index(int v, int n, int modulus) {
} }
static int inv_remap_prob(int v, int m) { static int inv_remap_prob(int v, int m) {
const int n = 256; const int n = 255;
v = merge_index(v, n - 1, MODULUS_PARAM); v = merge_index(v, n - 1, MODULUS_PARAM);
m--;
if ((m << 1) <= n) { if ((m << 1) <= n) {
return inv_recenter_nonneg(v + 1, m); return 1 + inv_recenter_nonneg(v + 1, m);
} else { } else {
return n - 1 - inv_recenter_nonneg(v + 1, n - 1 - m); return n - inv_recenter_nonneg(v + 1, n - 1 - m);
} }
} }

6
vp9/encoder/vp9_bitstream.c
View File

@@ -265,7 +265,7 @@ int count_term_subexp(int word, int k, int num_syms) {
static void compute_update_table() { static void compute_update_table() {
int i; int i;
for (i = 0; i < 255; i++) for (i = 0; i < 254; i++)
update_bits[i] = count_term_subexp(i, SUBEXP_PARAM, 255); update_bits[i] = count_term_subexp(i, SUBEXP_PARAM, 255);
} }
@@ -277,9 +277,11 @@ static int split_index(int i, int n, int modulus) {
} }
static int remap_prob(int v, int m) { static int remap_prob(int v, int m) {
const int n = 256; const int n = 255;
const int modulus = MODULUS_PARAM; const int modulus = MODULUS_PARAM;
int i; int i;
v--;
m--;
if ((m << 1) <= n) if ((m << 1) <= n)
i = recenter_nonneg(v, m) - 1; i = recenter_nonneg(v, m) - 1;
else else