Changeset 344

Timestamp:

02/16/07 12:59:27 (2 years ago)

Author:

astrange

Message:

Use unsigned int in ColorConversions?.c; clean up loops to only multiply IVs and not divide them. Fix y420->y422+sse2 footer loop (closes #107).
Simplify SSA tag machine's number parser.

Files:

• trunk/ColorConversions.c (modified) (12 diffs)
• trunk/ColorConversions.h (modified) (1 diff)
• trunk/SSATagParsing.m.rl (modified) (1 diff)

trunk/ColorConversions.c

@@ -63 +63 @@
-//also, big-endian only
-
-int outRB, int width, int
-
-int             y = height >> 1
-int             halfWidth = width >> 1, halfHalfWidth = halfWidth >> 1
+unsigned outRB, unsigned width, unsigned
+
+unsigned             y = height / 2
+unsigned             halfWidth = width / 2, halfHalfWidth = width / 4
-         UInt8          *inY = picture->data[0], *inU = picture->data[1], *inV = picture->data[2];
-         int             rB = picture->linesize[0], rbU = picture->linesize[1], rbV = picture->linesize[2];
@@ -106 +106 @@
- }
-
-int outRB, int width, int
-
-          
-int             
-int                            y,x,x2,x4, vWidth = width >> 5, halfheight = height >> 1
+unsigned outRB, unsigned width, unsigned
+
+                  
+unsigned               
+unsigned               y,x,x2,x4, vWidth = width / 32, halfheight = height / 2
-        
-        for (y = 0; y < halfheight; y ++) {
@@ -139 +139 @@
-                        UInt8 *o2 = o + outRB, *yc2 = yc + rY;
-                        for (x = vWidth * 32, x2 = x*2; x < width; x += 2, x2 += 4) {
-int             hx = x >> 1
+unsigned             hx = x / 2
-                                o2[x2] = o[x2] = uc[hx];
-                                o[x2 + 1] = yc[x];
@@ -156 +156 @@
-}
-
-int outRB, int width, int
-
-int outRB, int width, int
+unsigned outRB, unsigned width, unsigned
+
+unsigned outRB, unsigned width, unsigned
-        if (!y420_function) {
-                int sels[2] = { CTL_HW, HW_VECTORUNIT }; // from http://developer.apple.com/hardwaredrivers/ve/g3_compatibility.html
@@ -174 +174 @@
-#include <emmintrin.h>
-
-
+
+
+
-{
-        UInt8          *yc = picture->data[0], *uc = picture->data[1], *vc = picture->data[2];
-int             
-int                            y,x, vWidth = width >> 4, halfheight = height >> 1, halfwidth = width >> 1
+unsigned               
+unsigned               y,x, vWidth = width / 16, halfheight = height / 2, halfwidth = width / 2
-        
-        for (y = 0; y < halfheight; y ++) {
@@ -189 +191 @@
-                        * sse2 can do 64-bit loads, so we do that. (apple's h264 doesn't seem to, maybe we should copy them?)
-                        * unrolling loops is very bad on x86 */
-int
+unsigned
-                        __builtin_prefetch(&yv[x+1], 0, 0); __builtin_prefetch(&yv2[x+1], 0, 0); // prefetch next y vectors, throw it out of cache immediately after use
-                        __builtin_prefetch(&uv[x+1], 0, 0); __builtin_prefetch(&vv[x+1], 0, 0); // and chroma too
@@ -206 +208 @@
-                }
-                
-& 15
-o + outRB, *yc2 = yc + rY
-vWidth * 16; x < halfwidth; x 
-int             hx = x>>1
-2] = o[x2] = uc[h
-2 + 1] = yc[x
-2 + 1] = yc2[x
-2 + 2] = o[x2 + 2] = vc[h
-2 + 3] = yc[x
-2 + 3] = yc2[x
+% 16 != 0
+(UInt8*)ov2, *yc2 = (UInt8*)yv2
+TRUNCATE(width, 16) / 2; x < halfwidth; x
+unsigned x4 = x*4
+4] = o[x4] = uc[
+4 + 1] = yc[x2
+4 + 1] = yc2[x2
+4 + 2] = o[x4 + 2] = vc[
+4 + 3] = yc[x2
+4 + 3] = yc2[x2
-                        }                       
-                }
@@ -228 +230 @@
-
-
-int outRB, int width, int
-
-          
-int             rY = picture->linesize[0], rU = picture->linesize[1], rV = picture->linesize[2], halfheight = height >> 1, halfwidth = width >> 1
-int                    
+unsigned outRB, unsigned width, unsigned
+
+          
+unsigned       rY = picture->linesize[0], rU = picture->linesize[1], rV = picture->linesize[2], halfheight = height / 2, halfwidth = width / 2
+unsigned
-        
-        for (y = 0; y < halfheight; y ++) {
-                UInt8 *o2 = o + outRB, *yc2 = yc + rY;
-                
- 
-int             hx = x>>1
-2] = o[x2] = u[h
-2 + 1] = yc[x
-2 + 1] = yc2[x
-2 + 2] = o[x2 + 2] = v[h
-2 + 3] = yc[x
-2 + 3] = yc2[x
+
+unsigned x4 = x*4
+4] = o[x4] = u[
+4 + 1] = yc[x2
+4 + 1] = yc2[x2
+4 + 2] = o[x4 + 2] = v[
+4 + 3] = yc[x2
+4 + 3] = yc2[x2
-                }
-                
@@ -254 +256 @@
-}
-
-int outRB, int width, int
+unsigned outRB, unsigned width, unsigned
-{
-        uintptr_t yc = (uintptr_t)picture->data[0];
@@ -266 +268 @@
-#endif
-
-int rowBytes, int width, int
-
-int
+unsigned rowBytes, unsigned width, unsigned
+
+unsigned
-        UInt8 *srcPtr = picture->data[0];
-        
@@ -284 +286 @@
-}
-
-int rowBytes, int width, int
-
-int
+unsigned rowBytes, unsigned width, unsigned
+
+unsigned
-        UInt8 *srcPtr = picture->data[0];
-        
@@ -302 +304 @@
-}
-
-int outRB, int width, int
+unsigned outRB, unsigned width, unsigned
-{
-        UInt8          *yc = picture->data[0], *u = picture->data[1], *v = picture->data[2];
-int             rY = picture->linesize[0], rU = picture->linesize[1], rV = picture->linesize[2], y = 0, x, x
-
-
-, x2 = 0; x < width; x += 2, x2 += 4
-int             hx = x >> 1
-2] = u[h
-2 + 1] = yc[x
-2 + 2] = v[h
-2 + 3] = yc[x
+unsigned       rY = picture->linesize[0], rU = picture->linesize[1], rV = picture->linesize[2], y, x, x2, halfwidth = width / 
+
+y = 0
+; x < halfwidth; x++
+unsigned x2 = x * 2, x4 = x * 4
+4] = u[
+4 + 1] = yc[x2
+4 + 2] = v[
+4 + 3] = yc[x2
-                }
-                

trunk/ColorConversions.h

@@ -22 +22 @@
-
-extern void FastY420(UInt8 *baseAddr, AVFrame *picture);
-int rowBytes, int width, int
-int rowBytes, int width, int
-int rowBytes, int width, int
-int outRB, int width, int
+unsigned rowBytes, unsigned width, unsigned
+unsigned rowBytes, unsigned width, unsigned
+unsigned rowBytes, unsigned width, unsigned
+unsigned outRB, unsigned width, unsigned

trunk/SSATagParsing.m.rl

@@ -541 +541 @@
-                                
-                                flag = ([01] % {unichar fl = *(p-1); if (flag == '0' || flag == '1') flag = fl - '0';})? > {flag = 1;};
-*
++
-                                num = num_ > {numbegin = p;} % {num = [[NSString stringWithCharacters:numbegin length:p-numbegin] doubleValue];};
-                                
-*
-
-*
++
+
++
-
-                                cmd_specific = (("pos(" [^)]+ > pos_begin ")" % pos_end)