* + variable names should end with '_VAR'
* + environment variable default value should end with '_DEFAULT'
* + values having a special meaning with '_VAL'
- * + complete environment strings with '_ENV'
*
*/
* Program information
*******************************************************************************/
-/* Program options */
-#if defined(VIDEO_X11)
-#define VIDEO_OPTIONS "X11"
-#elif defined(VIDEO_FB)
-#define VIDEO_OPTIONS "Framebuffer"
-#elif defined(VIDEO_GGI)
-#define VIDEO_OPTIONS "GGI"
-#else
-#define VIDEO_OPTIONS ""
-#endif
-#if defined(HAVE_MMX)
-#define ARCH_OPTIONS "MMX"
-#else
-#define ARCH_OPTIONS ""
-#endif
-#define PROGRAM_OPTIONS VIDEO_OPTIONS " " ARCH_OPTIONS
-
/* Program version and copyright message */
-#define PROGRAM_VERSION "DR 2.1"
-#define COPYRIGHT_MESSAGE "VideoLAN Client v" PROGRAM_VERSION " (" __DATE__ ") - " PROGRAM_OPTIONS " - (c)1999 VideoLAN\n"
+#define COPYRIGHT_MESSAGE "VideoLAN Client v" PROGRAM_VERSION " - (c)1999-2000 VideoLAN"
+#define VERSION_MESSAGE "VideoLAN Client - (c)1999-2000 VideoLAN\n" \
+ "version " PROGRAM_VERSION " ( " PROGRAM_BUILD " )\n" \
+ "compilation options: " PROGRAM_OPTIONS
/*******************************************************************************
* General compilation options
* and might cause problems with some very weird streams. */
//#define MPEG2_COMPLIANT
-/* Define for profiling support */
+/* Define for profiling and statistics support - such informations, like FPS
+ * or pictures count won't be available if it not set */
#define STATS
/* Define for unthreaded version of the program - ?? not yet implemented */
/*******************************************************************************
* Debugging options - define or undefine symbols
*******************************************************************************/
+#ifdef DEBUG
+/* General debugging support, which depends of the DEBUG define, is determined
+ * in the Makefile */
-/* General debugging support */
-#define DEBUG
-
-/* Extended debugging support - in this mode, debugging messages will have their
- * date and context printed */
-#define DEBUG_CONTEXT
-
-/* Modules specific debugging */
+/* Modules specific debugging - this will produce a lot of output, but can be
+ * usefull to track a bug */
#define DEBUG_INTF
#define DEBUG_INPUT
#define DEBUG_AUDIO
-#define DEBUG_VIDEO
+//#define DEBUG_VIDEO
/* Debugging log file - if defined, a file can be used to store all messages. If
* DEBUG_LOG_ONLY is defined, debug messages will only be printed to the log and
* will not appear on the screen */
-#define DEBUG_LOG "vlc-debug.log"
-#define DEBUG_LOG_ONLY
+#define DEBUG_LOG "vlc-debug.log"
+#define DEBUG_LOG_ONLY
+#endif
/*******************************************************************************
- * Common settings
+ * General configuration
*******************************************************************************/
/* Automagically spawn input, audio and video threads ? */
+// ?? used ?
#define AUTO_SPAWN
-/* Startup script */
-#define INTF_INIT_SCRIPT_VAR "vlc_init"
-#define INTF_INIT_SCRIPT_DEFAULT "vlc.init"
-
-/* ?? */
-#define THREAD_SLEEP 100000
+/* When creating or destroying threads in blocking mode, delay to poll thread
+ * status */
+#define THREAD_SLEEP 10000
/*
- * X11/XLib settings
+ * Decoders FIFO configuration
*/
-/* Default font used when a wished font could not be loaded - note that this
- * font should be universal, else the program will exit when it can't find
- * a font */
-#define X11_DEFAULT_FONT "fixed"
+/* Size of the FIFO. FIFO_SIZE+1 must be a multiple of 2 */
+#define FIFO_SIZE 1023
+
+
+/*******************************************************************************
+ * Interface configuration
+ *******************************************************************************/
+
+/* Environment variable used to store startup script name and default value */
+#define INTF_INIT_SCRIPT_VAR "vlc_init"
+#define INTF_INIT_SCRIPT_DEFAULT "vlc.init"
+
+/* Base delay in micro second for interface sleeps */
+#define INTF_IDLE_SLEEP 100000
+
+/* Step for changing gamma, and minimum and maximum values */
+#define INTF_GAMMA_STEP .1
+#define INTF_GAMMA_LIMIT 3
/*
- * Decoders FIFO configuration
+ * X11 settings
*/
-/* Size of the FIFO. FIFO_SIZE+1 must be a multiple of 2 */
-#define FIFO_SIZE 1023
+/* Title of the X11 window */
+#define VOUT_TITLE "VideoLAN Client"
/*******************************************************************************
* Input thread configuration
/* Use a LIFO or FIFO for PES netlist ? */
#undef INPUT_LIFO_PES_NETLIST
-/* Maximum length of a hostname */
-#define INPUT_MAX_HOSTNAME_LENGTH 100
-
-
-/* Default input method */
-#define INPUT_DEFAULT_METHOD INPUT_METHOD_TS_UCAST
+/* Maximum length of a hostname or source name */
+#define INPUT_MAX_SOURCE_LENGTH 100
/* Default remote server */
-#define VIDEOLAN_DEFAULT_SERVER "vod.via.ecp.fr"
-
-/* Default videolan port */
-#define VIDEOLAN_DEFAULT_PORT 1234
+#define INPUT_SERVER_VAR "vlc_server"
+#define INPUT_SERVER_DEFAULT "138.195.143.220"
-/* Default videolan VLAN */
-#define VIDEOLAN_DEFAULT_VLAN 3
+/* Default input port */
+#define INPUT_PORT_VAR "vlc_server_port"
+#define INPUT_PORT_DEFAULT 1234
/*
* Vlan method
*/
-/* Default VLAN server */
-#define VLAN_DEFAULT_SERVER "vlanserver.via.ecp.fr"
-#define VLAN_DEFAULT_SERVER_PORT 6010
+/* Default network interface and environment variable */
+#define INPUT_IFACE_VAR "vlc_iface"
+#define INPUT_IFACE_DEFAULT "eth0"
+
+/* Default server and port */
+#define INPUT_VLAN_SERVER_VAR "vlc_vlan_server"
+#define INPUT_VLAN_SERVER_DEFAULT "138.195.140.31"
+#define INPUT_VLAN_PORT_VAR "vlc_vlan_port"
+#define INPUT_VLAN_PORT_DEFAULT 6010
+
+/* Delay between vlan changes - this is required to avoid flooding the VLAN
+ * server */
+#define INPUT_VLAN_CHANGE_DELAY 5000000
/*******************************************************************************
* Audio configuration
* Default settings for video output threads
*/
-/* Title of the window */
-#define VOUT_TITLE "VideoLAN Client"
+/* Environment variable used in place of DISPLAY if available */
+#define VOUT_DISPLAY_VAR "vlc_display"
-/* Default dimensions for display window - these dimensions are the standard
- * width and height for broadcasted MPEG-2 */
-#define VOUT_WIDTH 544
-#define VOUT_HEIGHT 576
+/* Default dimensions for display window - these dimensions are enough for the
+ * standard width and height broadcasted MPEG-2 streams */
+#define VOUT_WIDTH_VAR "vlc_width"
+#define VOUT_HEIGHT_VAR "vlc_height"
+#define VOUT_WIDTH_DEFAULT 640
+#define VOUT_HEIGHT_DEFAULT 480
/* Default video heap size - remember that a decompressed picture is big
* (~1 Mbyte) before using huge values */
#define VOUT_GRAYSCALE_VAR "vlc_grayscale"
#define VOUT_GRAYSCALE_DEFAULT 0
-/* Number of pictures required to computes the FPS rate */
-#define VOUT_FPS_SAMPLES 5
+/* Default gamma */
+#define VOUT_GAMMA 0.
+
+/* Default fonts */
+#define VOUT_DEFAULT_FONT "Resources/default8x9.psf"
+#define VOUT_LARGE_FONT "Resources/default8x16.psf"
/*
* Time settings
* at least VOUT_IDLE_SLEEP plus the time required to render a few
* images, to avoid trashing of decoded images */
/* ?? this constant will probably evolve to a calculated value */
-#define VOUT_DISPLAY_DELAY 100000
+#define VOUT_DISPLAY_DELAY 500000
+
+/* Delay (in microseconds) between increments in idle levels */
+#define VOUT_IDLE_DELAY 5000000000000
+
+/* Number of pictures required to computes the FPS rate */
+#define VOUT_FPS_SAMPLES 20
/*
* Framebuffer settings
#define VOUT_FB_DEV_VAR "vlc_fb_dev"
#define VOUT_FB_DEV_DEFAULT "/dev/fb0"
-/*
- * X11 settings
- */
-
-/* Allow use of X11 XShm (shared memory) extension if possible */
-#define VOUT_XSHM 1
-
-/* Font maximum and minimum characters - characters outside this range are not
- * printed - maximum range is 1-256 */
-#define VOUT_MIN_CHAR 1
-#define VOUT_MAX_CHAR 128
-
/*******************************************************************************
* Video parser configuration
*******************************************************************************/
#define VPAR_IDLE_SLEEP 100000
+/* Time to sleep when waiting for a buffer (from vout or the video fifo). */
+#define VPAR_OUTMEM_SLEEP 10000
+
+/* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
+ * that raising this level dramatically lengthens the compilation time. */
+#define VPAR_OPTIM_LEVEL 1
+
+/* The following directives only apply if you define VDEC_SMP below. */
+
/* Number of macroblock buffers available. It should be always greater than
* twice the number of macroblocks in a picture. VFIFO_SIZE + 1 should also
* be a power of two. */
-#define VFIFO_SIZE 4095
+#define VFIFO_SIZE 8191
/* Maximum number of macroblocks in a picture. */
#define MAX_MB 2048
* Video decoder configuration
*******************************************************************************/
+//#define VDEC_SMP
+
#define VDEC_IDLE_SLEEP 100000
/* Number of video_decoder threads to launch on startup of the video_parser.
* It should always be less than half the number of macroblocks of a
- * picture. */
+ * picture. Only available if you defined VDEC_SMP above. */
#define NB_VDEC 1
-/* Maximum range of values out of the IDCT + motion compensation. Only
- * used if you define MPEG2_COMPLIANT above. */
+/* Maximum range of values out of the IDCT + motion compensation. */
#define VDEC_CROPRANGE 2048
/*******************************************************************************
#define GDEC_IDLE_SLEEP 100000
/*******************************************************************************
- * Interface (main) thread configuration
- *******************************************************************************/
-
-/*
- * Interface configuration
- */
-
-/* Base delay in micro second for interface sleeps ?? */
-#define INTF_IDLE_SLEEP 100000
-
-/* Maximal number of arguments on a command line, including the function name */
-#define INTF_MAX_ARGS 20
-
-/* Maximal size of a command line in a script */
-#define INTF_MAX_CMD_SIZE 240
-/*
- * X11 interface properties
- */
-#define INTF_APP_CLASS "vlc"
-#define INTF_APP_NAME "vlc"
-
-/*
- * X11 console properties
- */
-
-/* Title of the X11 console interface window */
-#define INTF_XCONSOLE_TITLE "VideoLAN Client: console"
-
-/* Welcome message: this message is always displayed when a new console is
- * openned */
-#define INTF_XCONSOLE_WELCOME_MSG COPYRIGHT_MESSAGE "try `help' to have a list of available commands"
-
-/* Background pixmap - if not defined, no pixmap is used */
-#define INTF_XCONSOLE_BACKGROUND_PIXMAP "Resources/background.xpm"
-
-/* Default X11 console interface window geometry. It should at least give a
- * default size */
-#define INTF_XCONSOLE_GEOMETRY "400x100"
-
-/* Font used in console. If first font is not found, the fallback font is
- * used. Therefore, the fallback font should be a universal one. */
-#define INTF_XCONSOLE_FONT "-*-helvetica-medium-r-normal-*-18-*-*-*-*-*-iso8859-1"
-
-/* Number of memorized lines in X11 console window text zone */
-#define INTF_CONSOLE_MAX_TEXT 100
-
-/* Maximal number of commands which can be saved in history list */
-#define INTF_CONSOLE_MAX_HISTORY 20
-
-/* Maximum width of a line in an X11 console window. If a larger line is
- * printed, it will be wrapped. */
-#define INTF_XCONSOLE_MAX_LINE_WIDTH 120
-
-#define ENV_VLC_DISPLAY "vlc_DISPLAY"
-
-#define INTF_MAIN_WIDTH 600
-#define INTF_MAIN_HEIGHT 600
-
-/*******************************************************************************
- * Interface messages functions
+ * Messages and console interfaces configuration
*******************************************************************************/
/* Maximal size of the message queue - in case of overflow, all messages in the
/* 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 */
+#ifndef DEBUG
#define INTF_MSG_QUEUE
+#endif
/* Format of the header for debug messages. The arguments following this header
* are the file (char *), the function (char *) and the line (int) in which the
* message function was called */
-#define INTF_MSG_DBG_FORMAT "## %s:%s(),%i: "
+#define INTF_MSG_DBG_FORMAT "## %s:%s(),%i: "
-/*******************************************************************************
- * Network and VLAN management
- *******************************************************************************/
-/* Default network interface to use */
-#define NET_DFLT_IF "eth0"
+/* Maximal number of arguments on a command line, including the function name */
+#define INTF_MAX_ARGS 20
-/* Default VLANserver address */
-#define VLAN_DFLT_VLANSRV "vlanserver"
+/* Maximal size of a command line in a script */
+#define INTF_MAX_CMD_SIZE 240
-/* Default VLANserver port */
-#define VLAN_DFLT_VLANPORT "6010"
+/* Number of memorized lines in console window text zone */
+#define INTF_CONSOLE_MAX_TEXT 100
-/* Client identification */
-#define VLAN_LOGIN "guest"
-#define VLAN_PASSWD "none"
+/* Maximal number of commands which can be saved in history list */
+#define INTF_CONSOLE_MAX_HISTORY 20