Commit d6c2dc4f authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge
Browse files

Rename od_cdf_adapt_q15() to aom_cdf_adapt_q15().

Change-Id: I79addac857ff10c89f2ad79a5d2bf8d4c5e89ef4
parent 85001429
......@@ -28,7 +28,7 @@ void aom_cdf_init(uint16_t *cdf, int ncdfs, int nsyms, int val, int first) {
}
/** Adapts a Q15 cdf after encoding/decoding a symbol. */
void od_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate) {
void aom_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate) {
int i;
*count = OD_MINI(*count + 1, 1 << rate);
OD_ASSERT(cdf[n - 1] == 32768);
......
......@@ -54,7 +54,7 @@ void generic_model_init(generic_encoder *model);
void aom_cdf_init(uint16_t *cdf, int ncdfs, int nsyms, int val, int first);
void od_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate);
void aom_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate);
void od_encode_cdf_adapt_q15(od_ec_enc *ec, int val, uint16_t *cdf, int n,
int *count, int rate);
......
......@@ -44,7 +44,7 @@ int od_decode_cdf_adapt_q15_(od_ec_dec *ec, uint16_t *cdf, int n,
}
}
val = od_ec_decode_cdf_q15(ec, cdf, n);
od_cdf_adapt_q15(val, cdf, n, count, rate);
aom_cdf_adapt_q15(val, cdf, n, count, rate);
return val;
}
......
......@@ -47,7 +47,7 @@ void od_encode_cdf_adapt_q15(od_ec_enc *ec, int val, uint16_t *cdf, int n,
}
}
od_ec_encode_cdf_q15(ec, val, cdf, n);
od_cdf_adapt_q15(val, cdf, n, count, rate);
aom_cdf_adapt_q15(val, cdf, n, count, rate);
}
/** Encodes a value from 0 to N-1 (with N up to 16) based on a cdf and adapts
......
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