X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fconfig.h.in;h=34dd6c02cf52cfd390f124f5be56119683a0dbdb;hb=647cca0ebb2e897a570018ba80483bb81a7d90c6;hp=ffe2302f33e555ce0a1f64efd2f79500c20e6024;hpb=884bfabe2789a8189f9cc8f1e4b537f559633e99;p=vlc diff --git a/include/config.h.in b/include/config.h.in index ffe2302f33..34dd6c02cf 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -79,10 +79,11 @@ /* 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_INTF +//#define DEBUG_INPUT +//#define DEBUG_AUDIO +#define DEBUG_VOUT +#define DEBUG_VPAR /* 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 @@ -112,7 +113,7 @@ */ /* Size of the FIFO. FIFO_SIZE+1 must be a power of 2 */ -#define FIFO_SIZE 1023 +#define FIFO_SIZE 511 /* * Paths @@ -136,7 +137,7 @@ #define INTF_CHANNELS_DEFAULT "vlc.channels" /* Base delay in micro second for interface sleeps */ -#define INTF_IDLE_SLEEP ((int)(0.100*CLOCK_FREQ)) +#define INTF_IDLE_SLEEP ((int)(0.050*CLOCK_FREQ)) /* Step for changing gamma, and minimum and maximum values */ #define INTF_GAMMA_STEP .1 @@ -163,45 +164,15 @@ * General limitations */ -/* Broadcast address, in case of a broadcasted stream */ -#define INPUT_BCAST_ADDR "138.195.143.255" - /* Maximum number of input threads - this value is used exclusively by * interface, and is in fact an interface limitation */ #define INPUT_MAX_THREADS 10 -/* Maximum number of programs definitions in a TS stream */ -#define INPUT_MAX_PGRM 10 - -/* Maximum number of ES definitions in a TS stream */ -#define INPUT_MAX_ES 10 - -/* Maximum number of ES in a single program */ -#define INPUT_MAX_PROGRAM_ES 10 - -/* Maximum number of selected ES in an input thread */ -#define INPUT_MAX_SELECTED_ES 10 - -/* Maximum number of TS packets in the client at any time - * INPUT_MAX_TS + 1 must be a power of 2, to optimize the %(INPUT_MAX_TS+1) - * operation with a &INPUT_MAX_TS in the case of a fifo netlist. - * It should be > number of fifos * FIFO_SIZE to avoid input deadlock. */ -#define INPUT_MAX_TS 32767 /* INPUT_MAX_TS + 1 = 2^15 */ - -/* Same thing with PES packets */ -#define INPUT_MAX_PES 16383 +/* Maximum size of a data packet (128 kB) */ +#define INPUT_MAX_PACKET_SIZE 131072 -/* Maximum number of TS packets we read from the socket in one readv(). - * Since you can't put more than 7 TS packets in an Ethernet frame, - * the maximum value is 7. This number should also limit the stream server, - * otherwise any supplementary packet is lost. */ -#define INPUT_TS_READ_ONCE 7 - -/* Use a LIFO or FIFO for TS netlist ? */ -#undef INPUT_LIFO_TS_NETLIST - -/* Use a LIFO or FIFO for PES netlist ? */ -#undef INPUT_LIFO_PES_NETLIST +/* Maximum length of a pre-parsed chunk (4 MB) */ +#define INPUT_PREPARSE_LENGTH 4194304 /* Maximum length of a hostname or source name */ #define INPUT_MAX_SOURCE_LENGTH 100 @@ -228,7 +199,7 @@ /* Default server and port */ #define INPUT_VLAN_SERVER_VAR "vlc_vlan_server" -#define INPUT_VLAN_SERVER_DEFAULT "138.195.140.31" +#define INPUT_VLAN_SERVER_DEFAULT "138.195.139.95" #define INPUT_VLAN_PORT_VAR "vlc_vlan_port" #define INPUT_VLAN_PORT_DEFAULT 6010 @@ -236,10 +207,12 @@ * server */ #define INPUT_VLAN_CHANGE_DELAY (5*CLOCK_FREQ) -/* Duration between the time we receive the TS packet, and the time we will +/* Duration between the time we receive the data packet, and the time we will * mark it to be presented */ -#define INPUT_PTS_DELAY (.5*CLOCK_FREQ) +#define DEFAULT_PTS_DELAY (.2*CLOCK_FREQ) +#define INPUT_DVD_DEVICE_VAR "vlc_dvd_device" +#define INPUT_DVD_DEVICE_DEFAULT "/dev/dvd" #define INPUT_DVD_AUDIO_VAR "vlc_dvd_audio" #define INPUT_DVD_CHANNEL_VAR "vlc_dvd_channel" #define INPUT_DVD_SUBTITLE_VAR "vlc_dvd_subtitle" @@ -251,21 +224,49 @@ /* Environment variable containing the audio output method */ #define AOUT_METHOD_VAR "vlc_aout" -/* The fallback method */ -#define AOUT_DEFAULT_METHOD "dsp" - /* Environment variable used to store dsp device name, and default value */ #define AOUT_DSP_VAR "vlc_dsp" #define AOUT_DSP_DEFAULT "/dev/dsp" +/* Default audio output format (AOUT_FMT_S16_NE = Native Endianess) */ +#define AOUT_FORMAT_DEFAULT AOUT_FMT_S16_NE +/* #define AOUT_FORMAT_DEFAULT AOUT_FMT_S8 */ +/* #define AOUT_FORMAT_DEFAULT AOUT_FMT_U8 */ +/* #define AOUT_FORMAT_DEFAULT AOUT_FMT_S16_BE */ +/* #define AOUT_FORMAT_DEFAULT AOUT_FMT_S16_LE */ +/* #define AOUT_FORMAT_DEFAULT AOUT_FMT_U16_BE */ +/* #define AOUT_FORMAT_DEFAULT AOUT_FMT_U16_LE */ + /* Environment variable for stereo, and default value */ #define AOUT_STEREO_VAR "vlc_stereo" #define AOUT_STEREO_DEFAULT 1 +/* Volume */ +#define VOLUME_DEFAULT 512 +#define VOLUME_STEP 128 +#define VOLUME_MAX 1024 + /* Environment variable for output rate, and default value */ #define AOUT_RATE_VAR "vlc_audio_rate" #define AOUT_RATE_DEFAULT 44100 +/* Number of audio output frames contained in an audio output fifo. + * (AOUT_FIFO_SIZE + 1) must be a power of 2, in order to optimise the + * %(AOUT_FIFO_SIZE + 1) operation with an &AOUT_FIFO_SIZE. + * With 511 we have at least 511*384/2/48000=2 seconds of sound */ +#define AOUT_FIFO_SIZE 511 + +/* Maximum number of audio fifos. The value of AOUT_MAX_FIFOS should be a power + * of two, in order to optimize the '/AOUT_MAX_FIFOS' and '*AOUT_MAX_FIFOS' + * operations with '>>' and '<<' (gcc changes this at compilation-time) */ +#define AOUT_MAX_FIFOS 2 + +/* Duration (in microseconds) of an audio output buffer should be : + * - short, in order to be able to play a new song very quickly (especially a + * song from the interface) + * - long, in order to perform the buffer calculations as few as possible */ +#define AOUT_BUFFER_DURATION 100000 + /***************************************************************************** * Video configuration *****************************************************************************/ @@ -277,12 +278,15 @@ /* Environment variable containing the display method */ #define VOUT_METHOD_VAR "vlc_vout" +/* Environment variable containing the motion compensation method */ +#define MOTION_METHOD_VAR "vlc_motion" + +/* Environment variable containing the IDCT method */ +#define IDCT_METHOD_VAR "vlc_idct" + /* Environment variable containing the YUV method */ #define YUV_METHOD_VAR "vlc_yuv" -/* The fallback method */ -#define VOUT_DEFAULT_METHOD "x11" - /* Environment variable used in place of DISPLAY if available */ #define VOUT_DISPLAY_VAR "vlc_display" @@ -299,10 +303,10 @@ /* Video heap size - remember that a decompressed picture is big * (~1 Mbyte) before using huge values */ -#define VOUT_MAX_PICTURES 10 +#define VOUT_MAX_PICTURES 5 /* Number of simultaneous subpictures */ -#define VOUT_MAX_SUBPICTURES 10 +#define VOUT_MAX_SUBPICTURES 5 /* 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 @@ -322,6 +326,9 @@ #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 + /* * Time settings */ @@ -354,6 +361,13 @@ #define VOUT_FB_DEV_VAR "vlc_fb_dev" #define VOUT_FB_DEV_DEFAULT "/dev/fb0" +/* Some frame buffers aren't able to support double buffering. + * We don't want to lose one frame out of 2, so we may set the + * FB_NOYPAN + */ +// #define FB_NOYPAN + + /***************************************************************************** * Video parser configuration *****************************************************************************/ @@ -399,6 +413,9 @@ /* Maximum range of values out of the IDCT + motion compensation. */ #define VDEC_CROPRANGE 2048 +/* Nice increments for decoders -- necessary for x11 scheduling */ +#define VDEC_NICE 3 + /***************************************************************************** * Generic decoder configuration *****************************************************************************/ @@ -417,6 +434,10 @@ * queue are printed by the calling thread */ #define INTF_MSG_QSIZE 64 +/* Interface warnig message level */ +#define INTF_WARNING_VAR "warning_level" +#define INTF_WARNING_DEFAULT 12 + /* 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 */