Merge branch 'master' into 0.11

2025-02-17 11:45:25 +00:00 · 2011-04-19 16:25:28 +02:00 · 2011-04-19 16:25:28 +02:00 · d67288dd03
commit d67288dd03
parent 4aa6ca5578 bdb8bbc100
9 changed files with 200 additions and 12 deletions
--- a/gst/flv/gstflvdemux.c
+++ b/gst/flv/gstflvdemux.c
@ -3101,12 +3101,16 @@ gst_flv_demux_set_index (GstElement * element, GstIndex * index)
    gst_object_unref (demux->index);
  if (index) {
    demux->index = gst_object_ref (index);
-    gst_index_get_writer_id (index, GST_OBJECT (element), &demux->index_id);
    demux->own_index = FALSE;
  } else
    demux->index = NULL;

  GST_OBJECT_UNLOCK (demux);
+  /* object lock might be taken again */
+  if (index)
+    gst_index_get_writer_id (index, GST_OBJECT (element), &demux->index_id);
+  GST_DEBUG_OBJECT (demux, "Set index %" GST_PTR_FORMAT, demux->index);
+
 }

 static GstIndex *
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@ -99,6 +99,7 @@ endif


 check_PROGRAMS = \
+	generic/index \
 	generic/states \
 	elements/aacparse \
 	elements/ac3parse \
--- a/tests/check/elements/flacparse.c
+++ b/tests/check/elements/flacparse.c
@ -242,6 +242,23 @@ GST_START_TEST (test_parse_flac_detect_stream)

 GST_END_TEST;

+GST_START_TEST (test_parse_flac_set_index)
+{
+  GstElement *parse;
+  GstIndex *idx;
+
+  idx = gst_index_factory_make ("memindex");
+  if (idx == NULL)
+    return;
+  parse = gst_element_factory_make ("flacparse", NULL);
+  fail_unless (parse != NULL);
+  gst_object_ref_sink (idx);
+  gst_element_set_index (parse, GST_INDEX (idx));
+  gst_object_unref (idx);
+  gst_object_unref (parse);
+}
+
+GST_END_TEST;

 static Suite *
 flacparse_suite (void)
@ -258,6 +275,7 @@ flacparse_suite (void)

  /* Other tests */
  tcase_add_test (tc_chain, test_parse_flac_detect_stream);
+  tcase_add_test (tc_chain, test_parse_flac_set_index);

  return s;
 }
--- a/tests/check/elements/imagefreeze.c
+++ b/tests/check/elements/imagefreeze.c
@ -124,6 +124,7 @@ GST_START_TEST (test_imagefreeze_0_1)
  GstBus *bus;
  GMainLoop *loop;
  guint n_buffers = G_MAXUINT;
+  guint bus_watch = 0;

  caps1 =
      gst_video_format_new_caps (GST_VIDEO_FORMAT_xRGB, 640, 480, 25, 1, 1, 1);
@ -139,7 +140,7 @@ GST_START_TEST (test_imagefreeze_0_1)

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  n_buffers = 0;
@ -156,6 +157,7 @@ GST_START_TEST (test_imagefreeze_0_1)
  g_main_loop_unref (loop);
  gst_caps_unref (caps1);
  gst_caps_unref (caps2);
+  g_source_remove (bus_watch);
 }

 GST_END_TEST;
@ -185,6 +187,7 @@ GST_START_TEST (test_imagefreeze_25_1_0ms_400ms)
  GstBus *bus;
  GMainLoop *loop;
  guint n_buffers = G_MAXUINT;
+  guint bus_watch = 0;

  caps1 =
      gst_video_format_new_caps (GST_VIDEO_FORMAT_xRGB, 640, 480, 25, 1, 1, 1);
@ -200,7 +203,7 @@ GST_START_TEST (test_imagefreeze_25_1_0ms_400ms)

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  fail_unless_equals_int (gst_element_set_state (pipeline, GST_STATE_PAUSED),
@ -225,6 +228,7 @@ GST_START_TEST (test_imagefreeze_25_1_0ms_400ms)
  g_main_loop_unref (loop);
  gst_caps_unref (caps1);
  gst_caps_unref (caps2);
+  g_source_remove (bus_watch);
 }

 GST_END_TEST;
@ -255,6 +259,7 @@ GST_START_TEST (test_imagefreeze_25_1_200ms_400ms)
  GstBus *bus;
  GMainLoop *loop;
  guint n_buffers = G_MAXUINT;
+  guint bus_watch = 0;

  caps1 =
      gst_video_format_new_caps (GST_VIDEO_FORMAT_xRGB, 640, 480, 25, 1, 1, 1);
@ -270,7 +275,7 @@ GST_START_TEST (test_imagefreeze_25_1_200ms_400ms)

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  fail_unless_equals_int (gst_element_set_state (pipeline, GST_STATE_PAUSED),
@ -295,6 +300,7 @@ GST_START_TEST (test_imagefreeze_25_1_200ms_400ms)
  g_main_loop_unref (loop);
  gst_caps_unref (caps1);
  gst_caps_unref (caps2);
+  g_source_remove (bus_watch);
 }

 GST_END_TEST;
@ -325,6 +331,7 @@ GST_START_TEST (test_imagefreeze_25_1_400ms_0ms)
  GstBus *bus;
  GMainLoop *loop;
  guint n_buffers = G_MAXUINT;
+  guint bus_watch = 0;

  caps1 =
      gst_video_format_new_caps (GST_VIDEO_FORMAT_xRGB, 640, 480, 25, 1, 1, 1);
@ -340,7 +347,7 @@ GST_START_TEST (test_imagefreeze_25_1_400ms_0ms)

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  fail_unless_equals_int (gst_element_set_state (pipeline, GST_STATE_PAUSED),
@ -365,6 +372,7 @@ GST_START_TEST (test_imagefreeze_25_1_400ms_0ms)
  g_main_loop_unref (loop);
  gst_caps_unref (caps1);
  gst_caps_unref (caps2);
+  g_source_remove (bus_watch);
 }

 GST_END_TEST;
@ -406,6 +414,7 @@ GST_START_TEST (test_imagefreeze_25_1_220ms_380ms)
  GstBus *bus;
  GMainLoop *loop;
  guint n_buffers = G_MAXUINT;
+  guint bus_watch = 0;

  caps1 =
      gst_video_format_new_caps (GST_VIDEO_FORMAT_xRGB, 640, 480, 25, 1, 1, 1);
@ -421,7 +430,7 @@ GST_START_TEST (test_imagefreeze_25_1_220ms_380ms)

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  fail_unless_equals_int (gst_element_set_state (pipeline, GST_STATE_PAUSED),
@ -446,6 +455,7 @@ GST_START_TEST (test_imagefreeze_25_1_220ms_380ms)
  g_main_loop_unref (loop);
  gst_caps_unref (caps1);
  gst_caps_unref (caps2);
+  g_source_remove (bus_watch);
 }

 GST_END_TEST;
@ -491,6 +501,7 @@ GST_START_TEST (test_imagefreeze_bufferalloc)
  GstBus *bus;
  GMainLoop *loop;
  guint n_buffers = G_MAXUINT;
+  guint bus_watch = 0;

  caps1 =
      gst_video_format_new_caps (GST_VIDEO_FORMAT_xRGB, 640, 480, 25, 1, 1, 1);
@ -514,7 +525,7 @@ GST_START_TEST (test_imagefreeze_bufferalloc)

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  fail_unless_equals_int (gst_element_set_state (pipeline, GST_STATE_PAUSED),
@ -542,6 +553,7 @@ GST_START_TEST (test_imagefreeze_bufferalloc)
  g_main_loop_unref (loop);
  gst_caps_unref (caps1);
  gst_caps_unref (caps2);
+  g_source_remove (bus_watch);
 }

 GST_END_TEST;
@ -555,6 +567,7 @@ GST_START_TEST (test_imagefreeze_eos)
  GMainLoop *loop;
  GstFormat fmt = GST_FORMAT_TIME;
  gint64 position;
+  guint bus_watch = 0;

  caps1 =
      gst_video_format_new_caps (GST_VIDEO_FORMAT_xRGB, 640, 480, 25, 1, 1, 1);
@ -572,7 +585,7 @@ GST_START_TEST (test_imagefreeze_eos)

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  fail_unless_equals_int (gst_element_set_state (pipeline, GST_STATE_PAUSED),
@ -597,6 +610,7 @@ GST_START_TEST (test_imagefreeze_eos)
  g_main_loop_unref (loop);
  gst_caps_unref (caps1);
  gst_caps_unref (caps2);
+  g_source_remove (bus_watch);
 }

 GST_END_TEST;
--- a/tests/check/generic/.gitignore
+++ b/tests/check/generic/.gitignore
@ -1,2 +1,3 @@
 .dirstamp
+index
 states
--- a/tests/check/generic/index.c
+++ b/tests/check/generic/index.c
@ -0,0 +1,140 @@
+/* GStreamer
+ * unit test for index setting on all elements
+ * Copyright (C) 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+ * Copyright (C) 2011 Tim-Philipp Müller <tim centricular net>
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <gst/check/gstcheck.h>
+
+static GList *elements = NULL;
+
+static void
+setup (void)
+{
+  GList *features, *f;
+  GList *plugins, *p;
+  gchar **ignorelist = NULL;
+  const gchar *INDEX_IGNORE_ELEMENTS = NULL;
+
+  GST_DEBUG ("getting elements for package %s", PACKAGE);
+  INDEX_IGNORE_ELEMENTS = g_getenv ("GST_INDEX_IGNORE_ELEMENTS");
+  if (!g_getenv ("GST_NO_INDEX_IGNORE_ELEMENTS") && INDEX_IGNORE_ELEMENTS) {
+    GST_DEBUG ("Will ignore element factories: '%s'", INDEX_IGNORE_ELEMENTS);
+    ignorelist = g_strsplit (INDEX_IGNORE_ELEMENTS, " ", 0);
+  }
+
+  plugins = gst_registry_get_plugin_list (gst_registry_get_default ());
+
+  for (p = plugins; p; p = p->next) {
+    GstPlugin *plugin = p->data;
+
+    if (strcmp (gst_plugin_get_source (plugin), PACKAGE) != 0)
+      continue;
+
+    features =
+        gst_registry_get_feature_list_by_plugin (gst_registry_get_default (),
+        gst_plugin_get_name (plugin));
+
+    for (f = features; f; f = f->next) {
+      GstPluginFeature *feature = f->data;
+      const gchar *name = gst_plugin_feature_get_name (feature);
+      gboolean ignore = FALSE;
+
+      if (!GST_IS_ELEMENT_FACTORY (feature))
+        continue;
+
+      if (ignorelist) {
+        gchar **s;
+
+        for (s = ignorelist; s && *s; ++s) {
+          if (g_str_has_prefix (name, *s)) {
+            GST_DEBUG ("ignoring element %s", name);
+            ignore = TRUE;
+          }
+        }
+        if (ignore)
+          continue;
+      }
+
+      GST_DEBUG ("adding element %s", name);
+      elements = g_list_prepend (elements, (gpointer) g_strdup (name));
+    }
+    gst_plugin_feature_list_free (features);
+  }
+  gst_plugin_list_free (plugins);
+  g_strfreev (ignorelist);
+}
+
+static void
+teardown (void)
+{
+  GList *e;
+
+  for (e = elements; e; e = e->next) {
+    g_free (e->data);
+  }
+  g_list_free (elements);
+  elements = NULL;
+}
+
+GST_START_TEST (test_set_index)
+{
+  GstElement *element;
+  GstIndex *idx;
+  GList *e;
+
+  idx = gst_index_factory_make ("memindex");
+  if (idx == NULL)
+    return;
+
+  gst_object_ref_sink (idx);
+
+  for (e = elements; e; e = e->next) {
+    const gchar *name = e->data;
+
+    GST_INFO ("testing element %s", name);
+    element = gst_element_factory_make (name, name);
+    fail_if (element == NULL, "Could not make element from factory %s", name);
+
+    gst_element_set_index (element, idx);
+    gst_object_unref (element);
+  }
+
+  gst_object_unref (idx);
+}
+
+GST_END_TEST;
+
+static Suite *
+index_suite (void)
+{
+  Suite *s = suite_create ("index");
+  TCase *tc_chain = tcase_create ("general");
+
+  suite_add_tcase (s, tc_chain);
+  tcase_add_checked_fixture (tc_chain, setup, teardown);
+  tcase_add_test (tc_chain, test_set_index);
+
+  return s;
+}
+
+GST_CHECK_MAIN (index);
--- a/tests/check/pipelines/tagschecking.c
+++ b/tests/check/pipelines/tagschecking.c
@ -87,6 +87,7 @@ test_mux_tags (const gchar * tag_str, const gchar * caps,
  GstElement *mux;
  GstTagSetter *setter;
  gchar *launch_str;
+  guint bus_watch = 0;

  GST_DEBUG ("testing xmp muxing on : %s", muxer);

@ -104,7 +105,7 @@ test_mux_tags (const gchar * tag_str, const gchar * caps,

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  gst_element_set_state (pipeline, GST_STATE_READY);
@ -124,6 +125,7 @@ test_mux_tags (const gchar * tag_str, const gchar * caps,
  g_main_loop_unref (loop);
  g_object_unref (mux);
  g_object_unref (pipeline);
+  g_source_remove (bus_watch);
 }

 /*
@ -148,6 +150,7 @@ test_demux_tags (const gchar * tag_str, const gchar * demuxer,
  gint comparison;
  GstElement *demux;
  gchar *launch_str;
+  guint bus_watch = 0;

  GST_DEBUG ("testing tags : %s", tag_str);

@ -170,7 +173,7 @@ test_demux_tags (const gchar * tag_str, const gchar * demuxer,

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  sent_tags = gst_structure_from_string (tag_str, NULL);
@ -224,6 +227,7 @@ test_demux_tags (const gchar * tag_str, const gchar * demuxer,
  g_main_loop_unref (loop);
  g_object_unref (demux);
  g_object_unref (pipeline);
+  g_source_remove (bus_watch);
 }

 /*
--- a/tests/check/pipelines/wavenc.c
+++ b/tests/check/pipelines/wavenc.c
@ -69,6 +69,7 @@ make_n_channel_wav (const gint channels, const GValueArray * arr)
  GstBus *bus;
  GMainLoop *loop;
  guint i;
+  guint bus_watch = 0;

  audiotestsrc = g_new0 (GstElement *, channels);

@ -104,7 +105,7 @@ make_n_channel_wav (const gint channels, const GValueArray * arr)

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  gst_element_set_state (pipeline, GST_STATE_PLAYING);
@ -113,6 +114,9 @@ make_n_channel_wav (const gint channels, const GValueArray * arr)

  gst_object_unref (pipeline);
  g_free (audiotestsrc);
+
+  g_main_loop_unref (loop);
+  g_source_remove (bus_watch);
 }

 GST_START_TEST (test_encode_stereo)
--- a/tests/check/pipelines/wavpack.c
+++ b/tests/check/pipelines/wavpack.c
@ -95,6 +95,7 @@ GST_START_TEST (test_encode_decode)
  GstBus *bus;
  GMainLoop *loop;
  GstBuffer *in, *out;
+  guint bus_watch = 0;

  srcadapter = gst_adapter_new ();
  fail_unless (srcadapter != NULL);
@ -148,7 +149,7 @@ GST_START_TEST (test_encode_decode)

  bus = gst_element_get_bus (pipeline);
  fail_unless (bus != NULL);
-  gst_bus_add_watch (bus, bus_handler, loop);
+  bus_watch = gst_bus_add_watch (bus, bus_handler, loop);
  gst_object_unref (bus);

  had_first_buffer = FALSE;
@ -179,6 +180,7 @@ GST_START_TEST (test_encode_decode)
  g_main_loop_unref (loop);
  g_object_unref (srcadapter);
  g_object_unref (sinkadapter);
+  g_source_remove (bus_watch);
 }

 GST_END_TEST;