[Xineliboutput-cvslog] vdr-xineliboutput xine_sxfe_frontend.c, 1.181, 1.182
Brought to you by:
phintuka
From: Petri H. <phi...@us...> - 2012-01-24 14:34:29
|
Update of /cvsroot/xineliboutput/vdr-xineliboutput In directory vz-cvs-3.sog:/tmp/cvs-serv26118 Modified Files: xine_sxfe_frontend.c Log Message: hud_fill_lut8(): support for RGBA Index: xine_sxfe_frontend.c =================================================================== RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/xine_sxfe_frontend.c,v retrieving revision 1.181 retrieving revision 1.182 diff -u -d -r1.181 -r1.182 --- xine_sxfe_frontend.c 24 Jan 2012 14:32:38 -0000 1.181 +++ xine_sxfe_frontend.c 24 Jan 2012 14:34:27 -0000 1.182 @@ -700,15 +700,21 @@ return visual; } +#endif /* HAVE_XRENDER */ -static void hud_fill_lut8(uint32_t* dst, int dst_pitch, +#if defined(HAVE_XRENDER) || defined(HAVE_OPENGL) +static void osd_fill_lut8(uint32_t* dst, int dst_pitch, int argb, const struct osd_command_s *cmd) { uint8_t *data = cmd->raw_data; unsigned x, y; uint32_t lut[256]; - rle_palette_to_argb(lut, cmd->palette, cmd->colors); + if (argb) { + rle_palette_to_argb(lut, cmd->palette, cmd->colors); + } else { + rle_palette_to_rgba(lut, cmd->palette, cmd->colors); + } dst += cmd->y * dst_pitch + cmd->x; @@ -720,7 +726,9 @@ dst += dst_pitch; } } +#endif /* HAVE_XRENDER || HAVE_OPENGL */ +#ifdef HAVE_XRENDER static void hud_fill_argb(uint32_t* dst, int dst_pitch, const struct osd_command_s *cmd) { @@ -763,7 +771,7 @@ int *mask_changed, const struct osd_command_s *cmd) { if (cmd->cmd == OSD_Set_LUT8) { - hud_fill_lut8(dst, dst_pitch, cmd); + osd_fill_lut8(dst, dst_pitch, 1, cmd); } else if (cmd->cmd == OSD_Set_ARGB) { hud_fill_argb(dst, dst_pitch, cmd); |