X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_chroma%2Fgrey_yuv.c;h=494cacd6e01f89d5e762819e25bef61067ff2ee1;hb=5f8cd3991a86c8be37fe0bce9686c2d6f7635afa;hp=ab9149d98551562722b2acad7f104c18f96e541f;hpb=27d483e9ef7a451397d7857251c8d67097661f1d;p=vlc diff --git a/modules/video_chroma/grey_yuv.c b/modules/video_chroma/grey_yuv.c index ab9149d985..494cacd6e0 100644 --- a/modules/video_chroma/grey_yuv.c +++ b/modules/video_chroma/grey_yuv.c @@ -1,7 +1,7 @@ /***************************************************************************** * grey_yuv.c : grayscale to others conversion module for vlc ***************************************************************************** - * Copyright (C) 2007 the VideoLAN team + * Copyright (C) 2007, 2008 the VideoLAN team * $Id$ * * Authors: Sam Hocevar @@ -29,8 +29,9 @@ # include "config.h" #endif -#include +#include #include +#include #include #define SRC_FOURCC "GREY" @@ -41,15 +42,18 @@ *****************************************************************************/ static int Activate ( vlc_object_t * ); -static void GREY_I420 ( vout_thread_t *, picture_t *, picture_t * ); -static void GREY_YUY2 ( vout_thread_t *, picture_t *, picture_t * ); +static void GREY_I420( filter_t *, picture_t *, picture_t * ); +static void GREY_YUY2( filter_t *, picture_t *, picture_t * ); + +static picture_t *GREY_I420_Filter( filter_t *, picture_t * ); +static picture_t *GREY_YUY2_Filter( filter_t *, picture_t * ); /***************************************************************************** * Module descriptor. *****************************************************************************/ vlc_module_begin(); - set_description( _("Conversions from " SRC_FOURCC " to " DEST_FOURCC) ); - set_capability( "chroma", 80 ); + set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) ); + set_capability( "video filter2", 80 ); set_callbacks( Activate, NULL ); vlc_module_end(); @@ -60,25 +64,26 @@ vlc_module_end(); *****************************************************************************/ static int Activate( vlc_object_t *p_this ) { - vout_thread_t *p_vout = (vout_thread_t *)p_this; + filter_t *p_filter = (filter_t *)p_this; - if( p_vout->render.i_width & 1 || p_vout->render.i_height & 1 ) + if( p_filter->fmt_out.video.i_width & 1 + || p_filter->fmt_out.video.i_height & 1 ) { return -1; } - switch( p_vout->render.i_chroma ) + switch( p_filter->fmt_in.video.i_chroma ) { case VLC_FOURCC('Y','8','0','0'): - p_vout->render.i_chroma = VLC_FOURCC('G','R','E','Y'); + p_filter->fmt_in.video.i_chroma = VLC_FOURCC('G','R','E','Y'); case VLC_FOURCC('G','R','E','Y'): - switch( p_vout->output.i_chroma ) + switch( p_filter->fmt_out.video.i_chroma ) { case VLC_FOURCC('I','4','2','0'): - p_vout->chroma.pf_convert = GREY_I420; + p_filter->pf_video_filter = GREY_I420_Filter; break; case VLC_FOURCC('Y','U','Y','2'): - p_vout->chroma.pf_convert = GREY_YUY2; + p_filter->pf_video_filter = GREY_YUY2_Filter; break; default: return -1; @@ -92,13 +97,16 @@ static int Activate( vlc_object_t *p_this ) return 0; } +VIDEO_FILTER_WRAPPER( GREY_I420 ) +VIDEO_FILTER_WRAPPER( GREY_YUY2 ) + /* Following functions are local */ /***************************************************************************** * GREY_I420: 8-bit grayscale to planar YUV 4:2:0 *****************************************************************************/ -static void GREY_I420( vout_thread_t *p_vout, picture_t *p_source, - picture_t *p_dest ) +static void GREY_I420( filter_t *p_filter, picture_t *p_source, + picture_t *p_dest ) { uint8_t *p_line = p_source->p->p_pixels; uint8_t *p_y = p_dest->Y_PIXELS; @@ -114,7 +122,7 @@ static void GREY_I420( vout_thread_t *p_vout, picture_t *p_source, const int i_dest_margin_c = p_dest->p[1].i_pitch - p_dest->p[1].i_visible_pitch; - for( i_y = p_vout->render.i_height / 2; i_y-- ; ) + for( i_y = p_filter->fmt_in.video.i_height / 2; i_y-- ; ) { memset(p_u, 0x80, p_dest->p[1].i_visible_pitch); p_u += i_dest_margin_c; @@ -123,9 +131,9 @@ static void GREY_I420( vout_thread_t *p_vout, picture_t *p_source, p_v += i_dest_margin_c; } - for( i_y = p_vout->render.i_height; i_y-- ; ) + for( i_y = p_filter->fmt_in.video.i_height; i_y-- ; ) { - for( i_x = p_vout->render.i_width / 8; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width / 8; i_x-- ; ) { *p_y++ = *p_line++; *p_y++ = *p_line++; *p_y++ = *p_line++; *p_y++ = *p_line++; @@ -133,7 +141,7 @@ static void GREY_I420( vout_thread_t *p_vout, picture_t *p_source, *p_y++ = *p_line++; *p_y++ = *p_line++; } - for( i_x = p_vout->render.i_width % 8; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width % 8; i_x-- ; ) { *p_y++ = *p_line++; } @@ -146,8 +154,8 @@ static void GREY_I420( vout_thread_t *p_vout, picture_t *p_source, /***************************************************************************** * GREY_YUY2: 8-bit grayscale to packed YUY2 *****************************************************************************/ -static void GREY_YUY2( vout_thread_t *p_vout, picture_t *p_source, - picture_t *p_dest ) +static void GREY_YUY2( filter_t *p_filter, picture_t *p_source, + picture_t *p_dest ) { uint8_t *p_in = p_source->p->p_pixels; uint8_t *p_out = p_dest->p->p_pixels; @@ -159,9 +167,9 @@ static void GREY_YUY2( vout_thread_t *p_vout, picture_t *p_source, const int i_dest_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch; - for( i_y = p_vout->render.i_height; i_y-- ; ) + for( i_y = p_filter->fmt_out.video.i_height; i_y-- ; ) { - for( i_x = p_vout->render.i_width / 8; i_x-- ; ) + for( i_x = p_filter->fmt_out.video.i_width / 8; i_x-- ; ) { *p_out++ = *p_in++; *p_out++ = 0x80; *p_out++ = *p_in++; *p_out++ = 0x80; @@ -173,7 +181,7 @@ static void GREY_YUY2( vout_thread_t *p_vout, picture_t *p_source, *p_out++ = *p_in++; *p_out++ = 0x80; } - for( i_x = (p_vout->render.i_width % 8) / 2; i_x-- ; ) + for( i_x = (p_filter->fmt_out.video.i_width % 8) / 2; i_x-- ; ) { *p_out++ = *p_in++; *p_out++ = 0x80; *p_out++ = *p_in++; *p_out++ = 0x80;