diff options
| -rw-r--r-- | libvo/vo_vesa.c | 2 | ||||
| -rw-r--r-- | postproc/rgb2rgb.c | 53 | ||||
| -rw-r--r-- | postproc/rgb2rgb.h | 3 | ||||
| -rw-r--r-- | postproc/rgb2rgb_template.c | 53 |
4 files changed, 110 insertions, 1 deletions
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 1e9c01c315..be0ba00c91 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -584,6 +584,8 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3 else if(image_bpp == 32 && video_mode_info.BitsPerPixel == 24) rgb2rgb_fnc = rgb32to24; else + if(image_bpp == 15 && video_mode_info.BitsPerPixel == 16) rgb2rgb_fnc = rgb15to16; + else { printf("vo_vesa: Can't convert %u to %u\n",image_bpp,video_mode_info.BitsPerPixel); return -1; diff --git a/postproc/rgb2rgb.c b/postproc/rgb2rgb.c index 7e0a1e9917..df8c8c47fc 100644 --- a/postproc/rgb2rgb.c +++ b/postproc/rgb2rgb.c @@ -1,6 +1,7 @@ #include <inttypes.h> #include "../config.h" #include "rgb2rgb.h" +#include "mmx.h" /* TODO: MMX optimization */ @@ -33,3 +34,55 @@ void rgb32to24(uint8_t *src,uint8_t *dst,uint32_t src_size) 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 +} diff --git a/postproc/rgb2rgb.h b/postproc/rgb2rgb.h index 7d81ef171a..69cc9cc2a4 100644 --- a/postproc/rgb2rgb.h +++ b/postproc/rgb2rgb.h @@ -1,6 +1,6 @@ /* * - * rgb2rgb.h, Software RGB to RGB converter + * rgb2rgb.h, Software RGB to RGB convertor * */ @@ -9,5 +9,6 @@ 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 rgb15to16(uint8_t *src,uint8_t *dst,uint32_t src_size); #endif diff --git a/postproc/rgb2rgb_template.c b/postproc/rgb2rgb_template.c index 7e0a1e9917..df8c8c47fc 100644 --- a/postproc/rgb2rgb_template.c +++ b/postproc/rgb2rgb_template.c @@ -1,6 +1,7 @@ #include <inttypes.h> #include "../config.h" #include "rgb2rgb.h" +#include "mmx.h" /* TODO: MMX optimization */ @@ -33,3 +34,55 @@ void rgb32to24(uint8_t *src,uint8_t *dst,uint32_t src_size) 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 +} |