mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
cabac: drop unused STRICT_LIMITS code branch
This commit is contained in:
parent
9785082c15
commit
e451c26c5f
@ -109,10 +109,6 @@ void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size){
|
|||||||
c->low= 0;
|
c->low= 0;
|
||||||
c->range= 0x1FE;
|
c->range= 0x1FE;
|
||||||
c->outstanding_count= 0;
|
c->outstanding_count= 0;
|
||||||
#ifdef STRICT_LIMITS
|
|
||||||
c->sym_count =0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
c->pb.bit_left++; //avoids firstBitFlag
|
c->pb.bit_left++; //avoids firstBitFlag
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -179,10 +175,6 @@ static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
|
|||||||
}
|
}
|
||||||
|
|
||||||
renorm_cabac_encoder(c);
|
renorm_cabac_encoder(c);
|
||||||
|
|
||||||
#ifdef STRICT_LIMITS
|
|
||||||
c->symCount++;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -204,10 +196,6 @@ static void put_cabac_bypass(CABACContext *c, int bit){
|
|||||||
put_cabac_bit(c, 1);
|
put_cabac_bit(c, 1);
|
||||||
c->low -= 0x400;
|
c->low -= 0x400;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef STRICT_LIMITS
|
|
||||||
c->symCount++;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -232,10 +220,6 @@ static int put_cabac_terminate(CABACContext *c, int bit){
|
|||||||
flush_put_bits(&c->pb); //FIXME FIXME FIXME XXX wrong
|
flush_put_bits(&c->pb); //FIXME FIXME FIXME XXX wrong
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef STRICT_LIMITS
|
|
||||||
c->symCount++;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return (put_bits_count(&c->pb)+7)>>3;
|
return (put_bits_count(&c->pb)+7)>>3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,9 +41,6 @@ typedef struct CABACContext{
|
|||||||
int low;
|
int low;
|
||||||
int range;
|
int range;
|
||||||
int outstanding_count;
|
int outstanding_count;
|
||||||
#ifdef STRICT_LIMITS
|
|
||||||
int symCount;
|
|
||||||
#endif
|
|
||||||
const uint8_t *bytestream_start;
|
const uint8_t *bytestream_start;
|
||||||
const uint8_t *bytestream;
|
const uint8_t *bytestream;
|
||||||
const uint8_t *bytestream_end;
|
const uint8_t *bytestream_end;
|
||||||
|
Loading…
Reference in New Issue
Block a user