diff options
| author | Benjamin Otte <otte@gnome.org> | 2004-01-14 00:53:52 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2004-01-14 00:53:52 +0000 |
| commit | 596506d44396ef26250b58f5ce2dbeb6a5fec369 (patch) | |
| tree | f5ea8c5b7c51470db4279cf72c03f11334d80078 /ext | |
| parent | a9eb10c6efde1cb4b040c0b0fe81313a4e9403e5 (diff) | |
| download | gst-plugins-bad-596506d44396ef26250b58f5ce2dbeb6a5fec369.tar.gz gst-plugins-bad-596506d44396ef26250b58f5ce2dbeb6a5fec369.tar.bz2 gst-plugins-bad-596506d44396ef26250b58f5ce2dbeb6a5fec369.zip | |
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 'ext')
| -rw-r--r-- | ext/mas/massink.c | 7 | ||||
| -rw-r--r-- | ext/sdl/sdlvideosink.c | 9 |
2 files changed, 4 insertions, 12 deletions
diff --git a/ext/mas/massink.c b/ext/mas/massink.c index 01eed9e6..376cc862 100644 --- a/ext/mas/massink.c +++ b/ext/mas/massink.c @@ -225,12 +225,9 @@ gst_massink_chain (GstPad *pad, GstData *_data) GstMassink *massink = GST_MASSINK (gst_pad_get_parent (pad)); - if (massink->clock) { - GstClockID id = gst_clock_new_single_shot_id (massink->clock, GST_BUFFER_TIMESTAMP (buf)); - + if (massink->clock && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { GST_DEBUG ("massink: clock wait: %llu\n", GST_BUFFER_TIMESTAMP (buf)); - gst_element_clock_wait (GST_ELEMENT (massink), id, NULL); - gst_clock_id_free (id); + gst_element_wait (GST_ELEMENT (massink), GST_BUFFER_TIMESTAMP (buf)); } if (GST_BUFFER_DATA (buf) != NULL) { diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index 1e3e2f6e..a5fa4704 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -562,13 +562,8 @@ gst_sdlvideosink_chain (GstPad *pad, GstData *_data) return; } - if (GST_VIDEOSINK_CLOCK (sdlvideosink)) { - GstClockID id = gst_clock_new_single_shot_id ( - GST_VIDEOSINK_CLOCK (sdlvideosink), - GST_BUFFER_TIMESTAMP (buf)); - - gst_element_clock_wait (GST_ELEMENT (sdlvideosink), id, NULL); - gst_clock_id_free (id); + if (GST_VIDEOSINK_CLOCK (sdlvideosink) && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { + gst_element_wait (GST_ELEMENT (sdlvideosink), GST_BUFFER_TIMESTAMP (buf)); } if (GST_BUFFER_DATA (buf) != sdlvideosink->overlay->pixels[0]) { |