From 2a34f767d43b8a9892a51e1dc76e790470428448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 29 Apr 2013 12:54:27 +0200 Subject: [PATCH] typefind: Stop typefinding if we get a CAPS event from upstream --- plugins/elements/gsttypefindelement.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c index 31e41272ef..3f8875051d 100644 --- a/plugins/elements/gsttypefindelement.c +++ b/plugins/elements/gsttypefindelement.c @@ -719,34 +719,13 @@ gst_type_find_element_setcaps (GstTypeFindElement * typefind, GstCaps * caps) /* Shortcircuit typefinding if we get caps */ if (typefind->mode == MODE_TYPEFIND) { - GstBuffer *buffer; - gsize avail; - GST_DEBUG_OBJECT (typefind, "Skipping typefinding, using caps from " "upstream: %" GST_PTR_FORMAT, caps); - typefind->mode = MODE_NORMAL; - gst_type_find_element_send_cached_events (typefind); - GST_OBJECT_LOCK (typefind); - avail = gst_adapter_available (typefind->adapter); - if (avail == 0) - goto no_data; - - buffer = gst_adapter_take_buffer (typefind->adapter, avail); - GST_OBJECT_UNLOCK (typefind); - - GST_DEBUG_OBJECT (typefind, "Pushing buffer: %" G_GSIZE_FORMAT, avail); - gst_pad_push (typefind->src, buffer); + stop_typefinding (typefind); } return TRUE; - -no_data: - { - GST_DEBUG_OBJECT (typefind, "no data to push"); - GST_OBJECT_UNLOCK (typefind); - return TRUE; - } } static gchar *