comparison h263.c @ 1254:604661d34c68 libavcodec

bitstream reader optimize patch by (BERO <bero at geocities dot co dot jp>)

1253:5642ebadf1b5

            run = get_bits(&s->gb, 6);
            level = (int8_t)get_bits(&s->gb, 8);
            if(level == -128){
                if (s->h263_rv10) {
                    /* XXX: should patch encoder too */
                    level = get_bits(&s->gb, 12);
                    level= (level + ((-1)<<11)) ^ ((-1)<<11); //sign extension
                }else{
                    level = get_bits(&s->gb, 5);
                    level += get_bits(&s->gb, 6)<<5;
                    level= (level + ((-1)<<10)) ^ ((-1)<<10); //sign extension
                }
            }
        } else {
            run = rl->table_run[code];
            level = rl->table_level[code];

        return -1;
    }
    if (code == 0) {
        level = 0;
    } else {
        level = get_bits(&s->gb, code);
        if ((level >> (code - 1)) == 0) /* if MSB not set it is negative*/
            level = - (level ^ ((1 << code) - 1));
        if (code > 8){
            if(get_bits1(&s->gb)==0){ /* marker */
                if(s->error_resilience>=2){
                    fprintf(stderr, "dc marker bit missing\n");
                    return -1;

        int length;
        int x=0, y=0;

        length= get_vlc(&s->gb, &sprite_trajectory);
        if(length){
            x= get_bits(&s->gb, length);

            if ((x >> (length - 1)) == 0) /* if MSB not set it is negative*/
                x = - (x ^ ((1 << length) - 1));
        }
        if(!(s->divx_version==500 && s->divx_build==413)) skip_bits1(&s->gb); /* marker bit */
        
        length= get_vlc(&s->gb, &sprite_trajectory);
        if(length){
            y=get_bits(&s->gb, length);

            if ((y >> (length - 1)) == 0) /* if MSB not set it is negative*/
                y = - (y ^ ((1 << length) - 1));
        }
        skip_bits1(&s->gb); /* marker bit */
//printf("%d %d %d %d\n", x, y, i, s->sprite_warping_accuracy);
        d[i][0]= x;
        d[i][1]= y;

1254:604661d34c68

            run = get_bits(&s->gb, 6);
            level = (int8_t)get_bits(&s->gb, 8);
            if(level == -128){
                if (s->h263_rv10) {
                    /* XXX: should patch encoder too */
                    level = get_sbits(&s->gb, 12);
                }else{
                    level = get_bits(&s->gb, 5);
                    level |= get_sbits(&s->gb, 6)<<5;
                }
            }
        } else {
            run = rl->table_run[code];
            level = rl->table_level[code];

        return -1;
    }
    if (code == 0) {
        level = 0;
    } else {
        level = get_xbits(&s->gb, code);
        if (code > 8){
            if(get_bits1(&s->gb)==0){ /* marker */
                if(s->error_resilience>=2){
                    fprintf(stderr, "dc marker bit missing\n");
                    return -1;

        int length;
        int x=0, y=0;

        length= get_vlc(&s->gb, &sprite_trajectory);
        if(length){
            x= get_xbits(&s->gb, length);
        }
        if(!(s->divx_version==500 && s->divx_build==413)) skip_bits1(&s->gb); /* marker bit */
        
        length= get_vlc(&s->gb, &sprite_trajectory);
        if(length){
            y=get_xbits(&s->gb, length);
        }
        skip_bits1(&s->gb); /* marker bit */
//printf("%d %d %d %d\n", x, y, i, s->sprite_warping_accuracy);
        d[i][0]= x;
        d[i][1]= y;