X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_chroma%2Fi420_rgb.h;h=3bef970c644d9970db1e55ed44a14a630a683590;hb=f7e78fb2cb603de3cd1ab27e48055484a966be56;hp=d9b9e0a80188d40942675798efc594eb3ea993b2;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc diff --git a/modules/video_chroma/i420_rgb.h b/modules/video_chroma/i420_rgb.h index d9b9e0a801..3bef970c64 100644 --- a/modules/video_chroma/i420_rgb.h +++ b/modules/video_chroma/i420_rgb.h @@ -1,41 +1,45 @@ /***************************************************************************** * i420_rgb.h : YUV to bitmap RGB conversion module for vlc ***************************************************************************** - * Copyright (C) 2000, 2004 the VideoLAN team + * Copyright (C) 2000, 2004 VLC authors and VideoLAN * $Id$ * * Authors: Samuel Hocevar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined (SSE2) && !defined (MMX) +# define PLAIN +#endif + /** Number of entries in RGB palette/colormap */ #define CMAP_RGB2_SIZE 256 /** - * chroma_sys_t: chroma method descriptor + * filter_sys_t: chroma method descriptor * This structure is part of the chroma transformation descriptor, it * describes the yuv2rgb specific properties. */ -struct chroma_sys_t +struct filter_sys_t { uint8_t *p_buffer; int *p_offset; -#ifdef MODULE_NAME_IS_i420_rgb +#ifdef PLAIN /**< Pre-calculated conversion tables */ void *p_base; /**< base for all conversion tables */ uint8_t *p_rgb8; /**< RGB 8 bits table */ @@ -55,12 +59,18 @@ 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_RGB16_dither) ( vout_thread_t *, picture_t *, picture_t * ); +#ifdef PLAIN +void I420_RGB8 ( filter_t *, picture_t *, picture_t * ); +void I420_RGB16 ( filter_t *, picture_t *, picture_t * ); +void I420_RGB32 ( filter_t *, picture_t *, picture_t * ); +#else +void I420_R5G5B5 ( filter_t *, picture_t *, picture_t * ); +void I420_R5G6B5 ( filter_t *, picture_t *, picture_t * ); +void I420_A8R8G8B8 ( filter_t *, picture_t *, picture_t * ); +void I420_R8G8B8A8 ( filter_t *, picture_t *, picture_t * ); +void I420_B8G8R8A8 ( filter_t *, picture_t *, picture_t * ); +void I420_A8B8G8R8 ( filter_t *, picture_t *, picture_t * ); #endif -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 @@ -163,7 +173,7 @@ void E_(I420_RGB32) ( vout_thread_t *, picture_t *, picture_t * ); * Rewind buffer and offset, then copy and scale line */ \ p_buffer = p_buffer_start; \ p_offset = p_offset_start; \ - for( i_x = p_vout->output.i_width / 16; i_x--; ) \ + for( i_x = p_filter->fmt_out.video.i_width / 16; i_x--; ) \ { \ *p_pic++ = *p_buffer; p_buffer += *p_offset++; \ *p_pic++ = *p_buffer; p_buffer += *p_offset++; \ @@ -182,7 +192,7 @@ void E_(I420_RGB32) ( vout_thread_t *, picture_t *, picture_t * ); *p_pic++ = *p_buffer; p_buffer += *p_offset++; \ *p_pic++ = *p_buffer; p_buffer += *p_offset++; \ } \ - for( i_x = p_vout->output.i_width & 15; i_x--; ) \ + for( i_x = p_filter->fmt_out.video.i_width & 15; i_x--; ) \ { \ *p_pic++ = *p_buffer; p_buffer += *p_offset++; \ } \ @@ -205,7 +215,7 @@ void E_(I420_RGB32) ( vout_thread_t *, picture_t *, picture_t * ); { \ /* Horizontal scaling - we can't use a buffer due to dithering */ \ p_offset = p_offset_start; \ - for( i_x = p_vout->output.i_width / 16; i_x--; ) \ + for( i_x = p_filter->fmt_out.video.i_width / 16; i_x--; ) \ { \ CONVERT_4YUV_PIXEL_SCALE( CHROMA ) \ CONVERT_4YUV_PIXEL_SCALE( CHROMA ) \ @@ -215,7 +225,7 @@ void E_(I420_RGB32) ( vout_thread_t *, picture_t *, picture_t * ); } \ else \ { \ - for( i_x = p_vout->render.i_width / 16; i_x--; ) \ + for( i_x = p_filter->fmt_in.video.i_width / 16; i_x--; ) \ { \ CONVERT_4YUV_PIXEL( CHROMA ) \ CONVERT_4YUV_PIXEL( CHROMA ) \ @@ -251,10 +261,10 @@ void E_(I420_RGB32) ( vout_thread_t *, picture_t *, picture_t * ); switch( i_vscale ) \ { \ case -1: /* vertical scaling factor is < 1 */ \ - while( (i_scale_count -= p_vout->output.i_height) > 0 ) \ + while( (i_scale_count -= p_filter->fmt_out.video.i_height) > 0 ) \ { \ /* Height reduction: skip next source line */ \ - p_y += p_vout->render.i_width; \ + p_y += p_filter->fmt_in.video.i_width; \ i_y++; \ if( (CHROMA == 420) || (CHROMA == 422) ) \ { \ @@ -266,21 +276,20 @@ void E_(I420_RGB32) ( vout_thread_t *, picture_t *, picture_t * ); } \ else if( CHROMA == 444 ) \ { \ - p_u += p_vout->render.i_width; \ - p_v += p_vout->render.i_width; \ + p_u += p_filter->fmt_in.video.i_width; \ + p_v += p_filter->fmt_in.video.i_width; \ } \ } \ - i_scale_count += p_vout->render.i_height; \ + i_scale_count += p_filter->fmt_in.video.i_height; \ break; \ case 1: /* vertical scaling factor is > 1 */ \ - while( (i_scale_count -= p_vout->render.i_height) > 0 ) \ + while( (i_scale_count -= p_filter->fmt_in.video.i_height) > 0 ) \ { \ /* Height increment: copy previous picture line */ \ - p_vout->p_vlc->pf_memcpy( p_pic, p_pic_start, \ - p_vout->output.i_width * BPP ); \ + memcpy( p_pic, p_pic_start, p_filter->fmt_out.video.i_width * BPP ); \ p_pic = (void*)((uint8_t*)p_pic + p_dest->p->i_pitch ); \ } \ - i_scale_count += p_vout->output.i_height; \ + i_scale_count += p_filter->fmt_out.video.i_height; \ break; \ } \ @@ -307,10 +316,10 @@ void E_(I420_RGB32) ( vout_thread_t *, picture_t *, picture_t * ); switch( i_vscale ) \ { \ case -1: /* vertical scaling factor is < 1 */ \ - while( (i_scale_count -= p_vout->output.i_height) > 0 ) \ + while( (i_scale_count -= p_filter->fmt_out.video.i_height) > 0 ) \ { \ /* Height reduction: skip next source line */ \ - p_y += p_vout->render.i_width; \ + p_y += p_filter->fmt_in.video.i_width; \ i_y++; \ if( (CHROMA == 420) || (CHROMA == 422) ) \ { \ @@ -322,21 +331,21 @@ void E_(I420_RGB32) ( vout_thread_t *, picture_t *, picture_t * ); } \ else if( CHROMA == 444 ) \ { \ - p_u += p_vout->render.i_width; \ - p_v += p_vout->render.i_width; \ + p_u += p_filter->fmt_in.video.i_width; \ + p_v += p_filter->fmt_in.video.i_width; \ } \ } \ - i_scale_count += p_vout->render.i_height; \ + i_scale_count += p_filter->fmt_in.video.i_height; \ break; \ case 1: /* vertical scaling factor is > 1 */ \ - while( (i_scale_count -= p_vout->render.i_height) > 0 ) \ + while( (i_scale_count -= p_filter->fmt_in.video.i_height) > 0 ) \ { \ - p_y -= p_vout->render.i_width; \ + p_y -= p_filter->fmt_in.video.i_width; \ p_u -= i_chroma_width; \ p_v -= i_chroma_width; \ SCALE_WIDTH_DITHER( CHROMA ); \ } \ - i_scale_count += p_vout->output.i_height; \ + i_scale_count += p_filter->fmt_out.video.i_height; \ break; \ } \