* Added --enable-debug, --enable-stats and --disable-optims (sam could

[vlc] / include / config.h.in

diff --git a/include/config.h.in b/include/config.h.in
index c5b1e7a657a9dd1c290f2db83ea4a0ecd2a72baa..ffe2302f33e555ce0a1f64efd2f79500c20e6024 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -4,7 +4,8 @@
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
  *
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ *          Samuel Hocevar <sam@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,7 +45,7 @@
                           /* "(" PROGRAM_BUILD ") (" PROGRAM_OPTIONS ")\n" */ \
                             "Copyright 1996-2000 VideoLAN\n"
 #define COPYRIGHT_MESSAGE   "VideoLAN Client - version @VLC_VERSION@" \
-                            " @VLC_CODENAME@ - (c)1996-2000 VideoLAN"
+                            " @VLC_CODENAME@ - (c)1996-2000 VideoLAN\n"
 
 #define VERSION             "@VLC_VERSION@"
 
@@ -64,7 +65,7 @@
 
 /* Define for profiling and statistics support - such informations, like FPS
  * or pictures count won't be available if it not set */
-#define STATS
+/* #define STATS --moved in Makefile */
 
 /* Define for unthreaded version of the program FIXME: not yet implemented ??*/
 //#define NO_THREAD
@@ -127,8 +128,8 @@
  *****************************************************************************/
 
 /* 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"
+#define INTF_INIT_SCRIPT_VAR            "vlcrc"
+#define INTF_INIT_SCRIPT_DEFAULT        ".vlcrc"
 
 /* Environment variable used to store channels file and default value */
 #define INTF_CHANNELS_VAR               "vlc_channels"
@@ -213,6 +214,10 @@
 #define INPUT_PORT_VAR                  "vlc_server_port"
 #define INPUT_PORT_DEFAULT              1234
 
+/* Broadcast mode */
+#define INPUT_BROADCAST_VAR             "vlc_broadcast"
+#define INPUT_BROADCAST_DEFAULT         0
+
 /*
  * Vlan method
  */
@@ -233,7 +238,7 @@
 
 /* Duration between the time we receive the TS packet, and the time we will
  * mark it to be presented */
-#define INPUT_PTS_DELAY                 (2*CLOCK_FREQ)
+#define INPUT_PTS_DELAY                 (.5*CLOCK_FREQ)
 
 #define INPUT_DVD_AUDIO_VAR             "vlc_dvd_audio"
 #define INPUT_DVD_CHANNEL_VAR           "vlc_dvd_channel"
@@ -272,6 +277,9 @@
 /* Environment variable containing the display method */
 #define VOUT_METHOD_VAR                 "vlc_vout"
 
+/* Environment variable containing the YUV method */
+#define YUV_METHOD_VAR                  "vlc_yuv"
+
 /* The fallback method */
 #define VOUT_DEFAULT_METHOD             "x11"
 
@@ -282,8 +290,8 @@
  * standard width and height broadcasted MPEG-2 streams or DVDs */
 #define VOUT_WIDTH_VAR                  "vlc_width"
 #define VOUT_HEIGHT_VAR                 "vlc_height"
-#define VOUT_WIDTH_DEFAULT              360
-#define VOUT_HEIGHT_DEFAULT             288
+#define VOUT_WIDTH_DEFAULT              720
+#define VOUT_HEIGHT_DEFAULT             576
 
 /* Maximum width of a scaled source picture - this should be relatively high,
  * since higher stream values will result in no display at all. */
@@ -335,6 +343,9 @@
 /* Number of pictures required to computes the FPS rate */
 #define VOUT_FPS_SAMPLES                20
 
+/* Better be in advance when awakening than late... */
+#define VOUT_MWAIT_TOLERANCE            ((int)(0.020*CLOCK_FREQ))
+
 /*
  * Framebuffer settings
  */
@@ -353,7 +364,7 @@
  * It should be approximately the time needed to perform a complete picture
  * loop. Since it only happens when the video heap is full, it does not need
  * to be too low, even if it blocks the decoder. */
-#define VPAR_OUTMEM_SLEEP               ((int)(0.050*CLOCK_FREQ))
+#define VPAR_OUTMEM_SLEEP               ((int)(0.020*CLOCK_FREQ))
 
 /* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
  * that raising this level dramatically lengthens the compilation time. */
@@ -369,6 +380,9 @@
 /* Maximum number of macroblocks in a picture. */
 #define MAX_MB                          2048
 
+/* The synchro variable name */
+#define VPAR_SYNCHRO_VAR                "vlc_synchro"
+
 /*****************************************************************************
  * Video decoder configuration
  *****************************************************************************/
@@ -427,10 +441,3 @@
 /* Maximal number of commands which can be saved in history list */
 #define INTF_CONSOLE_MAX_HISTORY        20
 
-/*****************************************************************************
- * Synchro configuration
- *****************************************************************************/
-
-#define VOUT_SYNCHRO_LEVEL_START        5
-#define VOUT_SYNCHRO_LEVEL_MAX          15
-#define VOUT_SYNCHRO_HEAP_IDEAL_SIZE    5