From 6bb455cdc9da41aa72ecf8c8b207ec29a3f933c5 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sun, 2 Jun 2002 13:25:40 +0000 Subject: [PATCH] Make elements nanoseconds aware Original commit message from CVS: Make elements nanoseconds aware --- ext/esd/esdmon.c | 4 ++-- gst/goom/gstgoom.c | 2 +- gst/monoscope/gstmonoscope.c | 2 +- sys/oss/gstosssink.c | 1 + sys/oss/gstosssrc.c | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c index 51441c3..423e7f5 100644 --- a/ext/esd/esdmon.c +++ b/ext/esd/esdmon.c @@ -316,7 +316,7 @@ gst_esdmon_get (GstPad *pad) GST_BUFFER_SIZE (buf) = readbytes; GST_BUFFER_OFFSET (buf) = esdmon->curoffset; GST_BUFFER_TIMESTAMP (buf) = esdmon->basetime + - esdmon->samples_since_basetime * 1000000LL / esdmon->frequency; + esdmon->samples_since_basetime * GST_SECOND / esdmon->frequency; esdmon->curoffset += readbytes; readsamples = readbytes / esdmon->channels; @@ -351,7 +351,7 @@ gst_esdmon_set_property (GObject *object, guint prop_id, const GValue *value, GP break; case ARG_RATE: /* Preserve the timestamps */ - esdmon->basetime = esdmon->samples_since_basetime * 1000000LL / esdmon->frequency; + esdmon->basetime = esdmon->samples_since_basetime * GST_SECOND / esdmon->frequency; esdmon->samples_since_basetime = 0; /* Set the new frequency */ diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index 5b9f404..506ec82 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -281,7 +281,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin) GST_BUFFER_TIMESTAMP (bufout) = goom->next_time; GST_BUFFER_FLAG_SET (bufout, GST_BUFFER_DONTFREE); - goom->next_time += 1000000LL / goom->fps; + goom->next_time += GST_SECOND / goom->fps; gst_pad_push (goom->srcpad, bufout); diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index 8c4a84d..cad9c34 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -286,7 +286,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin) GST_BUFFER_TIMESTAMP (bufout) = monoscope->next_time; GST_BUFFER_FLAG_SET (bufout, GST_BUFFER_DONTFREE); - monoscope->next_time += 1000000LL / monoscope->fps; + monoscope->next_time += GST_SECOND / monoscope->fps; gst_pad_push (monoscope->srcpad, bufout); diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index c0bc4bd..dbd6670 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -462,6 +462,7 @@ gst_osssink_get_clock (GstElement *element) osssink = GST_OSSSINK (element); + return NULL; return GST_CLOCK (osssink->provided_clock); } diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index f8d0c11..6799f65 100644 --- a/sys/oss/gstosssrc.c +++ b/sys/oss/gstosssrc.c @@ -232,7 +232,7 @@ gst_osssrc_get (GstPad *pad) GST_BUFFER_SIZE (buf) = readbytes; GST_BUFFER_OFFSET (buf) = src->curoffset; GST_BUFFER_TIMESTAMP (buf) = src->basetime + - src->samples_since_basetime * 1000000LL / src->frequency; + src->samples_since_basetime * GST_SECOND / src->frequency; src->curoffset += readbytes; readsamples = readbytes / src->channels; @@ -265,7 +265,7 @@ gst_osssrc_set_property (GObject *object, guint prop_id, const GValue *value, GP break; case ARG_FREQUENCY: /* Preserve the timestamps */ - src->basetime = src->samples_since_basetime * 1000000LL / src->frequency; + src->basetime = src->samples_since_basetime * GST_SECOND / src->frequency; src->samples_since_basetime = 0; src->frequency = g_value_get_int (value); -- 2.7.4