mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

Add timestamps to osssrc.

Browse source 
Original commit message from CVS:
Add timestamps to osssrc.
Remove unused member "seq".
This commit is contained in:
Richard Boulton 2002-03-02 15:52:46 +00:00
parent e13d88d991
commit 58d346c0c4
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sys/oss/gstosssrc.c
View file

@ -174,7 +174,8 @@ gst_osssrc_init (GstOssSrc *osssrc)
osssrc->bytes_per_read = 4096; osssrc->bytes_per_read = 4096;
osssrc->curoffset = 0; osssrc->curoffset = 0;
osssrc->seq = 0; osssrc->basetime = 0;
osssrc->samples_since_basetime = 0;
} }
static GstBuffer * static GstBuffer *
@ -183,6 +184,7 @@ gst_osssrc_get (GstPad *pad)
GstOssSrc *src; GstOssSrc *src;
GstBuffer *buf; GstBuffer *buf;
glong readbytes; glong readbytes;
glong readsamples;
g_return_val_if_fail (pad != NULL, NULL); g_return_val_if_fail (pad != NULL, NULL);
src = GST_OSSSRC(gst_pad_get_parent (pad)); src = GST_OSSSRC(gst_pad_get_parent (pad));
@ -224,10 +226,15 @@ gst_osssrc_get (GstPad *pad)
GST_BUFFER_SIZE (buf) = readbytes; GST_BUFFER_SIZE (buf) = readbytes;
GST_BUFFER_OFFSET (buf) = src->curoffset; GST_BUFFER_OFFSET (buf) = src->curoffset;
GST_BUFFER_TIMESTAMP (buf) = src->basetime +
src->curoffset += readbytes; src->samples_since_basetime * 1000000LL / src->frequency;
GST_DEBUG (GST_CAT_PLUGIN_INFO, "pushed buffer from soundcard of %ld bytes\n", readbytes); src->curoffset += readbytes;
readsamples = readbytes / src->channels;
if (src->format == 16) readsamples /= 2;
src->samples_since_basetime += readsamples;
GST_DEBUG (GST_CAT_PLUGIN_INFO, "pushed buffer from soundcard of %ld bytes, timestamp %lld\n", readbytes, GST_BUFFER_TIMESTAMP (buf));
return buf; return buf;
} }
@ -252,6 +259,10 @@ gst_osssrc_set_property (GObject *object, guint prop_id, const GValue *value, GP
src->channels = g_value_get_int (value); src->channels = g_value_get_int (value);
break; break;
case ARG_FREQUENCY: case ARG_FREQUENCY:
/* Preserve the timestamps */
src->basetime = src->samples_since_basetime * 1000000LL / src->frequency;
src->samples_since_basetime = 0;
src->frequency = g_value_get_int (value); src->frequency = g_value_get_int (value);
break; break;
case ARG_CUROFFSET: case ARG_CUROFFSET:

4
sys/oss/gstosssrc.h
View file

@ -72,10 +72,10 @@ struct _GstOssSrc {
gint frequency; gint frequency;
/* blocking */ /* blocking */
guint64 basetime;
guint64 samples_since_basetime;
gulong curoffset; gulong curoffset;
gulong bytes_per_read; gulong bytes_per_read;
gulong seq;
}; };
struct _GstOssSrcClass { struct _GstOssSrcClass {