comparison cabac.h @ 5811:2926fc2a0396 libavcodec

Disable unused code; fixes several gcc warnings: cabac.h:112: warning: ¡Æput_cabac_static¡Ç defined but not used cabac.h:158: warning: ¡Æput_cabac_terminate¡Ç defined but not used cabac.h:186: warning: ¡Æput_cabac_u¡Ç defined but not used cabac.h:221: warning: ¡Æput_cabac_ueg¡Ç defined but not used cabac.h:273: warning: ¡Ærefill2¡Ç defined but not used cabac.h:811: warning: ¡Æget_cabac_u¡Ç defined but not used cabac.h:827: warning: ¡Æget_cabac_ueg¡Ç defined but not used

5810:3e5e2bafe35c

        c->range+= c->range;
        c->low += c->low;
    }
}

static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
    int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state];

    if(bit == ((*state)&1)){
        c->range -= RangeLPS;

        if(is_signed)
            put_cabac_bypass(c, sign);
    }
}

static void refill(CABACContext *c){
#if CABAC_BITS == 16
        c->low+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1);
#else

#endif
    c->low -= CABAC_MASK;
    c->bytestream+= CABAC_BITS/8;
}

static void refill2(CABACContext *c){
    int i, x;

    x= c->low ^ (c->low-1);
    i= 7 - ff_h264_norm_shift[x>>(CABAC_BITS-1)];

#endif

    c->low += x<<i;
    c->bytestream+= CABAC_BITS/8;
}

static inline void renorm_cabac_decoder(CABACContext *c){
    while(c->range < 0x100){
        c->range+= c->range;
        c->low+= c->low;

    }else{
        return c->bytestream - c->bytestream_start;
    }
}

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

    if(is_signed && get_cabac_bypass(c)){
        return -i;
    }else
        return i;
}

#endif /* CABAC_H */

5811:2926fc2a0396

        c->range+= c->range;
        c->low += c->low;
    }
}

#if 0
static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
    int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state];

    if(bit == ((*state)&1)){
        c->range -= RangeLPS;

        if(is_signed)
            put_cabac_bypass(c, sign);
    }
}
#endif /* 0 */

static void refill(CABACContext *c){
#if CABAC_BITS == 16
        c->low+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1);
#else

#endif
    c->low -= CABAC_MASK;
    c->bytestream+= CABAC_BITS/8;
}

#if 0
static void refill2(CABACContext *c){
    int i, x;

    x= c->low ^ (c->low-1);
    i= 7 - ff_h264_norm_shift[x>>(CABAC_BITS-1)];

#endif

    c->low += x<<i;
    c->bytestream+= CABAC_BITS/8;
}
#endif

static inline void renorm_cabac_decoder(CABACContext *c){
    while(c->range < 0x100){
        c->range+= c->range;
        c->low+= c->low;

    }else{
        return c->bytestream - c->bytestream_start;
    }
}

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

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

#endif /* CABAC_H */