diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gst/videomixer/videomixer.c | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,6 +1,12 @@ 2008-06-10 Wim Taymans <wim.taymans@collabora.co.uk> * gst/videomixer/videomixer.c: (gst_videomixer_fill_queues), + (gst_videomixer_blend_buffers), (gst_videomixer_update_queues): + Remove bogus check. + +2008-06-10 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/videomixer/videomixer.c: (gst_videomixer_fill_queues), (gst_videomixer_blend_buffers): Use stream_time to synchronize the object properties. Use running_time of the master pad to timestamp outgoing buffers. diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index ea03f269..0d9e70f7 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -1378,6 +1378,7 @@ gst_videomixer_update_queues (GstVideoMixer * mix) } else { interval = GST_SECOND * mix->fps_d / mix->fps_n; } + GST_DEBUG_OBJECT (mix, "set interval to %" G_GUINT64_FORMAT, interval); } walk = mix->sinkpads; @@ -1388,9 +1389,9 @@ gst_videomixer_update_queues (GstVideoMixer * mix) walk = g_slist_next (walk); - if (mixcol->buffer != NULL && GST_CLOCK_TIME_IS_VALID (pad->queued)) { + if (mixcol->buffer != NULL) { pad->queued -= interval; - GST_DEBUG_OBJECT (pad, "queued now %lld", pad->queued); + GST_DEBUG_OBJECT (pad, "queued now %" G_GINT64_FORMAT, pad->queued); if (pad->queued <= 0) { GST_DEBUG ("unreffing buffer"); gst_buffer_unref (mixcol->buffer); |