From 0aa5cea288cd2040123668302fbe88bbea8d6183 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 5 Dec 2005 10:59:17 +0000 Subject: [PATCH] Back out previous code changes, leave doc updates, file bugs instead. Original commit message from CVS: * gst/gstcaps.c: (gst_caps_is_equal): * plugins/elements/gstfakesrc.c: (gst_fake_src_class_init), (gst_fake_src_create): Back out previous code changes, leave doc updates, file bugs instead. --- ChangeLog | 8 ++++++++ gst/gstcaps.c | 6 ++---- plugins/elements/gstfakesrc.c | 35 ++++------------------------------- 3 files changed, 14 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1c247fb37..7d147dea6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-12-05 Wim Taymans + + * gst/gstcaps.c: (gst_caps_is_equal): + * plugins/elements/gstfakesrc.c: (gst_fake_src_class_init), + (gst_fake_src_create): + Back out previous code changes, leave doc updates, file bugs + instead. + 2005-12-05 Wim Taymans * plugins/elements/gstfakesrc.c: (gst_fake_src_class_init), diff --git a/gst/gstcaps.c b/gst/gstcaps.c index c58b6592f2..5300e580a1 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -872,10 +872,8 @@ gst_caps_is_equal (const GstCaps * caps1, const GstCaps * caps2) if (caps1 == caps2) return TRUE; - /* one of them NULL => they are different (can't be both NULL because - * we checked that above) */ - if (caps1 == NULL || caps2 == NULL) - return FALSE; + g_return_val_if_fail (caps1 != NULL, FALSE); + g_return_val_if_fail (caps2 != NULL, FALSE); if (gst_caps_is_fixed (caps1) && gst_caps_is_fixed (caps2)) return gst_caps_is_equal_fixed (caps1, caps2); diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c index eeb016fff6..4cd481ffd7 100644 --- a/plugins/elements/gstfakesrc.c +++ b/plugins/elements/gstfakesrc.c @@ -23,7 +23,7 @@ * SECTION:element-fakesrc * @short_description: Generate (meaningless) buffers * @see_also: #GstFakeSink - * + * * * * The fakesrc element is a multipurpose element that can generate @@ -225,8 +225,6 @@ static gboolean gst_fake_src_stop (GstBaseSrc * basesrc); static gboolean gst_fake_src_is_seekable (GstBaseSrc * basesrc); static gboolean gst_fake_src_event_handler (GstBaseSrc * src, GstEvent * event); -static void gst_fake_src_get_times (GstBaseSrc * basesrc, GstBuffer * buffer, - GstClockTime * start, GstClockTime * end); static GstFlowReturn gst_fake_src_create (GstBaseSrc * src, guint64 offset, guint length, GstBuffer ** buf); @@ -342,7 +340,6 @@ gst_fake_src_class_init (GstFakeSrcClass * klass) gstbase_src_class->start = GST_DEBUG_FUNCPTR (gst_fake_src_start); gstbase_src_class->stop = GST_DEBUG_FUNCPTR (gst_fake_src_stop); gstbase_src_class->event = GST_DEBUG_FUNCPTR (gst_fake_src_event_handler); - gstbase_src_class->get_times = GST_DEBUG_FUNCPTR (gst_fake_src_get_times); gstbase_src_class->create = GST_DEBUG_FUNCPTR (gst_fake_src_create); } @@ -701,33 +698,6 @@ gst_fake_src_create_buffer (GstFakeSrc * src) return buf; } -static void -gst_fake_src_get_times (GstBaseSrc * basesrc, GstBuffer * buffer, - GstClockTime * start, GstClockTime * end) -{ - GstFakeSrc *src; - - src = GST_FAKE_SRC (basesrc); - - /* sync on the timestamp of the buffer if requested. */ - if (src->sync) { - GstClockTime timestamp = GST_BUFFER_TIMESTAMP (buffer); - - if (GST_CLOCK_TIME_IS_VALID (timestamp)) { - /* get duration to calculate end time */ - GstClockTime duration = GST_BUFFER_DURATION (buffer); - - if (GST_CLOCK_TIME_IS_VALID (duration)) { - *end = timestamp + duration; - } - *start = timestamp; - } - } else { - *start = -1; - *end = -1; - } -} - static GstFlowReturn gst_fake_src_create (GstBaseSrc * basesrc, guint64 offset, guint length, GstBuffer ** ret) @@ -743,6 +713,9 @@ gst_fake_src_create (GstBaseSrc * basesrc, guint64 offset, guint length, if (src->datarate > 0) { time = (src->bytes_sent * GST_SECOND) / src->datarate; + if (src->sync) { + /* gst_element_wait (GST_ELEMENT (src), time); */ + } GST_BUFFER_DURATION (buf) = GST_BUFFER_SIZE (buf) * GST_SECOND / src->datarate;