X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_chroma%2Fi420_rgb8.c;h=14581c95e5eab720979c4085dd6903b2a59982f2;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=6939f5dc535e07076513686a03a37a244df826e3;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/video_chroma/i420_rgb8.c b/modules/video_chroma/i420_rgb8.c index 6939f5dc53..14581c95e5 100644 --- a/modules/video_chroma/i420_rgb8.c +++ b/modules/video_chroma/i420_rgb8.c @@ -1,7 +1,7 @@ /***************************************************************************** * i420_rgb8.c : YUV to bitmap RGB conversion module for vlc ***************************************************************************** - * Copyright (C) 2000 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2000 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 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 @@ -18,27 +18,29 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* strerror() */ -#include /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include "i420_rgb.h" #include "i420_rgb_c.h" -static void SetOffset( int, int, int, int, vlc_bool_t *, int *, int * ); +static void SetOffset( int, int, int, int, bool *, int *, int * ); /***************************************************************************** * I420_RGB8: color YUV 4:2:0 to RGB 8 bpp *****************************************************************************/ -void E_(I420_RGB8)( vout_thread_t *p_vout, picture_t *p_src, picture_t *p_dest ) +void I420_RGB8( filter_t *p_filter, picture_t *p_src, picture_t *p_dest ) { /* We got this one from the old arguments */ uint8_t *p_pic = (uint8_t*)p_dest->p->p_pixels; @@ -46,19 +48,19 @@ void E_(I420_RGB8)( vout_thread_t *p_vout, picture_t *p_src, picture_t *p_dest ) uint8_t *p_u = p_src->U_PIXELS; uint8_t *p_v = p_src->V_PIXELS; - vlc_bool_t b_hscale; /* horizontal scaling type */ - unsigned int i_vscale; /* vertical scaling type */ + bool b_hscale; /* horizontal scaling type */ + int i_vscale; /* vertical scaling type */ unsigned int i_x, i_y; /* horizontal and vertical indexes */ unsigned int i_real_y; /* y % 4 */ int i_right_margin; int i_scale_count; /* scale modulo counter */ - unsigned int i_chroma_width = p_vout->render.i_width / 2;/* chroma width */ + unsigned int i_chroma_width = p_filter->fmt_in.video.i_width / 2;/* chroma width */ /* Lookup table */ - uint8_t * p_lookup = p_vout->chroma.p_sys->p_base; + uint8_t * p_lookup = p_filter->p_sys->p_base; /* Offset array pointer */ - int * p_offset_start = p_vout->chroma.p_sys->p_offset; + int * p_offset_start = p_filter->p_sys->p_offset; int * p_offset; const int i_source_margin = p_src->p[0].i_pitch @@ -67,18 +69,20 @@ void E_(I420_RGB8)( vout_thread_t *p_vout, picture_t *p_src, picture_t *p_dest ) - p_src->p[1].i_visible_pitch; /* The dithering matrices */ - static int dither10[4] = { 0x0, 0x8, 0x2, 0xa }; - static int dither11[4] = { 0xc, 0x4, 0xe, 0x6 }; - static int dither12[4] = { 0x3, 0xb, 0x1, 0x9 }; - static int dither13[4] = { 0xf, 0x7, 0xd, 0x5 }; - - static int dither20[4] = { 0x0, 0x10, 0x4, 0x14 }; - static int dither21[4] = { 0x18, 0x8, 0x1c, 0xc }; - static int dither22[4] = { 0x6, 0x16, 0x2, 0x12 }; - static int dither23[4] = { 0x1e, 0xe, 0x1a, 0xa }; - - SetOffset( p_vout->render.i_width, p_vout->render.i_height, - p_vout->output.i_width, p_vout->output.i_height, + static const int dither10[4] = { 0x0, 0x8, 0x2, 0xa }; + static const int dither11[4] = { 0xc, 0x4, 0xe, 0x6 }; + static const int dither12[4] = { 0x3, 0xb, 0x1, 0x9 }; + static const int dither13[4] = { 0xf, 0x7, 0xd, 0x5 }; + + static const int dither20[4] = { 0x0, 0x10, 0x4, 0x14 }; + static const int dither21[4] = { 0x18, 0x8, 0x1c, 0xc }; + static const int dither22[4] = { 0x6, 0x16, 0x2, 0x12 }; + static const int dither23[4] = { 0x1e, 0xe, 0x1a, 0xa }; + + SetOffset( p_filter->fmt_in.video.i_width, + p_filter->fmt_in.video.i_height, + p_filter->fmt_out.video.i_width, + p_filter->fmt_out.video.i_height, &b_hscale, &i_vscale, p_offset_start ); i_right_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch; @@ -87,8 +91,9 @@ void E_(I420_RGB8)( vout_thread_t *p_vout, picture_t *p_src, picture_t *p_dest ) * Perform conversion */ i_scale_count = ( i_vscale == 1 ) ? - p_vout->output.i_height : p_vout->render.i_height; - for( i_y = 0, i_real_y = 0; i_y < p_vout->render.i_height; i_y++ ) + p_filter->fmt_out.video.i_height : + p_filter->fmt_in.video.i_height; + for( i_y = 0, i_real_y = 0; i_y < p_filter->fmt_in.video.i_height; i_y++ ) { /* Do horizontal and vertical scaling */ SCALE_WIDTH_DITHER( 420 ); @@ -113,7 +118,7 @@ void E_(I420_RGB8)( vout_thread_t *p_vout, picture_t *p_src, picture_t *p_dest ) * structure has interleaved Y and U/V offsets. *****************************************************************************/ static void SetOffset( int i_width, int i_height, int i_pic_width, - int i_pic_height, vlc_bool_t *pb_hscale, + int i_pic_height, bool *pb_hscale, int *pi_vscale, int *p_offset ) { int i_x; /* x position in destination */