mirror of https://git.ffmpeg.org/ffmpeg.git
cleanup
Originally committed as revision 1932 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
bc634f6fc2
commit
8f8c0800f8
|
@ -158,7 +158,7 @@ STOP_TIMER("put_cabac_u")
|
||||||
|
|
||||||
for(i=0; i<SIZE; i++){
|
for(i=0; i<SIZE; i++){
|
||||||
START_TIMER
|
START_TIMER
|
||||||
put_cabac_ueg(&c, state, r[i], 0, 3, 0, 1, 2);
|
put_cabac_ueg(&c, state, r[i], 3, 0, 1, 2);
|
||||||
STOP_TIMER("put_cabac_ueg")
|
STOP_TIMER("put_cabac_ueg")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -199,12 +199,16 @@ static inline void put_cabac_u(CABACContext *c, uint8_t * state, int v, int max,
|
||||||
/**
|
/**
|
||||||
* put unary exp golomb k-th order binarization.
|
* put unary exp golomb k-th order binarization.
|
||||||
*/
|
*/
|
||||||
static inline void put_cabac_ueg(CABACContext *c, uint8_t * state, int v, int sign, int max, int is_signed, int k, int max_index){
|
static inline void put_cabac_ueg(CABACContext *c, uint8_t * state, int v, int max, int is_signed, int k, int max_index){
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if(v==0)
|
if(v==0)
|
||||||
put_cabac(c, state, 0);
|
put_cabac(c, state, 0);
|
||||||
else{
|
else{
|
||||||
|
const int sign= v < 0;
|
||||||
|
|
||||||
|
if(is_signed) v= ABS(v);
|
||||||
|
|
||||||
if(v<max){
|
if(v<max){
|
||||||
for(i=0; i<v; i++){
|
for(i=0; i<v; i++){
|
||||||
put_cabac(c, state, 1);
|
put_cabac(c, state, 1);
|
||||||
|
|
Loading…
Reference in New Issue