falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3 

Originally committed as revision 6724 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 19 years ago
parent
5b9d79bd77
commit
eb73bf723d
2 changed files with 172 additions and 3 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +165
    -0
      libavcodec/cabac.h
  2. +7
    -3
      libavcodec/h264.c

+ 165
- 0
libavcodec/cabac.h View File

@@ -588,6 +588,171 @@ static int get_cabac_bypass(CABACContext *c){
return 1;
}
}
//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"

"movzbl (%1), %0 \n\t"
"movl %%esi, %%edx \n\t"
"andl $0xC0, %%esi \n\t"
"movzbl "MANGLE(ff_h264_lps_range)"(%0, %%esi, 2), %%esi\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, %0 \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, %0 \n\t"
#endif /* CMOV_IS_FAST */

"movzbl " MANGLE(ff_h264_norm_shift) "(%%esi), %%ecx \n\t"
"shll %%cl, %%esi \n\t"
"movzbl "MANGLE(ff_h264_mlps_state)"+128(%0), %%edx \n\t"
"movb %%dl, (%1) \n\t"
"shll %%cl, %%ebx \n\t"
"test %%bx, %%bx \n\t"
" jnz 1f \n\t"

"movl "BYTE "(%3), %%ecx \n\t"
"movzwl (%%ecx), %%edx \n\t"
"bswap %%edx \n\t"
"shrl $15, %%edx \n\t"
"subl $0xFFFF, %%edx \n\t"
"addl $2, %%ecx \n\t"
"movl %%ecx, "BYTE "(%3) \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 , %%edx \n\t"
"addl %%edx, %%ebx \n\t"
"1: \n\t"

"test $1, %0 \n\t"
" jz 3f \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"
"movl %%eax, %2 \n\t"

"movzbl 61(%1), %0 \n\t"
"movl %%esi, %%edx \n\t"
"andl $0xC0, %%esi \n\t"
"movzbl "MANGLE(ff_h264_lps_range)"(%0, %%esi, 2), %%esi\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, %0 \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, %0 \n\t"
#endif /* CMOV_IS_FAST */

"movzbl " MANGLE(ff_h264_norm_shift) "(%%esi), %%ecx \n\t"
"shll %%cl, %%esi \n\t"
"movzbl "MANGLE(ff_h264_mlps_state)"+128(%0), %%edx \n\t"
"movb %%dl, 61(%1) \n\t"
"shll %%cl, %%ebx \n\t"
"test %%bx, %%bx \n\t"
" jnz 1f \n\t"

"movl "BYTE "(%3), %%ecx \n\t"
"movzwl (%%ecx), %%edx \n\t"
"bswap %%edx \n\t"
"shrl $15, %%edx \n\t"
"subl $0xFFFF, %%edx \n\t"
"addl $2, %%ecx \n\t"
"movl %%ecx, "BYTE "(%3) \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 , %%edx \n\t"
"addl %%edx, %%ebx \n\t"
"1: \n\t"

"test $1, %%eax \n\t"
" jnz 4f \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"
"movl %%eax, %2 \n\t"
"4: \n\t"
"movl %2, %%eax \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

/**
*


+ 7
- 3
libavcodec/h264.c View File

@@ -6116,14 +6116,18 @@ static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n
break; \
} \
} \
}\
if( last == max_coeff -1 ) {\
index[coeff_count++] = last;\
}
const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] );
} else {
#ifdef ARCH_X86
coeff_count= decode_significance_x86(&h->cabac, max_coeff, significant_coeff_ctx_base, index);
#else
DECODE_SIGNIFICANCE( max_coeff - 1, last, last );
}
if( last == max_coeff -1 ) {
index[coeff_count++] = last;
#endif
}
assert(coeff_count > 0);



Write Preview
Loading…
Cancel
Save