X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_chroma%2Fi422_yuy2.c;h=fc426ffbc714bec0542c1fd78ba22b8f531488c2;hb=6478c429a2700d129485b13069d964a202fdded9;hp=cdedff4bc152f6924e2306366938afa41db791f8;hpb=27d483e9ef7a451397d7857251c8d67097661f1d;p=vlc diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c index cdedff4bc1..fc426ffbc7 100644 --- a/modules/video_chroma/i422_yuy2.c +++ b/modules/video_chroma/i422_yuy2.c @@ -30,9 +30,9 @@ # include "config.h" #endif -#include +#include #include -#include +#include #include "i422_yuy2.h" @@ -48,34 +48,37 @@ *****************************************************************************/ static int Activate ( vlc_object_t * ); -static void I422_YUY2 ( vout_thread_t *, picture_t *, picture_t * ); -static void I422_YVYU ( vout_thread_t *, picture_t *, picture_t * ); -static void I422_UYVY ( vout_thread_t *, picture_t *, picture_t * ); -static void I422_IUYV ( vout_thread_t *, picture_t *, picture_t * ); -static void I422_cyuv ( vout_thread_t *, picture_t *, picture_t * ); +static void I422_YUY2 ( filter_t *, picture_t *, picture_t * ); +static void I422_YVYU ( filter_t *, picture_t *, picture_t * ); +static void I422_UYVY ( filter_t *, picture_t *, picture_t * ); +static void I422_IUYV ( filter_t *, picture_t *, picture_t * ); +static void I422_cyuv ( filter_t *, picture_t *, picture_t * ); +static picture_t *I422_YUY2_Filter ( filter_t *, picture_t * ); +static picture_t *I422_YVYU_Filter ( filter_t *, picture_t * ); +static picture_t *I422_UYVY_Filter ( filter_t *, picture_t * ); +static picture_t *I422_IUYV_Filter ( filter_t *, picture_t * ); +static picture_t *I422_cyuv_Filter ( filter_t *, picture_t * ); #if defined (MODULE_NAME_IS_i422_yuy2) -static void I422_Y211 ( vout_thread_t *, picture_t *, picture_t * ); -static void I422_Y211 ( vout_thread_t *, picture_t *, picture_t * ); +static void I422_Y211 ( filter_t *, picture_t *, picture_t * ); +static picture_t *I422_Y211_Filter ( filter_t *, picture_t * ); #endif /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); +vlc_module_begin () #if defined (MODULE_NAME_IS_i422_yuy2) - 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 ) #elif defined (MODULE_NAME_IS_i422_yuy2_mmx) - set_description( _("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) ); - set_capability( "chroma", 100 ); - add_requirement( MMX ); + set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) ) + set_capability( "video filter2", 100 ) #elif defined (MODULE_NAME_IS_i422_yuy2_sse2) - set_description( _("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) ); - set_capability( "chroma", 120 ); - add_requirement( SSE2 ); + set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) ) + set_capability( "video filter2", 120 ) #endif - set_callbacks( Activate, NULL ); -vlc_module_end(); + set_callbacks( Activate, NULL ) +vlc_module_end () /***************************************************************************** * Activate: allocate a chroma function @@ -84,44 +87,41 @@ 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_in.video.i_width & 1 + || p_filter->fmt_in.video.i_height & 1 ) { return -1; } - switch( p_vout->render.i_chroma ) + switch( p_filter->fmt_in.video.i_chroma ) { - case VLC_FOURCC('I','4','2','2'): - switch( p_vout->output.i_chroma ) + case VLC_CODEC_I422: + switch( p_filter->fmt_out.video.i_chroma ) { - case VLC_FOURCC('Y','U','Y','2'): - case VLC_FOURCC('Y','U','N','V'): - p_vout->chroma.pf_convert = I422_YUY2; + case VLC_CODEC_YUYV: + p_filter->pf_video_filter = I422_YUY2_Filter; break; - case VLC_FOURCC('Y','V','Y','U'): - p_vout->chroma.pf_convert = I422_YVYU; + case VLC_CODEC_YVYU: + p_filter->pf_video_filter = I422_YVYU_Filter; break; - case VLC_FOURCC('U','Y','V','Y'): - case VLC_FOURCC('U','Y','N','V'): - case VLC_FOURCC('Y','4','2','2'): - p_vout->chroma.pf_convert = I422_UYVY; + case VLC_CODEC_UYVY: + p_filter->pf_video_filter = I422_UYVY_Filter; break; - case VLC_FOURCC('I','U','Y','V'): - p_vout->chroma.pf_convert = I422_IUYV; + p_filter->pf_video_filter = I422_IUYV_Filter; break; - case VLC_FOURCC('c','y','u','v'): - p_vout->chroma.pf_convert = I422_cyuv; + case VLC_CODEC_CYUV: + p_filter->pf_video_filter = I422_cyuv_Filter; break; #if defined (MODULE_NAME_IS_i422_yuy2) - case VLC_FOURCC('Y','2','1','1'): - p_vout->chroma.pf_convert = I422_Y211; + case VLC_CODEC_Y211: + p_filter->pf_video_filter = I422_Y211_Filter; break; #endif @@ -138,11 +138,20 @@ static int Activate( vlc_object_t *p_this ) /* Following functions are local */ +VIDEO_FILTER_WRAPPER( I422_YUY2 ) +VIDEO_FILTER_WRAPPER( I422_YVYU ) +VIDEO_FILTER_WRAPPER( I422_UYVY ) +VIDEO_FILTER_WRAPPER( I422_IUYV ) +VIDEO_FILTER_WRAPPER( I422_cyuv ) +#if defined (MODULE_NAME_IS_i422_yuy2) +VIDEO_FILTER_WRAPPER( I422_Y211 ) +#endif + /***************************************************************************** * I422_YUY2: planar YUV 4:2:2 to packed YUY2 4:2:2 *****************************************************************************/ -static void I422_YUY2( vout_thread_t *p_vout, picture_t *p_source, - picture_t *p_dest ) +static void I422_YUY2( filter_t *p_filter, picture_t *p_source, + picture_t *p_dest ) { uint8_t *p_line = p_dest->p->p_pixels; uint8_t *p_y = p_source->Y_PIXELS; @@ -164,13 +173,13 @@ static void I422_YUY2( vout_thread_t *p_vout, picture_t *p_source, ((intptr_t)p_line|(intptr_t)p_y))) ) { /* use faster SSE2 aligned fetch and store */ - 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 / 16 ; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) { SSE2_CALL( SSE2_YUV422_YUYV_ALIGNED ); } - for( i_x = ( p_vout->render.i_width % 16 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 16 ) / 2; i_x-- ; ) { C_YUV422_YUYV( p_line, p_y, p_u, p_v ); } @@ -182,13 +191,13 @@ static void I422_YUY2( vout_thread_t *p_vout, picture_t *p_source, } else { /* use slower SSE2 unaligned fetch and store */ - 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 / 16 ; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) { SSE2_CALL( SSE2_YUV422_YUYV_UNALIGNED ); } - for( i_x = ( p_vout->render.i_width % 16 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 16 ) / 2; i_x-- ; ) { C_YUV422_YUYV( p_line, p_y, p_u, p_v ); } @@ -202,9 +211,9 @@ static void I422_YUY2( vout_thread_t *p_vout, picture_t *p_source, #else - 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-- ; ) { #if defined (MODULE_NAME_IS_i422_yuy2) C_YUV422_YUYV( p_line, p_y, p_u, p_v ); @@ -215,7 +224,7 @@ static void I422_YUY2( vout_thread_t *p_vout, picture_t *p_source, MMX_CALL( MMX_YUV422_YUYV ); #endif } - for( i_x = ( p_vout->render.i_width % 8 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 8 ) / 2; i_x-- ; ) { C_YUV422_YUYV( p_line, p_y, p_u, p_v ); } @@ -234,8 +243,8 @@ static void I422_YUY2( vout_thread_t *p_vout, picture_t *p_source, /***************************************************************************** * I422_YVYU: planar YUV 4:2:2 to packed YVYU 4:2:2 *****************************************************************************/ -static void I422_YVYU( vout_thread_t *p_vout, picture_t *p_source, - picture_t *p_dest ) +static void I422_YVYU( filter_t *p_filter, picture_t *p_source, + picture_t *p_dest ) { uint8_t *p_line = p_dest->p->p_pixels; uint8_t *p_y = p_source->Y_PIXELS; @@ -257,13 +266,13 @@ static void I422_YVYU( vout_thread_t *p_vout, picture_t *p_source, ((intptr_t)p_line|(intptr_t)p_y))) ) { /* use faster SSE2 aligned fetch and store */ - 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 / 16 ; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) { SSE2_CALL( SSE2_YUV422_YVYU_ALIGNED ); } - for( i_x = ( p_vout->render.i_width % 16 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 16 ) / 2; i_x-- ; ) { C_YUV422_YVYU( p_line, p_y, p_u, p_v ); } @@ -275,13 +284,13 @@ static void I422_YVYU( vout_thread_t *p_vout, picture_t *p_source, } else { /* use slower SSE2 unaligned fetch and store */ - 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 / 16 ; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) { SSE2_CALL( SSE2_YUV422_YVYU_UNALIGNED ); } - for( i_x = ( p_vout->render.i_width % 16 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 16 ) / 2; i_x-- ; ) { C_YUV422_YVYU( p_line, p_y, p_u, p_v ); } @@ -295,9 +304,9 @@ static void I422_YVYU( vout_thread_t *p_vout, picture_t *p_source, #else - 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-- ; ) { #if defined (MODULE_NAME_IS_i422_yuy2) C_YUV422_YVYU( p_line, p_y, p_u, p_v ); @@ -308,7 +317,7 @@ static void I422_YVYU( vout_thread_t *p_vout, picture_t *p_source, MMX_CALL( MMX_YUV422_YVYU ); #endif } - for( i_x = ( p_vout->render.i_width % 8 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 8 ) / 2; i_x-- ; ) { C_YUV422_YVYU( p_line, p_y, p_u, p_v ); } @@ -327,8 +336,8 @@ static void I422_YVYU( vout_thread_t *p_vout, picture_t *p_source, /***************************************************************************** * I422_UYVY: planar YUV 4:2:2 to packed UYVY 4:2:2 *****************************************************************************/ -static void I422_UYVY( vout_thread_t *p_vout, picture_t *p_source, - picture_t *p_dest ) +static void I422_UYVY( filter_t *p_filter, picture_t *p_source, + picture_t *p_dest ) { uint8_t *p_line = p_dest->p->p_pixels; uint8_t *p_y = p_source->Y_PIXELS; @@ -350,13 +359,13 @@ static void I422_UYVY( vout_thread_t *p_vout, picture_t *p_source, ((intptr_t)p_line|(intptr_t)p_y))) ) { /* use faster SSE2 aligned fetch and store */ - 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 / 16 ; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) { SSE2_CALL( SSE2_YUV422_UYVY_ALIGNED ); } - for( i_x = ( p_vout->render.i_width % 16 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 16 ) / 2; i_x-- ; ) { C_YUV422_UYVY( p_line, p_y, p_u, p_v ); } @@ -368,13 +377,13 @@ static void I422_UYVY( vout_thread_t *p_vout, picture_t *p_source, } else { /* use slower SSE2 unaligned fetch and store */ - 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 / 16 ; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) { SSE2_CALL( SSE2_YUV422_UYVY_UNALIGNED ); } - for( i_x = ( p_vout->render.i_width % 16 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 16 ) / 2; i_x-- ; ) { C_YUV422_UYVY( p_line, p_y, p_u, p_v ); } @@ -388,9 +397,9 @@ static void I422_UYVY( vout_thread_t *p_vout, picture_t *p_source, #else - 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-- ; ) { #if defined (MODULE_NAME_IS_i422_yuy2) C_YUV422_UYVY( p_line, p_y, p_u, p_v ); @@ -401,7 +410,7 @@ static void I422_UYVY( vout_thread_t *p_vout, picture_t *p_source, MMX_CALL( MMX_YUV422_UYVY ); #endif } - for( i_x = ( p_vout->render.i_width % 8 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 8 ) / 2; i_x-- ; ) { C_YUV422_UYVY( p_line, p_y, p_u, p_v ); } @@ -420,19 +429,19 @@ static void I422_UYVY( vout_thread_t *p_vout, picture_t *p_source, /***************************************************************************** * I422_IUYV: planar YUV 4:2:2 to interleaved packed IUYV 4:2:2 *****************************************************************************/ -static void I422_IUYV( vout_thread_t *p_vout, picture_t *p_source, - picture_t *p_dest ) +static void I422_IUYV( filter_t *p_filter, picture_t *p_source, + picture_t *p_dest ) { VLC_UNUSED(p_source); VLC_UNUSED(p_dest); /* FIXME: TODO ! */ - msg_Err( p_vout, "I422_IUYV unimplemented, please harass " ); + msg_Err( p_filter, "I422_IUYV unimplemented, please harass " ); } /***************************************************************************** * I422_cyuv: planar YUV 4:2:2 to upside-down packed UYVY 4:2:2 *****************************************************************************/ -static void I422_cyuv( vout_thread_t *p_vout, picture_t *p_source, - picture_t *p_dest ) +static void I422_cyuv( filter_t *p_filter, picture_t *p_source, + picture_t *p_dest ) { uint8_t *p_line = p_dest->p->p_pixels + p_dest->p->i_visible_lines * p_dest->p->i_pitch; uint8_t *p_y = p_source->Y_PIXELS; @@ -454,15 +463,15 @@ static void I422_cyuv( vout_thread_t *p_vout, picture_t *p_source, ((intptr_t)p_line|(intptr_t)p_y))) ) { /* use faster SSE2 aligned fetch and store */ - for( i_y = p_vout->render.i_height ; i_y-- ; ) + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) { p_line -= 2 * p_dest->p->i_pitch; - for( i_x = p_vout->render.i_width / 16 ; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) { SSE2_CALL( SSE2_YUV422_UYVY_ALIGNED ); } - for( i_x = ( p_vout->render.i_width % 16 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 16 ) / 2; i_x-- ; ) { C_YUV422_UYVY( p_line, p_y, p_u, p_v ); } @@ -474,15 +483,15 @@ static void I422_cyuv( vout_thread_t *p_vout, picture_t *p_source, } else { /* use slower SSE2 unaligned fetch and store */ - for( i_y = p_vout->render.i_height ; i_y-- ; ) + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) { p_line -= 2 * p_dest->p->i_pitch; - for( i_x = p_vout->render.i_width / 16 ; i_x-- ; ) + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) { SSE2_CALL( SSE2_YUV422_UYVY_UNALIGNED ); } - for( i_x = ( p_vout->render.i_width % 16 ) / 2; i_x-- ; ) + for( i_x = ( p_filter->fmt_in.video.i_width % 16 ) / 2; i_x-- ; ) { C_YUV422_UYVY( p_line, p_y, p_u, p_v ); } @@ -496,9 +505,9 @@ static void I422_cyuv( vout_thread_t *p_vout, picture_t *p_source, #else - 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_line -= 2 * p_dest->p->i_pitch; @@ -529,8 +538,8 @@ static void I422_cyuv( vout_thread_t *p_vout, picture_t *p_source, * I422_Y211: planar YUV 4:2:2 to packed YUYV 2:1:1 *****************************************************************************/ #if defined (MODULE_NAME_IS_i422_yuy2) -static void I422_Y211( vout_thread_t *p_vout, picture_t *p_source, - picture_t *p_dest ) +static void I422_Y211( filter_t *p_filter, picture_t *p_source, + picture_t *p_dest ) { uint8_t *p_line = p_dest->p->p_pixels + p_dest->p->i_visible_lines * p_dest->p->i_pitch; uint8_t *p_y = p_source->Y_PIXELS; @@ -539,9 +548,9 @@ static void I422_Y211( vout_thread_t *p_vout, picture_t *p_source, int i_x, i_y; - 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-- ; ) { C_YUV422_Y211( p_line, p_y, p_u, p_v ); C_YUV422_Y211( p_line, p_y, p_u, p_v );