X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_chroma%2Fi422_yuy2.c;h=528ec6893f95e1e8739ec6a475b6d408d4be295d;hb=0d8adc76dbf01e54ef043a07a623982a7fa9a426;hp=beac1d1355d236f51e2cb79bdde81124c955a74a;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c index beac1d1355..528ec6893f 100644 --- a/modules/video_chroma/i422_yuy2.c +++ b/modules/video_chroma/i422_yuy2.c @@ -1,16 +1,17 @@ /***************************************************************************** - * i422_yuy2.c : YUV to YUV conversion module for vlc + * i422_yuy2.c : Planar YUV 4:2:2 to Packed YUV conversion module for vlc ***************************************************************************** * Copyright (C) 2000, 2001 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar + * Damien Fouilleul * * 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 * (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 @@ -24,11 +25,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* strerror() */ -#include /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include #include "i422_yuy2.h" @@ -44,15 +49,19 @@ *****************************************************************************/ 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_YV12 ( 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 /***************************************************************************** @@ -60,12 +69,16 @@ static void I422_YV12 ( vout_thread_t *, picture_t *, picture_t * ); *****************************************************************************/ 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 ); + set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) ); + set_capability( "video filter2", 100 ); add_requirement( MMX ); +#elif defined (MODULE_NAME_IS_i422_yuy2_sse2) + set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) ); + set_capability( "video filter2", 120 ); + add_requirement( SSE2 ); #endif set_callbacks( Activate, NULL ); vlc_module_end(); @@ -77,48 +90,45 @@ 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 ) + 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; + p_filter->pf_video_filter = I422_YUY2_Filter; break; case VLC_FOURCC('Y','V','Y','U'): - p_vout->chroma.pf_convert = I422_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; + 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; + 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; - break; - - case VLC_FOURCC('Y','V','1','2'): - p_vout->chroma.pf_convert = I422_YV12; + p_filter->pf_video_filter = I422_Y211_Filter; break; #endif @@ -130,17 +140,25 @@ static int Activate( vlc_object_t *p_this ) default: return -1; } - - return 0; + return 0; } /* 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; @@ -149,30 +167,91 @@ static void I422_YUY2( vout_thread_t *p_vout, picture_t *p_source, int i_x, i_y; - for( i_y = p_vout->render.i_height ; i_y-- ; ) + const int i_source_margin = p_source->p[0].i_pitch + - p_source->p[0].i_visible_pitch; + const int i_source_margin_c = p_source->p[1].i_pitch + - p_source->p[1].i_visible_pitch; + const int i_dest_margin = p_dest->p->i_pitch + - p_dest->p->i_visible_pitch; + +#if defined (MODULE_NAME_IS_i422_yuy2_sse2) + + if( 0 == (15 & (p_source->p[Y_PLANE].i_pitch|p_dest->p->i_pitch| + ((intptr_t)p_line|(intptr_t)p_y))) ) + { + /* use faster SSE2 aligned fetch and store */ + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) + { + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) + { + SSE2_CALL( SSE2_YUV422_YUYV_ALIGNED ); + } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; + } + } + else { + /* use slower SSE2 unaligned fetch and store */ + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) + { + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) + { + SSE2_CALL( SSE2_YUV422_YUYV_UNALIGNED ); + } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; + } + } + SSE2_END; + +#else + + 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 ); C_YUV422_YUYV( p_line, p_y, p_u, p_v ); C_YUV422_YUYV( p_line, p_y, p_u, p_v ); C_YUV422_YUYV( p_line, p_y, p_u, p_v ); -#else - __asm__( ".align 8" MMX_YUV422_YUYV - : : "r" (p_line), "r" (p_y), "r" (p_u), "r" (p_v) ); - - p_line += 16; p_y += 8; p_u += 4; p_v += 4; +#elif defined (MODULE_NAME_IS_i422_yuy2_mmx) + MMX_CALL( MMX_YUV422_YUYV ); #endif } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; } +#if defined (MODULE_NAME_IS_i422_yuy2_mmx) + MMX_END; +#endif + +#endif } /***************************************************************************** * 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; @@ -181,30 +260,91 @@ static void I422_YVYU( vout_thread_t *p_vout, picture_t *p_source, int i_x, i_y; - for( i_y = p_vout->render.i_height ; i_y-- ; ) + const int i_source_margin = p_source->p[0].i_pitch + - p_source->p[0].i_visible_pitch; + const int i_source_margin_c = p_source->p[1].i_pitch + - p_source->p[1].i_visible_pitch; + const int i_dest_margin = p_dest->p->i_pitch + - p_dest->p->i_visible_pitch; + +#if defined (MODULE_NAME_IS_i422_yuy2_sse2) + + if( 0 == (15 & (p_source->p[Y_PLANE].i_pitch|p_dest->p->i_pitch| + ((intptr_t)p_line|(intptr_t)p_y))) ) + { + /* use faster SSE2 aligned fetch and store */ + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) + { + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) + { + SSE2_CALL( SSE2_YUV422_YVYU_ALIGNED ); + } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; + } + } + else { + /* use slower SSE2 unaligned fetch and store */ + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) + { + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) + { + SSE2_CALL( SSE2_YUV422_YVYU_UNALIGNED ); + } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; + } + } + SSE2_END; + +#else + + 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 ); C_YUV422_YVYU( p_line, p_y, p_u, p_v ); C_YUV422_YVYU( p_line, p_y, p_u, p_v ); C_YUV422_YVYU( p_line, p_y, p_u, p_v ); -#else - __asm__( ".align 8" MMX_YUV422_YVYU - : : "r" (p_line), "r" (p_y), "r" (p_u), "r" (p_v) ); - - p_line += 16; p_y += 8; p_u += 4; p_v += 4; +#elif defined (MODULE_NAME_IS_i422_yuy2_mmx) + MMX_CALL( MMX_YUV422_YVYU ); #endif } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; } +#if defined (MODULE_NAME_IS_i422_yuy2_mmx) + MMX_END; +#endif + +#endif } /***************************************************************************** * 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; @@ -213,40 +353,102 @@ static void I422_UYVY( vout_thread_t *p_vout, picture_t *p_source, int i_x, i_y; - for( i_y = p_vout->render.i_height ; i_y-- ; ) + const int i_source_margin = p_source->p[0].i_pitch + - p_source->p[0].i_visible_pitch; + const int i_source_margin_c = p_source->p[1].i_pitch + - p_source->p[1].i_visible_pitch; + const int i_dest_margin = p_dest->p->i_pitch + - p_dest->p->i_visible_pitch; + +#if defined (MODULE_NAME_IS_i422_yuy2_sse2) + + if( 0 == (15 & (p_source->p[Y_PLANE].i_pitch|p_dest->p->i_pitch| + ((intptr_t)p_line|(intptr_t)p_y))) ) { - for( i_x = p_vout->render.i_width / 8 ; i_x-- ; ) + /* use faster SSE2 aligned fetch and store */ + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) + { + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) + { + SSE2_CALL( SSE2_YUV422_UYVY_ALIGNED ); + } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; + } + } + else { + /* use slower SSE2 unaligned fetch and store */ + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) + { + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) + { + SSE2_CALL( SSE2_YUV422_UYVY_UNALIGNED ); + } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; + } + } + SSE2_END; + +#else + + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) + { + 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 ); C_YUV422_UYVY( p_line, p_y, p_u, p_v ); C_YUV422_UYVY( p_line, p_y, p_u, p_v ); C_YUV422_UYVY( p_line, p_y, p_u, p_v ); -#else - __asm__( ".align 8" MMX_YUV422_UYVY - : : "r" (p_line), "r" (p_y), "r" (p_u), "r" (p_v) ); - - p_line += 16; p_y += 8; p_u += 4; p_v += 4; +#elif defined (MODULE_NAME_IS_i422_yuy2_mmx) + MMX_CALL( MMX_YUV422_UYVY ); #endif } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; } +#if defined (MODULE_NAME_IS_i422_yuy2_mmx) + MMX_END; +#endif + +#endif } /***************************************************************************** * 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; @@ -255,9 +457,64 @@ static void I422_cyuv( vout_thread_t *p_vout, picture_t *p_source, int i_x, i_y; - for( i_y = p_vout->render.i_height ; i_y-- ; ) + const int i_source_margin = p_source->p[0].i_pitch + - p_source->p[0].i_visible_pitch; + const int i_source_margin_c = p_source->p[1].i_pitch + - p_source->p[1].i_visible_pitch; + const int i_dest_margin = p_dest->p->i_pitch + - p_dest->p->i_visible_pitch; + +#if defined (MODULE_NAME_IS_i422_yuy2_sse2) + + if( 0 == (15 & (p_source->p[Y_PLANE].i_pitch|p_dest->p->i_pitch| + ((intptr_t)p_line|(intptr_t)p_y))) ) + { + /* use faster SSE2 aligned fetch and store */ + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) + { + p_line -= 2 * p_dest->p->i_pitch; + + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) + { + SSE2_CALL( SSE2_YUV422_UYVY_ALIGNED ); + } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; + } + } + else { + /* use slower SSE2 unaligned fetch and store */ + for( i_y = p_filter->fmt_in.video.i_height ; i_y-- ; ) + { + p_line -= 2 * p_dest->p->i_pitch; + + for( i_x = p_filter->fmt_in.video.i_width / 16 ; i_x-- ; ) + { + SSE2_CALL( SSE2_YUV422_UYVY_UNALIGNED ); + } + 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 ); + } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; + } + } + SSE2_END; + +#else + + 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; @@ -266,22 +523,30 @@ static void I422_cyuv( vout_thread_t *p_vout, picture_t *p_source, C_YUV422_UYVY( p_line, p_y, p_u, p_v ); C_YUV422_UYVY( p_line, p_y, p_u, p_v ); C_YUV422_UYVY( p_line, p_y, p_u, p_v ); -#else - __asm__( ".align 8" MMX_YUV422_UYVY - : : "r" (p_line), "r" (p_y), "r" (p_u), "r" (p_v) ); - - p_line += 16; p_y += 8; p_u += 4; p_v += 4; +#elif defined (MODULE_NAME_IS_i422_yuy2_mmx) + MMX_CALL( MMX_YUV422_UYVY ); #endif } + p_y += i_source_margin; + p_u += i_source_margin_c; + p_v += i_source_margin_c; + p_line += i_dest_margin; } +#if defined (MODULE_NAME_IS_i422_yuy2_mmx) + MMX_END; +#elif defined (MODULE_NAME_IS_i422_yuy2_sse2) + SSE2_END; +#endif + +#endif } /***************************************************************************** * 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; @@ -290,9 +555,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 ); @@ -300,36 +565,3 @@ static void I422_Y211( vout_thread_t *p_vout, picture_t *p_source, } } #endif - - -/***************************************************************************** - * I422_YV12: planar YUV 4:2:2 to planar YV12 - *****************************************************************************/ -#if defined (MODULE_NAME_IS_i422_yuy2) -static void I422_YV12( vout_thread_t *p_vout, picture_t *p_source, - picture_t *p_dest ) -{ - uint16_t i_dpy = p_dest->p[Y_PLANE].i_pitch; - uint16_t i_spy = p_source->p[Y_PLANE].i_pitch; - uint16_t i_dpuv = p_dest->p[U_PLANE].i_pitch; - uint16_t i_spuv = p_source->p[U_PLANE].i_pitch; - uint16_t i_width = p_vout->render.i_width; - uint16_t i_y = p_vout->render.i_height; - uint8_t *p_dy = p_dest->Y_PIXELS + (i_y-1)*i_dpy; - uint8_t *p_y = p_source->Y_PIXELS + (i_y-1)*i_spy; - uint8_t *p_du = p_dest->U_PIXELS + (i_y/2-1)*i_dpuv; - uint8_t *p_u = p_source->U_PIXELS + (i_y-1)*i_spuv; - uint8_t *p_dv = p_dest->V_PIXELS + (i_y/2-1)*i_dpuv; - uint8_t *p_v = p_source->V_PIXELS + (i_y-1)*i_spuv; - i_y /= 2; - - for ( ; i_y--; ) - { - memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy; - memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy; - memcpy(p_du, p_u, i_width/2); p_du -= i_dpuv; p_u -= 2*i_spuv; - memcpy(p_dv, p_v, i_width/2); p_dv -= i_dpuv; p_v -= 2*i_spuv; - } - -} -#endif