diff options
| author | hkuang <hkuang@google.com> | 2013-11-14 22:50:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-14 22:50:46 -0800 |
| commit | aa43d6ba5f5fb7eaeca1d0573ecb16ea4d388197 (patch) | |
| tree | 6ff3bfc5090953c49fa26fac842b924d88e0983d /libvpx/vp9/common/vp9_treecoder.h | |
| parent | a1b7a7bb1ccf3f479bbca69a52a76eb05789dbaf (diff) | |
| parent | 9b35249446b07f40ac5fcc3205f2c048616efacc (diff) | |
| download | android_external_libvpx-aa43d6ba5f5fb7eaeca1d0573ecb16ea4d388197.tar.gz android_external_libvpx-aa43d6ba5f5fb7eaeca1d0573ecb16ea4d388197.tar.bz2 android_external_libvpx-aa43d6ba5f5fb7eaeca1d0573ecb16ea4d388197.zip | |
am 9b352494: Roll latest libvpx to fix scalling bug. Checkout is from master:Ib748eb287520c794631697204da6ebe19523ce95
* commit '9b35249446b07f40ac5fcc3205f2c048616efacc':
Roll latest libvpx to fix scalling bug. Checkout is from master:Ib748eb287520c794631697204da6ebe19523ce95
Diffstat (limited to 'libvpx/vp9/common/vp9_treecoder.h')
| -rw-r--r-- | libvpx/vp9/common/vp9_treecoder.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libvpx/vp9/common/vp9_treecoder.h b/libvpx/vp9/common/vp9_treecoder.h index 9c776d6..a79b156 100644 --- a/libvpx/vp9/common/vp9_treecoder.h +++ b/libvpx/vp9/common/vp9_treecoder.h @@ -42,7 +42,6 @@ struct vp9_token { /* Construct encoding array from tree. */ void vp9_tokens_from_tree(struct vp9_token*, vp9_tree); -void vp9_tokens_from_tree_offset(struct vp9_token*, vp9_tree, int offset); /* Convert array of token occurrence counts into a table of probabilities for the associated binary encoding tree. Also writes count of branches @@ -51,8 +50,7 @@ void vp9_tokens_from_tree_offset(struct vp9_token*, vp9_tree, int offset); void vp9_tree_probs_from_distribution(vp9_tree tree, unsigned int branch_ct[ /* n - 1 */ ][2], - const unsigned int num_events[ /* n */ ], - unsigned int tok0_offset); + const unsigned int num_events[ /* n */ ]); static INLINE vp9_prob clip_prob(int p) { @@ -116,10 +114,10 @@ static unsigned int tree_merge_probs_impl(unsigned int i, static void tree_merge_probs(const vp9_tree_index *tree, const vp9_prob *pre_probs, - const unsigned int *counts, int offset, + const unsigned int *counts, unsigned int count_sat, unsigned int max_update_factor, vp9_prob *probs) { - tree_merge_probs_impl(0, tree, pre_probs, &counts[-offset], + tree_merge_probs_impl(0, tree, pre_probs, counts, count_sat, max_update_factor, probs); } |