Commit ae697f31 authored by Michel Lespinasse's avatar Michel Lespinasse

Une partie de patch qui ne devrait pas etre trop controversee : j'ai juste
change les #define MACHIN_DELAY pour qu'ils soient definis en tant que
multiples de CLOCK_FREQ

:>
parent 1399f00e
...@@ -50,7 +50,7 @@ MMX=YES ...@@ -50,7 +50,7 @@ MMX=YES
DECODER=new DECODER=new
# Debugging mode on or off (set to 1 to activate) # Debugging mode on or off (set to 1 to activate)
DEBUG=1 DEBUG=0
#----------------- do not change anything below this line ---------------------- #----------------- do not change anything below this line ----------------------
...@@ -140,7 +140,7 @@ CCFLAGS += -D_GNU_SOURCE ...@@ -140,7 +140,7 @@ CCFLAGS += -D_GNU_SOURCE
# Optimizations : don't compile debug versions with them # Optimizations : don't compile debug versions with them
CCFLAGS += -O6 CCFLAGS += -O6
CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global CCFLAGS += -ffast-math -funroll-loops -fargument-noalias-global
#CCFLAGS += -fomit-frame-pointer CCFLAGS += -fomit-frame-pointer
# Optimizations for x86 familiy # Optimizations for x86 familiy
ifeq ($(ARCH),X86) ifeq ($(ARCH),X86)
......
...@@ -76,13 +76,16 @@ ...@@ -76,13 +76,16 @@
* General configuration * General configuration
*****************************************************************************/ *****************************************************************************/
#define CLOCK_FREQ 1000000
/* Automagically spawn input, audio and video threads ? */ /* Automagically spawn input, audio and video threads ? */
// ?? used ? // ?? used ?
#define AUTO_SPAWN #define AUTO_SPAWN
/* When creating or destroying threads in blocking mode, delay to poll thread /* When creating or destroying threads in blocking mode, delay to poll thread
* status */ * status */
#define THREAD_SLEEP 10000 #define THREAD_SLEEP ((int)(0.010*CLOCK_FREQ))
/* /*
* Decoders FIFO configuration * Decoders FIFO configuration
...@@ -105,7 +108,7 @@ ...@@ -105,7 +108,7 @@
#define INTF_CHANNELS_DEFAULT "vlc.channels" #define INTF_CHANNELS_DEFAULT "vlc.channels"
/* Base delay in micro second for interface sleeps */ /* Base delay in micro second for interface sleeps */
#define INTF_IDLE_SLEEP 100000 #define INTF_IDLE_SLEEP ((int)(0.100*CLOCK_FREQ))
/* Step for changing gamma, and minimum and maximum values */ /* Step for changing gamma, and minimum and maximum values */
#define INTF_GAMMA_STEP .1 #define INTF_GAMMA_STEP .1
...@@ -123,7 +126,7 @@ ...@@ -123,7 +126,7 @@
*****************************************************************************/ *****************************************************************************/
/* ?? */ /* ?? */
#define INPUT_IDLE_SLEEP 100000 #define INPUT_IDLE_SLEEP ((int)(0.100*CLOCK_FREQ))
/* /*
* General limitations * General limitations
...@@ -196,11 +199,11 @@ ...@@ -196,11 +199,11 @@
/* Delay between vlan changes - this is required to avoid flooding the VLAN /* Delay between vlan changes - this is required to avoid flooding the VLAN
* server */ * server */
#define INPUT_VLAN_CHANGE_DELAY 5000000 #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 TS packet, and the time we will
* mark it to be presented */ * mark it to be presented */
#define INPUT_PTS_DELAY 2000000 #define INPUT_PTS_DELAY (2*CLOCK_FREQ)
/***************************************************************************** /*****************************************************************************
* Audio configuration * Audio configuration
...@@ -274,17 +277,17 @@ ...@@ -274,17 +277,17 @@
/* Time during which the thread will sleep if it has nothing to /* Time during which the thread will sleep if it has nothing to
* display (in micro-seconds) */ * display (in micro-seconds) */
#define VOUT_IDLE_SLEEP 20000 #define VOUT_IDLE_SLEEP ((int)(0.020*CLOCK_FREQ))
/* Maximum lap of time allowed between the beginning of rendering and /* Maximum lap of time allowed between the beginning of rendering and
* display. If, compared to the current date, the next image is too * display. If, compared to the current date, the next image is too
* late, the thread will perform an idle loop. This time should be * 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 * at least VOUT_IDLE_SLEEP plus the time required to render a few
* images, to avoid trashing of decoded images */ * images, to avoid trashing of decoded images */
#define VOUT_DISPLAY_DELAY 500000 #define VOUT_DISPLAY_DELAY ((int)(0.500*CLOCK_FREQ))
/* Delay (in microseconds) before an idle screen is displayed */ /* Delay (in microseconds) before an idle screen is displayed */
#define VOUT_IDLE_DELAY 5000000 #define VOUT_IDLE_DELAY (5*CLOCK_FREQ)
/* Number of pictures required to computes the FPS rate */ /* Number of pictures required to computes the FPS rate */
#define VOUT_FPS_SAMPLES 20 #define VOUT_FPS_SAMPLES 20
...@@ -301,13 +304,13 @@ ...@@ -301,13 +304,13 @@
* Video parser configuration * Video parser configuration
*****************************************************************************/ *****************************************************************************/
#define VPAR_IDLE_SLEEP 10000 #define VPAR_IDLE_SLEEP ((int)(0.010*CLOCK_FREQ))
/* Time to sleep when waiting for a buffer (from vout or the video fifo). /* 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 * 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 * 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. */ * to be too low, even if it blocks the decoder. */
#define VPAR_OUTMEM_SLEEP 50000 #define VPAR_OUTMEM_SLEEP ((int)(0.050*CLOCK_FREQ))
/* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember /* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
* that raising this level dramatically lengthens the compilation time. */ * that raising this level dramatically lengthens the compilation time. */
...@@ -329,7 +332,7 @@ ...@@ -329,7 +332,7 @@
//#define VDEC_SMP //#define VDEC_SMP
#define VDEC_IDLE_SLEEP 100000 #define VDEC_IDLE_SLEEP ((int)(0.100*CLOCK_FREQ))
/* Number of video_decoder threads to launch on startup of the video_parser. /* Number of video_decoder threads to launch on startup of the video_parser.
* It should always be less than half the number of macroblocks of a * It should always be less than half the number of macroblocks of a
...@@ -343,7 +346,7 @@ ...@@ -343,7 +346,7 @@
* Generic decoder configuration * Generic decoder configuration
*****************************************************************************/ *****************************************************************************/
#define GDEC_IDLE_SLEEP 100000 #define GDEC_IDLE_SLEEP ((int)(0.100*CLOCK_FREQ))
/***************************************************************************** /*****************************************************************************
* Messages and console interfaces configuration * Messages and console interfaces configuration
......
...@@ -91,8 +91,8 @@ typedef struct video_synchro_s ...@@ -91,8 +91,8 @@ typedef struct video_synchro_s
int i_coding_type; int i_coding_type;
} video_synchro_t; } video_synchro_t;
#define SYNC_TOLERATE 10000 /* 10 ms */ #define SYNC_TOLERATE ((int)(0.010*CLOCK_FREQ)) /* 10 ms */
#define SYNC_DELAY 500000 #define SYNC_DELAY ((int)(0.500*CLOCK_FREQ)) /* 500 ms */
#endif #endif
#ifdef POLUX_SYNCHRO #ifdef POLUX_SYNCHRO
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment