X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_config.h;h=405b9cfc6115344016d38809f2b34a2bc5b41f2e;hb=a705ab3377947746311b418c57f23276b5094324;hp=08b354ea687c5421444c1e913083be53f4d2a327;hpb=cf891bad55157104f8d9d50b1d95b25ebc7f7a5e;p=vlc diff --git a/include/vlc_config.h b/include/vlc_config.h index 08b354ea68..405b9cfc61 100644 --- a/include/vlc_config.h +++ b/include/vlc_config.h @@ -2,7 +2,7 @@ * vlc_config.h: limits and configuration * Defines all compilation-time configuration constants and size limits ***************************************************************************** - * Copyright (C) 1999-2002 VideoLAN + * Copyright (C) 1999-2003 VideoLAN * * Authors: Vincent Seguin * Samuel Hocevar @@ -11,7 +11,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -45,17 +45,20 @@ /* When a thread waits on a condition in debug mode, delay to wait before * outputting an error message (in second) */ -#define THREAD_COND_TIMEOUT 5 +#define THREAD_COND_TIMEOUT 1 /* The configuration file and directory */ #ifdef SYS_BEOS -# define CONFIG_DIR "config/settings" -#elif defined( WIN32 ) -# define CONFIG_DIR "vlc" +# define CONFIG_DIR "config/settings/VideoLAN Client" +#elif SYS_DARWIN +# define CONFIG_DIR "Library/Preferences/VLC" +#elif defined( WIN32 ) || defined( UNDER_CE ) +# define CONFIG_DIR "vlc" #else # define CONFIG_DIR ".vlc" #endif #define CONFIG_FILE "vlcrc" +#define PLUGINSCACHE_DIR "cache" /***************************************************************************** * Interface configuration @@ -72,9 +75,16 @@ * Input thread configuration *****************************************************************************/ -/* XXX?? */ +/* Used in ErrorThread */ #define INPUT_IDLE_SLEEP ((mtime_t)(0.100*CLOCK_FREQ)) +/* Time to wait in case of read error */ +#define INPUT_ERROR_SLEEP ((mtime_t)(0.10*CLOCK_FREQ)) + +/* Number of read() calls needed until we check the file size through + * fstat() */ +#define INPUT_FSTAT_NB_READS 10 + /* * General limitations */ @@ -99,21 +109,23 @@ * Channel method */ -/* Delay between channel changes - this is required to avoid flooding the +/* Delay between channel changes - this is required to avoid flooding the * channel server */ -#define INPUT_CHANNEL_CHANGE_DELAY (mtime_t)(5*CLOCK_FREQ) +#define INPUT_CHANNEL_CHANGE_DELAY (mtime_t)(5*CLOCK_FREQ) /* Duration between the time we receive the data packet, and the time we will * mark it to be presented */ -#define DEFAULT_PTS_DELAY (mtime_t)(.2*CLOCK_FREQ) +#define DEFAULT_PTS_DELAY (mtime_t)(.3*CLOCK_FREQ) /* DVD and VCD devices */ -#ifndef WIN32 +#if !defined( WIN32 ) && !defined( UNDER_CE ) # define DVD_DEVICE "/dev/dvd" # define VCD_DEVICE "/dev/cdrom" +# define CDAUDIO_DEVICE "/dev/cdrom" #else -# define DVD_DEVICE "D" -# define VCD_DEVICE "D" +# define DVD_DEVICE "D:" +# define VCD_DEVICE "D:" +# define CDAUDIO_DEVICE "D:" #endif /***************************************************************************** @@ -135,6 +147,10 @@ /* Max number of inputs */ #define AOUT_MAX_INPUTS 5 +/* Buffers which arrive in advance of more than AOUT_MAX_ADVANCE_TIME + * will be considered as bogus and be trashed */ +#define AOUT_MAX_ADVANCE_TIME (mtime_t)(DEFAULT_PTS_DELAY * 3) + /* Buffers which arrive in advance of more than AOUT_MAX_PREPARE_TIME * will cause the calling thread to sleep */ #define AOUT_MAX_PREPARE_TIME (mtime_t)(.5*CLOCK_FREQ) @@ -145,7 +161,10 @@ /* Max acceptable delay between the coded PTS and the actual presentation * time, without resampling */ -#define AOUT_PTS_TOLERANCE (mtime_t)(.02*CLOCK_FREQ) +#define AOUT_PTS_TOLERANCE (mtime_t)(.04*CLOCK_FREQ) + +/* Max acceptable resampling (in %) */ +#define AOUT_MAX_RESAMPLING 10 /***************************************************************************** * Video configuration @@ -172,20 +191,20 @@ * (~1 Mbyte) before using huge values */ #define VOUT_MAX_PICTURES 8 +/* Minimum number of direct pictures the video output will accept without + * creating additional pictures in system memory */ +#define VOUT_MIN_DIRECT_PICTURES 6 + /* Number of simultaneous subpictures */ #define VOUT_MAX_SUBPICTURES 8 /* 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 * picture, including its many additions such as subtitles, additionnal user - * informations and interface, has too many active areas, some of them are + * information and interface, has too many active areas, some of them are * joined. */ #define VOUT_MAX_AREAS 5 -/* Default fonts */ -#define VOUT_DEFAULT_FONT "default8x9.psf" -#define VOUT_LARGE_FONT "default8x16.psf" - /* Statistics are displayed every n loops (=~ pictures) */ #define VOUT_STATS_NB_LOOPS 100 @@ -206,7 +225,7 @@ /* Pictures which are VOUT_BOGUS_DELAY or more in advance probably have * a bogus PTS and won't be displayed */ -#define VOUT_BOGUS_DELAY ((int)(0.800*CLOCK_FREQ)) +#define VOUT_BOGUS_DELAY ((mtime_t)(DEFAULT_PTS_DELAY * 3)) /* Delay (in microseconds) before an idle screen is displayed */ #define VOUT_IDLE_DELAY (5*CLOCK_FREQ) @@ -224,7 +243,7 @@ #define VOUT_OUTMEM_SLEEP ((mtime_t)(0.020*CLOCK_FREQ)) /* The default video output window title */ -#define VOUT_TITLE "VideoLAN Client " VERSION +#define VOUT_TITLE "VLC" /***************************************************************************** * Video parser configuration @@ -234,7 +253,7 @@ /* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember * that raising this level dramatically lengthens the compilation time. */ -#if defined( HAVE_RELEASE ) || defined( __pentiumpro__ ) +#if defined( HAVE_RELEASE ) # define VPAR_OPTIM_LEVEL 2 #else # define VPAR_OPTIM_LEVEL 1 @@ -263,7 +282,7 @@ *****************************************************************************/ /* Maximal size of a message to be stored in the mesage queue, - * it is needed when vasprintf is not avalaible */ + * it is needed when vasprintf is not available */ #define INTF_MAX_MSG_SIZE 512 /* Maximal size of the message queue - in case of overflow, all messages in the