From 8104053a5d71f7ca8c673469d81fc961542e7560 Mon Sep 17 00:00:00 2001 From: Torsten Jager Date: Tue, 14 Feb 2012 22:17:08 +0200 Subject: Improved RGB->YUV conversion (use mpeg range instead of full range) Video out plugins expect mpeg range yuv data (y=16..235, uv=16..239). RGB sources (still images and audio visualisation effects) need to be converted first. --- src/xine-utils/color.c | 3 ++- src/xine-utils/xineutils.h | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c index 3c2388c27..8b37134b7 100644 --- a/src/xine-utils/color.c +++ b/src/xine-utils/color.c @@ -76,7 +76,8 @@ * next 9 defines. */ -#if 1 +/* convert full range rgb to mpeg range yuv */ +#if 0 #define Y_R (SCALEFACTOR * 0.29900) #define Y_G (SCALEFACTOR * 0.58700) diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 5b16e6e3c..662f39467 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -288,18 +288,20 @@ extern void (*yuy2_to_yv12) unsigned char *v_dst, int v_dst_pitch, int width, int height) XINE_PROTECTED; -#define SCALEFACTOR 65536 +/* convert full range rgb to mpeg range yuv */ +#define SCALESHIFT 16 +#define SCALEFACTOR (1<> SCALESHIFT) + 16) #define COMPUTE_U(r, g, b) \ (unsigned char) \ - ((u_r_table[r] + u_g_table[g] + u_b_table[b]) / SCALEFACTOR + CENTERSAMPLE) + (((u_r_table[r] + u_g_table[g] + u_b_table[b]) >> SCALESHIFT) + CENTERSAMPLE) #define COMPUTE_V(r, g, b) \ (unsigned char) \ - ((v_r_table[r] + v_g_table[g] + v_b_table[b]) / SCALEFACTOR + CENTERSAMPLE) + (((v_r_table[r] + v_g_table[g] + v_b_table[b]) >> SCALESHIFT) + CENTERSAMPLE) #define UNPACK_BGR15(packed_pixel, r, g, b) \ b = (packed_pixel & 0x7C00) >> 7; \ -- cgit v1.2.3