comparison rle.c @ 4771:7cd3ffe4897f libavcodec

Changed the rle encoder a little and made it more universal. Not only the repeated byte is calculated as (count ^ xor) + add but also the raw encoding lenth byte is calculated as that too patch by Xiaohui Sun sunxiaohui dsp ac cn

4770:a6d1c26e8b6f

    }

    return count;
}

int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr , int bpp, int w, int8_t add, uint8_t xor)
{
    int count, x;
    uint8_t *out = outbuf;

    for(x = 0; x < w; x += count) {
        /* see if we can encode the next set of pixels with RLE */
        if((count = count_pixels(ptr, w-x, bpp, 1)) > 1) {
            if(out + bpp + 1 > outbuf + out_size) return -1;
            *out++ = (count ^ xor) + add;
            memcpy(out, ptr, bpp);
            out += bpp;
        } else {
            /* fall back on uncompressed */
            count = count_pixels(ptr, w-x, bpp, 0);
            *out++ = count - 1;

            if(out + bpp*count > outbuf + out_size) return -1;
            memcpy(out, ptr, bpp * count);
            out += bpp * count;
        }

4771:7cd3ffe4897f

    }

    return count;
}

int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *ptr , int bpp, int w,
                   int8_t add_rep, uint8_t xor_rep,int8_t add_raw,uint8_t xor_raw)
{
    int count, x;
    uint8_t *out = outbuf;

    for(x = 0; x < w; x += count) {
        /* see if we can encode the next set of pixels with RLE */
        if((count = count_pixels(ptr, w-x, bpp, 1)) > 1) {
            if(out + bpp + 1 > outbuf + out_size) return -1;
            *out++ = (count ^ xor_rep) + add_rep;
            memcpy(out, ptr, bpp);
            out += bpp;
        } else {
            /* fall back on uncompressed */
            count = count_pixels(ptr, w-x, bpp, 0);
            *out++ = (count ^ xor_raw) + add_raw;

            if(out + bpp*count > outbuf + out_size) return -1;
            memcpy(out, ptr, bpp * count);
            out += bpp * count;
        }