aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp56.h
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2010-12-22 12:57:53 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-02-13 00:52:51 +0100
commit5da7494dc5b304bc3cb1114b9dabaf047e316e05 (patch)
tree3bc1fb8aafe940dabd01bea9bfc0441812a0018b /libavcodec/vp56.h
parentb423996b573fb78bdcc6ef60f090e75fecb5f595 (diff)
downloadffmpeg-5da7494dc5b304bc3cb1114b9dabaf047e316e05.tar.gz
ARM optimised vp56_rac_get_prob()
Approximately 3% faster on Cortex-A8. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 7da48fd0111adf504cfcfc5ebda7fd0681968041)
Diffstat (limited to 'libavcodec/vp56.h')
-rw-r--r--libavcodec/vp56.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index da6b1b64b8..d1735e5609 100644
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -201,7 +201,9 @@ static av_always_inline unsigned int vp56_rac_renorm(VP56RangeCoder *c)
return code_word;
}
-#if ARCH_X86
+#if ARCH_ARM
+#include "arm/vp56_arith.h"
+#elif ARCH_X86
#include "x86/vp56_arith.h"
#endif
@@ -221,6 +223,7 @@ static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
}
#endif
+#ifndef vp56_rac_get_prob_branchy
// branchy variant, to be used where there's a branch based on the bit decoded
static av_always_inline int vp56_rac_get_prob_branchy(VP56RangeCoder *c, int prob)
{
@@ -238,6 +241,7 @@ static av_always_inline int vp56_rac_get_prob_branchy(VP56RangeCoder *c, int pro
c->code_word = code_word;
return 0;
}
+#endif
static av_always_inline int vp56_rac_get(VP56RangeCoder *c)
{