diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-11 11:08:00 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-04-11 11:08:00 -0700 |
| commit | ec299e2092c51d60d487109366b982b1eadcf7fc (patch) | |
| tree | a97c0a338912a930e263c0247f928de182250832 /vp9/common/vp9_treecoder.h | |
| parent | 38d79453457e12ddc735243a701c980c068c0d0b (diff) | |
| download | libvpx-ec299e2092c51d60d487109366b982b1eadcf7fc.tar libvpx-ec299e2092c51d60d487109366b982b1eadcf7fc.tar.gz libvpx-ec299e2092c51d60d487109366b982b1eadcf7fc.tar.bz2 libvpx-ec299e2092c51d60d487109366b982b1eadcf7fc.zip | |
Encoder code cleanup.
Removing duplicated code from vp9_encodemv.c and reusing ROUND_POWER_OF_TWO
macro definitions.
Change-Id: I9caf0c17f761ada7905cb99a3e2a31f871fef0f9
Diffstat (limited to 'vp9/common/vp9_treecoder.h')
| -rw-r--r-- | vp9/common/vp9_treecoder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/common/vp9_treecoder.h b/vp9/common/vp9_treecoder.h index 9297d5280..133764856 100644 --- a/vp9/common/vp9_treecoder.h +++ b/vp9/common/vp9_treecoder.h @@ -13,6 +13,7 @@ #include "./vpx_config.h" #include "vpx/vpx_integer.h" +#include "vp9/common/vp9_common.h" typedef uint8_t vp9_prob; @@ -76,7 +77,7 @@ static INLINE vp9_prob get_binary_prob(int n0, int n1) { /* this function assumes prob1 and prob2 are already within [1,255] range */ static INLINE vp9_prob weighted_prob(int prob1, int prob2, int factor) { - return (prob1 * (256 - factor) + prob2 * factor + 128) >> 8; + return ROUND_POWER_OF_TWO(prob1 * (256 - factor) + prob2 * factor, 8); } #endif // VP9_COMMON_VP9_TREECODER_H_ |