X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcabac.h;h=57d1d70d29048dee9f7d717da09af632f021f689;hb=3fbc9bbb884da6a1fb331b1cb03945008ee36312;hp=9e36dc4d6ba5203095d5c22c4e20cd1e98744f66;hpb=8dda3e796b8615b183dc806fefe8ef983157aca2;p=ffmpeg diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index 9e36dc4d6ba..57d1d70d290 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -2,37 +2,40 @@ * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder * Copyright (c) 2003 Michael Niedermayer * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ /** - * @file cabac.h + * @file * Context Adaptive Binary Arithmetic Coder. */ +#ifndef AVCODEC_CABAC_H +#define AVCODEC_CABAC_H + +#include + +#include "put_bits.h" //#undef NDEBUG #include #define CABAC_BITS 16 #define CABAC_MASK ((1<range&0xC0) + *state]; @@ -253,6 +260,7 @@ static void put_cabac_ueg(CABACContext *c, uint8_t * state, int v, int max, int put_cabac_bypass(c, sign); } } +#endif /* TEST */ static void refill(CABACContext *c){ #if CABAC_BITS == 16 @@ -264,24 +272,6 @@ static void refill(CABACContext *c){ c->bytestream+= CABAC_BITS/8; } -static void refill2(CABACContext *c){ - int i, x; - - x= c->low ^ (c->low-1); - i= 7 - ff_h264_norm_shift[x>>(CABAC_BITS-1)]; - - x= -CABAC_MASK; - -#if CABAC_BITS == 16 - x+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1); -#else - x+= c->bytestream[0]<<1; -#endif - - c->low += x<bytestream+= CABAC_BITS/8; -} - static inline void renorm_cabac_decoder(CABACContext *c){ while(c->range < 0x100){ c->range+= c->range; @@ -292,263 +282,41 @@ static inline void renorm_cabac_decoder(CABACContext *c){ } static inline void renorm_cabac_decoder_once(CABACContext *c){ -#ifdef ARCH_X86_DISABLED - int temp; -#if 0 - //P3:683 athlon:475 - asm( - "lea -0x100(%0), %2 \n\t" - "shr $31, %2 \n\t" //FIXME 31->63 for x86-64 - "shl %%cl, %0 \n\t" - "shl %%cl, %1 \n\t" - : "+r"(c->range), "+r"(c->low), "+c"(temp) - ); -#elif 0 - //P3:680 athlon:474 - asm( - "cmp $0x100, %0 \n\t" - "setb %%cl \n\t" //FIXME 31->63 for x86-64 - "shl %%cl, %0 \n\t" - "shl %%cl, %1 \n\t" - : "+r"(c->range), "+r"(c->low), "+c"(temp) - ); -#elif 1 - int temp2; - //P3:665 athlon:517 - asm( - "lea -0x100(%0), %%eax \n\t" - "cdq \n\t" - "mov %0, %%eax \n\t" - "and %%edx, %0 \n\t" - "and %1, %%edx \n\t" - "add %%eax, %0 \n\t" - "add %%edx, %1 \n\t" - : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2) - ); -#elif 0 - int temp2; - //P3:673 athlon:509 - asm( - "cmp $0x100, %0 \n\t" - "sbb %%edx, %%edx \n\t" - "mov %0, %%eax \n\t" - "and %%edx, %0 \n\t" - "and %1, %%edx \n\t" - "add %%eax, %0 \n\t" - "add %%edx, %1 \n\t" - : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2) - ); -#else - int temp2; - //P3:677 athlon:511 - asm( - "cmp $0x100, %0 \n\t" - "lea (%0, %0), %%eax \n\t" - "lea (%1, %1), %%edx \n\t" - "cmovb %%eax, %0 \n\t" - "cmovb %%edx, %1 \n\t" - : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2) - ); -#endif -#else - //P3:675 athlon:476 int shift= (uint32_t)(c->range - 0x100)>>31; c->range<<= shift; c->low <<= shift; -#endif if(!(c->low & CABAC_MASK)) refill(c); } -static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state){ - //FIXME gcc generates duplicate load/stores for c->low and c->range -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) - int bit; - -#define LOW "0" -#define RANGE "4" -#define BYTESTART "12" -#define BYTE "16" -#define BYTEEND "20" -#ifndef BRANCHLESS_CABAC_DECODER - asm volatile( - "movzbl (%1), %%eax \n\t" - "movl "RANGE "(%2), %%ebx \n\t" - "movl "RANGE "(%2), %%edx \n\t" - "andl $0xC0, %%ebx \n\t" - "movzbl "MANGLE(ff_h264_lps_range)"(%%eax, %%ebx, 2), %%esi\n\t" - "movl "LOW "(%2), %%ebx \n\t" -//eax:state ebx:low, edx:range, esi:RangeLPS - "subl %%esi, %%edx \n\t" - "movl %%edx, %%ecx \n\t" - "shll $17, %%ecx \n\t" - "cmpl %%ecx, %%ebx \n\t" - " ja 1f \n\t" +#ifndef get_cabac_inline +static void refill2(CABACContext *c){ + int i, x; -#if 1 - //athlon:4067 P3:4110 - "lea -0x100(%%edx), %%ecx \n\t" - "shr $31, %%ecx \n\t" - "shl %%cl, %%edx \n\t" - "shl %%cl, %%ebx \n\t" + x= c->low ^ (c->low-1); + i= 7 - ff_h264_norm_shift[x>>(CABAC_BITS-1)]; + + x= -CABAC_MASK; + +#if CABAC_BITS == 16 + x+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1); #else - //athlon:4057 P3:4130 - "cmp $0x100, %%edx \n\t" //FIXME avoidable - "setb %%cl \n\t" - "shl %%cl, %%edx \n\t" - "shl %%cl, %%ebx \n\t" + x+= c->bytestream[0]<<1; #endif - "movzbl "MANGLE(ff_h264_mps_state)"(%%eax), %%ecx \n\t" - "movb %%cl, (%1) \n\t" -//eax:state ebx:low, edx:range, esi:RangeLPS - "test %%bx, %%bx \n\t" - " jnz 2f \n\t" - "movl "BYTE "(%2), %%esi \n\t" - "subl $0xFFFF, %%ebx \n\t" - "movzwl (%%esi), %%ecx \n\t" - "bswap %%ecx \n\t" - "shrl $15, %%ecx \n\t" - "addl $2, %%esi \n\t" - "addl %%ecx, %%ebx \n\t" - "movl %%esi, "BYTE "(%2) \n\t" - "jmp 2f \n\t" - "1: \n\t" -//eax:state ebx:low, edx:range, esi:RangeLPS - "subl %%ecx, %%ebx \n\t" - "movl %%esi, %%edx \n\t" - "movzbl " MANGLE(ff_h264_norm_shift) "(%%esi), %%ecx \n\t" - "shll %%cl, %%ebx \n\t" - "shll %%cl, %%edx \n\t" - "movzbl "MANGLE(ff_h264_lps_state)"(%%eax), %%ecx \n\t" - "movb %%cl, (%1) \n\t" - "addl $1, %%eax \n\t" - "test %%bx, %%bx \n\t" - " jnz 2f \n\t" - - "movl "BYTE "(%2), %%ecx \n\t" - "movzwl (%%ecx), %%esi \n\t" - "bswap %%esi \n\t" - "shrl $15, %%esi \n\t" - "subl $0xFFFF, %%esi \n\t" - "addl $2, %%ecx \n\t" - "movl %%ecx, "BYTE "(%2) \n\t" - - "leal -1(%%ebx), %%ecx \n\t" - "xorl %%ebx, %%ecx \n\t" - "shrl $15, %%ecx \n\t" - "movzbl " MANGLE(ff_h264_norm_shift) "(%%ecx), %%ecx \n\t" - "neg %%ecx \n\t" - "add $7, %%ecx \n\t" - - "shll %%cl , %%esi \n\t" - "addl %%esi, %%ebx \n\t" - "2: \n\t" - "movl %%edx, "RANGE "(%2) \n\t" - "movl %%ebx, "LOW "(%2) \n\t" - :"=&a"(bit) //FIXME this is fragile gcc either runs out of registers or misscompiles it (for example if "+a"(bit) or "+m"(*state) is used - :"r"(state), "r"(c) - : "%ecx", "%ebx", "%edx", "%esi", "memory" - ); - bit&=1; -#else /* BRANCHLESS_CABAC_DECODER */ - asm volatile( - "movzbl (%1), %%eax \n\t" - "movl "RANGE "(%2), %%ebx \n\t" - "movl "RANGE "(%2), %%edx \n\t" - "andl $0xC0, %%ebx \n\t" - "movzbl "MANGLE(ff_h264_lps_range)"(%%eax, %%ebx, 2), %%esi\n\t" - "movl "LOW "(%2), %%ebx \n\t" -//eax:state ebx:low, edx:range, esi:RangeLPS - "subl %%esi, %%edx \n\t" -#if (defined CMOV_IS_FAST && __CPU__ >= 686) - "movl %%edx, %%ecx \n\t" - "shl $17, %%edx \n\t" - "cmpl %%ebx, %%edx \n\t" - "cmova %%ecx, %%esi \n\t" - "sbbl %%ecx, %%ecx \n\t" - "andl %%ecx, %%edx \n\t" - "subl %%edx, %%ebx \n\t" - "xorl %%ecx, %%eax \n\t" -#else /* CMOV_IS_FAST */ - "movl %%edx, %%ecx \n\t" - "shl $17, %%edx \n\t" - "subl %%ebx, %%edx \n\t" - "sarl $31, %%edx \n\t" //lps_mask - "subl %%ecx, %%esi \n\t" //RangeLPS - range - "andl %%edx, %%esi \n\t" //(RangeLPS - range)&lps_mask - "addl %%ecx, %%esi \n\t" //new range - "shl $17, %%ecx \n\t" - "andl %%edx, %%ecx \n\t" - "subl %%ecx, %%ebx \n\t" - "xorl %%edx, %%eax \n\t" -#endif /* CMOV_IS_FAST */ - -//eax:state ebx:low edx:mask esi:range - -//eax:bit ebx:low esi:range - - "movzbl " MANGLE(ff_h264_norm_shift) "(%%esi), %%ecx \n\t" - "shll %%cl, %%esi \n\t" - "movzbl "MANGLE(ff_h264_mlps_state)"+128(%%eax), %%edx \n\t" - "movb %%dl, (%1) \n\t" - "movl %%esi, "RANGE "(%2) \n\t" - "shll %%cl, %%ebx \n\t" - "movl %%ebx, "LOW "(%2) \n\t" - "test %%bx, %%bx \n\t" - " jnz 1f \n\t" - - "movl "BYTE "(%2), %%ecx \n\t" - "movzwl (%%ecx), %%esi \n\t" - "bswap %%esi \n\t" - "shrl $15, %%esi \n\t" - "subl $0xFFFF, %%esi \n\t" - "addl $2, %%ecx \n\t" - "movl %%ecx, "BYTE "(%2) \n\t" - - "leal -1(%%ebx), %%ecx \n\t" - "xorl %%ebx, %%ecx \n\t" - "shrl $15, %%ecx \n\t" - "movzbl " MANGLE(ff_h264_norm_shift) "(%%ecx), %%ecx \n\t" - "neg %%ecx \n\t" - "add $7, %%ecx \n\t" - - "shll %%cl , %%esi \n\t" - "addl %%esi, %%ebx \n\t" - "movl %%ebx, "LOW "(%2) \n\t" - "1: \n\t" - :"=&a"(bit) - :"r"(state), "r"(c) - : "%ecx", "%ebx", "%edx", "%esi", "memory" - ); - bit&=1; -#endif /* BRANCHLESS_CABAC_DECODER */ -#else /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */ + + c->low += x<bytestream+= CABAC_BITS/8; +} + +static av_always_inline int get_cabac_inline(CABACContext *c, uint8_t * const state){ int s = *state; - int RangeLPS= ff_h264_lps_range[0][2*(c->range&0xC0) + s]; - int bit, lps_mask attribute_unused; + int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s]; + int bit, lps_mask; c->range -= RangeLPS; -#ifndef BRANCHLESS_CABAC_DECODER - if(c->low < (c->range<<17)){ - bit= s&1; - *state= ff_h264_mps_state[s]; - renorm_cabac_decoder_once(c); - }else{ - bit= ff_h264_norm_shift[RangeLPS]; - c->low -= (c->range<<17); - *state= ff_h264_lps_state[s]; - c->range = RangeLPS<low <<= bit; - bit= (s&1)^1; - - if(!(c->low & 0xFFFF)){ - refill2(c); - } - } -#else /* BRANCHLESS_CABAC_DECODER */ - lps_mask= ((c->range<<17) - c->low)>>31; + lps_mask= ((c->range<<(CABAC_BITS+1)) - c->low)>>31; - c->low -= (c->range<<17) & lps_mask; + c->low -= (c->range<<(CABAC_BITS+1)) & lps_mask; c->range += (RangeLPS - c->range) & lps_mask; s^=lps_mask; @@ -560,27 +328,26 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state c->low <<= lps_mask; if(!(c->low & CABAC_MASK)) refill2(c); -#endif /* BRANCHLESS_CABAC_DECODER */ -#endif /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */ return bit; } +#endif -static int __attribute((noinline)) get_cabac_noinline(CABACContext *c, uint8_t * const state){ +static int av_noinline av_unused get_cabac_noinline(CABACContext *c, uint8_t * const state){ return get_cabac_inline(c,state); } -static int get_cabac(CABACContext *c, uint8_t * const state){ +static int av_unused get_cabac(CABACContext *c, uint8_t * const state){ return get_cabac_inline(c,state); } -static int get_cabac_bypass(CABACContext *c){ +static int av_unused get_cabac_bypass(CABACContext *c){ int range; c->low += c->low; if(!(c->low & CABAC_MASK)) refill(c); - range= c->range<<17; + range= c->range<<(CABAC_BITS+1); if(c->low < range){ return 0; }else{ @@ -589,13 +356,31 @@ static int get_cabac_bypass(CABACContext *c){ } } + +#ifndef get_cabac_bypass_sign +static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ + int range, mask; + c->low += c->low; + + if(!(c->low & CABAC_MASK)) + refill(c); + + range= c->range<<(CABAC_BITS+1); + c->low -= range; + mask= c->low >> 31; + range &= mask; + c->low += range; + return (val^mask)-mask; +} +#endif + /** * * @return the number of bytes read or 0 if no end */ -static int get_cabac_terminate(CABACContext *c){ +static int av_unused get_cabac_terminate(CABACContext *c){ c->range -= 2; - if(c->low < c->range<<17){ + if(c->low < c->range<<(CABAC_BITS+1)){ renorm_cabac_decoder_once(c); return 0; }else{ @@ -603,8 +388,9 @@ static int get_cabac_terminate(CABACContext *c){ } } +#if 0 /** - * get (truncated) unnary binarization. + * Get (truncated) unary binarization. */ static int get_cabac_u(CABACContext *c, uint8_t * state, int max, int max_index, int truncated){ int i; @@ -658,3 +444,6 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe }else return i; } +#endif /* 0 */ + +#endif /* AVCODEC_CABAC_H */