X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_filter%2Fdeinterlace.c;h=27919cebd9ff3d709527bb528c667e8e5f3d198c;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=60c3d4d05ade6c09e3f102da472a979059d7bbce;hpb=a718e0c687ef7f36131cee9e77754a9272bdc0bd;p=vlc diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c index 60c3d4d05a..27919cebd9 100644 --- a/modules/video_filter/deinterlace.c +++ b/modules/video_filter/deinterlace.c @@ -1,7 +1,7 @@ /***************************************************************************** * deinterlace.c : deinterlacer plugin for vlc ***************************************************************************** - * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN + * Copyright (C) 2000, 2001, 2002, 2003 the VideoLAN team * $Id$ * * Author: Sam Hocevar @@ -18,18 +18,18 @@ * * 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 -#include /* malloc(), free() */ -#include #include -#include +#include +#include +#include "vlc_filter.h" #ifdef HAVE_ALTIVEC_H # include @@ -70,7 +70,10 @@ static void MergeGeneric ( void *, const void *, const void *, size_t ); static void MergeAltivec ( void *, const void *, const void *, size_t ); #endif #if defined(CAN_COMPILE_MMXEXT) -static void MergeMMX ( void *, const void *, const void *, size_t ); +static void MergeMMXEXT ( void *, const void *, const void *, size_t ); +#endif +#if defined(CAN_COMPILE_3DNOW) +static void Merge3DNow ( void *, const void *, const void *, size_t ); #endif #if defined(CAN_COMPILE_SSE) static void MergeSSE2 ( void *, const void *, const void *, size_t ); @@ -78,6 +81,9 @@ static void MergeSSE2 ( void *, const void *, const void *, size_t ); #if defined(CAN_COMPILE_MMXEXT) || defined(CAN_COMPILE_SSE) static void EndMMX ( void ); #endif +#if defined(CAN_COMPILE_3DNOW) +static void End3DNow ( void ); +#endif static int SendEvents ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); @@ -85,6 +91,9 @@ static int SendEvents ( vlc_object_t *, char const *, static void SetFilterMethod( vout_thread_t *p_vout, char *psz_method ); static vout_thread_t *SpawnRealVout( vout_thread_t *p_vout ); +static int OpenFilter( vlc_object_t *p_this ); +static void CloseFilter( vlc_object_t *p_this ); + /***************************************************************************** * Callback prototypes *****************************************************************************/ @@ -95,27 +104,45 @@ static int FilterCallback ( vlc_object_t *, char const *, * Module descriptor *****************************************************************************/ #define MODE_TEXT N_("Deinterlace mode") -#define MODE_LONGTEXT N_("You can choose the default deinterlace mode") +#define MODE_LONGTEXT N_("Deinterlace method to use for local playback.") + +#define SOUT_MODE_TEXT N_("Streaming deinterlace mode") +#define SOUT_MODE_LONGTEXT N_("Deinterlace method to use for streaming.") + +#define FILTER_CFG_PREFIX "sout-deinterlace-" -static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", "x" }; -static char *mode_list_text[] = { N_("Discard"), N_("Blend"), N_("Mean"), - N_("Bob"), N_("Linear"), N_("X") }; +static const char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", "x" }; +static const char *mode_list_text[] = { N_("Discard"), N_("Blend"), N_("Mean"), + N_("Bob"), N_("Linear"), "X" }; vlc_module_begin(); set_description( _("Deinterlacing video filter") ); - set_shortname( N_("Deinterlace" )); + set_shortname( _("Deinterlace" )); set_capability( "video filter", 0 ); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VFILTER ); + set_section( N_("Display"),NULL); add_string( "deinterlace-mode", "discard", NULL, MODE_TEXT, MODE_LONGTEXT, VLC_FALSE ); change_string_list( mode_list, mode_list_text, 0 ); add_shortcut( "deinterlace" ); set_callbacks( Create, Destroy ); + + add_submodule(); + set_capability( "video filter2", 0 ); + set_section( N_("Streaming"),NULL); + add_string( FILTER_CFG_PREFIX "mode", "blend", NULL, SOUT_MODE_TEXT, + SOUT_MODE_LONGTEXT, VLC_FALSE ); + change_string_list( mode_list, mode_list_text, 0 ); + set_callbacks( OpenFilter, CloseFilter ); vlc_module_end(); +static const char *ppsz_filter_options[] = { + "mode", NULL +}; + /***************************************************************************** * vout_sys_t: Deinterlace video output method descriptor ***************************************************************************** @@ -172,13 +199,13 @@ static int Create( vlc_object_t *p_this ) p_vout->pf_control = Control; p_vout->p_sys->i_mode = DEINTERLACE_DISCARD; - p_vout->p_sys->b_double_rate = 0; + p_vout->p_sys->b_double_rate = VLC_FALSE; p_vout->p_sys->last_date = 0; p_vout->p_sys->p_vout = 0; vlc_mutex_init( p_vout, &p_vout->p_sys->filter_lock ); #if defined(CAN_COMPILE_C_ALTIVEC) - if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC ) + if( vlc_CPU() & CPU_CAPABILITY_ALTIVEC ) { p_vout->p_sys->pf_merge = MergeAltivec; p_vout->p_sys->pf_end_merge = NULL; @@ -186,7 +213,7 @@ static int Create( vlc_object_t *p_this ) else #endif #if defined(CAN_COMPILE_SSE) - if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2 ) + if( vlc_CPU() & CPU_CAPABILITY_SSE2 ) { p_vout->p_sys->pf_merge = MergeSSE2; p_vout->p_sys->pf_end_merge = EndMMX; @@ -194,12 +221,20 @@ static int Create( vlc_object_t *p_this ) else #endif #if defined(CAN_COMPILE_MMXEXT) - if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_MMX ) + if( vlc_CPU() & CPU_CAPABILITY_MMXEXT ) { - p_vout->p_sys->pf_merge = MergeMMX; + p_vout->p_sys->pf_merge = MergeMMXEXT; p_vout->p_sys->pf_end_merge = EndMMX; } else +#endif +#if defined(CAN_COMPILE_3DNOW) + if( vlc_CPU() & CPU_CAPABILITY_3DNOW ) + { + p_vout->p_sys->pf_merge = Merge3DNow; + p_vout->p_sys->pf_end_merge = End3DNow; + } + else #endif { p_vout->p_sys->pf_merge = MergeGeneric; @@ -224,8 +259,6 @@ static int Create( vlc_object_t *p_this ) free( val.psz_string ); - var_AddCallback( p_vout, "deinterlace-mode", FilterCallback, NULL ); - return VLC_SUCCESS; } @@ -237,35 +270,35 @@ static void SetFilterMethod( vout_thread_t *p_vout, char *psz_method ) if( !strcmp( psz_method, "discard" ) ) { p_vout->p_sys->i_mode = DEINTERLACE_DISCARD; - p_vout->p_sys->b_double_rate = 0; + p_vout->p_sys->b_double_rate = VLC_FALSE; } else if( !strcmp( psz_method, "mean" ) ) { p_vout->p_sys->i_mode = DEINTERLACE_MEAN; - p_vout->p_sys->b_double_rate = 0; + p_vout->p_sys->b_double_rate = VLC_FALSE; } else if( !strcmp( psz_method, "blend" ) || !strcmp( psz_method, "average" ) || !strcmp( psz_method, "combine-fields" ) ) { p_vout->p_sys->i_mode = DEINTERLACE_BLEND; - p_vout->p_sys->b_double_rate = 0; + p_vout->p_sys->b_double_rate = VLC_FALSE; } else if( !strcmp( psz_method, "bob" ) || !strcmp( psz_method, "progressive-scan" ) ) { p_vout->p_sys->i_mode = DEINTERLACE_BOB; - p_vout->p_sys->b_double_rate = 1; + p_vout->p_sys->b_double_rate = VLC_TRUE; } else if( !strcmp( psz_method, "linear" ) ) { p_vout->p_sys->i_mode = DEINTERLACE_LINEAR; - p_vout->p_sys->b_double_rate = 1; + p_vout->p_sys->b_double_rate = VLC_TRUE; } else if( !strcmp( psz_method, "x" ) ) { p_vout->p_sys->i_mode = DEINTERLACE_X; - p_vout->p_sys->b_double_rate = 0; + p_vout->p_sys->b_double_rate = VLC_FALSE; } else { @@ -298,6 +331,7 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; + p_vout->fmt_out = p_vout->fmt_in; break; default: @@ -316,6 +350,8 @@ static int Init( vout_thread_t *p_vout ) return VLC_EGENERIC; } + var_AddCallback( p_vout, "deinterlace-mode", FilterCallback, NULL ); + ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); @@ -331,17 +367,12 @@ static int Init( vout_thread_t *p_vout ) static vout_thread_t *SpawnRealVout( vout_thread_t *p_vout ) { vout_thread_t *p_real_vout = NULL; - video_format_t fmt = {0}; + video_format_t fmt; + memset( &fmt, 0, sizeof( video_format_t ) ); msg_Dbg( p_vout, "spawning the real video output" ); - fmt.i_width = fmt.i_visible_width = p_vout->output.i_width; - fmt.i_height = fmt.i_visible_height = p_vout->output.i_height; - fmt.i_x_offset = fmt.i_y_offset = 0; - fmt.i_chroma = p_vout->output.i_chroma; - fmt.i_aspect = p_vout->output.i_aspect; - fmt.i_sar_num = p_vout->output.i_aspect * fmt.i_height / fmt.i_width; - fmt.i_sar_den = VOUT_ASPECT_FACTOR; + fmt = p_vout->fmt_out; switch( p_vout->render.i_chroma ) { @@ -352,7 +383,8 @@ static vout_thread_t *SpawnRealVout( vout_thread_t *p_vout ) { case DEINTERLACE_MEAN: case DEINTERLACE_DISCARD: - fmt.i_height = fmt.i_visible_height = p_vout->output.i_height / 2; + fmt.i_height /= 2; fmt.i_visible_height /= 2; fmt.i_y_offset /= 2; + fmt.i_sar_den *= 2; p_real_vout = vout_Create( p_vout, &fmt ); break; @@ -390,16 +422,6 @@ static void End( vout_thread_t *p_vout ) i_index--; free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); } -} - -/***************************************************************************** - * Destroy: destroy Deinterlace video thread output method - ***************************************************************************** - * Terminate an output method created by DeinterlaceCreateOutputMethod - *****************************************************************************/ -static void Destroy( vlc_object_t *p_this ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; if( p_vout->p_sys->p_vout ) { @@ -409,7 +431,17 @@ static void Destroy( vlc_object_t *p_this ) } DEL_PARENT_CALLBACKS( SendEventsToChild ); +} +/***************************************************************************** + * Destroy: destroy Deinterlace video thread output method + ***************************************************************************** + * Terminate an output method created by DeinterlaceCreateOutputMethod + *****************************************************************************/ +static void Destroy( vlc_object_t *p_this ) +{ + vout_thread_t *p_vout = (vout_thread_t *)p_this; + vlc_mutex_destroy( &p_vout->p_sys->filter_lock ); free( p_vout->p_sys ); } @@ -422,13 +454,32 @@ static void Destroy( vlc_object_t *p_this ) *****************************************************************************/ static void Render ( vout_thread_t *p_vout, picture_t *p_pic ) { + vout_sys_t *p_sys = p_vout->p_sys; picture_t *pp_outpic[2]; + p_vout->fmt_out.i_x_offset = p_sys->p_vout->fmt_in.i_x_offset = + p_vout->fmt_in.i_x_offset; + p_vout->fmt_out.i_y_offset = p_sys->p_vout->fmt_in.i_y_offset = + p_vout->fmt_in.i_y_offset; + p_vout->fmt_out.i_visible_width = p_sys->p_vout->fmt_in.i_visible_width = + p_vout->fmt_in.i_visible_width; + p_vout->fmt_out.i_visible_height = p_sys->p_vout->fmt_in.i_visible_height = + p_vout->fmt_in.i_visible_height; + if( p_vout->p_sys->i_mode == DEINTERLACE_MEAN || + p_vout->p_sys->i_mode == DEINTERLACE_DISCARD ) + { + p_vout->fmt_out.i_y_offset /= 2; p_sys->p_vout->fmt_in.i_y_offset /= 2; + p_vout->fmt_out.i_visible_height /= 2; + p_sys->p_vout->fmt_in.i_visible_height /= 2; + } + + pp_outpic[0] = pp_outpic[1] = NULL; + vlc_mutex_lock( &p_vout->p_sys->filter_lock ); /* Get a new picture */ while( ( pp_outpic[0] = vout_CreatePicture( p_vout->p_sys->p_vout, - 0, 0, 0 ) ) + 0, 0, 0 ) ) == NULL ) { if( p_vout->b_die || p_vout->b_error ) @@ -437,7 +488,7 @@ static void Render ( vout_thread_t *p_vout, picture_t *p_pic ) return; } msleep( VOUT_OUTMEM_SLEEP ); - } + } vout_DatePicture( p_vout->p_sys->p_vout, pp_outpic[0], p_pic->date ); @@ -539,10 +590,10 @@ static void RenderDiscard( vout_thread_t *p_vout, for( ; p_out < p_out_end ; ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; p_in += 2 * p_pic->p[i_plane].i_pitch; } break; @@ -555,12 +606,12 @@ static void RenderDiscard( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_out += p_outpic->p[i_plane].i_pitch; + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; p_in += i_increment; } } @@ -568,9 +619,9 @@ static void RenderDiscard( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; p_in += i_increment; } } @@ -608,37 +659,37 @@ static void RenderBob( vout_thread_t *p_vout, /* For BOTTOM field we need to add the first line */ if( i_field == 1 ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_in += p_pic->p[i_plane].i_pitch; - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; } p_out_end -= 2 * p_outpic->p[i_plane].i_pitch; for( ; p_out < p_out_end ; ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_in += 2 * p_pic->p[i_plane].i_pitch; - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; } - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); /* For TOP field we need to add the last line */ if( i_field == 0 ) { p_in += p_pic->p[i_plane].i_pitch; - p_out += p_pic->p[i_plane].i_pitch; - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_out += p_outpic->p[i_plane].i_pitch; + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); } break; @@ -647,10 +698,10 @@ static void RenderBob( vout_thread_t *p_vout, /* For BOTTOM field we need to add the first line */ if( i_field == 1 ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_in += p_pic->p[i_plane].i_pitch; - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; } p_out_end -= 2 * p_outpic->p[i_plane].i_pitch; @@ -659,39 +710,39 @@ static void RenderBob( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_in += 2 * p_pic->p[i_plane].i_pitch; - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; } } else { for( ; p_out < p_out_end ; ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; p_in += 2 * p_pic->p[i_plane].i_pitch; } } - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); /* For TOP field we need to add the last line */ if( i_field == 0 ) { p_in += p_pic->p[i_plane].i_pitch; - p_out += p_pic->p[i_plane].i_pitch; - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_out += p_outpic->p[i_plane].i_pitch; + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); } break; @@ -723,37 +774,37 @@ static void RenderLinear( vout_thread_t *p_vout, /* For BOTTOM field we need to add the first line */ if( i_field == 1 ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_in += p_pic->p[i_plane].i_pitch; - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; } p_out_end -= 2 * p_outpic->p[i_plane].i_pitch; for( ; p_out < p_out_end ; ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; Merge( p_out, p_in, p_in + 2 * p_pic->p[i_plane].i_pitch, p_pic->p[i_plane].i_pitch ); p_in += 2 * p_pic->p[i_plane].i_pitch; - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; } - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); /* For TOP field we need to add the last line */ if( i_field == 0 ) { p_in += p_pic->p[i_plane].i_pitch; - p_out += p_pic->p[i_plane].i_pitch; - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_out += p_outpic->p[i_plane].i_pitch; + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); } } @@ -782,7 +833,7 @@ static void RenderMean( vout_thread_t *p_vout, Merge( p_out, p_in, p_in + p_pic->p[i_plane].i_pitch, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; p_in += 2 * p_pic->p[i_plane].i_pitch; } } @@ -811,26 +862,26 @@ static void RenderBlend( vout_thread_t *p_vout, case VLC_FOURCC('I','Y','U','V'): case VLC_FOURCC('Y','V','1','2'): /* First line: simple copy */ - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; /* Remaining lines: mean value */ for( ; p_out < p_out_end ; ) { - Merge( p_out, p_in, p_in + p_pic->p[i_plane].i_pitch, - p_pic->p[i_plane].i_pitch ); + Merge( p_out, p_in, p_in + p_pic->p[i_plane].i_pitch, + p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; p_in += p_pic->p[i_plane].i_pitch; } break; case VLC_FOURCC('I','4','2','2'): /* First line: simple copy */ - p_vout->p_vlc->pf_memcpy( p_out, p_in, + p_vout->p_libvlc->pf_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; /* Remaining lines: mean value */ if( i_plane == Y_PLANE ) @@ -840,7 +891,7 @@ static void RenderBlend( vout_thread_t *p_vout, Merge( p_out, p_in, p_in + p_pic->p[i_plane].i_pitch, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; p_in += p_pic->p[i_plane].i_pitch; } } @@ -852,7 +903,7 @@ static void RenderBlend( vout_thread_t *p_vout, Merge( p_out, p_in, p_in + p_pic->p[i_plane].i_pitch, p_pic->p[i_plane].i_pitch ); - p_out += p_pic->p[i_plane].i_pitch; + p_out += p_outpic->p[i_plane].i_pitch; p_in += 2*p_pic->p[i_plane].i_pitch; } } @@ -893,8 +944,8 @@ static void MergeGeneric( void *_p_dest, const void *_p_s1, } #if defined(CAN_COMPILE_MMXEXT) -static void MergeMMX( void *_p_dest, const void *_p_s1, const void *_p_s2, - size_t i_bytes ) +static void MergeMMXEXT( void *_p_dest, const void *_p_s1, const void *_p_s2, + size_t i_bytes ) { uint8_t* p_dest = (uint8_t*)_p_dest; const uint8_t *p_s1 = (const uint8_t *)_p_s1; @@ -921,6 +972,35 @@ static void MergeMMX( void *_p_dest, const void *_p_s1, const void *_p_s2, } #endif +#if defined(CAN_COMPILE_3DNOW) +static void Merge3DNow( void *_p_dest, const void *_p_s1, const void *_p_s2, + size_t i_bytes ) +{ + uint8_t* p_dest = (uint8_t*)_p_dest; + const uint8_t *p_s1 = (const uint8_t *)_p_s1; + const uint8_t *p_s2 = (const uint8_t *)_p_s2; + uint8_t* p_end = p_dest + i_bytes - 8; + while( p_dest < p_end ) + { + __asm__ __volatile__( "movq %2,%%mm1;" + "pavgusb %1, %%mm1;" + "movq %%mm1, %0" :"=m" (*p_dest): + "m" (*p_s1), + "m" (*p_s2) ); + p_dest += 8; + p_s1 += 8; + p_s2 += 8; + } + + p_end += 8; + + while( p_dest < p_end ) + { + *p_dest++ = ( (uint16_t)(*p_s1++) + (uint16_t)(*p_s2++) ) >> 1; + } +} +#endif + #if defined(CAN_COMPILE_SSE) static void MergeSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2, size_t i_bytes ) @@ -929,10 +1009,10 @@ static void MergeSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2, const uint8_t *p_s1 = (const uint8_t *)_p_s1; const uint8_t *p_s2 = (const uint8_t *)_p_s2; uint8_t* p_end; - while( (int)p_s1 % 16 ) + while( (uintptr_t)p_s1 % 16 ) { *p_dest++ = ( (uint16_t)(*p_s1++) + (uint16_t)(*p_s2++) ) >> 1; - } + } p_end = p_dest + i_bytes - 16; while( p_dest < p_end ) { @@ -962,6 +1042,13 @@ static void EndMMX( void ) } #endif +#if defined(CAN_COMPILE_3DNOW) +static void End3DNow( void ) +{ + __asm__ __volatile__( "femms" :: ); +} +#endif + #ifdef CAN_COMPILE_C_ALTIVEC static void MergeAltivec( void *_p_dest, const void *_p_s1, const void *_p_s2, size_t i_bytes ) @@ -1630,7 +1717,7 @@ static inline void XDeint8x8FieldMotion( uint8_t *dst, int i_dst, #if 0 /* Kernel interpolation (1,-5,20,20,-5,1) - * Loose a bit more details+add aliasing than edge interpol but avoid + * Lose a bit more details+add aliasing than edge interpol but avoid * more artifacts */ static inline uint8_t clip1( int a ) @@ -1854,7 +1941,6 @@ static inline void XDeintBand8x8MMXEXT( uint8_t *dst, int i_dst, static void RenderX( vout_thread_t *p_vout, picture_t *p_outpic, picture_t *p_pic ) { - vout_sys_t *p_sys = p_vout->p_sys; int i_plane; /* Copy image and skip lines */ @@ -1877,7 +1963,7 @@ static void RenderX( vout_thread_t *p_vout, uint8_t *src = &p_pic->p[i_plane].p_pixels[8*y*i_src]; #ifdef CAN_COMPILE_MMXEXT - if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT ) + if( vlc_CPU() & CPU_CAPABILITY_MMXEXT ) XDeintBand8x8MMXEXT( dst, i_dst, src, i_src, i_mbx, i_modx ); else #endif @@ -1904,7 +1990,7 @@ static void RenderX( vout_thread_t *p_vout, } #ifdef CAN_COMPILE_MMXEXT - if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT ) + if( vlc_CPU() & CPU_CAPABILITY_MMXEXT ) emms(); #endif } @@ -2025,3 +2111,129 @@ static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var, var_Set( p_vout->p_sys->p_vout, psz_var, newval ); return VLC_SUCCESS; } + + +/***************************************************************************** + * video filter2 functions + *****************************************************************************/ +static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic ) +{ + vout_thread_t *p_vout = (vout_thread_t *)p_filter->p_sys; + picture_t *p_pic_dst; + + /* Request output picture */ + p_pic_dst = p_filter->pf_vout_buffer_new( p_filter ); + if( p_pic_dst == NULL ) + { + msg_Warn( p_filter, "can't get output picture" ); + return NULL; + } + + switch( p_vout->p_sys->i_mode ) + { + case DEINTERLACE_DISCARD: +#if 0 + RenderDiscard( p_vout, p_pic_dst, p_pic, 0 ); +#endif + msg_Err( p_vout, "discarding lines is not supported yet" ); + p_pic_dst->pf_release( p_pic_dst ); + return p_pic; + break; + + case DEINTERLACE_BOB: +#if 0 + RenderBob( p_vout, pp_outpic[0], p_pic, 0 ); + RenderBob( p_vout, pp_outpic[1], p_pic, 1 ); + break; +#endif + + case DEINTERLACE_LINEAR: +#if 0 + RenderLinear( p_vout, pp_outpic[0], p_pic, 0 ); + RenderLinear( p_vout, pp_outpic[1], p_pic, 1 ); +#endif + msg_Err( p_vout, "doubling the frame rate is not supported yet" ); + p_pic_dst->pf_release( p_pic_dst ); + return p_pic; + break; + + case DEINTERLACE_MEAN: + RenderMean( p_vout, p_pic_dst, p_pic ); + break; + + case DEINTERLACE_BLEND: + RenderBlend( p_vout, p_pic_dst, p_pic ); + break; + + case DEINTERLACE_X: + RenderX( p_vout, p_pic_dst, p_pic ); + break; + } + + p_pic_dst->date = p_pic->date; + p_pic_dst->b_force = p_pic->b_force; + p_pic_dst->i_nb_fields = p_pic->i_nb_fields; + p_pic_dst->b_progressive = VLC_TRUE; + p_pic_dst->b_top_field_first = p_pic->b_top_field_first; + + p_pic->pf_release( p_pic ); + return p_pic_dst; +} + +/***************************************************************************** + * OpenFilter: + *****************************************************************************/ +static int OpenFilter( vlc_object_t *p_this ) +{ + filter_t *p_filter = (filter_t*)p_this; + vout_thread_t *p_vout; + vlc_value_t val; + + if( ( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0') && + p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','Y','U','V') && + p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2') ) || + p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma ) + { + return VLC_EGENERIC; + } + + /* Impossible to use VLC_OBJECT_VOUT here because it would be used + * by spu filters */ + p_vout = vlc_object_create( p_filter, sizeof(vout_thread_t) ); + vlc_object_attach( p_vout, p_filter ); + p_filter->p_sys = (filter_sys_t *)p_vout; + p_vout->render.i_chroma = p_filter->fmt_in.video.i_chroma; + + config_ChainParse( p_filter, FILTER_CFG_PREFIX, ppsz_filter_options, + p_filter->p_cfg ); + var_Get( p_filter, FILTER_CFG_PREFIX "mode", &val ); + var_Create( p_filter, "deinterlace-mode", VLC_VAR_STRING ); + var_Set( p_filter, "deinterlace-mode", val ); + + if ( Create( VLC_OBJECT(p_vout) ) != VLC_SUCCESS ) + { + vlc_object_detach( p_vout ); + vlc_object_release( p_vout ); + return VLC_EGENERIC; + } + + p_filter->pf_video_filter = Deinterlace; + + msg_Dbg( p_filter, "deinterlacing" ); + + return VLC_SUCCESS; +} + +/***************************************************************************** + * CloseFilter: clean up the filter + *****************************************************************************/ +static void CloseFilter( vlc_object_t *p_this ) +{ + filter_t *p_filter = (filter_t*)p_this; + vout_thread_t *p_vout = (vout_thread_t *)p_filter->p_sys; + + Destroy( VLC_OBJECT(p_vout) ); + vlc_object_detach( p_vout ); + vlc_object_release( p_vout ); +} +