X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_config.h;h=ae6e7a19aa1b5d24b1097dd1f5e3a3031146ba76;hb=bd6930e42cd1aecdf8e4d292ea089a9e12ae0960;hp=1a67c39d41e6087be118d6df097adfd9988bb63b;hpb=0d7f2354e56a03b150e608cec553a5670c804ff3;p=vlc diff --git a/include/vlc_config.h b/include/vlc_config.h index 1a67c39d41..ae6e7a19aa 100644 --- a/include/vlc_config.h +++ b/include/vlc_config.h @@ -22,6 +22,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +/** + * \file + * This file defines of values used in interface, vout, aout and vlc core functions. + */ + /* Conventions regarding names of symbols and variables * ---------------------------------------------------- * @@ -33,30 +38,16 @@ * General configuration *****************************************************************************/ -#define CLOCK_FREQ 1000000 +/* All timestamp below or equal to this define are invalid/unset + * XXX the numerical value is 0 because of historical reason and will change.*/ +#define VLC_TS_INVALID (0) +#define CLOCK_FREQ INT64_C(1000000) /* When creating or destroying threads in blocking mode, delay to poll thread * status */ #define THREAD_SLEEP ((mtime_t)(0.010*CLOCK_FREQ)) -/* When a thread waits on a condition in debug mode, delay to wait before - * outputting an error message (in second) */ -#define THREAD_COND_TIMEOUT 1 - -/* The configuration file and directory */ -#if defined (SYS_BEOS) -# define CONFIG_DIR "config/settings/VideoLAN Client" -#elif defined (__APPLE__) -# 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 *****************************************************************************/ @@ -73,7 +64,6 @@ *****************************************************************************/ #define DEFAULT_INPUT_ACTIVITY 1 -#define DIRECTORY_ACTIVITY 100 #define TRANSCODE_ACTIVITY 10 /* Used in ErrorThread */ @@ -96,18 +86,21 @@ /* DVD and VCD devices */ #if !defined( WIN32 ) && !defined( UNDER_CE ) -# define VCD_DEVICE "/dev/cdrom" -# define CDAUDIO_DEVICE "/dev/cdrom" +# define CD_DEVICE "/dev/cdrom" +# define DVD_DEVICE "/dev/dvd" #else -# define VCD_DEVICE "D:" -# define CDAUDIO_DEVICE "D:" +# define CD_DEVICE "D:" +# define DVD_DEVICE NULL #endif +#define VCD_DEVICE CD_DEVICE +#define CDAUDIO_DEVICE CD_DEVICE /***************************************************************************** * Audio configuration *****************************************************************************/ /* Volume */ +/* If you are coding an interface, please see src/audio_output/intf.c */ #define AOUT_VOLUME_DEFAULT 256 #define AOUT_VOLUME_STEP 32 #define AOUT_VOLUME_MAX 1024 @@ -121,7 +114,7 @@ /* 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) +#define AOUT_MAX_ADVANCE_TIME (mtime_t)(DEFAULT_PTS_DELAY * 5) /* Buffers which arrive in advance of more than AOUT_MAX_PREPARE_TIME * will cause the calling thread to sleep */ @@ -138,6 +131,14 @@ /* Max acceptable resampling (in %) */ #define AOUT_MAX_RESAMPLING 10 +/***************************************************************************** + * SPU configuration + *****************************************************************************/ + +/* Buffer must avoid arriving more than SPU_MAX_PREPARE_TIME in advanced to + * the SPU */ +#define SPU_MAX_PREPARE_TIME ((mtime_t)(0.5*CLOCK_FREQ)) + /***************************************************************************** * Video configuration *****************************************************************************/ @@ -158,18 +159,7 @@ /* Video heap size - remember that a decompressed picture is big * (~1 Mbyte) before using huge values */ -#ifdef OPTIMIZE_MEMORY -# define VOUT_MAX_PICTURES 5 -#else -# define VOUT_MAX_PICTURES 8 -#endif - -/* 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 +#define VOUT_MAX_PICTURES 16 /* Statistics are displayed every n loops (=~ pictures) */ #define VOUT_STATS_NB_LOOPS 100 @@ -178,30 +168,6 @@ * Time settings */ -/* Time during which the thread will sleep if it has nothing to - * display (in micro-seconds) */ -#define VOUT_IDLE_SLEEP ((int)(0.020*CLOCK_FREQ)) - -/* Maximum lap of time allowed between the beginning of rendering and - * display. If, compared to the current date, the next image is too - * late, the thread will perform an idle loop. This time should be - * at least VOUT_IDLE_SLEEP plus the time required to render a few - * images, to avoid trashing of decoded images */ -#define VOUT_DISPLAY_DELAY ((int)(0.200*CLOCK_FREQ)) - -/* Pictures which are VOUT_BOGUS_DELAY or more in advance probably have - * a bogus PTS and won't be displayed */ -#define VOUT_BOGUS_DELAY ((mtime_t)(DEFAULT_PTS_DELAY * 30)) - -/* Delay (in microseconds) before an idle screen is displayed */ -#define VOUT_IDLE_DELAY (5*CLOCK_FREQ) - -/* 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 ((mtime_t)(0.020*CLOCK_FREQ)) - /* Time to sleep when waiting for a buffer (from vout or the video fifo). * 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