Removes trailing spaces. Removes tabs.

[vlc] / modules / video_filter / deinterlace.c

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 3815825efc79a114139458f0e4418f999f5b5d25..27919cebd9ff3d709527bb528c667e8e5f3d198c 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -25,12 +25,10 @@
  * Preamble
  *****************************************************************************/
 #include <errno.h>
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/sout.h>
+#include <vlc_vout.h>
+#include <vlc_sout.h>
 #include "vlc_filter.h"
 
 #ifdef HAVE_ALTIVEC_H
@@ -113,13 +111,13 @@ static int FilterCallback ( vlc_object_t *, char const *,
 
 #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"),
+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 );
@@ -207,7 +205,7 @@ static int Create( vlc_object_t *p_this )
     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;
@@ -215,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;
@@ -223,7 +221,7 @@ static int Create( vlc_object_t *p_this )
     else
 #endif
 #if defined(CAN_COMPILE_MMXEXT)
-    if( p_vout->p_libvlc->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 +229,7 @@ static int Create( vlc_object_t *p_this )
     else
 #endif
 #if defined(CAN_COMPILE_3DNOW)
-    if( p_vout->p_libvlc->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;
@@ -369,7 +367,8 @@ 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" );
 
@@ -591,7 +590,7 @@ 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_outpic->p[i_plane].i_pitch;
@@ -607,10 +606,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_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_out += p_outpic->p[i_plane].i_pitch;
                     p_in += i_increment;
@@ -620,7 +619,7 @@ 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_outpic->p[i_plane].i_pitch;
                     p_in += i_increment;
@@ -660,7 +659,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_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_outpic->p[i_plane].i_pitch;
@@ -670,19 +669,19 @@ 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_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_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 */
@@ -690,7 +689,7 @@ static void RenderBob( vout_thread_t *p_vout,
                 {
                     p_in += 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 );
                 }
                 break;
@@ -699,7 +698,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_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_outpic->p[i_plane].i_pitch;
@@ -711,12 +710,12 @@ 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_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;
@@ -727,7 +726,7 @@ 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_outpic->p[i_plane].i_pitch;
@@ -735,7 +734,7 @@ static void RenderBob( vout_thread_t *p_vout,
                     }
                 }
 
-                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 */
@@ -743,7 +742,7 @@ static void RenderBob( vout_thread_t *p_vout,
                 {
                     p_in += 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 );
                 }
                 break;
@@ -775,7 +774,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_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_outpic->p[i_plane].i_pitch;
@@ -785,7 +784,7 @@ static void RenderLinear( 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_outpic->p[i_plane].i_pitch;
@@ -797,7 +796,7 @@ static void RenderLinear( vout_thread_t *p_vout,
             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 */
@@ -805,7 +804,7 @@ static void RenderLinear( vout_thread_t *p_vout,
         {
             p_in += 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 );
         }
     }
@@ -863,7 +862,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_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_outpic->p[i_plane].i_pitch;
 
@@ -880,7 +879,7 @@ static void RenderBlend( vout_thread_t *p_vout,
 
             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_outpic->p[i_plane].i_pitch;
 
@@ -1010,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( (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 )
     {
@@ -1964,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
@@ -1991,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
 }
@@ -2205,7 +2204,7 @@ static int OpenFilter( vlc_object_t *p_this )
     p_filter->p_sys = (filter_sys_t *)p_vout;
     p_vout->render.i_chroma = p_filter->fmt_in.video.i_chroma;
 
-    sout_CfgParse( p_filter, FILTER_CFG_PREFIX, ppsz_filter_options,
+    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 );