summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-06-10 17:20:45 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-06-10 17:20:45 +0000
commit06fa431cef7f98f8447c710769d9c77057f198c1 (patch)
treef1bc980b8d7184c2f2292695f44e1a1ba8dc2b0d
parent515b32d5aa66dd6e2cfc0b49e7d249bc614ca4b8 (diff)
gst/videomixer/videomixer.c: Remove bogus check.
Original commit message from CVS: * gst/videomixer/videomixer.c: (gst_videomixer_fill_queues), (gst_videomixer_blend_buffers), (gst_videomixer_update_queues): Remove bogus check.
-rw-r--r--ChangeLog6
-rw-r--r--gst/videomixer/videomixer.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f31a575..bf69e70a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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);