remove the need of one extra shift in rgb16ToUV
authorIvo van Poorten <ivop@euronet.nl>
Wed, 9 May 2007 21:34:05 +0000 (21:34 +0000)
committerIvo van Poorten <ivop@euronet.nl>
Wed, 9 May 2007 21:34:05 +0000 (21:34 +0000)
Originally committed as revision 23281 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

libswscale/swscale_template.c

index 21fb4e8f165590d0d83956b4fae21f36fe4d77c2..8cd51e94d29c8f4d078e5f9d72f2d65207b82cd6 100644 (file)
@@ -2229,13 +2229,10 @@ static inline void RENAME(rgb16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
         int d0= ((uint32_t*)src1)[i];
 
         int dl= (d0&0x07E0F81F);
-        int dh= ((d0>>5)&0x07C0F83F);
+        int d= dl + (((d0>>16) + (d0<<16))&0x07E0F81F);
 
-        int dh2= (dh>>11) + (dh<<21);
-        int d= dh2 + dl;
-
-        int r= d&0x7F;
-        int b= (d>>11)&0x7F;
+        int r= d&0x3F;
+        int b= (d>>11)&0x3F;
         int g= d>>21;
         dstU[i]= ((2*RU*r + GU*g + 2*BU*b)>>(RGB2YUV_SHIFT+1-2)) + 128;
         dstV[i]= ((2*RV*r + GV*g + 2*BV*b)>>(RGB2YUV_SHIFT+1-2)) + 128;