comparison vp56.h @ 12029:934968bd410d libavcodec

renormalize VP5/6/7/8 range coder without loop

12028:2caea98f5711

#include "vp56data.h"
#include "dsputil.h"
#include "get_bits.h"
#include "bytestream.h"
#include "vp56dsp.h"

typedef struct vp56_context VP56Context;
typedef struct vp56_mv VP56mv;

static inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
{
    unsigned int low = 1 + (((c->high - 1) * prob) >> 8);
    unsigned int low_shift = low << 8;
    int bit = c->code_word >= low_shift;

    if (bit) {
        c->high -= low;
        c->code_word -= low_shift;
    } else {
        c->high = low;
    }

    /* normalize */
    while (c->high < 128) {
        c->high <<= 1;
        c->code_word <<= 1;
        if (--c->bits == 0 && c->buffer < c->end) {
            c->bits = 8;
            c->code_word |= *c->buffer++;
        }
    }
    return bit;
}

static inline int vp56_rac_get(VP56RangeCoder *c)

12029:934968bd410d

#include "vp56data.h"
#include "dsputil.h"
#include "get_bits.h"
#include "bytestream.h"
#include "cabac.h"
#include "vp56dsp.h"

typedef struct vp56_context VP56Context;
typedef struct vp56_mv VP56mv;

static inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
{
    unsigned int low = 1 + (((c->high - 1) * prob) >> 8);
    unsigned int low_shift = low << 8;
    int bit = c->code_word >= low_shift;
    int shift;

    if (bit) {
        c->high -= low;
        c->code_word -= low_shift;
    } else {
        c->high = low;
    }

    /* normalize */
    shift = ff_h264_norm_shift[c->high] - 1;
    c->high      <<= shift;
    c->code_word <<= shift;
    c->bits       -= shift;
    if(c->bits <= 0 && c->buffer < c->end) {
        c->code_word |= *c->buffer++ << -c->bits;
        c->bits += 8;
    }
    return bit;
}

static inline int vp56_rac_get(VP56RangeCoder *c)