diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-02-02 14:33:34 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-06 16:37:11 +0000 |
| commit | c98e9d2882b4dcfe70d1a7136eb8bcb4b2eb5292 (patch) | |
| tree | f406c54654431daa59704f42f0b322c359e70db2 /vp8/encoder/bitstream.c | |
| parent | 58ec6fe8c399c3f21e8e0ba368a80270581b2aa6 (diff) | |
| download | libvpx-c98e9d2882b4dcfe70d1a7136eb8bcb4b2eb5292.tar libvpx-c98e9d2882b4dcfe70d1a7136eb8bcb4b2eb5292.tar.gz libvpx-c98e9d2882b4dcfe70d1a7136eb8bcb4b2eb5292.tar.bz2 libvpx-c98e9d2882b4dcfe70d1a7136eb8bcb4b2eb5292.zip | |
Moved prob_dualpred to common.
Moved the prob_dualpred[] sturcture to common.
Created common prediction entry for Dual flag.
Change-Id: I9ac3d128bae6114f09e5c18216d4b95cf36453d5
Diffstat (limited to 'vp8/encoder/bitstream.c')
| -rw-r--r-- | vp8/encoder/bitstream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 3c0ea4c2b..99f3df9dc 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -1419,9 +1419,9 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) #if CONFIG_DUALPRED if (cpi->common.dual_pred_mode == HYBRID_PREDICTION) { - cpi->prob_dualpred[0] = (prob_dual_pred[0] + cpi->prob_dualpred[0] + 1) >> 1; - cpi->prob_dualpred[1] = (prob_dual_pred[1] + cpi->prob_dualpred[1] + 1) >> 1; - cpi->prob_dualpred[2] = (prob_dual_pred[2] + cpi->prob_dualpred[2] + 1) >> 1; + pc->prob_dualpred[0] = (prob_dual_pred[0] + pc->prob_dualpred[0] + 1) >> 1; + pc->prob_dualpred[1] = (prob_dual_pred[1] + pc->prob_dualpred[1] + 1) >> 1; + pc->prob_dualpred[2] = (prob_dual_pred[2] + pc->prob_dualpred[2] + 1) >> 1; } #endif /* CONFIG_DUALPRED */ } @@ -1782,9 +1782,9 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) #if CONFIG_DUALPRED if (cpi->common.dual_pred_mode == HYBRID_PREDICTION) { - cpi->prob_dualpred[0] = (prob_dual_pred[0] + cpi->prob_dualpred[0] + 1) >> 1; - cpi->prob_dualpred[1] = (prob_dual_pred[1] + cpi->prob_dualpred[1] + 1) >> 1; - cpi->prob_dualpred[2] = (prob_dual_pred[2] + cpi->prob_dualpred[2] + 1) >> 1; + pc->prob_dualpred[0] = (prob_dual_pred[0] + pc->prob_dualpred[0] + 1) >> 1; + pc->prob_dualpred[1] = (prob_dual_pred[1] + pc->prob_dualpred[1] + 1) >> 1; + pc->prob_dualpred[2] = (prob_dual_pred[2] + pc->prob_dualpred[2] + 1) >> 1; } #endif /* CONFIG_DUALPRED */ } |