Merge branch 'master' into 0.11

gst/gstcaps.c

@@ -253,7 +253,10 @@ gst_caps_new_simple (const char *media_type, const char *fieldname, ...)
   structure = gst_structure_new_valist (media_type, fieldname, var_args);
   va_end (var_args);
 
-  gst_caps_append_structure_unchecked (caps, structure);
+  if (structure)
+    gst_caps_append_structure_unchecked (caps, structure);
+  else
+    gst_caps_replace (&caps, NULL);
 
   return caps;
 }
@@ -842,7 +845,7 @@ gst_caps_set_value (GstCaps * caps, const char *field, const GValue * value)
  * Sets fields in a #GstCaps.  The arguments must be passed in the same
  * manner as gst_structure_set(), and be NULL-terminated.
  * <note>Prior to GStreamer version 0.10.26, this function failed when
- * @caps was not simple. If your code needs to work with those versions 
+ * @caps was not simple. If your code needs to work with those versions
  * of GStreamer, you may only call this function when GST_CAPS_IS_SIMPLE()
  * is %TRUE for @caps.</note>
  */

gst/gstpadtemplate.c

@@ -31,26 +31,26 @@
  * created (request or sometimes pads).
  *
  * Pad and PadTemplates have #GstCaps attached to it to describe the media type
- * they are capable of dealing with. gst_pad_template_get_caps() or 
+ * they are capable of dealing with. gst_pad_template_get_caps() or
- * GST_PAD_TEMPLATE_CAPS() are used to get the caps of a padtemplate. It's not 
+ * GST_PAD_TEMPLATE_CAPS() are used to get the caps of a padtemplate. It's not
  * possible to modify the caps of a padtemplate after creation.
  *
  * PadTemplates have a #GstPadPresence property which identifies the lifetime
- * of the pad and that can be retrieved with GST_PAD_TEMPLATE_PRESENCE(). Also 
+ * of the pad and that can be retrieved with GST_PAD_TEMPLATE_PRESENCE(). Also
- * the direction of the pad can be retrieved from the #GstPadTemplate with 
+ * the direction of the pad can be retrieved from the #GstPadTemplate with
  * GST_PAD_TEMPLATE_DIRECTION().
  *
  * The GST_PAD_TEMPLATE_NAME_TEMPLATE () is important for GST_PAD_REQUEST pads
  * because it has to be used as the name in the gst_element_get_request_pad()
  * call to instantiate a pad from this template.
  *
- * Padtemplates can be created with gst_pad_template_new() or with 
+ * Padtemplates can be created with gst_pad_template_new() or with
  * gst_static_pad_template_get (), which creates a #GstPadTemplate from a
  * #GstStaticPadTemplate that can be filled with the
- * convenient GST_STATIC_PAD_TEMPLATE() macro. 
+ * convenient GST_STATIC_PAD_TEMPLATE() macro.
  *
- * A padtemplate can be used to create a pad (see gst_pad_new_from_template() 
+ * A padtemplate can be used to create a pad (see gst_pad_new_from_template()
- * or gst_pad_new_from_static_template ()) or to add to an element class 
+ * or gst_pad_new_from_static_template ()) or to add to an element class
  * (see gst_element_class_add_pad_template ()).
  *
  * The following code example shows the code to create a pad from a padtemplate.
@@ -66,7 +66,7 @@
  *       "audio/x-raw-int, "
  *         "channels = (int) [ 1, 6 ]"
  *     )
- *   )
+ *   );
  *   void
  *   my_method (void)
  *   {
@@ -85,7 +85,7 @@
  *   my_element_base_init (gpointer g_class)
  *   {
  *     GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
- *    
+ *
  *     gst_element_class_add_pad_template (gstelement_class,
  *         gst_static_pad_template_get (&my_template));
  *   }

gst/gststructure.c

@@ -29,7 +29,7 @@
  *
  * In addition to the key/value pairs, a #GstStructure also has a name. The name
  * starts with a letter and can be folled by letters, numbers and any of "/-_.:".
- * 
+ *
  * #GstStructure is used by various GStreamer subsystems to store information
  * in a flexible and extensible way. A #GstStructure does not have a refcount
  * because it usually is part of a higher level object such as #GstCaps. It
@@ -39,7 +39,7 @@
  * A #GstStructure can be created with gst_structure_empty_new() or
  * gst_structure_new(), which both take a name and an optional set of
  * key/value pairs along with the types of the values.
- * 
+ *
  * Field values can be changed with gst_structure_set_value() or
  * gst_structure_set().
  *
@@ -219,8 +219,6 @@ gst_structure_new (const gchar * name, const gchar * firstfield, ...)
   GstStructure *structure;
   va_list varargs;
 
-  g_return_val_if_fail (name != NULL, NULL);
-
   va_start (varargs, firstfield);
   structure = gst_structure_new_valist (name, firstfield, varargs);
   va_end (varargs);
@@ -250,8 +248,6 @@ gst_structure_new_valist (const gchar * name,
 {
   GstStructure *structure;
 
-  g_return_val_if_fail (name != NULL, NULL);
-
   structure = gst_structure_empty_new (name);
 
   if (structure)
@@ -1466,7 +1462,7 @@ gst_structure_get_date_time (const GstStructure * structure,
  * and has the correct type.
  *
  * Returns: TRUE if the value could be set correctly. If there was no field
- * with @fieldname or the existing field did not contain a #GstClockTime, this 
+ * with @fieldname or the existing field did not contain a #GstClockTime, this
  * function returns FALSE.
  */
 gboolean
@@ -1502,7 +1498,7 @@ gst_structure_get_clock_time (const GstStructure * structure,
  * and has the correct type.
  *
  * Returns: TRUE if the value could be set correctly. If there was no field
- * with @fieldname or the existing field did not contain a double, this 
+ * with @fieldname or the existing field did not contain a double, this
  * function returns FALSE.
  */
 gboolean
@@ -1606,12 +1602,12 @@ gst_structure_get_enum (const GstStructure * structure,
  * @value_numerator: (out): a pointer to an int to set
  * @value_denominator: (out): a pointer to an int to set
  *
- * Sets the integers pointed to by @value_numerator and @value_denominator 
+ * Sets the integers pointed to by @value_numerator and @value_denominator
- * corresponding to the value of the given field.  Caller is responsible 
+ * corresponding to the value of the given field.  Caller is responsible
  * for making sure the field exists and has the correct type.
  *
  * Returns: TRUE if the values could be set correctly. If there was no field
- * with @fieldname or the existing field did not contain a GstFraction, this 
+ * with @fieldname or the existing field did not contain a GstFraction, this
  * function returns FALSE.
  */
 gboolean
@@ -2566,7 +2562,7 @@ gst_structure_fixate_field_string (GstStructure * structure,
  * @target_denominator: The denominator of the target value of the fixation
  *
  * Fixates a #GstStructure by changing the given field to the nearest
- * fraction to @target_numerator/@target_denominator that is a subset 
+ * fraction to @target_numerator/@target_denominator that is a subset
  * of the existing field.
  *
  * Returns: TRUE if the structure could be fixated

tests/check/Makefile.am

@@ -65,6 +65,7 @@ REGISTRY_CHECKS =				\
 	gst/gstbin				\
 	gst/gstchildproxy			\
 	gst/gstelement				\
+	gst/gstelementfactory			\
 	gst/gstevent				\
 	gst/gstghostpad				\
 	gst/gstindex				\
@@ -132,12 +133,12 @@ check_PROGRAMS =				\
 	libs/bytewriter				\
 	libs/gstnetclientclock			\
 	libs/gstnettimeprovider			\
-	libs/transform1				
+	libs/transform1
 
 # failing tests
 noinst_PROGRAMS =				\
 	gst/gstpipeline				\
-	libs/collectpads			
+	libs/collectpads
 
 # elements to ignore for the state tests
 # STATE_IGNORE_ELEMENTS =
@@ -169,7 +170,7 @@ AM_CXXFLAGS = $(GST_OBJ_CXXFLAGS) -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS
 LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
 	$(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
 	$(GST_OBJ_LIBS)
-	
+
 gst_gstcpp_SOURCES = gst/gstcpp.cc
 
 gst_gstutils_LDADD = $(LDADD) $(GSL_LIBS) $(GMP_LIBS)

tests/check/gst/.gitignore

@@ -12,6 +12,7 @@ gstcpp
 gstdata
 gstdatetime
 gstelement
+gstelementfactory
 gstevent
 gstghostpad
 gstiterator

tests/check/gst/gstelement.c

@@ -164,49 +164,6 @@ GST_START_TEST (test_link_no_pads)
 
 GST_END_TEST;
 
-/* check if the elementfactory of a class is filled (see #131079) */
-GST_START_TEST (test_class)
-{
-  GstElementClass *klass;
-  GstElementFactory *factory, *tmp;
-  GType type;
-
-  GST_DEBUG ("finding factory for queue");
-  factory = gst_element_factory_find ("queue");
-  fail_if (factory == NULL);
-
-  /* it may already be loaded if check is being run with CK_FORK=no */
-  if (!GST_PLUGIN_FEATURE (factory)->loaded) {
-    GST_DEBUG ("getting the type");
-    /* feature is not loaded, should return 0 as the type */
-    type = gst_element_factory_get_element_type (factory);
-    fail_if (type != 0);
-  }
-
-  GST_DEBUG ("now loading the plugin");
-  tmp =
-      GST_ELEMENT_FACTORY (gst_plugin_feature_load (GST_PLUGIN_FEATURE
-          (factory)));
-  fail_if (tmp == NULL);
-
-  gst_object_unref (factory);
-  factory = tmp;
-
-  /* feature is now loaded */
-  type = gst_element_factory_get_element_type (factory);
-  fail_if (type == 0);
-
-  klass = g_type_class_ref (factory->type);
-  fail_if (klass == NULL);
-
-  GST_DEBUG ("checking the element factory class field");
-  /* and elementfactory is filled in */
-  fail_if (klass->elementfactory == NULL);
-  fail_if (klass->elementfactory != factory);
-
-}
-
-GST_END_TEST;
 
 static Suite *
 gst_element_suite (void)
@@ -220,7 +177,6 @@ gst_element_suite (void)
   tcase_add_test (tc_chain, test_error_no_bus);
   tcase_add_test (tc_chain, test_link);
   tcase_add_test (tc_chain, test_link_no_pads);
-  tcase_add_test (tc_chain, test_class);
 
   return s;
 }

tests/check/gst/gstelementfactory.c

@@ -0,0 +1,138 @@
+/* GStreamer
+ * Copyright (C) 2011 Stefan Kost <ensonic@users.sf.net>
+ *
+ * gstelementfactory.c: Unit test for GstElementFactory
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <gst/check/gstcheck.h>
+
+static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-raw-int, " "channels = (int) [ 1, 6 ]")
+    );
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("audio/x-raw-int, " "channels = (int) [ 1, 6 ]")
+    );
+
+static void
+setup_pad_template (GstElementFactory * factory, GstStaticPadTemplate * tmpl)
+{
+  GstStaticPadTemplate *template;
+
+  template = g_slice_dup (GstStaticPadTemplate, tmpl);
+  factory->staticpadtemplates = g_list_append (factory->staticpadtemplates,
+      template);
+  factory->numpadtemplates++;
+}
+
+static GstElementFactory *
+setup_factory (void)
+{
+  GstPluginFeature *feature;
+  GstElementFactory *factory;
+
+  feature = g_object_newv (GST_TYPE_ELEMENT_FACTORY, 0, NULL);
+  gst_plugin_feature_set_name (feature, "test");
+
+  factory = GST_ELEMENT_FACTORY_CAST (feature);
+  factory->details.longname = g_strdup ("test");
+  factory->details.klass = g_strdup ("test");
+  factory->details.description = g_strdup ("test");
+  factory->details.author = g_strdup ("test");
+
+  setup_pad_template (factory, &sink_template);
+  setup_pad_template (factory, &src_template);
+
+  return factory;
+}
+
+/* create a basic factory */
+GST_START_TEST (test_create)
+{
+  GstElementFactory *factory;
+
+  factory = setup_factory ();
+  fail_if (factory == NULL);
+
+  g_object_unref (factory);
+}
+
+GST_END_TEST;
+
+/* check if the elementfactory of a class is filled (see #131079) */
+GST_START_TEST (test_class)
+{
+  GstElementClass *klass;
+  GstElementFactory *factory, *tmp;
+  GType type;
+
+  GST_DEBUG ("finding factory for queue");
+  factory = gst_element_factory_find ("queue");
+  fail_if (factory == NULL);
+
+  /* it may already be loaded if check is being run with CK_FORK=no */
+  if (!GST_PLUGIN_FEATURE (factory)->loaded) {
+    GST_DEBUG ("getting the type");
+    /* feature is not loaded, should return 0 as the type */
+    type = gst_element_factory_get_element_type (factory);
+    fail_if (type != 0);
+  }
+
+  GST_DEBUG ("now loading the plugin");
+  tmp =
+      GST_ELEMENT_FACTORY (gst_plugin_feature_load (GST_PLUGIN_FEATURE
+          (factory)));
+  fail_if (tmp == NULL);
+
+  gst_object_unref (factory);
+  factory = tmp;
+
+  /* feature is now loaded */
+  type = gst_element_factory_get_element_type (factory);
+  fail_if (type == 0);
+
+  klass = g_type_class_ref (factory->type);
+  fail_if (klass == NULL);
+
+  GST_DEBUG ("checking the element factory class field");
+  /* and elementfactory is filled in */
+  fail_if (klass->elementfactory == NULL);
+  fail_if (klass->elementfactory != factory);
+
+}
+
+GST_END_TEST;
+
+
+static Suite *
+gst_element_factory_suite (void)
+{
+  Suite *s = suite_create ("GstElementFactory");
+  TCase *tc_chain = tcase_create ("element-factory tests");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_test (tc_chain, test_class);
+  tcase_add_test (tc_chain, test_create);
+
+  return s;
+}
+
+GST_CHECK_MAIN (gst_element_factory);

tests/examples/helloworld/helloworld.c

@@ -1,115 +1,80 @@
-#include <stdlib.h>
 #include <gst/gst.h>
 
-static void
+static gboolean
-event_loop (GstElement * pipe)
+bus_call (GstBus * bus, GstMessage * msg, gpointer data)
 {
-  GstBus *bus;
+  GMainLoop *loop = (GMainLoop *) data;
-  GstMessage *message = NULL;
-  gboolean running = TRUE;
 
-  bus = gst_element_get_bus (GST_ELEMENT (pipe));
+  switch (GST_MESSAGE_TYPE (msg)) {
-
+    case GST_MESSAGE_EOS:{
-  while (running) {
+      g_print ("End-of-stream\n");
-    message = gst_bus_poll (bus, GST_MESSAGE_ANY, -1);
+      g_main_loop_quit (loop);
-
+      break;
-    g_assert (message != NULL);
-
-    switch (message->type) {
-      case GST_MESSAGE_EOS:
-        running = FALSE;
-        break;
-      case GST_MESSAGE_WARNING:{
-        GError *gerror;
-        gchar *debug;
-
-        gst_message_parse_warning (message, &gerror, &debug);
-        gst_object_default_error (GST_MESSAGE_SRC (message), gerror, debug);
-        g_error_free (gerror);
-        g_free (debug);
-        break;
-      }
-      case GST_MESSAGE_ERROR:{
-        GError *gerror;
-        gchar *debug;
-
-        gst_message_parse_error (message, &gerror, &debug);
-        gst_object_default_error (GST_MESSAGE_SRC (message), gerror, debug);
-        g_error_free (gerror);
-        g_free (debug);
-        running = FALSE;
-        break;
-      }
-      default:
-        break;
     }
-    gst_message_unref (message);
+    case GST_MESSAGE_ERROR:{
+      gchar *debug;
+      GError *err;
+
+      gst_message_parse_error (msg, &err, &debug);
+      g_free (debug);
+
+      g_print ("Error: %s\n", err->message);
+      g_error_free (err);
+
+      g_main_loop_quit (loop);
+
+      break;
+    }
+    default:
+      break;
   }
-  gst_object_unref (bus);
+  return TRUE;
 }
 
-int
+gint
-main (int argc, char *argv[])
+main (gint argc, gchar * argv[])
 {
-  GstElement *bin, *filesrc, *decoder, *audiosink;
+  GstElement *playbin;
-  GstElement *conv, *resample;
+  GMainLoop *loop;
+  GstBus *bus;
+  gchar *uri;
 
   gst_init (&argc, &argv);
 
-  if (argc != 2) {
+  if (argc < 2) {
-    g_print ("usage: %s <mp3 file>\n", argv[0]);
+    g_print ("usage: %s <media file or uri>\n", argv[0]);
-    exit (-1);
+    return 1;
   }
 
-  /* create a new bin to hold the elements */
+  playbin = gst_element_factory_make ("playbin2", NULL);
-  bin = gst_pipeline_new ("pipeline");
+  if (!playbin) {
-  g_assert (bin);
+    g_print ("'playbin2' gstreamer plugin missing\n");
-
+    return 1;
-  /* create a disk reader */
-  filesrc = gst_element_factory_make ("filesrc", "disk_source");
-  g_assert (filesrc);
-  g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
-
-  /* now it's time to get the decoder */
-  decoder = gst_element_factory_make ("mad", "decode");
-  if (!decoder) {
-    g_print ("could not find plugin \"mad\"");
-    return -1;
   }
 
-  /* also, we need to add some converters to make sure the audio stream
+  /* take the commandline argument and ensure that it is a uri */
-   * from the decoder is converted into a format the audio sink can
+  if (gst_uri_is_valid (argv[1]))
-   * understand (if necessary) */
+    uri = g_strdup (argv[1]);
-  conv = gst_element_factory_make ("audioconvert", "audioconvert");
+  else
-  if (!conv) {
+    uri = gst_filename_to_uri (argv[1], NULL);
-    g_print ("could not create \"audioconvert\" element!");
+  g_object_set (playbin, "uri", uri, NULL);
-    return -1;
+  g_free (uri);
-  }
-  resample = gst_element_factory_make ("audioresample", "audioresample");
-  if (!resample) {
-    g_print ("could not create \"audioresample\" element!");
-    return -1;
-  }
 
-  /* and an audio sink */
+  /* create and event loop and feed gstreamer bus mesages to it */
-  audiosink = gst_element_factory_make ("alsasink", "play_audio");
+  loop = g_main_loop_new (NULL, FALSE);
-  g_assert (audiosink);
 
-  /* add objects to the main pipeline */
+  bus = gst_element_get_bus (playbin);
-  gst_bin_add_many (GST_BIN (bin), filesrc, decoder, conv,
+  gst_bus_add_watch (bus, bus_call, loop);
-      resample, audiosink, NULL);
+  g_object_unref (bus);
 
-  /* link the elements */
+  /* start play back and listed to events */
-  gst_element_link_many (filesrc, decoder, conv, resample, audiosink, NULL);
+  gst_element_set_state (playbin, GST_STATE_PLAYING);
+  g_main_loop_run (loop);
 
-  /* start playing */
+  /* cleanup */
-  gst_element_set_state (bin, GST_STATE_PLAYING);
+  gst_element_set_state (playbin, GST_STATE_NULL);
+  g_object_unref (playbin);
+  g_object_unref (loop);
 
-  /* Run event loop listening for bus messages until EOS or ERROR */
+  return 0;
-  event_loop (bin);
-
-  /* stop the bin */
-  gst_element_set_state (bin, GST_STATE_NULL);
-
-  exit (0);
 }