summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2004-01-14 00:53:52 +0000
committerBenjamin Otte <otte@gnome.org>2004-01-14 00:53:52 +0000
commit3a64b7c99f51bde86adbef8e47cea52860f0dc3a (patch)
treec9f102dab0798f3a683dde207f0cb810fbac0e80 /sys
parenta4b77770a946e12bbc0943e1708623fce29200f8 (diff)
use element time.
Original commit message from CVS: 2004-01-14 Benjamin Otte <in7y118@public.uni-hamburg.de> * ext/aalib/gstaasink.c: (gst_aasink_chain): * ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event): * ext/esd/esdsink.c: (gst_esdsink_chain): * ext/libcaca/gstcacasink.c: (gst_cacasink_chain): * ext/mas/massink.c: (gst_massink_chain): * ext/sdl/sdlvideosink.c: (gst_sdlvideosink_chain): * gst/matroska/matroska-demux.c: (gst_matroska_demux_parse_index), (gst_matroska_demux_parse_metadata): * gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_loop), (gst_mpeg_parse_release_locks): * gst/tcp/gsttcpsink.c: (gst_tcpsink_chain): * gst/udp/gstudpsink.c: (gst_udpsink_chain): * gst/videotestsrc/gstvideotestsrc.c: (gst_videotestsrc_get): * sys/oss/gstosssink.c: (gst_osssink_init), (gst_osssink_chain), (gst_osssink_change_state): * sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_chain): * sys/ximage/ximagesink.c: (gst_ximagesink_chain): * sys/xvideo/xvideosink.c: (gst_xvideosink_chain), (gst_xvideosink_release_locks): * sys/xvimage/xvimagesink.c: (gst_xvimagesink_chain): use element time. * ext/alsa/gstalsaclock.c: (gst_alsa_clock_start), (gst_alsa_clock_stop): * gst-libs/gst/audio/audioclock.c: (gst_audio_clock_set_active), (gst_audio_clock_get_internal_time): simplify for use with new clocking code. * testsuite/alsa/Makefile.am: * testsuite/alsa/sinesrc.c: (sinesrc_init), (sinesrc_force_caps): fix testsuite for new caps system
Diffstat (limited to 'sys')
-rw-r--r--sys/v4l/gstv4lmjpegsink.c12
-rw-r--r--sys/ximage/ximagesink.c6
-rw-r--r--sys/xvimage/xvimagesink.c6
3 files changed, 3 insertions, 21 deletions
diff --git a/sys/v4l/gstv4lmjpegsink.c b/sys/v4l/gstv4lmjpegsink.c
index 3bde5e157..d2212a4fc 100644
--- a/sys/v4l/gstv4lmjpegsink.c
+++ b/sys/v4l/gstv4lmjpegsink.c
@@ -243,7 +243,6 @@ gst_v4lmjpegsink_chain (GstPad *pad,
{
GstBuffer *buf = GST_BUFFER (_data);
GstV4lMjpegSink *v4lmjpegsink;
- GstClockTimeDiff jitter;
gint num;
g_return_if_fail (pad != NULL);
@@ -253,18 +252,9 @@ gst_v4lmjpegsink_chain (GstPad *pad,
v4lmjpegsink = GST_V4LMJPEGSINK (gst_pad_get_parent (pad));
if (v4lmjpegsink->clock) {
- GstClockID id;
-
GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP(buf));
- jitter = 0; /* FIXME: jitter = gst_clock_current_diff(v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP (buf)); */
-
- if (jitter > 500000 || jitter < -500000)
- GST_DEBUG ("jitter: %" G_GINT64_FORMAT, jitter);
-
- id = gst_clock_new_single_shot_id (v4lmjpegsink->clock, GST_BUFFER_TIMESTAMP(buf));
- gst_element_clock_wait(GST_ELEMENT(v4lmjpegsink), id, NULL);
- gst_clock_id_free (id);
+ gst_element_wait (GST_ELEMENT(v4lmjpegsink), GST_BUFFER_TIMESTAMP(buf));
}
#if 0
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 942bb456e..69c004166 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -730,11 +730,7 @@ gst_ximagesink_chain (GstPad *pad, GstData *data)
GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT, ximagesink->time);
if (GST_VIDEOSINK_CLOCK (ximagesink)) {
- GstClockID id;
- id = gst_clock_new_single_shot_id (GST_VIDEOSINK_CLOCK (ximagesink),
- ximagesink->time);
- gst_element_clock_wait (GST_ELEMENT (ximagesink), id, NULL);
- gst_clock_id_free (id);
+ gst_element_wait (GST_ELEMENT (ximagesink), ximagesink->time);
}
/* If this buffer has been allocated using our buffer management we simply
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 00f975764..34f18ec98 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -936,11 +936,7 @@ gst_xvimagesink_chain (GstPad *pad, GstData *data)
GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT, xvimagesink->time);
if (GST_VIDEOSINK_CLOCK (xvimagesink)) {
- GstClockID id;
- id = gst_clock_new_single_shot_id (GST_VIDEOSINK_CLOCK (xvimagesink),
- xvimagesink->time);
- gst_element_clock_wait (GST_ELEMENT (xvimagesink), id, NULL);
- gst_clock_id_free (id);
+ gst_element_wait (GST_ELEMENT (xvimagesink), xvimagesink->time);
}
/* If this buffer has been allocated using our buffer management we simply