* 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.111 2001/08/07 02:48:25 sam Exp $
+ * Copyright (C) 1998-2001 VideoLAN
+ * $Id: main.c,v 1.142 2002/01/04 14:01:35 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "defs.h"
-
#include <signal.h> /* SIGHUP, SIGINT, SIGKILL */
#include <stdio.h> /* sprintf() */
#include <setjmp.h> /* longjmp, setjmp */
+#include <videolan/vlc.h>
+
#ifdef HAVE_GETOPT_LONG
# ifdef HAVE_GETOPT_H
# include <getopt.h> /* getopt() */
# 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 "threads.h"
-#include "mtime.h"
-#include "tests.h" /* TestCPU() */
-#include "modules.h"
+#include "netutils.h" /* network_ChannelJoin */
#include "stream_control.h"
#include "input_ext-intf.h"
-#include "intf_msg.h"
#include "intf_playlist.h"
#include "interface.h"
#include "video.h"
#include "video_output.h"
-#ifdef SYS_BEOS
-# include "beos_specific.h"
-#endif
-
-#ifdef SYS_DARWIN
-# include "darwin_specific.h"
-#endif
-
-#include "netutils.h" /* network_ChannelJoin */
-
-#include "main.h"
+#include "debug.h"
/*****************************************************************************
* 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_SMP 167
+#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
+
+#define OPT_NOMMX 201
+#define OPT_NO3DNOW 202
+#define OPT_NOMMXEXT 203
+#define OPT_NOSSE 204
+#define OPT_NOALTIVEC 205
/* 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[] =
{
{ "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 },
{ "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 },
{ "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' },
{ "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 },
+
+ /* CPU options */
+ { "nommx", 0, 0, OPT_NOMMX },
+ { "no3dnow", 0, 0, OPT_NO3DNOW },
+ { "nommxext", 0, 0, OPT_NOMMXEXT },
+ { "nosse", 0, 0, OPT_NOSSE },
+ { "noaltivec", 0, 0, OPT_NOALTIVEC },
+
{ 0, 0, 0, 0 }
};
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;
static void InitSignalHandler ( void );
static void SimpleSignalHandler ( int i_signal );
static void FatalSignalHandler ( int i_signal );
-static void InstructionSignalHandler( int i_signal );
-static int CPUCapabilities ( void );
+static void IllegalSignalHandler ( int i_signal );
+static u32 CPUCapabilities ( void );
static int RedirectSTDOUT ( void );
static void ShowConsole ( void );
static jmp_buf env;
-static int i_illegal;
+static int i_illegal;
+static char *psz_capability;
/*****************************************************************************
* main: parse command line, start interface and spawn threads
p_aout_bank = &aout_bank;
p_vout_bank = &vout_bank;
+#ifdef ENABLE_NLS
+ /*
+ * Support for getext
+ */
+#if defined( HAVE_LOCALE_H ) && defined( HAVE_LC_MESSAGES )
+ if( !setlocale( LC_MESSAGES, "" ) )
+ {
+ 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
+ * Test if our code is likely to run on this CPU
*/
p_main->i_cpu_capabilities = CPUCapabilities();
-
-#if defined( __pentium__ ) || defined( __pentiumpro__ )
- if( ! TestCPU( CPU_CAPABILITY_586 ) )
- {
- fprintf( stderr, "error: this program needs a Pentium CPU,\n"
- "please try a version without Pentium support\n" );
- return( 1 );
- }
-#endif
/*
* System specific initialization code
*/
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 )
system_Init( &i_argc, ppsz_argv, ppsz_env );
-#elif defined( WIN32 )
- _fmode = _O_BINARY; /* sets the default file-translation mode on Win32 */
+
+#elif defined( SYS_LINUX )
+# ifdef DEBUG
+ /* Activate malloc checking routines to detect heap corruptions. */
+ main_PutIntVariable( "MALLOC_CHECK_", 2 );
+# endif
#endif
/*
return( errno );
}
- intf_MsgImm( COPYRIGHT_MESSAGE );
+ intf_MsgImm( COPYRIGHT_MESSAGE "\n" );
/*
* Read configuration
*/
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" );
+ PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" );
+ intf_StatMsg( "info: CPU has capabilities : %s", p_capabilities );
+ }
+
/*
* Initialize playlist and get commandline files
*/
aout_InitBank();
vout_InitBank();
+ /*
+ * Choose the best memcpy module
+ */
+ if( module_NeedMemcpy( &p_main->memcpy ) )
+ {
+ intf_ErrMsg( "intf error: no suitable memcpy module, "
+ "using libc default" );
+ p_main->memcpy.pf_memcpy = memcpy;
+ }
+
/*
* Initialize shared resources and libraries
*/
}
/*
- * Free module, aout and vout banks
+ * Free aout and vout banks
*/
vout_EndBank();
aout_EndBank();
- module_EndBank();
/*
* Free playlist
*/
intf_PlaylistDestroy( p_main->p_playlist );
+ /*
+ * Free memcpy module if it was allocated
+ */
+ if( p_main->memcpy.p_module != NULL )
+ {
+ module_UnneedMemcpy( &p_main->memcpy );
+ }
+
+ /*
+ * Free module bank
+ */
+ module_EndBank();
+
/*
* System specific cleaning code
*/
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 )
system_End();
#endif
/*
* Terminate messages interface and program
*/
- intf_Msg( "intf: program terminated" );
+ intf_WarnMsg( 1, "intf: program terminated" );
intf_MsgDestroy();
/*
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;
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;
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 */
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;
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") )
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 */
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;
+
+ /* CPU options */
+ case OPT_NOMMX:
+ p_main->i_cpu_capabilities &= ~CPU_CAPABILITY_MMX;
+ break;
+
+ case OPT_NO3DNOW:
+ p_main->i_cpu_capabilities &= ~CPU_CAPABILITY_3DNOW;
+ break;
+
+ case OPT_NOMMXEXT:
+ p_main->i_cpu_capabilities &= ~CPU_CAPABILITY_MMXEXT;
break;
-
+
+ case OPT_NOSSE:
+ p_main->i_cpu_capabilities &= ~CPU_CAPABILITY_SSE;
+ break;
+
+ case OPT_NOALTIVEC:
+ p_main->i_cpu_capabilities &= ~CPU_CAPABILITY_ALTIVEC;
+ 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,
"\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"
"\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"
"\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"
"\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 --nommx \tdisable CPU's MMX support"
+ "\n --no3dnow \tdisable CPU's 3D Now! support"
+ "\n --nommxext \tdisable CPU's MMX EXT support"
+ "\n --nosse \tdisable CPU's SSE support"
+ "\n --noaltivec \tdisable CPU's AltiVec support"
"\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;
"\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 " INTF_STDOUT_VAR "=<filename> \tredirect console stdout"
+ "\n " MEMCPY_METHOD_VAR "=<method name> \tmemcpy method" );
/* Audio parameters */
intf_MsgImm( "\nAudio parameters:"
"\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:"
"\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 " VDEC_SMP_VAR "=<number of threads> \tuse several processors" );
+ "\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" );
}
/*****************************************************************************
#endif
}
-
/*****************************************************************************
* SimpleSignalHandler: system signal handler
*****************************************************************************
intf_WarnMsg( 0, "intf: ignoring signal %d", i_signal );
}
-
/*****************************************************************************
* FatalSignalHandler: system signal handler
*****************************************************************************
}
/*****************************************************************************
- * InstructionSignalHandler: system signal handler
+ * IllegalSignalHandler: system signal handler
*****************************************************************************
* This function is called when a illegal instruction signal is received by
- * the program.
- * We use this function to test OS and CPU_Capabilities
+ * the program. We use this function to test OS and CPU capabilities
*****************************************************************************/
-static void InstructionSignalHandler( int i_signal )
+static void IllegalSignalHandler( int i_signal )
{
- /* Once a signal has been trapped, the termination sequence will be
- * armed and following signals will be ignored to avoid sending messages
- * to an interface having been destroyed */
-
/* Acknowledge the signal received */
- fprintf( stderr, "warning: extended instructions unsupported, "
- "some optimizations will be disabled\n" );
-#ifdef SYS_LINUX
- fprintf( stderr, "upgrade to kernel 2.4.x to get rid of this warning\n" );
-#endif
-
i_illegal = 1;
-
+
#ifdef HAVE_SIGRELSE
sigrelse( i_signal );
#endif
+
+ fprintf( stderr, "warning: your CPU has %s instructions, but not your "
+ "operating system.\n", psz_capability );
+ fprintf( stderr, " some optimizations will be disabled unless "
+ "you upgrade your OS\n" );
+#ifdef SYS_LINUX
+ fprintf( stderr, " (for instance Linux kernel 2.4.x or later)" );
+#endif
+
longjmp( env, 1 );
}
*****************************************************************************
* This function is called to list extensions the CPU may have.
*****************************************************************************/
-static int CPUCapabilities( void )
+static u32 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 );
+ volatile u32 i_capabilities = CPU_CAPABILITY_NONE;
-#elif defined( SYS_DARWIN )
+#if defined( SYS_DARWIN )
struct host_basic_info hi;
kern_return_t ret;
host_name_port_t host;
int i_size;
char *psz_name, *psz_subname;
+ i_capabilities |= CPU_CAPABILITY_FPU;
+
/* Should 'never' fail? */
host = mach_host_self();
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;
}
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;
+
+# if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
+ signal( SIGILL, IllegalSignalHandler );
+# endif
+
/* 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 );
+# if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
+ signal( SIGILL, NULL );
+# endif
return( i_capabilities );
}
if( !i_eax )
{
- signal( SIGILL, NULL );
+# if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
+ signal( SIGILL, NULL );
+# endif
return( i_capabilities );
}
if( ! (i_edx & 0x00800000) )
{
- signal( SIGILL, NULL );
+# if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
+ signal( SIGILL, NULL );
+# endif
return( i_capabilities );
}
{
i_capabilities |= CPU_CAPABILITY_MMXEXT;
+# ifdef CAN_COMPILE_SSE
/* We test if OS support the SSE instructions */
+ psz_capability = "SSE";
i_illegal = 0;
if( setjmp( env ) == 0 )
{
{
i_capabilities |= CPU_CAPABILITY_SSE;
}
+ else
+ {
+ fprintf( stderr, "warning: your OS doesn't have support for "
+ "SSE instructions, some optimizations\n"
+ "will be disabled"
+# ifdef SYS_LINUX
+ " (you will need Linux kernel 2.4.x or later)"
+# endif
+ "\n" );
+ }
+# endif
}
-
+
/* test for additional capabilities */
cpuid( 0x80000000 );
if( i_eax < 0x80000001 )
{
- signal( SIGILL, NULL );
+# if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
+ signal( SIGILL, NULL );
+# endif
return( i_capabilities );
}
/* list these additional capabilities */
cpuid( 0x80000001 );
+# ifdef CAN_COMPILE_3DNOW
if( i_edx & 0x80000000 )
{
+ psz_capability = "3D Now!";
i_illegal = 0;
if( setjmp( env ) == 0 )
{
__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 );
+# if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
+ signal( SIGILL, NULL );
+# endif
+ return( i_capabilities );
+
+#elif defined( __powerpc__ )
+
+ i_capabilities |= CPU_CAPABILITY_FPU;
+
+# ifdef CAN_COMPILE_ALTIVEC
+ signal( SIGILL, IllegalSignalHandler );
+
+ psz_capability = "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;
+ }
+
+ signal( SIGILL, NULL );
+# endif
+
return( i_capabilities );
#else
*****************************************************************************/
static int RedirectSTDOUT( void )
{
- int i_stdout_filedesc;
- char *psz_stdout_filename;
+ int i_fd;
+ char *psz_filename;
- psz_stdout_filename = main_GetPszVariable( INTF_STDOUT_VAR,
- INTF_STDOUT_DEFAULT );
- if( strcmp( "", psz_stdout_filename ) != 0 )
+ psz_filename = main_GetPszVariable( INTF_STDOUT_VAR, INTF_STDOUT_DEFAULT );
+
+ if( *psz_filename )
{
ShowConsole();
- i_stdout_filedesc = open( psz_stdout_filename,
- O_CREAT | O_TRUNC | O_RDWR,
- S_IREAD | S_IWRITE );
-
- if( dup2( i_stdout_filedesc, fileno(stdout) ) == -1 )
+ 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_stdout_filedesc, fileno(stderr) ) == -1 )
+ if( dup2( i_fd, fileno(stderr) ) == -1 )
{
intf_ErrMsg( "warning: unable to redirect stderr" );
}
- close( i_stdout_filedesc );
+ close( i_fd );
}
else
{
projects / vlc / blobdiff