X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcabac.h;h=e012727054e694f3a5541136adc407ed189de8e3;hb=41e4055b63d64f62fd259858ca0bca83e867878f;hp=592fe1313a46749fa39a1affb618275e45ad5bfc;hpb=d3e7c5c35be22adb9964a25c434cf3f2f3ea816d;p=ffmpeg diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index 592fe1313a4..e012727054e 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -17,7 +17,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ /** @@ -25,14 +24,18 @@ * Context Adaptive Binary Arithmetic Coder. */ +#ifndef AVCODEC_CABAC_H +#define AVCODEC_CABAC_H + +#include "bitstream.h" //#undef NDEBUG #include +#include "libavutil/x86_cpu.h" #define CABAC_BITS 16 #define CABAC_MASK ((1<range&0xC0) + *state]; @@ -254,6 +258,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 @@ -265,6 +270,7 @@ static void refill(CABACContext *c){ c->bytestream+= CABAC_BITS/8; } +#if ! ( defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) ) static void refill2(CABACContext *c){ int i, x; @@ -282,6 +288,7 @@ static void refill2(CABACContext *c){ c->low += x<bytestream+= CABAC_BITS/8; } +#endif static inline void renorm_cabac_decoder(CABACContext *c){ while(c->range < 0x100){ @@ -297,7 +304,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ int temp; #if 0 //P3:683 athlon:475 - asm( + __asm__( "lea -0x100(%0), %2 \n\t" "shr $31, %2 \n\t" //FIXME 31->63 for x86-64 "shl %%cl, %0 \n\t" @@ -306,7 +313,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ ); #elif 0 //P3:680 athlon:474 - asm( + __asm__( "cmp $0x100, %0 \n\t" "setb %%cl \n\t" //FIXME 31->63 for x86-64 "shl %%cl, %0 \n\t" @@ -316,9 +323,9 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ #elif 1 int temp2; //P3:665 athlon:517 - asm( + __asm__( "lea -0x100(%0), %%eax \n\t" - "cdq \n\t" + "cltd \n\t" "mov %0, %%eax \n\t" "and %%edx, %0 \n\t" "and %1, %%edx \n\t" @@ -329,7 +336,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ #elif 0 int temp2; //P3:673 athlon:509 - asm( + __asm__( "cmp $0x100, %0 \n\t" "sbb %%edx, %%edx \n\t" "mov %0, %%eax \n\t" @@ -342,7 +349,7 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ #else int temp2; //P3:677 athlon:511 - asm( + __asm__( "cmp $0x100, %0 \n\t" "lea (%0, %0), %%eax \n\t" "lea (%1, %1), %%edx \n\t" @@ -361,18 +368,24 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ refill(c); } -static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state){ +static av_always_inline int get_cabac_inline(CABACContext *c, uint8_t * const state){ //FIXME gcc generates duplicate load/stores for c->low and c->range #define LOW "0" #define RANGE "4" +#ifdef ARCH_X86_64 +#define BYTESTART "16" +#define BYTE "24" +#define BYTEEND "32" +#else #define BYTESTART "12" #define BYTE "16" #define BYTEEND "20" -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) +#endif +#if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) int bit; #ifndef BRANCHLESS_CABAC_DECODER - asm volatile( + __asm__ volatile( "movzbl (%1), %0 \n\t" "movl "RANGE "(%2), %%ebx \n\t" "movl "RANGE "(%2), %%edx \n\t" @@ -404,14 +417,14 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state //eax:state ebx:low, edx:range, esi:RangeLPS "test %%bx, %%bx \n\t" " jnz 2f \n\t" - "movl "BYTE "(%2), %%esi \n\t" + "mov "BYTE "(%2), %%"REG_S" \n\t" "subl $0xFFFF, %%ebx \n\t" - "movzwl (%%esi), %%ecx \n\t" + "movzwl (%%"REG_S"), %%ecx \n\t" "bswap %%ecx \n\t" "shrl $15, %%ecx \n\t" - "addl $2, %%esi \n\t" + "add $2, %%"REG_S" \n\t" "addl %%ecx, %%ebx \n\t" - "movl %%esi, "BYTE "(%2) \n\t" + "mov %%"REG_S", "BYTE "(%2) \n\t" "jmp 2f \n\t" "1: \n\t" //eax:state ebx:low, edx:range, esi:RangeLPS @@ -422,17 +435,17 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state "shll %%cl, %%edx \n\t" "movzbl "MANGLE(ff_h264_lps_state)"(%0), %%ecx \n\t" "movb %%cl, (%1) \n\t" - "addl $1, %0 \n\t" + "add $1, %0 \n\t" "test %%bx, %%bx \n\t" " jnz 2f \n\t" - "movl "BYTE "(%2), %%ecx \n\t" - "movzwl (%%ecx), %%esi \n\t" + "mov "BYTE "(%2), %%"REG_c" \n\t" + "movzwl (%%"REG_c"), %%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" + "add $2, %%"REG_c" \n\t" + "mov %%"REG_c", "BYTE "(%2) \n\t" "leal -1(%%ebx), %%ecx \n\t" "xorl %%ebx, %%ecx \n\t" @@ -446,15 +459,15 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state "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 + :"=&a"(bit) //FIXME this is fragile gcc either runs out of registers or miscompiles it (for example if "+a"(bit) or "+m"(*state) is used :"r"(state), "r"(c) - : "%ecx", "%ebx", "%edx", "%esi", "memory" + : "%"REG_c, "%ebx", "%edx", "%"REG_S, "memory" ); bit&=1; #else /* BRANCHLESS_CABAC_DECODER */ -#if (defined CMOV_IS_FAST && __CPU__ >= 686) +#if defined HAVE_FAST_CMOV #define BRANCHLESS_GET_CABAC_UPDATE(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ "mov "tmp" , %%ecx \n\t"\ "shl $17 , "tmp" \n\t"\ @@ -464,7 +477,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state "and %%ecx , "tmp" \n\t"\ "sub "tmp" , "low" \n\t"\ "xor %%ecx , "ret" \n\t" -#else /* CMOV_IS_FAST */ +#else /* HAVE_FAST_CMOV */ #define BRANCHLESS_GET_CABAC_UPDATE(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ "mov "tmp" , %%ecx \n\t"\ "shl $17 , "tmp" \n\t"\ @@ -477,7 +490,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state "and "tmp" , %%ecx \n\t"\ "sub %%ecx , "low" \n\t"\ "xor "tmp" , "ret" \n\t" -#endif /* CMOV_IS_FAST */ +#endif /* HAVE_FAST_CMOV */ #define BRANCHLESS_GET_CABAC(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ @@ -494,13 +507,13 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state "shl %%cl , "low" \n\t"\ "test "lowword" , "lowword" \n\t"\ " jnz 1f \n\t"\ - "mov "BYTE"("cabac"), %%ecx \n\t"\ - "movzwl (%%ecx) , "tmp" \n\t"\ + "mov "BYTE"("cabac"), %%"REG_c" \n\t"\ + "movzwl (%%"REG_c") , "tmp" \n\t"\ "bswap "tmp" \n\t"\ "shr $15 , "tmp" \n\t"\ "sub $0xFFFF , "tmp" \n\t"\ - "add $2 , %%ecx \n\t"\ - "mov %%ecx , "BYTE "("cabac") \n\t"\ + "add $2 , %%"REG_c" \n\t"\ + "mov %%"REG_c" , "BYTE "("cabac") \n\t"\ "lea -1("low") , %%ecx \n\t"\ "xor "low" , %%ecx \n\t"\ "shr $15 , %%ecx \n\t"\ @@ -511,7 +524,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state "add "tmp" , "low" \n\t"\ "1: \n\t" - asm volatile( + __asm__ volatile( "movl "RANGE "(%2), %%esi \n\t" "movl "LOW "(%2), %%ebx \n\t" BRANCHLESS_GET_CABAC("%0", "%2", "(%1)", "%%ebx", "%%bx", "%%esi", "%%edx", "%%dl") @@ -520,37 +533,37 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state :"=&a"(bit) :"r"(state), "r"(c) - : "%ecx", "%ebx", "%edx", "%esi", "memory" + : "%"REG_c, "%ebx", "%edx", "%esi", "memory" ); bit&=1; #endif /* BRANCHLESS_CABAC_DECODER */ -#else /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */ +#else /* defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ int s = *state; int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s]; - int bit, lps_mask attribute_unused; + int bit, lps_mask av_unused; c->range -= RangeLPS; #ifndef BRANCHLESS_CABAC_DECODER - if(c->low < (c->range<<17)){ + if(c->low < (c->range<<(CABAC_BITS+1))){ 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); + c->low -= (c->range<<(CABAC_BITS+1)); *state= ff_h264_lps_state[s]; c->range = RangeLPS<low <<= bit; bit= (s&1)^1; - if(!(c->low & 0xFFFF)){ + if(!(c->low & CABAC_MASK)){ 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; @@ -563,46 +576,46 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state if(!(c->low & CABAC_MASK)) refill2(c); #endif /* BRANCHLESS_CABAC_DECODER */ -#endif /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */ +#endif /* defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ return bit; } -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){ #if 0 //not faster int bit; - asm volatile( + __asm__ volatile( "movl "RANGE "(%1), %%ebx \n\t" "movl "LOW "(%1), %%eax \n\t" "shl $17, %%ebx \n\t" "add %%eax, %%eax \n\t" "sub %%ebx, %%eax \n\t" - "cdq \n\t" + "cltd \n\t" "and %%edx, %%ebx \n\t" "add %%ebx, %%eax \n\t" "test %%ax, %%ax \n\t" " jnz 1f \n\t" - "movl "BYTE "(%1), %%ebx \n\t" + "movl "BYTE "(%1), %%"REG_b" \n\t" "subl $0xFFFF, %%eax \n\t" - "movzwl (%%ebx), %%ecx \n\t" + "movzwl (%%"REG_b"), %%ecx \n\t" "bswap %%ecx \n\t" "shrl $15, %%ecx \n\t" - "addl $2, %%ebx \n\t" + "addl $2, %%"REG_b" \n\t" "addl %%ecx, %%eax \n\t" - "movl %%ebx, "BYTE "(%1) \n\t" + "movl %%"REG_b", "BYTE "(%1) \n\t" "1: \n\t" "movl %%eax, "LOW "(%1) \n\t" :"=&d"(bit) :"r"(c) - : "%eax", "%ebx", "%ecx", "memory" + : "%eax", "%"REG_b, "%ecx", "memory" ); return bit+1; #else @@ -612,7 +625,7 @@ static int get_cabac_bypass(CABACContext *c){ if(!(c->low & CABAC_MASK)) refill(c); - range= c->range<<17; + range= c->range<<(CABAC_BITS+1); if(c->low < range){ return 0; }else{ @@ -623,35 +636,35 @@ static int get_cabac_bypass(CABACContext *c){ } -static always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ -#ifdef ARCH_X86 - asm volatile( +static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ +#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) + __asm__ volatile( "movl "RANGE "(%1), %%ebx \n\t" "movl "LOW "(%1), %%eax \n\t" "shl $17, %%ebx \n\t" "add %%eax, %%eax \n\t" "sub %%ebx, %%eax \n\t" - "cdq \n\t" + "cltd \n\t" "and %%edx, %%ebx \n\t" "add %%ebx, %%eax \n\t" "xor %%edx, %%ecx \n\t" "sub %%edx, %%ecx \n\t" "test %%ax, %%ax \n\t" " jnz 1f \n\t" - "movl "BYTE "(%1), %%ebx \n\t" + "mov "BYTE "(%1), %%"REG_b" \n\t" "subl $0xFFFF, %%eax \n\t" - "movzwl (%%ebx), %%edx \n\t" + "movzwl (%%"REG_b"), %%edx \n\t" "bswap %%edx \n\t" "shrl $15, %%edx \n\t" - "addl $2, %%ebx \n\t" + "add $2, %%"REG_b" \n\t" "addl %%edx, %%eax \n\t" - "movl %%ebx, "BYTE "(%1) \n\t" + "mov %%"REG_b", "BYTE "(%1) \n\t" "1: \n\t" "movl %%eax, "LOW "(%1) \n\t" :"+c"(val) :"r"(c) - : "%eax", "%ebx", "%edx", "memory" + : "%eax", "%"REG_b, "%edx", "memory" ); return val; #else @@ -661,7 +674,7 @@ static always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ if(!(c->low & CABAC_MASK)) refill(c); - range= c->range<<17; + range= c->range<<(CABAC_BITS+1); c->low -= range; mask= c->low >> 31; range &= mask; @@ -670,68 +683,13 @@ static always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ #endif } -//FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!) -//FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard) -#ifdef ARCH_X86 -static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){ - void *end= significant_coeff_ctx_base + max_coeff - 1; - int minusstart= -(int)significant_coeff_ctx_base; - int minusindex= -(int)index; - int coeff_count; - asm volatile( - "movl "RANGE "(%3), %%esi \n\t" - "movl "LOW "(%3), %%ebx \n\t" - - "2: \n\t" - - BRANCHLESS_GET_CABAC("%%edx", "%3", "(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") - - "test $1, %%edx \n\t" - " jz 3f \n\t" - - BRANCHLESS_GET_CABAC("%%edx", "%3", "61(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") - - "movl %2, %%eax \n\t" - "movl %4, %%ecx \n\t" - "addl %1, %%ecx \n\t" - "movl %%ecx, (%%eax) \n\t" - "addl $4, %%eax \n\t" - - "test $1, %%edx \n\t" - " jnz 4f \n\t" - - "movl %%eax, %2 \n\t" - - "3: \n\t" - "addl $1, %1 \n\t" - "cmpl %5, %1 \n\t" - " jb 2b \n\t" - "movl %2, %%eax \n\t" - "movl %4, %%ecx \n\t" - "addl %1, %%ecx \n\t" - "movl %%ecx, (%%eax) \n\t" - "addl $4, %%eax \n\t" - "4: \n\t" - "addl %6, %%eax \n\t" - "shr $2, %%eax \n\t" - - "movl %%esi, "RANGE "(%3) \n\t" - "movl %%ebx, "LOW "(%3) \n\t" - :"=&a"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index)\ - :"r"(c), "m"(minusstart), "m"(end), "m"(minusindex)\ - : "%ecx", "%ebx", "%edx", "%esi", "memory"\ - ); - return coeff_count; -} -#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{ @@ -739,8 +697,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; @@ -794,3 +753,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 */