Commit b238eb2e authored by Nick Kurshev's avatar Nick Kurshev

vo_vesa: more rgb2rgb support

Originally committed as revision 2507 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
parent 59ac5a93
#include <inttypes.h> #include <inttypes.h>
#include "../config.h" #include "../config.h"
#include "rgb2rgb.h" #include "rgb2rgb.h"
#include "mmx.h"
/* TODO: MMX optimization */ /* TODO: MMX optimization */
...@@ -33,3 +34,55 @@ void rgb32to24(uint8_t *src,uint8_t *dst,uint32_t src_size) ...@@ -33,3 +34,55 @@ void rgb32to24(uint8_t *src,uint8_t *dst,uint32_t src_size)
s++; s++;
} }
} }
/* Original by Strepto/Astral
ported to gcc & bugfixed : A'rpi */
void rgb15to16(uint8_t *src,uint8_t *dst,uint32_t src_size)
{
#ifdef HAVE_MMX
static uint64_t mask_b = 0x001F001F001F001FLL; // 00000000 00011111 xxB
static uint64_t mask_rg = 0x7FE07FE07FE07FE0LL; // 01111111 11100000 RGx
register char* s=src+src_size;
register char* d=dst+src_size;
register int offs=-src_size;
movq_m2r (mask_b, mm4);
movq_m2r (mask_rg, mm5);
while(offs<0){
movq_m2r (*(s+offs), mm0);
movq_r2r (mm0, mm1);
movq_m2r (*(s+8+offs), mm2);
movq_r2r (mm2, mm3);
pand_r2r (mm4, mm0);
pand_r2r (mm5, mm1);
psllq_i2r(1,mm1);
pand_r2r (mm4, mm2);
pand_r2r (mm5, mm3);
por_r2r (mm1, mm0);
psllq_i2r(1,mm3);
movq_r2m (mm0,*(d+offs));
por_r2r (mm3,mm2);
movq_r2m (mm2,*(d+8+offs));
offs+=16;
}
emms();
#else
uint16_t *s1=( uint16_t * )src;
uint16_t *d1=( uint16_t * )dst;
uint16_t *e=((uint8_t *)s1)+src_size;
while( s1<e ){
register int x=*( s1++ );
/* rrrrrggggggbbbbb
0rrrrrgggggbbbbb
0111 1111 1110 0000=0x7FE0
00000000000001 1111=0x001F */
*( d1++ )=( x&0x001F )|( ( x&0x7FE0 )<<1 );
}
#endif
}
/* /*
* *
* rgb2rgb.h, Software RGB to RGB converter * rgb2rgb.h, Software RGB to RGB convertor
* *
*/ */
...@@ -9,5 +9,6 @@ ...@@ -9,5 +9,6 @@
extern void rgb24to32(uint8_t *src,uint8_t *dst,uint32_t src_size); extern void rgb24to32(uint8_t *src,uint8_t *dst,uint32_t src_size);
extern void rgb32to24(uint8_t *src,uint8_t *dst,uint32_t src_size); extern void rgb32to24(uint8_t *src,uint8_t *dst,uint32_t src_size);
extern void rgb15to16(uint8_t *src,uint8_t *dst,uint32_t src_size);
#endif #endif
#include <inttypes.h> #include <inttypes.h>
#include "../config.h" #include "../config.h"
#include "rgb2rgb.h" #include "rgb2rgb.h"
#include "mmx.h"
/* TODO: MMX optimization */ /* TODO: MMX optimization */
...@@ -33,3 +34,55 @@ void rgb32to24(uint8_t *src,uint8_t *dst,uint32_t src_size) ...@@ -33,3 +34,55 @@ void rgb32to24(uint8_t *src,uint8_t *dst,uint32_t src_size)
s++; s++;
} }
} }
/* Original by Strepto/Astral
ported to gcc & bugfixed : A'rpi */
void rgb15to16(uint8_t *src,uint8_t *dst,uint32_t src_size)
{
#ifdef HAVE_MMX
static uint64_t mask_b = 0x001F001F001F001FLL; // 00000000 00011111 xxB
static uint64_t mask_rg = 0x7FE07FE07FE07FE0LL; // 01111111 11100000 RGx
register char* s=src+src_size;
register char* d=dst+src_size;
register int offs=-src_size;
movq_m2r (mask_b, mm4);
movq_m2r (mask_rg, mm5);
while(offs<0){
movq_m2r (*(s+offs), mm0);
movq_r2r (mm0, mm1);
movq_m2r (*(s+8+offs), mm2);
movq_r2r (mm2, mm3);
pand_r2r (mm4, mm0);
pand_r2r (mm5, mm1);
psllq_i2r(1,mm1);
pand_r2r (mm4, mm2);
pand_r2r (mm5, mm3);
por_r2r (mm1, mm0);
psllq_i2r(1,mm3);
movq_r2m (mm0,*(d+offs));
por_r2r (mm3,mm2);
movq_r2m (mm2,*(d+8+offs));
offs+=16;
}
emms();
#else
uint16_t *s1=( uint16_t * )src;
uint16_t *d1=( uint16_t * )dst;
uint16_t *e=((uint8_t *)s1)+src_size;
while( s1<e ){
register int x=*( s1++ );
/* rrrrrggggggbbbbb
0rrrrrgggggbbbbb
0111 1111 1110 0000=0x7FE0
00000000000001 1111=0x001F */
*( d1++ )=( x&0x001F )|( ( x&0x7FE0 )<<1 );
}
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment