]> git.sesse.net Git - vlc/blobdiff - src/interface/main.c
* CPU detection under BeOS.
[vlc] / src / interface / main.c
index c5d701db50b8d9971056dc21515e13cb79244198..8c041df51d2718712c58d74c73bc3bee43dadca2 100644 (file)
@@ -3,8 +3,8 @@
  * Includes the main() function for vlc. Parses command line, start interface
  * and spawn threads.
  *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: main.c,v 1.102 2001/06/12 22:14:44 sam Exp $
+ * Copyright (C) 1998-2001 VideoLAN
+ * $Id: main.c,v 1.139 2001/12/17 03:38:21 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -41,7 +41,7 @@
 #   include "GNUgetopt/getopt.h"
 #endif
 
-#ifdef SYS_DARWIN1_3
+#ifdef SYS_DARWIN
 #   include <mach/mach.h>                               /* Altivec detection */
 #   include <mach/mach_error.h>       /* some day the header files||compiler *
                                                        will define it for us */
 #endif
 
 #ifndef WIN32
-#include <netinet/in.h>                               /* BSD: struct in_addr */
+#   include <netinet/in.h>                            /* BSD: struct in_addr */
 #endif
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#   include <unistd.h>
+#elif defined( _MSC_VER ) && defined( _WIN32 )
+#   include <io.h>
+#endif
+
+#ifdef HAVE_LOCALE_H
+#    include <locale.h>
 #endif
 
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdlib.h>                                  /* getenv(), strtol(),  */
 #include <string.h>                                            /* strerror() */
+#include <fcntl.h>                                       /* open(), O_WRONLY */
+#include <sys/stat.h>                                             /* S_IREAD */
 
-#include "config.h"
 #include "common.h"
 #include "debug.h"
+#include "intf_msg.h"
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"                                              /* TestCPU() */
@@ -71,7 +79,6 @@
 #include "stream_control.h"
 #include "input_ext-intf.h"
 
-#include "intf_msg.h"
 #include "intf_playlist.h"
 #include "interface.h"
 
 #   include "beos_specific.h"
 #endif
 
-#ifdef SYS_DARWIN1_3
+#ifdef SYS_DARWIN
 #   include "darwin_specific.h"
 #endif
 
-#include "netutils.h"                                 /* network_ChannelJoin */
+#ifdef WIN32
+#   include "win32_specific.h"
+#endif
 
-#include "main.h"
+#include "netutils.h"                                 /* network_ChannelJoin */
 
 /*****************************************************************************
  * Command line options constants. If something is changed here, be sure that
 #define OPT_STEREO              151
 #define OPT_MONO                152
 #define OPT_SPDIF               153
+#define OPT_VOLUME              154
+#define OPT_DESYNC              155
 
 #define OPT_NOVIDEO             160
 #define OPT_DISPLAY             161
 #define OPT_COLOR               164
 #define OPT_FULLSCREEN          165
 #define OPT_OVERLAY             166
+#define OPT_XVADAPTOR           167
+#define OPT_SMP                 168
+#define OPT_FILTER              169
 
 #define OPT_CHANNELS            170
 #define OPT_SERVER              171
 #define OPT_PORT                172
 #define OPT_BROADCAST           173
+#define OPT_CHANNELSERVER       174
 
 #define OPT_INPUT               180
 #define OPT_MOTION              181
 #define OPT_YUV                 183
 #define OPT_DOWNMIX             184
 #define OPT_IMDCT               185
+#define OPT_MEMCPY              186
+#define OPT_DVDCSS_METHOD       187
+#define OPT_DVDCSS_VERBOSE      188
 
 #define OPT_SYNCHRO             190
 #define OPT_WARNING             191
 #define OPT_VERSION             192
+#define OPT_STDOUT              193
+#define OPT_STATS               194
+
+#define OPT_MPEG_ADEC           200
 
 /* Usage fashion */
 #define USAGE                     0
 #define SHORT_HELP                1
 #define LONG_HELP                 2
 
-/* Needed for x86 CPU capabilities detection */
-#define cpuid( a )                 \
-    asm volatile ( "cpuid"         \
-                 : "=a" ( i_eax ), \
-                   "=b" ( i_ebx ), \
-                   "=c" ( i_ecx ), \
-                   "=d" ( i_edx )  \
-                 : "a"  ( a )      \
-                 : "cc" );
-
 /* Long options */
 static const struct option longopts[] =
 {
@@ -156,6 +168,8 @@ static const struct option longopts[] =
     /* Interface options */
     {   "intf",             1,          0,      'I' },
     {   "warning",          1,          0,      OPT_WARNING },
+    {   "stdout",           1,          0,      OPT_STDOUT },
+    {   "stats",            0,          0,      OPT_STATS },
 
     /* Audio options */
     {   "noaudio",          0,          0,      OPT_NOAUDIO },
@@ -165,6 +179,8 @@ static const struct option longopts[] =
     {   "spdif",            0,          0,      OPT_SPDIF },
     {   "downmix",          1,          0,      OPT_DOWNMIX },
     {   "imdct",            1,          0,      OPT_IMDCT },
+    {   "volume",           1,          0,      OPT_VOLUME },
+    {   "desync",           1,          0,      OPT_DESYNC },
 
     /* Video options */
     {   "novideo",          0,          0,      OPT_NOVIDEO },
@@ -179,6 +195,9 @@ static const struct option longopts[] =
     {   "yuv",              1,          0,      OPT_YUV },
     {   "fullscreen",       0,          0,      OPT_FULLSCREEN },
     {   "overlay",          0,          0,      OPT_OVERLAY },
+    {   "xvadaptor",        1,          0,      OPT_XVADAPTOR },
+    {   "smp",              1,          0,      OPT_SMP },
+    {   "filter",           1,          0,      OPT_FILTER },
 
     /* DVD options */
     {   "dvdtitle",         1,          0,      't' },
@@ -187,16 +206,21 @@ static const struct option longopts[] =
     {   "dvdaudio",         1,          0,      'a' },
     {   "dvdchannel",       1,          0,      'c' },
     {   "dvdsubtitle",      1,          0,      's' },
-    
+    {   "dvdcss-method",    1,          0,      OPT_DVDCSS_METHOD },
+    {   "dvdcss-verbose",   1,          0,      OPT_DVDCSS_VERBOSE },
+
     /* Input options */
     {   "input",            1,          0,      OPT_INPUT },
-    {   "server",           1,          0,      OPT_SERVER },
-    {   "port",             1,          0,      OPT_PORT },
-    {   "broadcast",        1,          0,      OPT_BROADCAST },
     {   "channels",         0,          0,      OPT_CHANNELS },
+    {   "channelserver",    1,          0,      OPT_CHANNELSERVER },
 
-    /* Synchro options */
+    /* Misc options */
     {   "synchro",          1,          0,      OPT_SYNCHRO },
+    {   "memcpy",           1,          0,      OPT_MEMCPY },
+
+    /* Decoder options */
+    {   "mpeg_adec",        1,          0,      OPT_MPEG_ADEC },
+
     {   0,                  0,          0,      0 }
 };
 
@@ -204,8 +228,7 @@ static const struct option longopts[] =
 static const char *psz_shortopts = "hHvgt:T:u:a:s:c:I:A:V:";
 
 /*****************************************************************************
- * Global variable program_data - these are the only ones, see main.h and
- * modules.h
+ * Global variables - these are the only ones, see main.h and modules.h
  *****************************************************************************/
 main_t        *p_main;
 module_bank_t *p_module_bank;
@@ -226,6 +249,10 @@ static void SimpleSignalHandler     ( int i_signal );
 static void FatalSignalHandler      ( int i_signal );
 static void InstructionSignalHandler( int i_signal );
 static int  CPUCapabilities         ( void );
+
+static int  RedirectSTDOUT          ( void );
+static void ShowConsole             ( void );
+
 static jmp_buf env;
 static int  i_illegal;
 
@@ -251,25 +278,47 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
     p_aout_bank   = &aout_bank;
     p_vout_bank   = &vout_bank;
 
+#ifdef ENABLE_NLS
     /*
-     * Test if our code is likely to run on this CPU 
+     * Support for getext
      */
-    p_main->i_cpu_capabilities = CPUCapabilities();
-    
-#if defined( __pentium__ ) || defined( __pentiumpro__ )
-    if( ! TestCPU( CPU_CAPABILITY_586 ) )
+#if defined( HAVE_LOCALE_H ) && defined( HAVE_LC_MESSAGES )
+    if( !setlocale( LC_MESSAGES, "" ) )
     {
-        fprintf( stderr, "error: this program needs a Pentium CPU,\n"
-                         "please try a version without Pentium support\n" );
-        return( 1 );
+        fprintf( stderr, "warning: unsupported locale.\n" );
     }
 #endif
 
+    if( !bindtextdomain( PACKAGE, LOCALEDIR ) )
+    {
+        fprintf( stderr, "warning: no domain %s in directory %s\n",
+                 PACKAGE, LOCALEDIR );
+    }
+
+    textdomain( PACKAGE );
+#endif
+
+    /*
+     * Initialize threads system
+     */
+    vlc_threads_init( );
+
+    /*
+     * Test if our code is likely to run on this CPU
+     */
+    p_main->i_cpu_capabilities = CPUCapabilities();
+
     /*
      * System specific initialization code
      */
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 )
     system_Init( &i_argc, ppsz_argv, ppsz_env );
+
+#elif defined( SYS_LINUX )
+#   ifdef DEBUG
+    /* Activate malloc checking routines to detect heap corruptions. */
+    main_PutIntVariable( "MALLOC_CHECK_", 2 );
+#   endif
 #endif
 
     /*
@@ -283,7 +332,7 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
         return( errno );
     }
 
-    intf_MsgImm( COPYRIGHT_MESSAGE );
+    intf_MsgImm( COPYRIGHT_MESSAGE "\n" );
 
     /*
      * Read configuration
@@ -294,6 +343,36 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
         return( errno );
     }
 
+    /*
+     * Redirect the standard output if required by the user, and on Win32 we
+     * also open a console to display the debug messages.
+     */
+    RedirectSTDOUT();
+
+    if( p_main->b_stats )
+    {
+        char          p_capabilities[200];
+        p_capabilities[0] = '\0';
+
+#define PRINT_CAPABILITY( capability, string )                              \
+        if( p_main->i_cpu_capabilities & capability )                       \
+        {                                                                   \
+            strncat( p_capabilities, string " ",                            \
+                     sizeof(p_capabilities) - strlen(p_capabilities) );     \
+            p_capabilities[sizeof(p_capabilities) - 1] = '\0';              \
+        }
+
+        PRINT_CAPABILITY( CPU_CAPABILITY_486, "486" );
+        PRINT_CAPABILITY( CPU_CAPABILITY_586, "586" );
+        PRINT_CAPABILITY( CPU_CAPABILITY_PPRO, "Pentium Pro" );
+        PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" );
+        PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
+        PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" );
+        PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" );
+        PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "Altivec" );
+        intf_StatMsg("info: CPU has capabilities %s", p_capabilities );
+    }
+
     /*
      * Initialize playlist and get commandline files
      */
@@ -318,6 +397,24 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
     aout_InitBank();
     vout_InitBank();
 
+    /*
+     * Choose the best memcpy module
+     */
+    p_main->p_memcpy_module = module_Need( MODULE_CAPABILITY_MEMCPY, NULL );
+
+    if( p_main->p_memcpy_module != NULL )
+    {
+#define f p_main->p_memcpy_module->p_functions->memcpy.functions.memcpy
+        p_main->fast_memcpy = f.fast_memcpy;
+#undef f
+    }
+    else
+    {
+        intf_ErrMsg( "intf error: no suitable memcpy module, "
+                     "using libc default" );
+        p_main->fast_memcpy = memcpy;
+    }
+
     /*
      * Initialize shared resources and libraries
      */
@@ -366,6 +463,14 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
         }
     }
 
+    /*
+     * Free memcpy module
+     */
+    if( p_main->p_memcpy_module != NULL )
+    {
+        module_Unneed( p_main->p_memcpy_module );
+    }
+
     /*
      * Free module, aout and vout banks
      */
@@ -381,16 +486,22 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
     /*
      * System specific cleaning code
      */
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN1_3 )
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 )
     system_End();
 #endif
 
+
     /*
      * Terminate messages interface and program
      */
     intf_Msg( "intf: program terminated" );
     intf_MsgDestroy();
 
+    /*
+     * Stop threads system
+     */
+    vlc_threads_end( );
+
     return 0;
 }
 
@@ -501,6 +612,8 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
     p_main->b_video     = 1;
 
     p_main->i_warning_level = 0;
+    p_main->b_stats = 0;
+    p_main->i_desync = 0; /* No desynchronization by default */
 
     p_main->p_channel = NULL;
 
@@ -518,7 +631,7 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
         }
     }
 
-#ifdef SYS_DARWIN1_3
+#ifdef SYS_DARWIN
     /* When vlc.app is run by double clicking in Mac OS X, the 2nd arg
      * is the PSN - process serial number (a unique PID-ish thingie)
      * still ok for real Darwin & when run from command line */
@@ -547,15 +660,48 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
         {
         /* General/common options */
         case 'h':                                              /* -h, --help */
+            ShowConsole();
+            RedirectSTDOUT();
             Usage( SHORT_HELP );
+#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
+            if( strcmp( "", main_GetPszVariable( INTF_STDOUT_VAR,
+                                                 INTF_STDOUT_DEFAULT ) ) == 0 )
+            {
+                /* No stdout redirection has been asked for */
+                intf_MsgImm( "\nPress the RETURN key to continue..." );
+                getchar();
+            }
+#endif
             return( -1 );
             break;
         case 'H':                                          /* -H, --longhelp */
+            ShowConsole();
+            RedirectSTDOUT();
             Usage( LONG_HELP );
+#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
+            if( strcmp( "", main_GetPszVariable( INTF_STDOUT_VAR,
+                                                 INTF_STDOUT_DEFAULT ) ) == 0 )
+            {
+                /* No stdout redirection has been asked for */
+                intf_MsgImm( "\nPress the RETURN key to continue..." );
+                getchar();
+            }
+#endif
             return( -1 );
             break;
         case OPT_VERSION:                                       /* --version */
+            ShowConsole();
+            RedirectSTDOUT();
             Version();
+#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
+            if( strcmp( "", main_GetPszVariable( INTF_STDOUT_VAR,
+                                                 INTF_STDOUT_DEFAULT ) ) == 0 )
+            {
+                /* No stdout redirection has been asked for */
+                intf_MsgImm( "\nPress the RETURN key to continue..." );
+                getchar();
+            }
+#endif
             return( -1 );
             break;
         case 'v':                                           /* -v, --verbose */
@@ -571,6 +717,14 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
             p_main->i_warning_level = atoi(optarg);
             break;
 
+        case OPT_STDOUT:                                         /* --stdout */
+            main_PutPszVariable( INTF_STDOUT_VAR, optarg );
+            break;
+
+        case OPT_STATS:
+            p_main->b_stats = 1;
+            break;
+
         /* Audio options */
         case OPT_NOAUDIO:                                       /* --noaudio */
             p_main->b_audio = 0;
@@ -587,12 +741,18 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
         case OPT_SPDIF:                                           /* --spdif */
             main_PutIntVariable( AOUT_SPDIF_VAR, 1 );
             break;
-       case OPT_DOWNMIX:                                       /* --downmix */
+        case OPT_DOWNMIX:                                       /* --downmix */
             main_PutPszVariable( DOWNMIX_METHOD_VAR, optarg );
             break;
         case OPT_IMDCT:                                           /* --imdct */
             main_PutPszVariable( IMDCT_METHOD_VAR, optarg );
             break;
+        case OPT_VOLUME:                                         /* --volume */
+            main_PutIntVariable( AOUT_VOLUME_VAR, atoi(optarg) );
+            break;
+        case OPT_DESYNC:                                         /* --desync */
+            p_main->i_desync = atoi(optarg);
+            break;
 
         /* Video options */
         case OPT_NOVIDEO:                                       /* --novideo */
@@ -622,6 +782,9 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
         case OPT_OVERLAY:                                       /* --overlay */
             main_PutIntVariable( VOUT_OVERLAY_VAR, 1 );
             break;
+        case OPT_XVADAPTOR:                                   /* --xvadaptor */
+            main_PutIntVariable( VOUT_XVADAPTOR_VAR, atoi(optarg) );
+            break;
         case OPT_MOTION:                                         /* --motion */
             main_PutPszVariable( MOTION_METHOD_VAR, optarg );
             break;
@@ -631,18 +794,24 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
         case OPT_YUV:                                               /* --yuv */
             main_PutPszVariable( YUV_METHOD_VAR, optarg );
             break;
+        case OPT_SMP:                                               /* --smp */
+            main_PutIntVariable( VDEC_SMP_VAR, atoi(optarg) );
+            break;
+        case OPT_FILTER:                                         /* --filter */
+            main_PutPszVariable( VOUT_FILTER_VAR, optarg );
+            break;
 
         /* DVD options */
-        case 't':
+        case 't':                                              /* --dvdtitle */
             main_PutIntVariable( INPUT_TITLE_VAR, atoi(optarg) );
             break;
-        case 'T':
+        case 'T':                                            /* --dvdchapter */
             main_PutIntVariable( INPUT_CHAPTER_VAR, atoi(optarg) );
             break;
-        case 'u':
+        case 'u':                                              /* --dvdangle */
             main_PutIntVariable( INPUT_ANGLE_VAR, atoi(optarg) );
             break;
-        case 'a':
+        case 'a':                                              /* --dvdaudio */
             if ( ! strcmp(optarg, "ac3") )
                 main_PutIntVariable( INPUT_AUDIO_VAR, REQUESTED_AC3 );
             else if ( ! strcmp(optarg, "lpcm") )
@@ -652,12 +821,18 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
             else
                 main_PutIntVariable( INPUT_AUDIO_VAR, REQUESTED_NOAUDIO );
             break;
-        case 'c':
+        case 'c':                                            /* --dvdchannel */
             main_PutIntVariable( INPUT_CHANNEL_VAR, atoi(optarg) );
             break;
-        case 's':
+        case 's':                                           /* --dvdsubtitle */
             main_PutIntVariable( INPUT_SUBTITLE_VAR, atoi(optarg) );
             break;
+        case OPT_DVDCSS_METHOD:                           /* --dvdcss-method */
+            main_PutPszVariable( "DVDCSS_METHOD", optarg );
+            break;
+        case OPT_DVDCSS_VERBOSE:                         /* --dvdcss-verbose */
+            main_PutPszVariable( "DVDCSS_VERBOSE", optarg );
+            break;
 
         /* Input options */
         case OPT_INPUT:                                           /* --input */
@@ -666,28 +841,40 @@ static int GetConfiguration( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] )
         case OPT_CHANNELS:                                     /* --channels */
             main_PutIntVariable( INPUT_NETWORK_CHANNEL_VAR, 1 );
             break;
-        case OPT_SERVER:                                         /* --server */
-            main_PutPszVariable( INPUT_SERVER_VAR, optarg );
+        case OPT_CHANNELSERVER:                           /* --channelserver */
+            main_PutPszVariable( INPUT_CHANNEL_SERVER_VAR, optarg );
             break;
-        case OPT_PORT:                                             /* --port */
-            main_PutPszVariable( INPUT_PORT_VAR, optarg );
+
+        /* Misc options */
+        case OPT_SYNCHRO:
+            main_PutPszVariable( VPAR_SYNCHRO_VAR, optarg );
             break;
-        case OPT_BROADCAST:                                   /* --broadcast */
-            main_PutIntVariable( INPUT_BROADCAST_VAR, 1 );
-            main_PutPszVariable( INPUT_BCAST_ADDR_VAR, optarg );
+        case OPT_MEMCPY:
+            main_PutPszVariable( MEMCPY_METHOD_VAR, optarg );
             break;
 
-        /* Synchro options */
-        case OPT_SYNCHRO:                                      
-            main_PutPszVariable( VPAR_SYNCHRO_VAR, optarg );
+        /* Decoder options */
+        case OPT_MPEG_ADEC:
+            main_PutPszVariable( ADEC_MPEG_VAR, optarg );
             break;
-            
+
         /* Internal error: unknown option */
         case '?':
         default:
+            ShowConsole();
+            RedirectSTDOUT();
             intf_ErrMsg( "intf error: unknown option `%s'",
-                         ppsz_argv[optind - 1] );
+                         ppsz_argv[optind] );
             Usage( USAGE );
+#ifdef WIN32        /* Pause the console because it's destroyed when we exit */
+            if( strcmp( "", main_GetPszVariable( INTF_STDOUT_VAR,
+                                                 INTF_STDOUT_DEFAULT ) ) == 0 )
+            {
+                /* No stdout redirection has been asked for */
+                intf_MsgImm( "\nPress the RETURN key to continue..." );
+                getchar();
+            }
+#endif
             return( EINVAL );
             break;
         }
@@ -742,6 +929,8 @@ static void Usage( int i_fashion )
     intf_MsgImm( "\nOptions:"
           "\n  -I, --intf <module>            \tinterface method"
           "\n  -v, --verbose                  \tverbose mode (cumulative)"
+          "\n      --stdout <filename>        \tredirect console stdout"
+          "\n      --memcpy <module>          \tmemcpy method"
           "\n"
           "\n      --noaudio                  \tdisable audio"
           "\n  -A, --aout <module>            \taudio output method"
@@ -749,6 +938,8 @@ static void Usage( int i_fashion )
           "\n      --spdif                    \tAC3 pass-through mode"
           "\n      --downmix <module>         \tAC3 downmix method"
           "\n      --imdct <module>           \tAC3 IMDCT method"
+          "\n      --volume [0..1024]         \tVLC output volume"
+          "\n      --desync <time in ms>      \tCompensate desynchronization of the audio"
           "\n"
           "\n      --novideo                  \tdisable video"
           "\n  -V, --vout <module>            \tvideo output method"
@@ -757,11 +948,14 @@ static void Usage( int i_fashion )
           "\n  -g, --grayscale                \tgrayscale output"
           "\n      --fullscreen               \tfullscreen output"
           "\n      --overlay                  \taccelerated display"
+          "\n      --xvadaptor <adaptor>      \tXVideo adaptor"
           "\n      --color                    \tcolor output"
           "\n      --motion <module>          \tmotion compensation method"
           "\n      --idct <module>            \tIDCT method"
           "\n      --yuv <module>             \tYUV method"
           "\n      --synchro <type>           \tforce synchro algorithm"
+          "\n      --smp <number of threads>  \tuse several processors"
+          "\n      --filter <module>          \tvideo filter module"
           "\n"
           "\n  -t, --dvdtitle <num>           \tchoose DVD title"
           "\n  -T, --dvdchapter <num>         \tchoose DVD chapter"
@@ -769,25 +963,38 @@ static void Usage( int i_fashion )
           "\n  -a, --dvdaudio <type>          \tchoose DVD audio type"
           "\n  -c, --dvdchannel <channel>     \tchoose DVD audio channel"
           "\n  -s, --dvdsubtitle <channel>    \tchoose DVD subtitle channel"
+          "\n      --dvdcss-method <method>   \tselect dvdcss decryption method"
+          "\n      --dvdcss-verbose <level>   \tselect dvdcss verbose level"
           "\n"
           "\n      --input                    \tinput method"
           "\n      --channels                 \tenable channels"
-          "\n      --server <host>            \tvideo server address"
-          "\n      --port <port>              \tvideo server port"
-          "\n      --broadcast                \tlisten to a broadcast"
+          "\n      --channelserver <host>     \tchannel server address"
+          "\n"
+          "\n      --mpeg_adec <builtin|mad>  \tchoose audio decoder"
           "\n"
           "\n  -h, --help                     \tprint help and exit"
           "\n  -H, --longhelp                 \tprint long help and exit"
-          "\n      --version                  \toutput version information and exit" );
+          "\n      --version                  \toutput version information and exit"
+          "\n\nPlaylist items :"
+          "\n  *.mpg, *.vob                   \tPlain MPEG-1/2 files"
+          "\n  dvd:<device>[@<raw device>]    \tDVD device"
+          "\n  vcd:<device>                   \tVCD device"
+          "\n  udpstream:[<server>[:<server port>]][@[<bind address>][:<bind port>]]"
+          "\n                                 \tUDP stream sent by VLS"
+          "\n  vlc:loop                       \tLoop execution of the playlist"
+          "\n  vlc:pause                      \tPause execution of playlist items"
+          "\n  vlc:quit                       \tQuit VLC");
 
     if( i_fashion == SHORT_HELP )
         return;
 
     /* Interface parameters */
     intf_MsgImm( "\nInterface parameters:"
-        "\n  " INTF_METHOD_VAR "=<method name>          \tinterface method"
-        "\n  " INTF_INIT_SCRIPT_VAR "=<filename>               \tinitialization script"
-        "\n  " INTF_CHANNELS_VAR "=<filename>            \tchannels list" );
+        "\n  " INTF_METHOD_VAR "=<method name>        \tinterface method"
+        "\n  " INTF_INIT_SCRIPT_VAR "=<filename>              \tinitialization script"
+        "\n  " INTF_CHANNELS_VAR "=<filename>         \tchannels list"
+        "\n  " INTF_STDOUT_VAR "=<filename>           \tredirect console stdout"
+        "\n  " MEMCPY_METHOD_VAR "=<method name>      \tmemcpy method" );
 
     /* Audio parameters */
     intf_MsgImm( "\nAudio parameters:"
@@ -797,7 +1004,8 @@ static void Usage( int i_fashion )
         "\n  " AOUT_SPDIF_VAR "={1|0}                 \tAC3 pass-through mode"
         "\n  " DOWNMIX_METHOD_VAR "=<method name>     \tAC3 downmix method"
         "\n  " IMDCT_METHOD_VAR "=<method name>       \tAC3 IMDCT method"
-        "\n  " AOUT_RATE_VAR "=<rate>             \toutput rate" );
+        "\n  " AOUT_VOLUME_VAR "=[0..1024]            \tVLC output volume"
+        "\n  " AOUT_RATE_VAR "=<rate>                 \toutput rate" );
 
     /* Video parameters */
     intf_MsgImm( "\nVideo parameters:"
@@ -809,30 +1017,33 @@ static void Usage( int i_fashion )
         "\n  " VOUT_GRAYSCALE_VAR "={1|0}             \tgrayscale or color output"
         "\n  " VOUT_FULLSCREEN_VAR "={1|0}            \tfullscreen"
         "\n  " VOUT_OVERLAY_VAR "={1|0}               \toverlay"
+        "\n  " VOUT_XVADAPTOR_VAR "=<adaptor>         \tXVideo adaptor"
         "\n  " MOTION_METHOD_VAR "=<method name>      \tmotion compensation method"
         "\n  " IDCT_METHOD_VAR "=<method name>        \tIDCT method"
         "\n  " YUV_METHOD_VAR "=<method name>         \tYUV method"
-        "\n  " VPAR_SYNCHRO_VAR "={I|I+|IP|IP+|IPB}   \tsynchro algorithm" );
+        "\n  " VPAR_SYNCHRO_VAR "={I|I+|IP|IP+|IPB}   \tsynchro algorithm"
+        "\n  " VDEC_SMP_VAR "=<number of threads>     \tuse several processors"
+        "\n  " VOUT_FILTER_VAR "=<method name>        \tvideo filter method" );
 
     /* DVD parameters */
     intf_MsgImm( "\nDVD parameters:"
-        "\n  " INPUT_DVD_DEVICE_VAR "=<device>           \tDVD device"
-        "\n  " INPUT_TITLE_VAR "=<title>             \ttitle number"
-        "\n  " INPUT_CHAPTER_VAR "=<chapter>         \tchapter number"
-        "\n  " INPUT_ANGLE_VAR "=<angle>             \tangle number"
-        "\n  " INPUT_AUDIO_VAR "={ac3|lpcm|mpeg|off} \taudio type"
-        "\n  " INPUT_CHANNEL_VAR "=[0-15]            \taudio channel"
-        "\n  " INPUT_SUBTITLE_VAR "=[0-31]           \tsubtitle channel" );
+        "\n  " INPUT_DVD_DEVICE_VAR "=<device>        \tDVD device"
+        "\n  " INPUT_TITLE_VAR "=<title>              \ttitle number"
+        "\n  " INPUT_CHAPTER_VAR "=<chapter>          \tchapter number"
+        "\n  " INPUT_ANGLE_VAR "=<angle>              \tangle number"
+        "\n  " INPUT_AUDIO_VAR "={ac3|lpcm|mpeg|off}  \taudio type"
+        "\n  " INPUT_CHANNEL_VAR "=[0-15]             \taudio channel"
+        "\n  " INPUT_SUBTITLE_VAR "=[0-31]            \tsubtitle channel" );
 
     /* Input parameters */
     intf_MsgImm( "\nInput parameters:"
-        "\n  " INPUT_SERVER_VAR "=<hostname>         \tvideo server"
-        "\n  " INPUT_PORT_VAR "=<port>               \tvideo server port"
-        "\n  " INPUT_IFACE_VAR "=<interface>         \tnetwork interface"
-        "\n  " INPUT_BCAST_ADDR_VAR "=<addr>         \tbroadcast mode"
-        "\n  " INPUT_CHANNEL_SERVER_VAR "=<hostname> \tchannel server"
-        "\n  " INPUT_CHANNEL_PORT_VAR "=<port>       \tchannel server port" );
+        "\n  " INPUT_IFACE_VAR "=<interface>          \tnetwork interface"
+        "\n  " INPUT_CHANNEL_SERVER_VAR "=<hostname>  \tchannel server"
+        "\n  " INPUT_CHANNEL_PORT_VAR "=<port>        \tchannel server port" );
 
+    /* Decoder parameters */
+    intf_MsgImm( "\nDecoder parameters:"
+        "\n  " ADEC_MPEG_VAR "=<builtin|mad>          \taudio decoder" );
 }
 
 /*****************************************************************************
@@ -922,11 +1133,11 @@ static void InstructionSignalHandler( int i_signal )
      * to an interface having been destroyed */
 
     /* Acknowledge the signal received */
-    fprintf( stderr, "illegal instruction : optimization disabled\n" );
-
     i_illegal = 1;
-    
+
+#ifdef HAVE_SIGRELSE
     sigrelse( i_signal );
+#endif
     longjmp( env, 1 );
 }
 
@@ -939,14 +1150,7 @@ static int CPUCapabilities( void )
 {
     volatile int i_capabilities = CPU_CAPABILITY_NONE;
 
-#if defined( SYS_BEOS )
-    i_capabilities |= CPU_CAPABILITY_486
-                      | CPU_CAPABILITY_586
-                      | CPU_CAPABILITY_MMX;
-
-    return( i_capabilities );
-
-#elif defined( SYS_DARWIN1_3 )
+#if defined( SYS_DARWIN )
     struct host_basic_info hi;
     kern_return_t          ret;
     host_name_port_t       host;
@@ -954,6 +1158,8 @@ static int CPUCapabilities( void )
     int i_size;
     char *psz_name, *psz_subname;
 
+    i_capabilities |= CPU_CAPABILITY_FPU;
+
     /* Should 'never' fail? */
     host = mach_host_self();
 
@@ -962,14 +1168,14 @@ static int CPUCapabilities( void )
 
     if( ret != KERN_SUCCESS )
     {
-        intf_ErrMsg( "error: couldn't get CPU information" );
+        fprintf( stderr, "error: couldn't get CPU information\n" );
         return( i_capabilities );
     }
 
     slot_name( hi.cpu_type, hi.cpu_subtype, &psz_name, &psz_subname );
     /* FIXME: need better way to detect newer proccessors.
      * could do strncmp(a,b,5), but that's real ugly */
-    if( strcmp(psz_name, "ppc7400") || strcmp(psz_name, "ppc7450") )
+    if( !strcmp(psz_name, "ppc7400") || !strcmp(psz_name, "ppc7450") )
     {
         i_capabilities |= CPU_CAPABILITY_ALTIVEC;
     }
@@ -980,25 +1186,43 @@ static int CPUCapabilities( void )
     volatile unsigned int  i_eax, i_ebx, i_ecx, i_edx;
     volatile boolean_t     b_amd;
 
-    signal( SIGILL,  InstructionSignalHandler );
-    
+    /* Needed for x86 CPU capabilities detection */
+#   define cpuid( a )                      \
+        asm volatile ( "pushl %%ebx\n\t"   \
+                       "cpuid\n\t"         \
+                       "movl %%ebx,%1\n\t" \
+                       "popl %%ebx\n\t"    \
+                     : "=a" ( i_eax ),     \
+                       "=r" ( i_ebx ),     \
+                       "=c" ( i_ecx ),     \
+                       "=d" ( i_edx )      \
+                     : "a"  ( a )          \
+                     : "cc" );
+
+    i_capabilities |= CPU_CAPABILITY_FPU;
+
+    signal( SIGILL, InstructionSignalHandler );
+
     /* test for a 486 CPU */
-    asm volatile ( "pushfl\n\t"
+    asm volatile ( "pushl %%ebx\n\t"
+                   "pushfl\n\t"
                    "popl %%eax\n\t"
                    "movl %%eax, %%ebx\n\t"
                    "xorl $0x200000, %%eax\n\t"
                    "pushl %%eax\n\t"
                    "popfl\n\t"
                    "pushfl\n\t"
-                   "popl %%eax"
+                   "popl %%eax\n\t"
+                   "movl %%ebx,%1\n\t"
+                   "popl %%ebx\n\t"
                  : "=a" ( i_eax ),
-                   "=b" ( i_ebx )
+                   "=r" ( i_ebx )
                  :
                  : "cc" );
 
     if( i_eax == i_ebx )
     {
-        signal( SIGILL, NULL );     
+        signal( SIGILL, NULL );
         return( i_capabilities );
     }
 
@@ -1009,7 +1233,7 @@ static int CPUCapabilities( void )
 
     if( !i_eax )
     {
-        signal( SIGILL, NULL );     
+        signal( SIGILL, NULL );
         return( i_capabilities );
     }
 
@@ -1025,7 +1249,7 @@ static int CPUCapabilities( void )
 
     if( ! (i_edx & 0x00800000) )
     {
-        signal( SIGILL, NULL );     
+        signal( SIGILL, NULL );
         return( i_capabilities );
     }
 
@@ -1035,6 +1259,7 @@ static int CPUCapabilities( void )
     {
         i_capabilities |= CPU_CAPABILITY_MMXEXT;
 
+#ifdef CAN_COMPILE_SSE
         /* We test if OS support the SSE instructions */
         i_illegal = 0;
         if( setjmp( env ) == 0 )
@@ -1047,20 +1272,31 @@ static int CPUCapabilities( void )
         {
             i_capabilities |= CPU_CAPABILITY_SSE;
         }
+        else
+        {
+            fprintf( stderr, "warning: your OS doesn't have support for "
+                             "SSE instructions, "
+                             "some optimizations\nwill be disabled\n" );
+#ifdef SYS_LINUX
+            fprintf( stderr, "(you will need Linux kernel 2.4.x or later)\n" );
+#endif
+        }
+#endif
     }
-    
+
     /* test for additional capabilities */
     cpuid( 0x80000000 );
 
     if( i_eax < 0x80000001 )
     {
-        signal( SIGILL, NULL );     
+        signal( SIGILL, NULL );
         return( i_capabilities );
     }
 
     /* list these additional capabilities */
     cpuid( 0x80000001 );
 
+#ifdef CAN_COMPILE_3DNOW
     if( i_edx & 0x80000000 )
     {
         i_illegal = 0;
@@ -1070,18 +1306,45 @@ static int CPUCapabilities( void )
             __asm__ __volatile__ ( "pfadd %%mm0,%%mm0\n" "femms\n" : : );
         }
 
-        if( i_illegal == 0 ) 
+        if( i_illegal == 0 )
         {
             i_capabilities |= CPU_CAPABILITY_3DNOW;
         }
     }
+#endif
 
     if( b_amd && ( i_edx & 0x00400000 ) )
     {
         i_capabilities |= CPU_CAPABILITY_MMXEXT;
     }
 
-    signal( SIGILL, NULL );     
+    signal( SIGILL, NULL );
+    return( i_capabilities );
+
+#elif defined( __powerpc__ )
+
+    i_capabilities |= CPU_CAPABILITY_FPU;
+
+    /* Test for Altivec */
+    signal( SIGILL, InstructionSignalHandler );
+
+#ifdef CAN_COMPILE_ALTIVEC
+    i_illegal = 0;
+    if( setjmp( env ) == 0 )
+    {
+        asm volatile ("mtspr 256, %0\n\t"
+                      "vand %%v0, %%v0, %%v0"
+                      :
+                      : "r" (-1));
+    }
+
+    if( i_illegal == 0 )
+    {
+        i_capabilities |= CPU_CAPABILITY_ALTIVEC;
+    }
+#endif
+
+    signal( SIGILL, NULL );
     return( i_capabilities );
 
 #else
@@ -1091,3 +1354,62 @@ static int CPUCapabilities( void )
 #endif
 }
 
+/*****************************************************************************
+ * RedirectSTDOUT: redirect stdout and stderr to a file
+ *****************************************************************************
+ * This function will redirect stdout and stderr to a file if the user has
+ * specified so.
+ *****************************************************************************/
+static int RedirectSTDOUT( void )
+{
+    int  i_fd;
+    char *psz_filename;
+
+    psz_filename = main_GetPszVariable( INTF_STDOUT_VAR, INTF_STDOUT_DEFAULT );
+
+    if( *psz_filename )
+    {
+        ShowConsole();
+        i_fd = open( psz_filename, O_CREAT | O_TRUNC | O_RDWR,
+                                   S_IREAD | S_IWRITE );
+        if( dup2( i_fd, fileno(stdout) ) == -1 )
+        {
+            intf_ErrMsg( "warning: unable to redirect stdout" );
+        }
+
+        if( dup2( i_fd, fileno(stderr) ) == -1 )
+        {
+            intf_ErrMsg( "warning: unable to redirect stderr" );
+        }
+
+        close( i_fd );
+    }
+    else
+    {
+        /* No stdout redirection has been asked so open a console */
+        if( p_main->i_warning_level )
+        {
+            ShowConsole();
+        }
+
+    }
+
+    return 0;
+}
+
+/*****************************************************************************
+ * ShowConsole: On Win32, create an output console for debug messages
+ *****************************************************************************
+ * This function is usefull only on Win32.
+ *****************************************************************************/
+static void ShowConsole( void )
+{
+#ifdef WIN32 /*  */
+    AllocConsole();
+    freopen( "CONOUT$", "w", stdout );
+    freopen( "CONOUT$", "w", stderr );
+    freopen( "CONIN$", "r", stdin );
+#endif
+    return;
+}
+