[FFmpeg-cvslog] r32190 - in trunk/libswscale: rgb2rgb.c rgb2rgb.h rgb2rgb_template.c

[ramiro]

Author: ramiro
Date: Sun Sep 12 15:03:41 2010
New Revision: 32190

Log:
rgb2rgb: replace shuffle_bytes_2103() by optimized rgb32tobgr32()

Modified:
   trunk/libswscale/rgb2rgb.c
   trunk/libswscale/rgb2rgb.h
   trunk/libswscale/rgb2rgb_template.c

Modified: trunk/libswscale/rgb2rgb.c
==============================================================================
--- trunk/libswscale/rgb2rgb.c	Sun Sep 12 15:01:05 2010	(r32189)
+++ trunk/libswscale/rgb2rgb.c	Sun Sep 12 15:03:41 2010	(r32190)
@@ -47,7 +47,7 @@ void (*rgb16to32)(const uint8_t *src, ui
 void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
 void (*rgb24to16)(const uint8_t *src, uint8_t *dst, long src_size);
 void (*rgb24to15)(const uint8_t *src, uint8_t *dst, long src_size);
-void (*rgb32tobgr32)(const uint8_t *src, uint8_t *dst, long src_size);
+void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, long src_size);
 void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
 void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
 
@@ -435,7 +435,6 @@ void shuffle_bytes_##a##b##c##d(const ui
 
 DEFINE_SHUFFLE_BYTES(0, 3, 2, 1);
 DEFINE_SHUFFLE_BYTES(1, 2, 3, 0);
-DEFINE_SHUFFLE_BYTES(2, 1, 0, 3);
 DEFINE_SHUFFLE_BYTES(3, 0, 1, 2);
 DEFINE_SHUFFLE_BYTES(3, 2, 1, 0);
 

Modified: trunk/libswscale/rgb2rgb.h
==============================================================================
--- trunk/libswscale/rgb2rgb.h	Sun Sep 12 15:01:05 2010	(r32189)
+++ trunk/libswscale/rgb2rgb.h	Sun Sep 12 15:03:41 2010	(r32190)
@@ -47,7 +47,7 @@ extern void (*rgb16to32)   (const uint8_
 extern void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, long src_size);
 extern void (*rgb24to16)   (const uint8_t *src, uint8_t *dst, long src_size);
 extern void (*rgb24to15)   (const uint8_t *src, uint8_t *dst, long src_size);
-extern void (*rgb32tobgr32)(const uint8_t *src, uint8_t *dst, long src_size);
+extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, long src_size);
 extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
 extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);
 
@@ -65,7 +65,6 @@ void bgr8torgb8  (const uint8_t *src, ui
 
 void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, long src_size);
 void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, long src_size);
-void shuffle_bytes_2103(const uint8_t *src, uint8_t *dst, long src_size);
 void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, long src_size);
 void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, long src_size);
 

Modified: trunk/libswscale/rgb2rgb_template.c
==============================================================================
--- trunk/libswscale/rgb2rgb_template.c	Sun Sep 12 15:01:05 2010	(r32189)
+++ trunk/libswscale/rgb2rgb_template.c	Sun Sep 12 15:03:41 2010	(r32190)
@@ -1225,7 +1225,7 @@ static inline void RENAME(rgb16to32)(con
     }
 }
 
-static inline void RENAME(rgb32tobgr32)(const uint8_t *src, uint8_t *dst, long src_size)
+static inline void RENAME(shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, long src_size)
 {
     x86_reg idx = 15 - src_size;
     const uint8_t *s = src-idx;
@@ -2912,7 +2912,7 @@ static inline void RENAME(rgb2rgb_init)(
     rgb24to15       = RENAME(rgb24to15);
     rgb24to16       = RENAME(rgb24to16);
     rgb24tobgr24    = RENAME(rgb24tobgr24);
-    rgb32tobgr32    = RENAME(rgb32tobgr32);
+    shuffle_bytes_2103 = RENAME(shuffle_bytes_2103);
     rgb32tobgr16    = RENAME(rgb32tobgr16);
     rgb32tobgr15    = RENAME(rgb32tobgr15);
     yv12toyuy2      = RENAME(yv12toyuy2);