comparison vp56.h @ 12031:5578dcdf030c libavcodec

Optimize vp56 arithmetic decoder Negate "bits" to eliminate a negate in cache refilling.

12030:22da8afd75a5

typedef int  (*VP56ParseHeader)(VP56Context *s, const uint8_t *buf,
                                int buf_size, int *golden_frame);

typedef struct {
    int high;
    int bits;
    const uint8_t *buffer;
    const uint8_t *end;
    unsigned long code_word;
} VP56RangeCoder;

static inline void vp56_init_range_decoder(VP56RangeCoder *c,
                                           const uint8_t *buf, int buf_size)
{
    c->high = 255;
    c->bits = 8;
    c->buffer = buf;
    c->end = buf + buf_size;
    c->code_word = bytestream_get_be16(&c->buffer);
}

    /* 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)

        c->high = low << 1;
    }

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

12031:5578dcdf030c

typedef int  (*VP56ParseHeader)(VP56Context *s, const uint8_t *buf,
                                int buf_size, int *golden_frame);

typedef struct {
    int high;
    int bits; /* Stored negated (i.e. negative "bits" is a positive number of bits left)
               * in order to eliminate a negate in cache refilling */
    const uint8_t *buffer;
    const uint8_t *end;
    unsigned long code_word;
} VP56RangeCoder;

static inline void vp56_init_range_decoder(VP56RangeCoder *c,
                                           const uint8_t *buf, int buf_size)
{
    c->high = 255;
    c->bits = -8;
    c->buffer = buf;
    c->end = buf + buf_size;
    c->code_word = bytestream_get_be16(&c->buffer);
}

    /* 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)

        c->high = low << 1;
    }

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