Browse Source

cabac: drop unused STRICT_LIMITS code branch

tags/n0.10
Diego Biurrun 14 years ago
parent
commit
e451c26c5f
2 changed files with 0 additions and 19 deletions
  1. +0
    -16
      libavcodec/cabac.c
  2. +0
    -3
      libavcodec/cabac.h

+ 0
- 16
libavcodec/cabac.c View File

@@ -109,10 +109,6 @@ void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size){
c->low= 0;
c->range= 0x1FE;
c->outstanding_count= 0;
#ifdef STRICT_LIMITS
c->sym_count =0;
#endif

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);

#ifdef STRICT_LIMITS
c->symCount++;
#endif
}

/**
@@ -204,10 +196,6 @@ static void put_cabac_bypass(CABACContext *c, int bit){
put_cabac_bit(c, 1);
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
}

#ifdef STRICT_LIMITS
c->symCount++;
#endif

return (put_bits_count(&c->pb)+7)>>3;
}



+ 0
- 3
libavcodec/cabac.h View File

@@ -41,9 +41,6 @@ typedef struct CABACContext{
int low;
int range;
int outstanding_count;
#ifdef STRICT_LIMITS
int symCount;
#endif
const uint8_t *bytestream_start;
const uint8_t *bytestream;
const uint8_t *bytestream_end;


Loading…
Cancel
Save