* 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.122 2001/11/12 12:54:16 massiot Exp $
+ * Copyright (C) 1998-2001 VideoLAN
+ * $Id: main.c,v 1.137 2001/12/12 15:20:16 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
# 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() */
#include "stream_control.h"
#include "input_ext-intf.h"
-#include "intf_msg.h"
#include "intf_playlist.h"
#include "interface.h"
# 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_MONO 152
#define OPT_SPDIF 153
#define OPT_VOLUME 154
+#define OPT_DESYNC 155
#define OPT_NOVIDEO 160
#define OPT_DISPLAY 161
#define OPT_YUV 183
#define OPT_DOWNMIX 184
#define OPT_IMDCT 185
-#define OPT_DVDCSS 186
+#define OPT_MEMCPY 186
+#define OPT_DVDCSS_METHOD 187
+#define OPT_DVDCSS_VERBOSE 188
#define OPT_SYNCHRO 190
#define OPT_WARNING 191
#define OPT_STDOUT 193
#define OPT_STATS 194
+#define OPT_MPEG_ADEC 200
+
/* Usage fashion */
#define USAGE 0
#define SHORT_HELP 1
{ "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 },
{ "dvdaudio", 1, 0, 'a' },
{ "dvdchannel", 1, 0, 'c' },
{ "dvdsubtitle", 1, 0, 's' },
- { "dvdcss_method", 1, 0, OPT_DVDCSS },
+ { "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 }
};
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;
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
*/
/*
* 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. */
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
*/
}
}
+ /*
+ * Free memcpy module
+ */
+ if( p_main->p_memcpy_module != NULL )
+ {
+ module_Unneed( p_main->p_memcpy_module );
+ }
+
/*
* Free module, aout and vout banks
*/
/*
* System specific cleaning code
*/
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 )
system_End();
#endif
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;
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 's': /* --dvdsubtitle */
main_PutIntVariable( INPUT_SUBTITLE_VAR, atoi(optarg) );
break;
- case OPT_DVDCSS: /* --dvdcss */
- main_PutPszVariable( INPUT_DVDCSS_VAR, optarg );
+ 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_CHANNELSERVER: /* --channelserver */
main_PutPszVariable( INPUT_CHANNEL_SERVER_VAR, optarg );
break;
- case OPT_SERVER: /* --server */
- main_PutPszVariable( INPUT_SERVER_VAR, optarg );
- break;
- case OPT_PORT: /* --port */
- main_PutPszVariable( INPUT_PORT_VAR, optarg );
- break;
- case OPT_BROADCAST: /* --broadcast */
- main_PutIntVariable( INPUT_BROADCAST_VAR, 1 );
- main_PutPszVariable( INPUT_BCAST_ADDR_VAR, optarg );
- break;
- /* Synchro options */
+ /* Misc options */
case OPT_SYNCHRO:
main_PutPszVariable( VPAR_SYNCHRO_VAR, optarg );
break;
+ case OPT_MEMCPY:
+ main_PutPszVariable( MEMCPY_METHOD_VAR, optarg );
+ break;
+ /* Decoder options */
+ case OPT_MPEG_ADEC:
+ main_PutPszVariable( ADEC_MPEG_VAR, optarg );
+ break;
+
/* Internal error: unknown option */
case '?':
default:
"\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 --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 -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> \tselect DVDCSS decryption method"
+ "\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 --channelserver <host> \tchannel server address"
- "\n --server <host> \tvideo server address"
- "\n --port <port> \tvideo server port"
- "\n --broadcast \tlisten to a broadcast"
+ "\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;
"\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 " 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_DVDCSS_VAR "={csskey|disc|title} \tdvdcss method" );
+ "\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" );
+ /* Decoder parameters */
+ intf_MsgImm( "\nDecoder parameters:"
+ "\n " ADEC_MPEG_VAR "=<builtin|mad> \taudio decoder" );
}
/*****************************************************************************
volatile int i_capabilities = CPU_CAPABILITY_NONE;
#if defined( SYS_BEOS )
- i_capabilities |= CPU_CAPABILITY_486
+ i_capabilities |= CPU_CAPABILITY_FPU
+ | CPU_CAPABILITY_486
| CPU_CAPABILITY_586
| CPU_CAPABILITY_MMX;
int i_size;
char *psz_name, *psz_subname;
+ i_capabilities |= CPU_CAPABILITY_FPU;
+
/* Should 'never' fail? */
host = mach_host_self();
volatile unsigned int i_eax, i_ebx, i_ecx, i_edx;
volatile boolean_t b_amd;
+ i_capabilities |= CPU_CAPABILITY_FPU;
+
signal( SIGILL, InstructionSignalHandler );
/* test for a 486 CPU */
{
i_capabilities |= CPU_CAPABILITY_MMXEXT;
-#ifdef HAVE_SSE
+#ifdef CAN_COMPILE_SSE
/* We test if OS support the SSE instructions */
i_illegal = 0;
if( setjmp( env ) == 0 )
/* list these additional capabilities */
cpuid( 0x80000001 );
-#ifdef HAVE_3DNOW
+#ifdef CAN_COMPILE_3DNOW
if( i_edx & 0x80000000 )
{
i_illegal = 0;
#elif defined( __powerpc__ )
+ i_capabilities |= CPU_CAPABILITY_FPU;
+
/* Test for Altivec */
signal( SIGILL, InstructionSignalHandler );
-#ifdef HAVE_ALTIVEC
+#ifdef CAN_COMPILE_ALTIVEC
i_illegal = 0;
if( setjmp( env ) == 0 )
{
- asm volatile ("mtspr 256,%0" : : "r" (-1));
+ asm volatile ("mtspr 256, %0\n\t"
+ "vand %%v0, %%v0, %%v0"
+ :
+ : "r" (-1));
}
if( i_illegal == 0 )
*****************************************************************************/
static int RedirectSTDOUT( void )
{
- int i_stdout_filedesc;
- char *psz_stdout_filename;
+ int i_fd;
+ char *psz_filename;
+
+ psz_filename = main_GetPszVariable( INTF_STDOUT_VAR, INTF_STDOUT_DEFAULT );
- psz_stdout_filename = main_GetPszVariable( INTF_STDOUT_VAR,
- INTF_STDOUT_DEFAULT );
- if( strcmp( "", psz_stdout_filename ) != 0 )
+ 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