# HG changeset patch # User michael # Date 1004477581 0 # Node ID f2353173d52c1e91532e128d0d87dd91b1c6312d # Parent 13608ff3d1e60390a24c7ec77c3182ae54d226b0 c optimizations (array is faster than pointer) (16bpp variants tested and 2% faster) diff -r 13608ff3d1e6 -r f2353173d52c postproc/swscale.c --- a/postproc/swscale.c Tue Oct 30 21:22:28 2001 +0000 +++ b/postproc/swscale.c Tue Oct 30 21:33:01 2001 +0000 @@ -506,18 +506,15 @@ for(i=0;i>19; - dest++; + ((uint8_t*)dest)[i] = (buf0[i]*yalpha1+buf1[i]*yalpha)>>19; } if(uvalpha != -1) { for(i=0; i>19; - ((uint8_t*)vDest)[0] = (uvbuf0[i+2048]*uvalpha1+uvbuf1[i+2048]*uvalpha)>>19; - uDest++; - vDest++; + ((uint8_t*)uDest)[i] = (uvbuf0[i]*uvalpha1+uvbuf1[i]*uvalpha)>>19; + ((uint8_t*)vDest)[i] = (uvbuf0[i+2048]*uvalpha1+uvbuf1[i+2048]*uvalpha)>>19; } } } @@ -704,11 +701,10 @@ int U=((uvbuf0[i]*uvalpha1+uvbuf1[i]*uvalpha)>>19); int V=((uvbuf0[i+2048]*uvalpha1+uvbuf1[i+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<3)&0x07E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<8)&0xF800); - dest+=2; } } else if(dstbpp==15) @@ -719,11 +715,10 @@ int U=((uvbuf0[i]*uvalpha1+uvbuf1[i]*uvalpha)>>19); int V=((uvbuf0[i+2048]*uvalpha1+uvbuf1[i+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<2)&0x03E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<7)&0x7C00); - dest+=2; } } #endif @@ -814,11 +809,10 @@ int U=((uvbuf0[i/2]*uvalpha1+uvbuf1[i/2]*uvalpha)>>19); int V=((uvbuf0[i/2+2048]*uvalpha1+uvbuf1[i/2+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<3)&0x07E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<8)&0xF800); - dest+=2; } } else if(dstbpp==15) @@ -829,11 +823,10 @@ int U=((uvbuf0[i/2]*uvalpha1+uvbuf1[i/2]*uvalpha)>>19); int V=((uvbuf0[i/2+2048]*uvalpha1+uvbuf1[i/2+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<2)&0x03E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<7)&0x7C00); - dest+=2; } } #endif @@ -993,11 +986,10 @@ int U=((uvbuf0[i/2]*uvalpha1+uvbuf1[i/2]*uvalpha)>>19); int V=((uvbuf0[i/2+2048]*uvalpha1+uvbuf1[i/2+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<3)&0x07E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<8)&0xF800); - dest+=2; } } else if(dstbpp==15) @@ -1008,11 +1000,10 @@ int U=((uvbuf0[i/2]*uvalpha1+uvbuf1[i/2]*uvalpha)>>19); int V=((uvbuf0[i/2+2048]*uvalpha1+uvbuf1[i/2+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<2)&0x03E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<7)&0x7C00); - dest+=2; } } #endif diff -r 13608ff3d1e6 -r f2353173d52c postproc/swscale_template.c --- a/postproc/swscale_template.c Tue Oct 30 21:22:28 2001 +0000 +++ b/postproc/swscale_template.c Tue Oct 30 21:33:01 2001 +0000 @@ -506,18 +506,15 @@ for(i=0;i>19; - dest++; + ((uint8_t*)dest)[i] = (buf0[i]*yalpha1+buf1[i]*yalpha)>>19; } if(uvalpha != -1) { for(i=0; i>19; - ((uint8_t*)vDest)[0] = (uvbuf0[i+2048]*uvalpha1+uvbuf1[i+2048]*uvalpha)>>19; - uDest++; - vDest++; + ((uint8_t*)uDest)[i] = (uvbuf0[i]*uvalpha1+uvbuf1[i]*uvalpha)>>19; + ((uint8_t*)vDest)[i] = (uvbuf0[i+2048]*uvalpha1+uvbuf1[i+2048]*uvalpha)>>19; } } } @@ -704,11 +701,10 @@ int U=((uvbuf0[i]*uvalpha1+uvbuf1[i]*uvalpha)>>19); int V=((uvbuf0[i+2048]*uvalpha1+uvbuf1[i+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<3)&0x07E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<8)&0xF800); - dest+=2; } } else if(dstbpp==15) @@ -719,11 +715,10 @@ int U=((uvbuf0[i]*uvalpha1+uvbuf1[i]*uvalpha)>>19); int V=((uvbuf0[i+2048]*uvalpha1+uvbuf1[i+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<2)&0x03E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<7)&0x7C00); - dest+=2; } } #endif @@ -814,11 +809,10 @@ int U=((uvbuf0[i/2]*uvalpha1+uvbuf1[i/2]*uvalpha)>>19); int V=((uvbuf0[i/2+2048]*uvalpha1+uvbuf1[i/2+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<3)&0x07E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<8)&0xF800); - dest+=2; } } else if(dstbpp==15) @@ -829,11 +823,10 @@ int U=((uvbuf0[i/2]*uvalpha1+uvbuf1[i/2]*uvalpha)>>19); int V=((uvbuf0[i/2+2048]*uvalpha1+uvbuf1[i/2+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<2)&0x03E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<7)&0x7C00); - dest+=2; } } #endif @@ -993,11 +986,10 @@ int U=((uvbuf0[i/2]*uvalpha1+uvbuf1[i/2]*uvalpha)>>19); int V=((uvbuf0[i/2+2048]*uvalpha1+uvbuf1[i/2+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<3)&0x07E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<8)&0xF800); - dest+=2; } } else if(dstbpp==15) @@ -1008,11 +1000,10 @@ int U=((uvbuf0[i/2]*uvalpha1+uvbuf1[i/2]*uvalpha)>>19); int V=((uvbuf0[i/2+2048]*uvalpha1+uvbuf1[i/2+2048]*uvalpha)>>19); - ((uint16_t*)dest)[0] = + ((uint16_t*)dest)[i] = (clip_table[(Y + yuvtab_40cf[U]) >>13]>>3) | ((clip_table[(Y + yuvtab_1a1e[V] + yuvtab_0c92[U]) >>13]<<2)&0x03E0) | ((clip_table[(Y + yuvtab_3343[V]) >>13]<<7)&0x7C00); - dest+=2; } } #endif