From 31eee016245097dd5ec3775f6c6052c261799edb Mon Sep 17 00:00:00 2001 From: michael Date: Thu, 20 Dec 2001 17:30:59 +0000 Subject: rgb24toyv12 bugfix git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3634 b3059339-0415-0410-9bf9-f77b7e298cf2 --- postproc/rgb2rgb.h | 3 +++ postproc/rgb2rgb_template.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/postproc/rgb2rgb.h b/postproc/rgb2rgb.h index 3b8e9abe19..5c3b3f84e2 100644 --- a/postproc/rgb2rgb.h +++ b/postproc/rgb2rgb.h @@ -30,6 +30,9 @@ extern void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t * extern void yuy2toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, unsigned int width, unsigned int height, unsigned int lumStride, unsigned int chromStride, unsigned int srcStride); +extern void rgb24toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, + unsigned int width, unsigned int height, + unsigned int lumStride, unsigned int chromStride, unsigned int srcStride); #define MODE_RGB 0x1 #define MODE_BGR 0x2 diff --git a/postproc/rgb2rgb_template.c b/postproc/rgb2rgb_template.c index ff3ee83b44..ac6e237c17 100644 --- a/postproc/rgb2rgb_template.c +++ b/postproc/rgb2rgb_template.c @@ -916,9 +916,9 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_ unsigned int g= src[6*i+1]; unsigned int r= src[6*i+2]; - unsigned int Y = RY*r + GY*g + BY*b + 16; - unsigned int V = RV*r + GV*g + BV*b + 128; - unsigned int U = RU*r + GU*g + BU*b + 128; + unsigned int Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16; + unsigned int V = ((RV*r + GV*g + BV*b)>>RGB2YUV_SHIFT) + 128; + unsigned int U = ((RU*r + GU*g + BU*b)>>RGB2YUV_SHIFT) + 128; udst[i] = U; vdst[i] = V; @@ -928,7 +928,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_ g= src[6*i+4]; r= src[6*i+5]; - Y = RY*r + GY*g + BY*b + 16; + Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16; ydst[2*i+1] = Y; } ydst += lumStride; @@ -940,7 +940,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_ unsigned int g= src[6*i+1]; unsigned int r= src[6*i+2]; - unsigned int Y = RY*r + GY*g + BY*b + 16; + unsigned int Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16; ydst[2*i] = Y; @@ -948,7 +948,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_ g= src[6*i+4]; r= src[6*i+5]; - Y = RY*r + GY*g + BY*b + 16; + Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16; ydst[2*i+1] = Y; } udst += chromStride; -- cgit v1.2.3