diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-09 15:10:49 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-09 15:10:49 -0800 |
| commit | 347df4ce55a82120944a4e2ee6cdf060b2f8307a (patch) | |
| tree | cca6c77a49c19e9d66fd7d22c74f98dcdae30c5b /vp9/common | |
| parent | 2c3120274a7f24bba9205b5f7e7a074b4155812a (diff) | |
| parent | cb92f4f042a932c8f35d0a56b0691c7f3b1121af (diff) | |
| download | libvpx-347df4ce55a82120944a4e2ee6cdf060b2f8307a.tar libvpx-347df4ce55a82120944a4e2ee6cdf060b2f8307a.tar.gz libvpx-347df4ce55a82120944a4e2ee6cdf060b2f8307a.tar.bz2 libvpx-347df4ce55a82120944a4e2ee6cdf060b2f8307a.zip | |
Merge "Renaming vp9_get_pred_context_tx_size() function."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_pred_common.c | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_pred_common.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index 8cc3e27b4..24cdd5fe2 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -364,7 +364,7 @@ unsigned char vp9_get_pred_context_single_ref_p2(const MACROBLOCKD *xd) { // The mode info data structure has a one element border above and to the // left of the entries corresponding to real blocks. // The prediction flags in these dummy entries are initialized to 0. -unsigned char vp9_get_pred_context_tx_size(const MACROBLOCKD *xd) { +int vp9_get_tx_size_context(const MACROBLOCKD *xd) { const int max_tx_size = max_txsize_lookup[xd->mi_8x8[0]->mbmi.sb_type]; const MB_MODE_INFO *const above_mbmi = get_above_mbmi(get_above_mi(xd)); const MB_MODE_INFO *const left_mbmi = get_left_mbmi(get_left_mi(xd)); diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h index bfbfba207..a23848922 100644 --- a/vp9/common/vp9_pred_common.h +++ b/vp9/common/vp9_pred_common.h @@ -100,7 +100,7 @@ static INLINE vp9_prob vp9_get_pred_prob_single_ref_p2(const VP9_COMMON *cm, return cm->fc.single_ref_prob[pred_context][1]; } -unsigned char vp9_get_pred_context_tx_size(const MACROBLOCKD *xd); +int vp9_get_tx_size_context(const MACROBLOCKD *xd); static const vp9_prob *get_tx_probs(TX_SIZE max_tx_size, int ctx, const struct tx_probs *tx_probs) { @@ -119,8 +119,7 @@ static const vp9_prob *get_tx_probs(TX_SIZE max_tx_size, int ctx, static const vp9_prob *get_tx_probs2(TX_SIZE max_tx_size, const MACROBLOCKD *xd, const struct tx_probs *tx_probs) { - const int ctx = vp9_get_pred_context_tx_size(xd); - return get_tx_probs(max_tx_size, ctx, tx_probs); + return get_tx_probs(max_tx_size, vp9_get_tx_size_context(xd), tx_probs); } static unsigned int *get_tx_counts(TX_SIZE max_tx_size, int ctx, |