Mercurial > libavcodec.hg

changeset 1295:5c67ef6498ed libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix 4xm yuv->rgb565 transform
author michaelni
date Sun, 01 Jun 2003 10:56:36 +0000
parents 6896bc2f3bf5
children eff1dc4bed49
files 4xm.c
diffstat 1 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/4xm.c	Sun Jun 01 10:13:29 2003 +0000
+++ b/4xm.c	Sun Jun 01 10:56:36 2003 +0000
@@ -416,32 +416,38 @@
     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){