[0.11] gst-ffmpeg: tests: make tests compile

Wim Taymans wtay at kemper.freedesktop.org
Wed Jan 4 01:17:37 PST 2012


Module: gst-ffmpeg
Branch: 0.11
Commit: 6651c908a126455771144bb693964e0441670411
URL:    http://cgit.freedesktop.org/gstreamer/gst-ffmpeg/commit/?id=6651c908a126455771144bb693964e0441670411

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Wed Jan  4 10:17:01 2012 +0100

tests: make tests compile

---

 tests/check/elements/ffdec_adpcm.c       |    6 ++++--
 tests/check/elements/ffdemux_ape.c       |   14 ++++++++------
 tests/check/generic/libavcodec-locking.c |    2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/tests/check/elements/ffdec_adpcm.c b/tests/check/elements/ffdec_adpcm.c
index 08ff5c1..c4c0c89 100644
--- a/tests/check/elements/ffdec_adpcm.c
+++ b/tests/check/elements/ffdec_adpcm.c
@@ -139,8 +139,10 @@ run_check_for_file (const gchar * filename)
 GST_START_TEST (test_low_sample_rate_adpcm)
 {
 #define MIN_VERSION GST_VERSION_MAJOR, GST_VERSION_MINOR, 0
-  if (!gst_default_registry_check_feature_version ("wavparse", MIN_VERSION) ||
-      !gst_default_registry_check_feature_version ("decodebin", MIN_VERSION)) {
+  if (!gst_registry_check_feature_version (gst_registry_get (), "wavparse",
+          MIN_VERSION)
+      || !gst_registry_check_feature_version (gst_registry_get (), "decodebin",
+          MIN_VERSION)) {
     g_printerr ("skipping test_low_sample_rate_adpcm: required element "
         "wavparse or element decodebin not found\n");
     return;
diff --git a/tests/check/elements/ffdemux_ape.c b/tests/check/elements/ffdemux_ape.c
index ed8c35f..f9b73bd 100644
--- a/tests/check/elements/ffdemux_ape.c
+++ b/tests/check/elements/ffdemux_ape.c
@@ -52,11 +52,10 @@ error_cb (GstBus * bus, GstMessage * msg, gpointer user_data)
 }
 
 static GstPadProbeReturn
-event_probe (GstPad * pad, GstPadProbeType type, gpointer type_data,
-    gpointer user_data)
+event_probe (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
 {
   GstTagList **p_tags = user_data;
-  GstEvent *event = type_data;
+  GstEvent *event = GST_PAD_PROBE_INFO_EVENT (info);
 
   if (GST_EVENT_TYPE (event) == GST_EVENT_TAG) {
     GST_INFO ("tag event: %" GST_PTR_FORMAT, event);
@@ -113,7 +112,8 @@ read_tags_from_file (const gchar * file, gboolean push_mode)
   /* we want to make sure there's a tag event coming out of ffdemux_ape
    * (ie. the one apedemux generated) */
   pad = gst_element_get_static_pad (sink, "sink");
-  gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT, event_probe, &tags, NULL);
+  gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, event_probe,
+      &tags, NULL);
   gst_object_unref (pad);
 
   state_ret = gst_element_set_state (pipeline, GST_STATE_PAUSED);
@@ -177,8 +177,10 @@ GST_START_TEST (test_tag_caching)
 {
 #define MIN_VERSION GST_VERSION_MAJOR, GST_VERSION_MINOR, 0
 
-  if (!gst_default_registry_check_feature_version ("apedemux", MIN_VERSION) ||
-      !gst_default_registry_check_feature_version ("decodebin", MIN_VERSION)) {
+  if (!gst_registry_check_feature_version (gst_registry_get (), "apedemux",
+          MIN_VERSION)
+      || !gst_registry_check_feature_version (gst_registry_get (), "decodebin",
+          MIN_VERSION)) {
     g_printerr ("Skipping test_tag_caching: required element apedemux or "
         "decodebin element not found\n");
     return;
diff --git a/tests/check/generic/libavcodec-locking.c b/tests/check/generic/libavcodec-locking.c
index 6c41791..a16af1c 100644
--- a/tests/check/generic/libavcodec-locking.c
+++ b/tests/check/generic/libavcodec-locking.c
@@ -147,7 +147,7 @@ simple_launch_lines_suite (void)
 
 #ifndef GST_DISABLE_PARSE
   /* only run this if we haven't been configured with --disable-encoders */
-  if (gst_default_registry_check_feature_version ("ffenc_mpeg4",
+  if (gst_registry_check_feature_version (gst_registry_get (), "ffenc_mpeg4",
           GST_VERSION_MAJOR, GST_VERSION_MINOR, 0)) {
     tcase_add_test (tc_chain, test_libavcodec_locks);
   } else {



More information about the gstreamer-commits mailing list