mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-25 10:04:19 +00:00
Code Issues1 Projects Releases Wiki Activity

Small cleanups and portability fixes for GUINT64

Browse source 
Original commit message from CVS:
Small cleanups and portability fixes for GUINT64
This commit is contained in:
Wim Taymans 2003-02-10 20:16:38 +00:00
parent ec6a2c1997
commit 136e5d254e
6 changed files with 20 additions and 20 deletions

8
gst/gstclock.h
View file

@ -41,10 +41,10 @@ typedef gpointer GstClockID;
#define GST_CLOCK_TIME_NONE ((guint64)-1)
#define GST_SECOND ((guint64) G_USEC_PER_SEC * 1000LL)
#define GST_MSECOND ((guint64) GST_SECOND / 1000LL)
#define GST_USECOND ((guint64) GST_SECOND / 1000000LL)
#define GST_NSECOND ((guint64) GST_SECOND / 1000000000LL)
#define GST_SECOND ((guint64) G_USEC_PER_SEC * G_GINT64_CONSTANT (1000))
#define GST_MSECOND ((guint64) GST_SECOND / G_GINT64_CONSTANT (1000))
#define GST_USECOND ((guint64) GST_SECOND / G_GINT64_CONSTANT (1000000))
#define GST_NSECOND ((guint64) GST_SECOND / G_GINT64_CONSTANT (1000000000))
#define GST_CLOCK_DIFF(s, e) (GstClockTimeDiff)((s) - (e))
#define GST_TIMEVAL_TO_TIME(tv) ((tv).tv_sec * GST_SECOND + (tv).tv_usec * GST_USECOND)

4
gst/gstformat.h
View file

@ -41,8 +41,8 @@ typedef enum {
} GstFormat;
/* a percentage is always relative to 1000000 */
#define GST_FORMAT_PERCENT_MAX 1000000LL
#define GST_FORMAT_PERCENT_SCALE 10000LL
#define GST_FORMAT_PERCENT_MAX G_GINT64_CONSTANT (1000000)
#define GST_FORMAT_PERCENT_SCALE G_GINT64_CONSTANT (10000)
typedef struct _GstFormatDefinition GstFormatDefinition;

4
gst/gstindex.c
View file

@ -89,7 +89,7 @@ gst_index_resolver_get_type (void)
}
GType
gst_index_get_type(void) {
gst_index_get_type (void) {
static GType index_type = 0;
if (!index_type) {
@ -216,7 +216,7 @@ gst_index_group_new(guint groupnum)
* Returns: a new index object
*/
GstIndex*
gst_index_new()
gst_index_new (void)
{
GstIndex *index;

4
gst/gstquery.h
View file

@ -39,8 +39,8 @@ typedef enum {
GST_QUERY_RATE
} GstQueryType;
/* rate is relative to 1000000LL */
#define GST_QUERY_TYPE_RATE_DEN 1000000LL
/* rate is relative to 1000000 */
#define GST_QUERY_TYPE_RATE_DEN G_GINT64_CONSTANT (1000000)
typedef struct _GstQueryTypeDefinition GstQueryTypeDefinition;

10
gst/gstqueue.c
View file

@ -229,10 +229,10 @@ gst_queue_init (GstQueue *queue)
queue->queue = NULL;
queue->level_buffers = 0;
queue->level_bytes = 0;
queue->level_time = 0LL;
queue->size_buffers = 100; /* 100 buffers */
queue->size_bytes = 100 * 1024; /* 100KB */
queue->size_time = 1000000000LL; /* 1sec */
queue->level_time = G_GINT64_CONSTANT (0);
queue->size_buffers = 100; /* 100 buffers */
queue->size_bytes = 100 * 1024; /* 100KB */
queue->size_time = G_GINT64_CONSTANT (1000000000); /* 1sec */
queue->may_deadlock = TRUE;
queue->block_timeout = -1;
queue->interrupt = FALSE;
@ -293,7 +293,7 @@ gst_queue_locked_flush (GstQueue *queue)
queue->timeval = NULL;
queue->level_buffers = 0;
queue->level_bytes = 0;
queue->level_time = 0LL;
queue->level_time = G_GINT64_CONSTANT (0);
/* make sure any pending buffers to be added are flushed too */
queue->flush = TRUE;
}

10
plugins/elements/gstqueue.c
View file

@ -229,10 +229,10 @@ gst_queue_init (GstQueue *queue)
queue->queue = NULL;
queue->level_buffers = 0;
queue->level_bytes = 0;
queue->level_time = 0LL;
queue->size_buffers = 100; /* 100 buffers */
queue->size_bytes = 100 * 1024; /* 100KB */
queue->size_time = 1000000000LL; /* 1sec */
queue->level_time = G_GINT64_CONSTANT (0);
queue->size_buffers = 100; /* 100 buffers */
queue->size_bytes = 100 * 1024; /* 100KB */
queue->size_time = G_GINT64_CONSTANT (1000000000); /* 1sec */
queue->may_deadlock = TRUE;
queue->block_timeout = -1;
queue->interrupt = FALSE;
@ -293,7 +293,7 @@ gst_queue_locked_flush (GstQueue *queue)
queue->timeval = NULL;
queue->level_buffers = 0;
queue->level_bytes = 0;
queue->level_time = 0LL;
queue->level_time = G_GINT64_CONSTANT (0);
/* make sure any pending buffers to be added are flushed too */
queue->flush = TRUE;
}