Changeset 23809

Timestamp:

09/21/13 11:30:57 (10 years ago)

Author:

nit

Message:

[titan] optimize

File:

• titan/titan/skin.h (modified) (11 diffs)

titan/titan/skin.h

@@ -93 +93 @@
         if(ostrcmp("getplaytext", value) == 0)
                 return &getplaytext;
-  if(ostrcmp("getbufferstatus", value) == 0)
+        if(ostrcmp("getbufferstatus", value) == 0)
         {
                 *rettype = FUNCPROGRESS;
@@ -133 +133 @@
                 return &getsignal;
         }
-  if(ostrcmp("getrecfreesizetext", value) == 0)
+        if(ostrcmp("getrecfreesizetext", value) == 0)
                 return &getrecfreesizetext;
         if(ostrcmp("getwlanlinkqualitytext", value) == 0)
@@ -1514 +1514 @@
 int drawjpgsw(struct jpeg_decompress_struct* cinfo, unsigned char* buf, int posx, int posy, int width, int height, int colbytes, int mwidth, int mheight, int scalewidth, int scaleheight, int halign, int valign)
 {
-        int aktline = 0, x = 0, py = 0, px = 0, row_stride = 0;
+        int aktline = 0, x = 0, py = 0, px = 0, row_stride = 0, pyw = 0;
+        int width4 = width * 4, width8 = width * 8, aktline1 = 0;
         unsigned char red, green, blue;
         unsigned long color = 0;
@@ -1529 +1530 @@
                 row_stride = width * colbytes; 
 
-        if(accelfb != NULL && accelfb->varfbsize > width * 8 && (scalewidth != 0 || scaleheight != 0) && (scalewidth != width || scaleheight != height))
+        if(accelfb != NULL && accelfb->varfbsize > width8 && (scalewidth != 0 || scaleheight != 0) && (scalewidth != width || scaleheight != height))
         {
                 if(halign == CENTER)
@@ -1554 +1555 @@
 
                                 py++;
+                                pyw = width * py;
                                 for(x = 0; x < width; x++)
                                 {
@@ -1567 +1569 @@
                                                 color = (255 << 24) | (red << 16) | (red << 8) | red;
 
-                                        drawpixelfb(accelfb, (width * py) + x, 0, color);
+                                        drawpixelfb(accelfb, pyw + x, 0, color);
                                 }
 
-                                if((py * width * 4) + (width * 8) >= accelfb->varfbsize)
+                                if((py * width4) + (width8) >= accelfb->varfbsize)
                                 {
                                         py++;
@@ -1591 +1593 @@
                         while(aktline < height)
                         {
+                                aktline1 = aktline * row_stride;
                                 aktline++;
 
                                 py++;
+                                pyw = width * py;
                                 for(x = 0; x < width; x++)
                                 {
                                         px = colbytes * x;
-                                        red = buf[((aktline - 1) * row_stride) + px];
+                                        red = buf[aktline1 + px];
                                         if(colbytes > 2)
                                         {
-                                                green = buf[((aktline - 1) * row_stride) + (px + 1)];
-                                                blue = buf[((aktline - 1) * row_stride) + (px + 2)];
+                                                green = buf[aktline1 + (px + 1)];
+                                                blue = buf[aktline1 + (px + 2)];
                                                 color = (255 << 24) | (red << 16) | (green << 8) | blue;
                                         }
@@ -1607 +1611 @@
                                                 color = (255 << 24) | (red << 16) | (red << 8) | red;
 
-                                        drawpixelfb(accelfb, (width * py) + x, 0, color);
+                                        drawpixelfb(accelfb, pyw + x, 0, color);
                                 }
 
-                                if((py * width * 4) + (width * 8) >= accelfb->varfbsize)
+                                if((py * width4) + (width8) >= accelfb->varfbsize)
                                 {
                                         py++;
@@ -1660 +1664 @@
                         else
                                 aktline++;
+                                
+                        aktline1 = (aktline - 1) * row_stride;
 
                         py = (posy + aktline - 1) * skinfb->width;
@@ -1669 +1675 @@
                                         red = buffer[0][px];
                                 else
-                                        red = buf[((aktline - 1) * row_stride) + px];
+                                        red = buf[aktline1 + px];
 
                                 if(colbytes > 2)
@@ -1681 +1687 @@
                                         else
                                         {
-                                                green = buf[((aktline - 1) * row_stride) + (px + 1)];
-                                                blue = buf[((aktline - 1) * row_stride) + (px + 2)];
+                                                green = buf[aktline1 + (px + 1)];
+                                                blue = buf[aktline1 + (px + 2)];
                                                 color = (255 << 24) | (red << 16) | (green << 8) | blue;
                                         }