Commit 3b6dc9ca authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

replace a few hardcoded numbers with their correct named ones

Originally committed as revision 7441 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6de06295
...@@ -539,26 +539,26 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st ...@@ -539,26 +539,26 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st
c->range -= RangeLPS; c->range -= RangeLPS;
#ifndef BRANCHLESS_CABAC_DECODER #ifndef BRANCHLESS_CABAC_DECODER
if(c->low < (c->range<<17)){ if(c->low < (c->range<<(CABAC_BITS+1))){
bit= s&1; bit= s&1;
*state= ff_h264_mps_state[s]; *state= ff_h264_mps_state[s];
renorm_cabac_decoder_once(c); renorm_cabac_decoder_once(c);
}else{ }else{
bit= ff_h264_norm_shift[RangeLPS]; bit= ff_h264_norm_shift[RangeLPS];
c->low -= (c->range<<17); c->low -= (c->range<<(CABAC_BITS+1));
*state= ff_h264_lps_state[s]; *state= ff_h264_lps_state[s];
c->range = RangeLPS<<bit; c->range = RangeLPS<<bit;
c->low <<= bit; c->low <<= bit;
bit= (s&1)^1; bit= (s&1)^1;
if(!(c->low & 0xFFFF)){ if(!(c->low & CABAC_MASK)){
refill2(c); refill2(c);
} }
} }
#else /* BRANCHLESS_CABAC_DECODER */ #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; c->range += (RangeLPS - c->range) & lps_mask;
s^=lps_mask; s^=lps_mask;
...@@ -620,7 +620,7 @@ static int get_cabac_bypass(CABACContext *c){ ...@@ -620,7 +620,7 @@ static int get_cabac_bypass(CABACContext *c){
if(!(c->low & CABAC_MASK)) if(!(c->low & CABAC_MASK))
refill(c); refill(c);
range= c->range<<17; range= c->range<<(CABAC_BITS+1);
if(c->low < range){ if(c->low < range){
return 0; return 0;
}else{ }else{
...@@ -669,7 +669,7 @@ static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ ...@@ -669,7 +669,7 @@ static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
if(!(c->low & CABAC_MASK)) if(!(c->low & CABAC_MASK))
refill(c); refill(c);
range= c->range<<17; range= c->range<<(CABAC_BITS+1);
c->low -= range; c->low -= range;
mask= c->low >> 31; mask= c->low >> 31;
range &= mask; range &= mask;
...@@ -794,7 +794,7 @@ static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coe ...@@ -794,7 +794,7 @@ static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coe
*/ */
static int get_cabac_terminate(CABACContext *c){ static int get_cabac_terminate(CABACContext *c){
c->range -= 2; c->range -= 2;
if(c->low < c->range<<17){ if(c->low < c->range<<(CABAC_BITS+1)){
renorm_cabac_decoder_once(c); renorm_cabac_decoder_once(c);
return 0; return 0;
}else{ }else{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment