X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_config.h;h=77709e7306c78fddb46086a1396df733697b8acd;hb=7393f3b36c177cd87aed250cc3ed1d1d924f360e;hp=b6a377b4db374a5d09f2be4b36d8ddd03733f7c2;hpb=17f227bf9c179149a7f1869f3114b097a0698ed3;p=vlc

diff --git a/include/vlc_config.h b/include/vlc_config.h
index b6a377b4db..77709e7306 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -22,9 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
+/**
+ * \file
+ * This file defines of values used in interface, vout, aout and vlc core functions.
+ */
 
 /* Conventions regarding names of symbols and variables
  * ----------------------------------------------------
@@ -37,17 +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 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             3
-
 /*****************************************************************************
  * Interface configuration
  *****************************************************************************/
@@ -64,7 +64,6 @@
  *****************************************************************************/
 
 #define DEFAULT_INPUT_ACTIVITY 1
-#define DIRECTORY_ACTIVITY 100
 #define TRANSCODE_ACTIVITY 10
 
 /* Used in ErrorThread */
@@ -101,6 +100,7 @@
  *****************************************************************************/
 
 /* 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
@@ -114,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 */
@@ -151,18 +151,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
@@ -171,30 +160,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