| Index: source/libvpx/vp8/encoder/bitstream.c
|
| ===================================================================
|
| --- source/libvpx/vp8/encoder/bitstream.c (revision 172621)
|
| +++ source/libvpx/vp8/encoder/bitstream.c (working copy)
|
| @@ -118,7 +118,7 @@
|
|
|
| update_mode(
|
| w, VP8_YMODES, vp8_ymode_encodings, vp8_ymode_tree,
|
| - Pnew, x->fc.ymode_prob, bct, (unsigned int *)cpi->mb.ymode_count
|
| + Pnew, x->fc.ymode_prob, bct, (unsigned int *)cpi->ymode_count
|
| );
|
| }
|
| {
|
| @@ -127,7 +127,7 @@
|
|
|
| update_mode(
|
| w, VP8_UV_MODES, vp8_uv_mode_encodings, vp8_uv_mode_tree,
|
| - Pnew, x->fc.uv_mode_prob, bct, (unsigned int *)cpi->mb.uv_mode_count
|
| + Pnew, x->fc.uv_mode_prob, bct, (unsigned int *)cpi->uv_mode_count
|
| );
|
| }
|
| }
|
| @@ -539,7 +539,7 @@
|
| {
|
| int total_mbs = pc->mb_rows * pc->mb_cols;
|
|
|
| - prob_skip_false = (total_mbs - cpi->mb.skip_true_count ) * 256 / total_mbs;
|
| + prob_skip_false = (total_mbs - cpi->skip_true_count ) * 256 / total_mbs;
|
|
|
| if (prob_skip_false <= 1)
|
| prob_skip_false = 1;
|
| @@ -730,7 +730,7 @@
|
| {
|
| int total_mbs = c->mb_rows * c->mb_cols;
|
|
|
| - prob_skip_false = (total_mbs - cpi->mb.skip_true_count ) * 256 / total_mbs;
|
| + prob_skip_false = (total_mbs - cpi->skip_true_count ) * 256 / total_mbs;
|
|
|
| if (prob_skip_false <= 1)
|
| prob_skip_false = 1;
|
| @@ -851,7 +851,6 @@
|
|
|
| static int independent_coef_context_savings(VP8_COMP *cpi)
|
| {
|
| - MACROBLOCK *const x = & cpi->mb;
|
| int savings = 0;
|
| int i = 0;
|
| do
|
| @@ -868,7 +867,7 @@
|
| */
|
|
|
| probs = (const unsigned int (*)[MAX_ENTROPY_TOKENS])
|
| - x->coef_counts[i][j];
|
| + cpi->coef_counts[i][j];
|
|
|
| /* Reset to default probabilities at key frames */
|
| if (cpi->common.frame_type == KEY_FRAME)
|
| @@ -927,7 +926,6 @@
|
|
|
| static int default_coef_context_savings(VP8_COMP *cpi)
|
| {
|
| - MACROBLOCK *const x = & cpi->mb;
|
| int savings = 0;
|
| int i = 0;
|
| do
|
| @@ -947,7 +945,7 @@
|
| MAX_ENTROPY_TOKENS, vp8_coef_encodings, vp8_coef_tree,
|
| cpi->frame_coef_probs [i][j][k],
|
| cpi->frame_branch_ct [i][j][k],
|
| - x->coef_counts [i][j][k],
|
| + cpi->coef_counts [i][j][k],
|
| 256, 1
|
| );
|
|
|
|
|