[FFmpeg-devel] [PATCH] correctly handle MSRLE uncompressed

[Baptiste Coudurier]

Kostya wrote:
>> [...]
>>  
>> -    ff_msrle_decode(avctx, (AVPicture*)&s->frame, avctx->bits_per_coded_sample, buf, buf_size);
>> +    /* FIXME how to correctly detected RLE ??? */
> 
> s/detected/detect/

Changed.

>> +    if (avctx->height * istride == avpkt->size) { /* assume uncompressed */
>> +        int linesize = avctx->width * avctx->bits_per_coded_sample / 8;
>> +        uint8_t *ptr = s->frame.data[0];
>> +        uint8_t *buf = avpkt->data + (avctx->height-1)*istride;
>> +        int i, j;
>>  
>> +        for (i = 0; i < avctx->height; i++) {
>> +            if (avctx->bits_per_coded_sample == 4) {
>> +                for (j = 0; j < linesize; j++) {
>> +                    ptr[j*2+0] = buf[j] >> 4;
>> +                    ptr[j*2+1] = buf[j] & 0xf;
>> +                }
>> +                if (j*2 < avctx->width)
>> +                    ptr[j*2+0] = buf[j] >> 4;
> 
> again, maybe
>  for (j = 0; j < width; j += 2) {
>   ptr[j+0] = buf[j>>1] >> 4;
>   ptr[j+1] = buf[j>>1] & 0xF;
>  }
>  if (width & 1) ptr[width-1] = buf[j>>1] >> 4;
> 
> thus you'll get rid of unneeded multiplication as well
> but if you think this is better, commit this

Good :)
Changed, I adapted a bit and kept indentation like previous lines,
if you don't mind, I can keep your way if you prefer of course.

-- 
Baptiste COUDURIER                              GnuPG Key Id: 0x5C1ABAAA
Key fingerprint                 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
FFmpeg maintainer                                  http://www.ffmpeg.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: msrle_uncompressed3.patch
Type: text/x-diff
Size: 2052 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090527/8c40c2b0/attachment.patch>