* (c)1999 VideoLAN
*******************************************************************************/
-/* needs : "netlist.h", "config.h" */
+/* needs : "netlist.h", "config.h", "mtime.h" */
/* ?? missing:
* tables version control */
boolean_t b_data_alignment; /* used to find the beginning of a
* video or audio unit */
boolean_t b_has_pts; /* is the following field set ? */
- s64 i_pts; /* the PTS for this packet (if set above) */
+ mtime_t i_pts; /* the PTS for this packet (if set above) */
boolean_t b_random_access;
/* if TRUE, in the payload of this packet, there is the first byte
* of a video sequence header, or the first byte of an audio frame.
{
pthread_mutex_t lock; /* pcr modification lock */
- s64 delta_clock;
- s64 delta_decode;
+ mtime_t delta_clock;
+ mtime_t delta_decode;
/* represents decoder_time - pcr_time in usecondes */
count_t c_average;
/* counter used to compute dynamic average values */
#ifdef STATS
/* Stats */
count_t c_average_jitter;
- s64 max_jitter; /* the evalueted maximum jitter */
- s64 average_jitter; /* the evalueted average jitter */
+ mtime_t max_jitter; /* the evalueted maximum jitter */
+ mtime_t average_jitter; /* the evalueted average jitter */
count_t c_pcr; /* the number of PCR which have been decoded */
-#endif
+#endif
} pcr_descriptor_t;
/*******************************************************************************
*******************************************************************************
* Store an high precision date or time interval. The maximum precision is the
* micro-second, and a 64 bits integer is used to avoid any overflow (maximum
- * time interval is then 584542 years, which should be length enough for any
+ * time interval is then 292271 years, which should be length enough for any
* video). Date are stored as a time interval since a common date.
- * Note than date and time intervals can be manipulated using regular arithmetic
+ * Note that date and time intervals can be manipulated using regular arithmetic
* operators, and that no special functions are required.
*******************************************************************************/
-typedef u64 mtime_t;
+typedef s64 mtime_t;
/*******************************************************************************
* LAST_MDATE: date which will never happen
* returning the date of the first image to be displayed. It can be used in
* comparaison with other values: all existing dates will be earlier.
*******************************************************************************/
-#define LAST_MDATE ((mtime_t) -1)
+#define LAST_MDATE ((mtime_t)((u64)(-1)/2))
/*******************************************************************************
* MSTRTIME_MAX_SIZE: maximum possible size of mstrtime
*******************************************************************************
* This values is the maximal possible size of the string returned by the
- * mstrtime() function, including the final '\0'. It should be used to allocate
- * the buffer.
+ * mstrtime() function, including '-' and the final '\0'. It should be used to
+ * allocate the buffer.
*******************************************************************************/
-#define MSTRTIME_MAX_SIZE 20
+#define MSTRTIME_MAX_SIZE 22
/*******************************************************************************
* Prototypes
-/*******************************************************************************
+/******************************************************************************
* mtime.c: high rezolution time management functions
* (c)1998 VideoLAN
- *******************************************************************************
+ ******************************************************************************
* Functions are prototyped in mtime.h.
- *******************************************************************************
+ ******************************************************************************
* to-do list:
* see if using Linux real-time extensions is possible and profitable
- *******************************************************************************/
+ ******************************************************************************/
-/*******************************************************************************
+/******************************************************************************
* Preamble
- *******************************************************************************/
-
+ ******************************************************************************/
#include <stdio.h>
#include <sys/time.h>
#include "common.h"
#include "mtime.h"
-/*******************************************************************************
+/******************************************************************************
* mstrtime: return a date in a readable format
- *******************************************************************************
+ ******************************************************************************
* This functions is provided for any interface function which need to print a
* date. psz_buffer should be a buffer long enough to store the formatted
- * date.
- *******************************************************************************/
+ * date.
+ ******************************************************************************/
char *mstrtime( char *psz_buffer, mtime_t date )
{
- sprintf( psz_buffer, "%02d:%02d:%02d-%03d.%03d",
- (int) (date / (1000UL * 1000UL * 60UL * 60UL) % 24UL),
- (int) (date / (1000UL * 1000UL * 60UL) % 60UL),
- (int) (date / (1000UL * 1000UL) % 60UL),
- (int) (date / 1000UL % 1000UL),
- (int) (date % 1000UL) );
+ sprintf( psz_buffer, "%02d:%02d:%02d-%03d.%03d",
+ (int) (date / (1000LL * 1000LL * 60LL * 60LL) % 24LL),
+ (int) (date / (1000LL * 1000LL * 60LL) % 60LL),
+ (int) (date / (1000LL * 1000LL) % 60LL),
+ (int) (date / 1000LL % 1000LL),
+ (int) (date % 1000LL) );
return( psz_buffer );
}
-/*******************************************************************************
+/******************************************************************************
* mdate: return high precision date (inline function)
- *******************************************************************************
+ ******************************************************************************
* Uses the gettimeofday() function when possible (1 MHz resolution) or the
* ftime() function (1 kHz resolution).
- *******************************************************************************
+ ******************************************************************************
* to-do list: ??
* implement the function when gettimeofday is not available
* this function should be decalred as inline
- *******************************************************************************/
-mtime_t mdate( void )
+ ******************************************************************************/
+mtime_t mdate( void )
{
struct timeval tv_date;
return( (mtime_t) tv_date.tv_sec * 1000000 + (mtime_t) tv_date.tv_usec );
}
-/*******************************************************************************
- * mwait: wait for a date (inline function)
- *******************************************************************************
+/******************************************************************************
+ * mwait: wait for a date (inline function)
+ ******************************************************************************
* This function uses select() and an system date function to wake up at a
* precise date. It should be used for process synchronization. If current date
* is posterior to wished date, the function returns immediately.
- *******************************************************************************
+ ******************************************************************************
* to-do list:
* implement the function when gettimeofday is not available
* optimize delay calculation
* ?? declare as inline
- *******************************************************************************/
+ ******************************************************************************/
void mwait( mtime_t date )
{
struct timeval tv_date, tv_delay;
- s64 delay; /* delay in msec, signed to detect errors */
+ mtime_t delay; /* delay in msec, signed to detect errors */
/* see mdate() about gettimeofday() possible errors */
gettimeofday( &tv_date, NULL );
/* calculate delay and check if current date is before wished date */
delay = date - (mtime_t) tv_date.tv_sec * 1000000 - (mtime_t) tv_date.tv_usec;
- if( delay < 0 ) /* wished date is already passed */
+ if( delay <= 0 ) /* wished date is now or already passed */
{
return;
}
tv_delay.tv_sec = delay / 1000000;
- tv_delay.tv_usec = delay % 1000000;
-
+ tv_delay.tv_usec = delay % 1000000;
+
/* see msleep() about select() errors */
select( 0, NULL, NULL, NULL, &tv_delay );
}
-/*******************************************************************************
+/******************************************************************************
* msleep: more precise sleep() (inline function) (ok ?)
- *******************************************************************************
+ ******************************************************************************
* This function uses select() in a classical way to implement a sleep() call
- * with a microsecond precision.
+ * with a microsecond precision.
* For synchronization purposes, mwait() should be prefered.
- *******************************************************************************
+ ******************************************************************************
* ?? decalre as inline
- *******************************************************************************/
+ ******************************************************************************/
void msleep( mtime_t delay )
{
struct timeval tv_delay;
projects / vlc / commitdiff