Browse Source

cabac: drop unused and disabled get_cabac_u() / get_cabac_ueg() functions

tags/n0.10
Diego Biurrun 14 years ago
parent
commit
9dec55748c
2 changed files with 0 additions and 73 deletions
  1. +0
    -15
      libavcodec/cabac.c
  2. +0
    -58
      libavcodec/cabac.h

+ 0
- 15
libavcodec/cabac.c View File

@@ -343,21 +343,6 @@ START_TIMER
av_log(NULL, AV_LOG_ERROR, "CABAC failure at %d\n", i);
STOP_TIMER("get_cabac")
}
#if 0
for(i=0; i<SIZE; i++){
START_TIMER
if( r[i] != get_cabac_u(&c, state, (i&1) ? 6 : 7, 3, i&1) )
av_log(NULL, AV_LOG_ERROR, "CABAC unary (truncated) binarization failure at %d\n", i);
STOP_TIMER("get_cabac_u")
}

for(i=0; i<SIZE; i++){
START_TIMER
if( r[i] != get_cabac_ueg(&c, state, 3, 0, 1, 2))
av_log(NULL, AV_LOG_ERROR, "CABAC unary (truncated) binarization failure at %d\n", i);
STOP_TIMER("get_cabac_ueg")
}
#endif
if(!get_cabac_terminate(&c))
av_log(NULL, AV_LOG_ERROR, "where's the Terminator?\n");



+ 0
- 58
libavcodec/cabac.h View File

@@ -213,62 +213,4 @@ static int av_unused get_cabac_terminate(CABACContext *c){
}
}

#if 0
/**
* Get (truncated) unary binarization.
*/
static int get_cabac_u(CABACContext *c, uint8_t * state, int max, int max_index, int truncated){
int i;

for(i=0; i<max; i++){
if(get_cabac(c, state)==0)
return i;

if(i< max_index) state++;
}

return truncated ? max : -1;
}

/**
* get unary exp golomb k-th order binarization.
*/
static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signed, int k, int max_index){
int i, v;
int m= 1<<k;

if(get_cabac(c, state)==0)
return 0;

if(0 < max_index) state++;

for(i=1; i<max; i++){
if(get_cabac(c, state)==0){
if(is_signed && get_cabac_bypass(c)){
return -i;
}else
return i;
}

if(i < max_index) state++;
}

while(get_cabac_bypass(c)){
i+= m;
m+= m;
}

v=0;
while(m>>=1){
v+= v + get_cabac_bypass(c);
}
i += v;

if(is_signed && get_cabac_bypass(c)){
return -i;
}else
return i;
}
#endif /* 0 */

#endif /* AVCODEC_CABAC_H */

Loading…
Cancel
Save