Skip to content

V
vlc-1.1
Commit d6b20103 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./modules/video_chroma/i420_rgb16.c: merged the RV15 and RV16 conversions 

    because they're basically the same. Also, the MMX conversions now check
    that the bitmasks are the ones we expect.
parent 592dee30
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 86 deletions
include/video.h
View file @ d6b20103
......@@ -4,7 +4,7 @@
* includes all common video types and constants.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video.h,v 1.60 2002/11/20 13:37:35 sam Exp $
* $Id: video.h,v 1.61 2002/11/25 19:29:10 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -114,15 +114,6 @@ struct picture_heap_t
void (* pf_setpalette) ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
};
/* RGB2PIXEL: assemble RGB components to a pixel value, returns a uint32_t */
#define RGB2PIXEL( p_vout, i_r, i_g, i_b ) \
(((((uint32_t)i_r) >> p_vout->output.i_rrshift) \
<< p_vout->output.i_lrshift) \
| ((((uint32_t)i_g) >> p_vout->output.i_rgshift) \
<< p_vout->output.i_lgshift) \
| ((((uint32_t)i_b) >> p_vout->output.i_rbshift) \
<< p_vout->output.i_lbshift))
/*****************************************************************************
* Flags used to describe the status of a picture
*****************************************************************************/
......
modules/video_chroma/i420_rgb.c
View file @ d6b20103
......@@ -2,7 +2,7 @@
* i420_rgb.c : YUV to bitmap RGB conversion module for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: i420_rgb.c,v 1.2 2002/11/20 13:37:36 sam Exp $
* $Id: i420_rgb.c,v 1.3 2002/11/25 19:29:10 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -36,6 +36,17 @@
# include "i420_rgb_c.h"
#endif
/*****************************************************************************
* RGB2PIXEL: assemble RGB components to a pixel value, returns a uint32_t
*****************************************************************************/
#define RGB2PIXEL( p_vout, i_r, i_g, i_b ) \
(((((uint32_t)i_r) >> p_vout->output.i_rrshift) \
<< p_vout->output.i_lrshift) \
| ((((uint32_t)i_g) >> p_vout->output.i_rgshift) \
<< p_vout->output.i_lgshift) \
| ((((uint32_t)i_b) >> p_vout->output.i_rbshift) \
<< p_vout->output.i_lbshift))
/*****************************************************************************
* Local and extern prototypes.
*****************************************************************************/
......@@ -54,7 +65,7 @@ static void Set8bppPalette ( vout_thread_t *, u8 * );
vlc_module_begin();
#if defined (MODULE_NAME_IS_i420_rgb)
set_description( _("I420,IYUV,YV12 to "
"RGB,RV15,RV16,RV24,RV32 conversions") );
"RGB2,RV15,RV16,RV24,RV32 conversions") );
set_capability( "chroma", 80 );
#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
set_description( _( "MMX I420,IYUV,YV12 to "
......@@ -95,15 +106,33 @@ static int Activate( vlc_object_t *p_this )
break;
#endif
case VLC_FOURCC('R','V','1','5'):
p_vout->chroma.pf_convert = E_(I420_RGB15);
break;
case VLC_FOURCC('R','V','1','6'):
#if defined (MODULE_NAME_IS_i420_rgb_mmx)
/* If we don't have support for the bitmasks, bail out */
if( ( p_vout->output.i_rmask != 0x7c00
|| p_vout->output.i_gmask != 0x03e0
|| p_vout->output.i_bmask != 0x001f )
&& ( p_vout->output.i_rmask != 0xf800
|| p_vout->output.i_gmask != 0x07e0
|| p_vout->output.i_bmask != 0x001f ) )
{
return -1;
}
#endif
p_vout->chroma.pf_convert = E_(I420_RGB16);
break;
case VLC_FOURCC('R','V','2','4'):
case VLC_FOURCC('R','V','3','2'):
#if defined (MODULE_NAME_IS_i420_rgb_mmx)
/* If we don't have support for the bitmasks, bail out */
if( p_vout->output.i_rmask != 0x00ff0000
|| p_vout->output.i_gmask != 0x0000ff00
|| p_vout->output.i_bmask != 0x000000ff )
{
return -1;
}
#endif
p_vout->chroma.pf_convert = E_(I420_RGB32);
break;
......
modules/video_chroma/i420_rgb.h
View file @ d6b20103
......@@ -2,7 +2,7 @@
* i420_rgb.h : YUV to bitmap RGB conversion module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: i420_rgb.h,v 1.1 2002/08/04 17:23:43 sam Exp $
* $Id: i420_rgb.h,v 1.2 2002/11/25 19:29:10 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -45,11 +45,11 @@ struct chroma_sys_t
* Prototypes
*****************************************************************************/
#ifdef MODULE_NAME_IS_i420_rgb
void E_(I420_RGB8) ( vout_thread_t *, picture_t *, picture_t * );
void E_(I420_RGB8) ( vout_thread_t *, picture_t *, picture_t * );
void E_(I420_RGB16_dither) ( vout_thread_t *, picture_t *, picture_t * );
#endif
void E_(I420_RGB15)( vout_thread_t *, picture_t *, picture_t * );
void E_(I420_RGB16)( vout_thread_t *, picture_t *, picture_t * );
void E_(I420_RGB32)( vout_thread_t *, picture_t *, picture_t * );
void E_(I420_RGB16) ( vout_thread_t *, picture_t *, picture_t * );
void E_(I420_RGB32) ( vout_thread_t *, picture_t *, picture_t * );
/*****************************************************************************
* CONVERT_*_PIXEL: pixel conversion macros
......@@ -75,6 +75,22 @@ void E_(I420_RGB32)( vout_thread_t *, picture_t *, picture_t * );
i_blue = (U_BLUE_COEF * i_uval) >> SHIFT; \
CONVERT_Y_PIXEL( BPP ) \
#define CONVERT_Y_PIXEL_DITHER( BPP ) \
/* Only Y sample is present */ \
p_ybase = p_yuv + *p_y++; \
*p_buffer++ = p_ybase[RED_OFFSET-((V_RED_COEF*128+p_dither[i_real_y])>>SHIFT) + i_red] | \
p_ybase[GREEN_OFFSET-(((U_GREEN_COEF+V_GREEN_COEF)*128+p_dither[i_real_y])>>SHIFT) \
+ i_green ] | p_ybase[BLUE_OFFSET-((U_BLUE_COEF*128+p_dither[i_real_y])>>SHIFT) + i_blue];
#define CONVERT_YUV_PIXEL_DITHER( BPP ) \
/* Y, U and V samples are present */ \
i_uval = *p_u++; \
i_vval = *p_v++; \
i_red = (V_RED_COEF * i_vval) >> SHIFT; \
i_green = (U_GREEN_COEF * i_uval + V_GREEN_COEF * i_vval) >> SHIFT; \
i_blue = (U_BLUE_COEF * i_uval) >> SHIFT; \
CONVERT_Y_PIXEL_DITHER( BPP ) \
#define CONVERT_4YUV_PIXEL( CHROMA ) \
*p_pic++ = p_lookup[ \
(((*p_y++ + dither10[i_real_y]) >> 4) << 7) \
......
modules/video_chroma/i420_rgb16.c
View file @ d6b20103
This diff is collapsed.
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