Commit 42d5e31e authored by Paul Wilkins's avatar Paul Wilkins Committed by Gerrit Code Review
Browse files

Merge "bitstream: give exported symbols a vp9_ prefix; make local symbols...

Merge "bitstream: give exported symbols a vp9_ prefix; make local symbols static." into experimental
parents 976d0450 8ce9fb8d
...@@ -186,7 +186,7 @@ static int get_binary_prob(int n0, int n1) { ...@@ -186,7 +186,7 @@ static int get_binary_prob(int n0, int n1) {
return get_prob(n0, n0 + n1); return get_prob(n0, n0 + n1);
} }
void update_skip_probs(VP8_COMP *cpi) { void vp9_update_skip_probs(VP8_COMP *cpi) {
VP8_COMMON *const pc = &cpi->common; VP8_COMMON *const pc = &cpi->common;
int prob_skip_false[3] = {0, 0, 0}; int prob_skip_false[3] = {0, 0, 0};
int k; int k;
...@@ -197,7 +197,8 @@ void update_skip_probs(VP8_COMP *cpi) { ...@@ -197,7 +197,8 @@ void update_skip_probs(VP8_COMP *cpi) {
} }
} }
void update_switchable_interp_probs(VP8_COMP *cpi, vp8_writer* const bc) { static void update_switchable_interp_probs(VP8_COMP *cpi,
vp8_writer* const bc) {
VP8_COMMON *const pc = &cpi->common; VP8_COMMON *const pc = &cpi->common;
unsigned int branch_ct[32][2]; unsigned int branch_ct[32][2];
int i, j; int i, j;
...@@ -1512,8 +1513,7 @@ static void print_prob_tree(vp8_prob ...@@ -1512,8 +1513,7 @@ static void print_prob_tree(vp8_prob
fclose(f); fclose(f);
} }
static void build_coeff_contexts(VP8_COMP *cpi) {
void build_coeff_contexts(VP8_COMP *cpi) {
int i = 0, j, k; int i = 0, j, k;
#ifdef ENTROPY_STATS #ifdef ENTROPY_STATS
int t = 0; int t = 0;
...@@ -2263,7 +2263,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) ...@@ -2263,7 +2263,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
if (pc->mb_no_coeff_skip) { if (pc->mb_no_coeff_skip) {
int k; int k;
update_skip_probs(cpi); vp9_update_skip_probs(cpi);
for (k = 0; k < MBSKIP_CONTEXTS; ++k) for (k = 0; k < MBSKIP_CONTEXTS; ++k)
vp8_write_literal(&header_bc, pc->mbskip_pred_probs[k], 8); vp8_write_literal(&header_bc, pc->mbskip_pred_probs[k], 8);
} }
......
...@@ -24,4 +24,4 @@ void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount, ...@@ -24,4 +24,4 @@ void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount,
#endif #endif
#endif #endif
void update_skip_probs(VP8_COMP *cpi); void vp9_update_skip_probs(VP8_COMP *cpi);
...@@ -280,7 +280,7 @@ static void update_base_skip_probs(VP8_COMP *cpi) { ...@@ -280,7 +280,7 @@ static void update_base_skip_probs(VP8_COMP *cpi) {
VP8_COMMON *cm = &cpi->common; VP8_COMMON *cm = &cpi->common;
if (cm->frame_type != KEY_FRAME) { if (cm->frame_type != KEY_FRAME) {
update_skip_probs(cpi); vp9_update_skip_probs(cpi);
if (cm->refresh_alt_ref_frame) { if (cm->refresh_alt_ref_frame) {
int k; int k;
......
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