diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-06-01 10:56:36 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-06-01 10:56:36 +0000 |
| commit | b60ad448de1e2250e8d72efc31081d5a73065d81 (patch) | |
| tree | d3bce14f5d402912238bce56c8261afda2ee0346 /libavcodec/4xm.c | |
| parent | 5be8a3737bae9d090b8d893135c292f0bd4e85b0 (diff) | |
| download | ffmpeg-b60ad448de1e2250e8d72efc31081d5a73065d81.tar.gz | |
fix 4xm yuv->rgb565 transform
Originally committed as revision 1925 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index d66718095d..80e87c3797 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -416,32 +416,38 @@ static inline void idct_put(FourXContext *f, int x, int y){ int stride= f->current_picture.linesize[0]>>1; int i; uint16_t *dst = ((uint16_t*)f->current_picture.data[0]) + y * stride + x; + + for(i=0; i<4; i++){ + block[i][0] += 0x80*8*8; + idct(block[i]); + } - for(i=0; i<6; i++) idct(block[i]); + if(!(f->avctx->flags&CODEC_FLAG_GRAY)){ + for(i=4; i<6; i++) idct(block[i]); + } for(y=0; y<8; y++){ for(x=0; x<8; x++){ DCTELEM *temp= block[(x>>2) + 2*(y>>2)] + 2*(x&3) + 2*8*(y&3); //FIXME optimize - int cb= block[4][x + 8*y] + 0x80; - int cr= block[5][x + 8*y] + 0x80; + int cb= block[4][x + 8*y]; + int cr= block[5][x + 8*y]; int cg= (cb + cr)>>1; int y; - cb+=cb - 0x80; + cb+=cb; y = temp[0]; - dst[0 ]= ((y+cb)>>3) + (((y+cg)&0xFC)<<3) + (((y+cr)&0xF8)<<8); + dst[0 ]= ((y+cb)>>3) + (((y-cg)&0xFC)<<3) + (((y+cr)&0xF8)<<8); y = temp[1]; - dst[1 ]= ((y+cb)>>3) + (((y+cg)&0xFC)<<3) + (((y+cr)&0xF8)<<8); + dst[1 ]= ((y+cb)>>3) + (((y-cg)&0xFC)<<3) + (((y+cr)&0xF8)<<8); y = temp[8]; - dst[ stride]= ((y+cb)>>3) + (((y+cg)&0xFC)<<3) + (((y+cr)&0xF8)<<8); + dst[ stride]= ((y+cb)>>3) + (((y-cg)&0xFC)<<3) + (((y+cr)&0xF8)<<8); y = temp[9]; - dst[1+stride]= ((y+cb)>>3) + (((y+cg)&0xFC)<<3) + (((y+cr)&0xF8)<<8); + dst[1+stride]= ((y+cb)>>3) + (((y-cg)&0xFC)<<3) + (((y+cr)&0xF8)<<8); dst += 2; } dst += 2*stride - 2*8; } -// if(!(f->avctx->flags&CODEC_FLAG_GRAY)){ } static int decode_i_mb(FourXContext *f){ |