X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fdeinterlace.c;h=4ec8333340263f2b8b58aac34e0be95215aaf830;hb=688f0a8d8913f20ac5d3e27bf4f2bbe35c9f5de7;hp=5aae8f82ae764b363eafea7e514a22b2cc55cec2;hpb=6ec82b018ceee54f37157333ce6bc74dd23b57cb;p=vlc diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c index 5aae8f82ae..4ec8333340 100644 --- a/modules/video_filter/deinterlace.c +++ b/modules/video_filter/deinterlace.c @@ -24,19 +24,23 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include /* malloc(), free() */ -#include -#include -#include -#include -#include "vlc_filter.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #ifdef HAVE_ALTIVEC_H # include #endif +#include +#include +#include +#include +#include "vlc_filter.h" + #ifdef CAN_COMPILE_MMXEXT # include "mmx.h" #endif @@ -65,7 +69,7 @@ static void RenderBob ( vout_thread_t *, picture_t *, picture_t *, int ); static void RenderMean ( vout_thread_t *, picture_t *, picture_t * ); static void RenderBlend ( vout_thread_t *, picture_t *, picture_t * ); static void RenderLinear ( vout_thread_t *, picture_t *, picture_t *, int ); -static void RenderX ( vout_thread_t *, picture_t *, picture_t * ); +static void RenderX ( picture_t *, picture_t * ); static void MergeGeneric ( void *, const void *, const void *, size_t ); #if defined(CAN_COMPILE_C_ALTIVEC) @@ -113,20 +117,21 @@ static int FilterCallback ( vlc_object_t *, char const *, #define FILTER_CFG_PREFIX "sout-deinterlace-" -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" }; +static const char *const mode_list[] = { + "discard", "blend", "mean", "bob", "linear", "x" }; +static const char *const mode_list_text[] = { + N_("Discard"), N_("Blend"), N_("Mean"), N_("Bob"), N_("Linear"), "X" }; vlc_module_begin(); - set_description( _("Deinterlacing video filter") ); - set_shortname( _("Deinterlace" )); + set_description( N_("Deinterlacing video filter") ); + set_shortname( N_("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 ); + MODE_LONGTEXT, false ); change_string_list( mode_list, mode_list_text, 0 ); add_shortcut( "deinterlace" ); @@ -136,12 +141,12 @@ vlc_module_begin(); 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 ); + SOUT_MODE_LONGTEXT, false ); change_string_list( mode_list, mode_list_text, 0 ); set_callbacks( OpenFilter, CloseFilter ); vlc_module_end(); -static const char *ppsz_filter_options[] = { +static const char *const ppsz_filter_options[] = { "mode", NULL }; @@ -154,7 +159,7 @@ static const char *ppsz_filter_options[] = { struct vout_sys_t { int i_mode; /* Deinterlace mode */ - vlc_bool_t b_double_rate; /* Shall we double the framerate? */ + bool b_double_rate; /* Shall we double the framerate? */ mtime_t last_date; mtime_t next_date; @@ -188,10 +193,7 @@ static int Create( vlc_object_t *p_this ) /* Allocate structure */ p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); if( p_vout->p_sys == NULL ) - { - msg_Err( p_vout, "out of memory" ); return VLC_ENOMEM; - } p_vout->pf_init = Init; p_vout->pf_end = End; @@ -201,13 +203,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 = VLC_FALSE; + p_vout->p_sys->b_double_rate = 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 ); + vlc_mutex_init( &p_vout->p_sys->filter_lock ); #if defined(CAN_COMPILE_C_ALTIVEC) - if( p_vout->p_libvlc_global->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; @@ -215,7 +217,7 @@ static int Create( vlc_object_t *p_this ) else #endif #if defined(CAN_COMPILE_SSE) - if( p_vout->p_libvlc_global->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; @@ -223,7 +225,7 @@ static int Create( vlc_object_t *p_this ) else #endif #if defined(CAN_COMPILE_MMXEXT) - if( p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT ) + if( vlc_CPU() & CPU_CAPABILITY_MMXEXT ) { p_vout->p_sys->pf_merge = MergeMMXEXT; p_vout->p_sys->pf_end_merge = EndMMX; @@ -231,7 +233,7 @@ static int Create( vlc_object_t *p_this ) else #endif #if defined(CAN_COMPILE_3DNOW) - if( p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW ) + if( vlc_CPU() & CPU_CAPABILITY_3DNOW ) { p_vout->p_sys->pf_merge = Merge3DNow; p_vout->p_sys->pf_end_merge = End3DNow; @@ -272,35 +274,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 = VLC_FALSE; + p_vout->p_sys->b_double_rate = false; } else if( !strcmp( psz_method, "mean" ) ) { p_vout->p_sys->i_mode = DEINTERLACE_MEAN; - p_vout->p_sys->b_double_rate = VLC_FALSE; + p_vout->p_sys->b_double_rate = 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 = VLC_FALSE; + p_vout->p_sys->b_double_rate = 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 = VLC_TRUE; + p_vout->p_sys->b_double_rate = true; } else if( !strcmp( psz_method, "linear" ) ) { p_vout->p_sys->i_mode = DEINTERLACE_LINEAR; - p_vout->p_sys->b_double_rate = VLC_TRUE; + p_vout->p_sys->b_double_rate = true; } else if( !strcmp( psz_method, "x" ) ) { p_vout->p_sys->i_mode = DEINTERLACE_X; - p_vout->p_sys->b_double_rate = VLC_FALSE; + p_vout->p_sys->b_double_rate = false; } else { @@ -418,6 +420,11 @@ static void End( vout_thread_t *p_vout ) { int i_index; + DEL_PARENT_CALLBACKS( SendEventsToChild ); + + if( p_vout->p_sys->p_vout ) + DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); + /* Free the fake output buffers we allocated */ for( i_index = I_OUTPUTPICTURES ; i_index ; ) { @@ -426,13 +433,7 @@ static void End( vout_thread_t *p_vout ) } if( p_vout->p_sys->p_vout ) - { - DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - vlc_object_detach( p_vout->p_sys->p_vout ); - vout_Destroy( p_vout->p_sys->p_vout ); - } - - DEL_PARENT_CALLBACKS( SendEventsToChild ); + vout_CloseAndRelease( p_vout->p_sys->p_vout ); } /***************************************************************************** @@ -484,7 +485,7 @@ static void Render ( vout_thread_t *p_vout, picture_t *p_pic ) 0, 0, 0 ) ) == NULL ) { - if( p_vout->b_die || p_vout->b_error ) + if( !vlc_object_alive (p_vout) || p_vout->b_error ) { vlc_mutex_unlock( &p_vout->p_sys->filter_lock ); return; @@ -501,7 +502,7 @@ static void Render ( vout_thread_t *p_vout, picture_t *p_pic ) 0, 0, 0 ) ) == NULL ) { - if( p_vout->b_die || p_vout->b_error ) + if( !vlc_object_alive (p_vout) || p_vout->b_error ) { vout_DestroyPicture( p_vout->p_sys->p_vout, pp_outpic[0] ); vlc_mutex_unlock( &p_vout->p_sys->filter_lock ); @@ -532,16 +533,16 @@ static void Render ( vout_thread_t *p_vout, picture_t *p_pic ) break; case DEINTERLACE_BOB: - RenderBob( p_vout, pp_outpic[0], p_pic, 0 ); + RenderBob( p_vout, pp_outpic[0], p_pic, p_pic->b_top_field_first ? 0 : 1 ); vout_DisplayPicture( p_vout->p_sys->p_vout, pp_outpic[0] ); - RenderBob( p_vout, pp_outpic[1], p_pic, 1 ); + RenderBob( p_vout, pp_outpic[1], p_pic, p_pic->b_top_field_first ? 1 : 0 ); vout_DisplayPicture( p_vout->p_sys->p_vout, pp_outpic[1] ); break; case DEINTERLACE_LINEAR: - RenderLinear( p_vout, pp_outpic[0], p_pic, 0 ); + RenderLinear( p_vout, pp_outpic[0], p_pic, p_pic->b_top_field_first ? 0 : 1 ); vout_DisplayPicture( p_vout->p_sys->p_vout, pp_outpic[0] ); - RenderLinear( p_vout, pp_outpic[1], p_pic, 1 ); + RenderLinear( p_vout, pp_outpic[1], p_pic, p_pic->b_top_field_first ? 1 : 0 ); vout_DisplayPicture( p_vout->p_sys->p_vout, pp_outpic[1] ); break; @@ -556,7 +557,7 @@ static void Render ( vout_thread_t *p_vout, picture_t *p_pic ) break; case DEINTERLACE_X: - RenderX( p_vout, pp_outpic[0], p_pic ); + RenderX( pp_outpic[0], p_pic ); vout_DisplayPicture( p_vout->p_sys->p_vout, pp_outpic[0] ); break; } @@ -592,8 +593,7 @@ static void RenderDiscard( vout_thread_t *p_vout, for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, 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; @@ -608,11 +608,9 @@ static void RenderDiscard( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); 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 ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; p_in += i_increment; } @@ -621,8 +619,7 @@ static void RenderDiscard( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; p_in += i_increment; } @@ -661,8 +658,7 @@ 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_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_in += p_pic->p[i_plane].i_pitch; p_out += p_outpic->p[i_plane].i_pitch; } @@ -671,28 +667,24 @@ static void RenderBob( vout_thread_t *p_vout, for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); 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 ); + vlc_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_outpic->p[i_plane].i_pitch; } - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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_outpic->p[i_plane].i_pitch; - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); } break; @@ -700,8 +692,7 @@ 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_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_in += p_pic->p[i_plane].i_pitch; p_out += p_outpic->p[i_plane].i_pitch; } @@ -712,13 +703,11 @@ static void RenderBob( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); 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 ); + vlc_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_outpic->p[i_plane].i_pitch; @@ -728,24 +717,21 @@ static void RenderBob( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, 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_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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_outpic->p[i_plane].i_pitch; - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); } break; } @@ -776,8 +762,7 @@ 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_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_in += p_pic->p[i_plane].i_pitch; p_out += p_outpic->p[i_plane].i_pitch; } @@ -786,8 +771,7 @@ static void RenderLinear( vout_thread_t *p_vout, for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; @@ -798,16 +782,14 @@ static void RenderLinear( vout_thread_t *p_vout, 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 ); + vlc_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_outpic->p[i_plane].i_pitch; - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); } } EndMerge(); @@ -864,8 +846,7 @@ 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_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; /* Remaining lines: mean value */ @@ -881,8 +862,7 @@ static void RenderBlend( vout_thread_t *p_vout, case VLC_FOURCC('I','4','2','2'): /* First line: simple copy */ - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; /* Remaining lines: mean value */ @@ -1011,10 +991,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( (ptrdiff_t)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 ) { @@ -1166,7 +1146,7 @@ static inline int XDeint8x8DetectC( uint8_t *src, int i_src ) src += 2*i_src; } - return fc < 1 ? VLC_FALSE : VLC_TRUE; + return fc < 1 ? false : true; } #ifdef CAN_COMPILE_MMXEXT static inline int XDeint8x8DetectMMXEXT( uint8_t *src, int i_src ) @@ -1283,7 +1263,7 @@ static inline void XDeint8x8MergeMMXEXT( uint8_t *dst, int i_dst, uint8_t *src1, int i_src1, uint8_t *src2, int i_src2 ) { - static const uint64_t m_4 = I64C(0x0004000400040004); + static const uint64_t m_4 = INT64_C(0x0004000400040004); int y, x; /* Progressive */ @@ -1788,7 +1768,7 @@ static inline int XDeintNxNDetect( uint8_t *src, int i_src, fc++; } - return fc < 2 ? VLC_FALSE : VLC_TRUE; + return fc < 2 ? false : true; } static inline void XDeintNxNFrame( uint8_t *dst, int i_dst, @@ -1940,8 +1920,7 @@ static inline void XDeintBand8x8MMXEXT( uint8_t *dst, int i_dst, } #endif -static void RenderX( vout_thread_t *p_vout, - picture_t *p_outpic, picture_t *p_pic ) +static void RenderX( picture_t *p_outpic, picture_t *p_pic ) { int i_plane; @@ -1965,7 +1944,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_global->i_cpu & CPU_CAPABILITY_MMXEXT ) + if( vlc_CPU() & CPU_CAPABILITY_MMXEXT ) XDeintBand8x8MMXEXT( dst, i_dst, src, i_src, i_mbx, i_modx ); else #endif @@ -1992,7 +1971,7 @@ static void RenderX( vout_thread_t *p_vout, } #ifdef CAN_COMPILE_MMXEXT - if( p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT ) + if( vlc_CPU() & CPU_CAPABILITY_MMXEXT ) emms(); #endif } @@ -2003,6 +1982,7 @@ static void RenderX( vout_thread_t *p_vout, static int SendEvents( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *_p_vout ) { + VLC_UNUSED(p_this); VLC_UNUSED(oldval); vout_thread_t *p_vout = (vout_thread_t *)_p_vout; vlc_value_t sentval = newval; @@ -2029,6 +2009,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(psz_cmd); VLC_UNUSED(p_data); VLC_UNUSED(oldval); vout_thread_t * p_vout = (vout_thread_t *)p_this; int i_old_mode = p_vout->p_sys->i_mode; @@ -2079,11 +2060,11 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, } /* We need to kill the old vout */ - - DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - - vlc_object_detach( p_vout->p_sys->p_vout ); - vout_Destroy( p_vout->p_sys->p_vout ); + if( p_vout->p_sys->p_vout ) + { + DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); + vout_CloseAndRelease( p_vout->p_sys->p_vout ); + } /* Try to open a new video output */ p_vout->p_sys->p_vout = SpawnRealVout( p_vout ); @@ -2109,6 +2090,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(p_data); VLC_UNUSED(oldval); vout_thread_t *p_vout = (vout_thread_t *)p_this; var_Set( p_vout->p_sys->p_vout, psz_var, newval ); return VLC_SUCCESS; @@ -2124,12 +2106,9 @@ static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic ) picture_t *p_pic_dst; /* Request output picture */ - p_pic_dst = p_filter->pf_vout_buffer_new( p_filter ); + p_pic_dst = filter_NewPicture( p_filter ); if( p_pic_dst == NULL ) - { - msg_Warn( p_filter, "can't get output picture" ); - return NULL; - } + return p_pic; switch( p_vout->p_sys->i_mode ) { @@ -2138,7 +2117,7 @@ static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic ) 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 ); + picture_Release( p_pic_dst ); return p_pic; break; @@ -2155,7 +2134,7 @@ static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic ) 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 ); + picture_Release( p_pic_dst ); return p_pic; break; @@ -2168,17 +2147,14 @@ static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic ) break; case DEINTERLACE_X: - RenderX( p_vout, p_pic_dst, p_pic ); + RenderX( 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; + picture_CopyProperties( p_pic_dst, p_pic ); + p_pic_dst->b_progressive = true; - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return p_pic_dst; }