Mercurial > mplayer.hg

changeset 2782:b52d3e6ff4ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
app michale's rgb32tobgr32
author pontscho
date Fri, 09 Nov 2001 13:05:55 +0000
parents bd851a5afcb3
children aa37ac641337
files Gui/wm/ws.c Gui/wm/wsconv.c Gui/wm/wsconv.h
diffstat 3 files changed, 23 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/wm/ws.c	Fri Nov 09 12:58:43 2001 +0000
+++ b/Gui/wm/ws.c	Fri Nov 09 13:05:55 2001 +0000
@@ -245,7 +245,8 @@
      #ifdef DEBUG
       fprintf( stderr,"rgb32 to bgr32\n" );
      #endif
-     wsConvFunc=BGR8880_to_BGR8880_c;
+//     wsConvFunc=BGR8880_to_BGR8880_c;
+     wsConvFunc=rgb32tobgr32;
      break;
    case wsRGB24:
      #ifdef DEBUG
--- a/Gui/wm/wsconv.c	Fri Nov 09 12:58:43 2001 +0000
+++ b/Gui/wm/wsconv.c	Fri Nov 09 13:05:55 2001 +0000
@@ -18,7 +18,7 @@
 
 #define SWAP_RGB_24(src,dst) dst[1]=src[0];dst[1]=src[1];dst[2]=src[0]
 
-void BGR8880_to_RGB555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+void BGR8880_to_RGB555_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels)
 {
  unsigned short pixel;
  int i;
@@ -31,7 +31,7 @@
   }
 }
 
-void BGR8880_to_BGR555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+void BGR8880_to_BGR555_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels)
 {
  unsigned short pixel;
  int i;
@@ -44,7 +44,7 @@
   }
 }
 
-void BGR8880_to_RGB565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+void BGR8880_to_RGB565_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels)
 {
  unsigned short pixel;
  int i;
@@ -57,7 +57,7 @@
   }
 }
 
-void BGR8880_to_BGR565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels)
+void BGR8880_to_BGR565_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels)
 {
  unsigned short pixel;
  int i;
@@ -70,7 +70,7 @@
   }
 }
 
-void BGR8880_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+void BGR8880_to_RGB888_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels )
 {
  int i;
  for(i = 0; i < num_pixels / 4; i++)
@@ -81,7 +81,7 @@
   }
 }
 
-void BGR8880_to_BGR888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+void BGR8880_to_BGR888_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels )
 {
  int i;
  for(i = 0; i < num_pixels / 4; i++)
@@ -92,7 +92,7 @@
   }
 }
 
-void BGR8880_to_BGR8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+void BGR8880_to_BGR8880_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels )
 {
  int i;
  for(i = 0; i < num_pixels / 4; i++)
@@ -103,7 +103,7 @@
   }
 }
 
-void BGR8880_to_RGB8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels )
+void BGR8880_to_RGB8880_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels )
 { memcpy( out_pixels,in_pixels,num_pixels ); }
 
 /*
@@ -119,7 +119,7 @@
 #define RGB16_MIDDLE_MASK 0x07e0
 #define RGB16_UPPER_MASK  0xf800
 
-void RGB565_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels)
+void RGB565_to_RGB888_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels)
 {
  unsigned short in_pixel;
  int i;
@@ -169,7 +169,7 @@
 static mmx_t lower_dword_mask; // Mask for the lower doublewords
 static mmx_t upper_dword_mask; // Mask for the upper doublewords
 
-void BGR8880_to_RGB888_mmx(unsigned char * in_pixels,unsigned char * out_pixels,int num_pixels)
+void BGR8880_to_RGB888_mmx(unsigned char * in_pixels,unsigned char * out_pixels,unsigned num_pixels)
 {
  int imax = num_pixels/4;
  int i;
--- a/Gui/wm/wsconv.h	Fri Nov 09 12:58:43 2001 +0000
+++ b/Gui/wm/wsconv.h	Fri Nov 09 13:05:55 2001 +0000
@@ -16,23 +16,23 @@
                                 pixel<<=5;\
                                 pixel|=(r>>3)
 
-typedef void(*wsTConvFunc)( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
+typedef void(*wsTConvFunc)( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels );
 extern wsTConvFunc wsConvFunc;
 
-extern void BGR8880_to_RGB555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
-extern void BGR8880_to_BGR555_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
-extern void BGR8880_to_RGB565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
-extern void BGR8880_to_BGR565_c( unsigned char * in_pixels, unsigned char * out_pixels, int num_pixels );
-extern void BGR8880_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
-extern void BGR8880_to_BGR888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
-extern void BGR8880_to_BGR8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
-extern void BGR8880_to_RGB8880_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels );
+extern void BGR8880_to_RGB555_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels );
+extern void BGR8880_to_BGR555_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_RGB565_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_BGR565_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_RGB888_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_BGR888_c( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned  num_pixels );
+extern void BGR8880_to_BGR8880_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned  num_pixels );
+extern void BGR8880_to_RGB8880_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned  num_pixels );
 
 #ifdef xHAVE_MMX
- extern void BGR8880_to_RGB888_mmx(unsigned char * in_pixels,unsigned char * out_pixels,int num_pixels);
+ extern void BGR8880_to_RGB888_mmx( const unsigned char * in_pixels,unsigned char * out_pixels,unsigned num_pixels);
 #endif
 
-extern void RGB565_to_RGB888_c( unsigned char * in_pixels, unsigned char * out_pixels,int num_pixels);
+extern void RGB565_to_RGB888_c( const unsigned char * in_pixels, unsigned char * out_pixels,unsigned num_pixels);
 
 extern void initConverter( void );