From 5115d8326e8eba707ee3048930674e2f9058d913 Mon Sep 17 00:00:00 2001 From: John Cox Date: Wed, 20 Jan 2016 17:56:30 +0000 Subject: [PATCH] cabac_functions: Count zeros with ctz if it is fast When refilling the low bit buffer after get_cabac count the bits with ctz if the processor has a fast version. Signed-off-by: Michael Niedermayer --- libavcodec/cabac_functions.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h index 31c919bd71..42841c7e08 100644 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@ -76,9 +76,12 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ static void refill2(CABACContext *c){ int i; unsigned x; - +#if !HAVE_FAST_CLZ x= c->low ^ (c->low-1); i= 7 - ff_h264_norm_shift[x>>(CABAC_BITS-1)]; +#else + i = ff_ctz(c->low) - CABAC_BITS; +#endif x= -CABAC_MASK;