X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fconfig.h.in;h=a4dbad5deb87d65a36bd0c1712211b76fcc1028c;hb=9f8fcf88ebab58c592fbadda1495834e7e34cbfd;hp=df059e9bd16b10526a358e1faba25ef30a0f0e10;hpb=6aaf635c356acf87b336f83a57b187657cb9d9f0;p=vlc diff --git a/include/config.h.in b/include/config.h.in index df059e9bd1..a4dbad5deb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,7 +2,7 @@ * config.h: limits and configuration * Defines all compilation-time configuration constants and size limits ***************************************************************************** - * Copyright (C) 1999, 2000 VideoLAN + * Copyright (C) 1999, 2000, 2001 VideoLAN * * Authors: Vincent Seguin * Samuel Hocevar @@ -43,9 +43,9 @@ /* Program version and copyright message */ #define VERSION_MESSAGE "vlc @VLC_VERSION@ @VLC_CODENAME@ " \ /* "(" PROGRAM_BUILD ") (" PROGRAM_OPTIONS ")\n" */ \ - "Copyright 1996-2000 VideoLAN\n" + "Copyright 1996-2001 VideoLAN\n" #define COPYRIGHT_MESSAGE "VideoLAN Client - version @VLC_VERSION@" \ - " @VLC_CODENAME@ - (c)1996-2000 VideoLAN\n" + " @VLC_CODENAME@ - (C)1996-2001 VideoLAN\n" #define VERSION "@VLC_VERSION@" @@ -63,22 +63,15 @@ * and might cause problems with some very weird streams. */ //#define MPEG2_COMPLIANT -/* Define for profiling and statistics support - such informations, like FPS - * or pictures count won't be available if it not set */ -/* #define STATS --moved in Makefile */ - -/* Define for unthreaded version of the program FIXME: not yet implemented ??*/ -//#define NO_THREAD - /***************************************************************************** * Debugging options - define or undefine symbols *****************************************************************************/ -#if DEBUG == 1 +#ifdef DEBUG /* General debugging support, which depends of the DEBUG define, is determined * in the Makefile */ /* Modules specific debugging - this will produce a lot of output, but can be - * usefull to track a bug */ + * useful to track a bug */ //#define DEBUG_INTF //#define DEBUG_INPUT //#define DEBUG_AUDIO @@ -128,6 +121,9 @@ * Interface configuration *****************************************************************************/ +/* Environment variable containing the display method */ +#define INTF_METHOD_VAR "vlc_intf" + /* Environment variable used to store startup script name and default value */ #define INTF_INIT_SCRIPT_VAR "vlcrc" #define INTF_INIT_SCRIPT_DEFAULT ".vlcrc" @@ -137,7 +133,7 @@ #define INTF_CHANNELS_DEFAULT "vlc.channels" /* Base delay in micro second for interface sleeps */ -#define INTF_IDLE_SLEEP ((int)(0.100*CLOCK_FREQ)) +#define INTF_IDLE_SLEEP ((int)(0.050*CLOCK_FREQ)) /* Step for changing gamma, and minimum and maximum values */ #define INTF_GAMMA_STEP .1 @@ -146,17 +142,13 @@ /* Maximum number of channels */ #define INTF_MAX_CHANNELS 10 -/* - * X11 settings - */ - -/* Title of the X11 window */ -#define VOUT_TITLE "VideoLAN Client" - /***************************************************************************** * Input thread configuration *****************************************************************************/ +/* Environment variable containing the display method */ +#define INPUT_METHOD_VAR "vlc_input" + /* XXX?? */ #define INPUT_IDLE_SLEEP ((int)(0.100*CLOCK_FREQ)) @@ -168,17 +160,11 @@ * interface, and is in fact an interface limitation */ #define INPUT_MAX_THREADS 10 -/* Maximum number of ES definitions in a TS stream */ -#define INPUT_MAX_ES 42 - -/* Maximum number of selected ES in an input thread */ -#define INPUT_MAX_SELECTED_ES 42 - /* Maximum size of a data packet (128 kB) */ -#define INPUT_MAX_PACKET_SIZE 131072 +#define INPUT_MAX_PACKET_SIZE 131072 -/* Maximum length of a pre-parsed chunk (32 MB) */ -#define INPUT_PREPARSE_LENGTH 33554432 +/* Maximum length of a pre-parsed chunk (4 MB) */ +#define INPUT_PREPARSE_LENGTH 4194304 /* Maximum length of a hostname or source name */ #define INPUT_MAX_SOURCE_LENGTH 100 @@ -186,6 +172,7 @@ /* Default remote server */ #define INPUT_SERVER_VAR "vlc_server" #define INPUT_SERVER_DEFAULT "138.195.143.220" +#define INPUT_BCAST_ADDR "138.195.143.255" /* Default input port */ #define INPUT_PORT_VAR "vlc_server_port" @@ -196,7 +183,7 @@ #define INPUT_BROADCAST_DEFAULT 0 /* - * Vlan method + * Channel method */ /* Default network interface and environment variable */ @@ -204,22 +191,27 @@ #define INPUT_IFACE_DEFAULT "eth0" /* Default server and port */ -#define INPUT_VLAN_SERVER_VAR "vlc_vlan_server" -#define INPUT_VLAN_SERVER_DEFAULT "138.195.139.95" -#define INPUT_VLAN_PORT_VAR "vlc_vlan_port" -#define INPUT_VLAN_PORT_DEFAULT 6010 +#define INPUT_CHANNEL_SERVER_VAR "vlc_channel_server" +#define INPUT_CHANNEL_SERVER_DEFAULT "138.195.139.95" +#define INPUT_CHANNEL_PORT_VAR "vlc_channel_port" +#define INPUT_CHANNEL_PORT_DEFAULT 6010 -/* Delay between vlan changes - this is required to avoid flooding the VLAN - * server */ -#define INPUT_VLAN_CHANGE_DELAY (5*CLOCK_FREQ) +/* Delay between channel changes - this is required to avoid flooding the + * channel server */ +#define INPUT_CHANNEL_CHANGE_DELAY (mtime_t)(5*CLOCK_FREQ) -/* Duration between the time we receive the TS packet, and the time we will +/* Duration between the time we receive the data packet, and the time we will * mark it to be presented */ -#define DEFAULT_PTS_DELAY (.5*CLOCK_FREQ) +#define DEFAULT_PTS_DELAY (mtime_t)(.2*CLOCK_FREQ) + +#define INPUT_DVD_DEVICE_VAR "vlc_dvd_device" +#define INPUT_DVD_DEVICE_DEFAULT "/dev/dvd" -#define INPUT_DVD_AUDIO_VAR "vlc_dvd_audio" -#define INPUT_DVD_CHANNEL_VAR "vlc_dvd_channel" -#define INPUT_DVD_SUBTITLE_VAR "vlc_dvd_subtitle" +#define INPUT_TITLE_VAR "vlc_input_title" +#define INPUT_CHAPTER_VAR "vlc_input_chapter" +#define INPUT_AUDIO_VAR "vlc_input_audio" +#define INPUT_CHANNEL_VAR "vlc_input_channel" +#define INPUT_SUBTITLE_VAR "vlc_input_subtitle" /***************************************************************************** * Audio configuration @@ -228,9 +220,6 @@ /* Environment variable containing the audio output method */ #define AOUT_METHOD_VAR "vlc_aout" -/* The fallback method */ -#define AOUT_DEFAULT_METHOD "dsp" - /* Environment variable used to store dsp device name, and default value */ #define AOUT_DSP_VAR "vlc_dsp" #define AOUT_DSP_DEFAULT "/dev/dsp" @@ -249,9 +238,9 @@ #define AOUT_STEREO_DEFAULT 1 /* Volume */ -#define VOLUME_DEFAULT 256 -#define VOLUME_STEP 5 -#define VOLUME_MAX 765 +#define VOLUME_DEFAULT 512 +#define VOLUME_STEP 128 +#define VOLUME_MAX 1024 /* Environment variable for output rate, and default value */ #define AOUT_RATE_VAR "vlc_audio_rate" @@ -285,12 +274,15 @@ /* Environment variable containing the display method */ #define VOUT_METHOD_VAR "vlc_vout" +/* Environment variable containing the motion compensation method */ +#define MOTION_METHOD_VAR "vlc_motion" + +/* Environment variable containing the IDCT method */ +#define IDCT_METHOD_VAR "vlc_idct" + /* Environment variable containing the YUV method */ #define YUV_METHOD_VAR "vlc_yuv" -/* The fallback method */ -#define VOUT_DEFAULT_METHOD "x11" - /* Environment variable used in place of DISPLAY if available */ #define VOUT_DISPLAY_VAR "vlc_display" @@ -307,10 +299,10 @@ /* Video heap size - remember that a decompressed picture is big * (~1 Mbyte) before using huge values */ -#define VOUT_MAX_PICTURES 10 +#define VOUT_MAX_PICTURES 5 /* Number of simultaneous subpictures */ -#define VOUT_MAX_SUBPICTURES 10 +#define VOUT_MAX_SUBPICTURES 5 /* Maximum number of active areas in a rendering buffer. Active areas are areas * of the picture which need to be cleared before re-using the buffer. If a @@ -323,6 +315,14 @@ #define VOUT_GRAYSCALE_VAR "vlc_grayscale" #define VOUT_GRAYSCALE_DEFAULT 0 +/* Environment variable for fullscreen mode, and default value */ +#define VOUT_FULLSCREEN_VAR "vlc_fullscreen" +#define VOUT_FULLSCREEN_DEFAULT 0 + +/* Environment variable for overlay mode, and default value */ +#define VOUT_OVERLAY_VAR "vlc_overlay" +#define VOUT_OVERLAY_DEFAULT 0 + /* Default gamma */ #define VOUT_GAMMA 0. @@ -365,12 +365,8 @@ #define VOUT_FB_DEV_VAR "vlc_fb_dev" #define VOUT_FB_DEV_DEFAULT "/dev/fb0" -/* Some frame buffers aren't able to support double buffering. - * We don't want to lose one frame out of 2, so we may set the - * FB_NOYPAN - */ -// #define FB_NOYPAN - +/* The default video output window title */ +#define VOUT_TITLE "VideoLAN Client @VLC_VERSION@" /***************************************************************************** * Video parser configuration @@ -418,7 +414,7 @@ #define VDEC_CROPRANGE 2048 /* Nice increments for decoders -- necessary for x11 scheduling */ -#define VDEC_NICE 3 +#define VDEC_NICE 3 /***************************************************************************** * Generic decoder configuration @@ -439,14 +435,14 @@ #define INTF_MSG_QSIZE 64 /* Interface warnig message level */ -#define INTF_WARNING_VAR "warning_level" -#define INTF_WARNING_DEFAULT 12 +#define INTF_WARNING_VAR "warning_level" +#define INTF_WARNING_DEFAULT 12 -/* Define to enable messages queues - disabling messages queue can be usefull - * when debugging, since it allows messages which would not otherwise be printed, - * due to a crash, to be printed anyway */ +/* Define to enable messages queues - disabling messages queue can be useful + * when debugging, since it allows messages which would not be printed + * due to a crash to be printed anyway */ #ifndef DEBUG -#define INTF_MSG_QUEUE +//#define INTF_MSG_QUEUE #endif /* Format of the header for debug messages. The arguments following this header