[gst-cvs] tpm gst-plugins-good: gst-plugins-good/ gst-plugins-good/gst/matroska/ gst-plugins-good/tests/check/elements/

[<tp...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     tpm
Date:           Thu Nov 16 2006  15:37:00 UTC

Log message:
* gst/matroska/matroska-mux.c: (gst_matroska_mux_class_init),
(gst_matroska_mux_request_new_pad):
Use GST_DEBUG_FUNCPTR; activate request pad before returning it.
* tests/check/elements/matroskamux.c: (setup_src_pad),
(setup_sink_pad), (GST_START_TEST):
Activate pads before using them.

Modified files:
    .               : ChangeLog
    gst/matroska    : matroska-mux.c
    tests/check/elements: matroskamux.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2625&r2=1.2626
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/matroska/matroska-mux.c.diff?r1=1.50&r2=1.51
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/tests/check/elements/matroskamux.c.diff?r1=1.5&r2=1.6

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.2625
retrieving revision 1.2626
diff -u -d -r1.2625 -r1.2626
--- ChangeLog	16 Nov 2006 15:04:55 -0000	1.2625
+++ ChangeLog	16 Nov 2006 15:36:48 -0000	1.2626
@@ -1,5 +1,15 @@
 2006-11-16  Tim-Philipp Müller  <tim at centricular dot net>
 
+	* gst/matroska/matroska-mux.c: (gst_matroska_mux_class_init),
+	(gst_matroska_mux_request_new_pad):
+	  Use GST_DEBUG_FUNCPTR; activate request pad before returning it.
+
+	* tests/check/elements/matroskamux.c: (setup_src_pad),
+	(setup_sink_pad), (GST_START_TEST):
+	Activate pads before using them.
+2006-11-16  Tim-Philipp Müller  <tim at centricular dot net>
 	* gst/avi/gstavidemux.c: (gst_avi_demux_stream_scan):
 	  Initialise variable to get rid of bogus compiler warning.
Index: matroska-mux.c
RCS file: /cvs/gstreamer/gst-plugins-good/gst/matroska/matroska-mux.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- matroska-mux.c	15 Nov 2006 12:08:20 -0000	1.50
+++ matroska-mux.c	16 Nov 2006 15:36:48 -0000	1.51
@@ -218,9 +218,12 @@
           "This parameter determines what matroska features can be used.",
           1, 2, 1, G_PARAM_READWRITE));
-  gstelement_class->change_state = gst_matroska_mux_change_state;
-  gstelement_class->request_new_pad = gst_matroska_mux_request_new_pad;
-  gstelement_class->release_pad = gst_matroska_mux_release_pad;
+  gstelement_class->change_state =
+      GST_DEBUG_FUNCPTR (gst_matroska_mux_change_state);
+  gstelement_class->request_new_pad =
+      GST_DEBUG_FUNCPTR (gst_matroska_mux_request_new_pad);
+  gstelement_class->release_pad =
+      GST_DEBUG_FUNCPTR (gst_matroska_mux_release_pad);
 }
@@ -1128,6 +1131,7 @@
       GST_DEBUG_FUNCPTR (gst_matroska_mux_handle_sink_event));
   gst_pad_set_setcaps_function (newpad, setcapsfunc);
+  gst_pad_set_active (newpad, TRUE);
   gst_element_add_pad (element, newpad);
   return newpad;
Index: matroskamux.c
RCS file: /cvs/gstreamer/gst-plugins-good/tests/check/elements/matroskamux.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- matroskamux.c	6 Feb 2006 11:57:52 -0000	1.5
+++ matroskamux.c	16 Nov 2006 15:36:48 -0000	1.6
@@ -65,6 +65,7 @@
   srcpad = gst_pad_new_from_static_template (template, "src");
   fail_if (srcpad == NULL, "Could not create a srcpad");
   ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1);
+  gst_pad_set_active (srcpad, TRUE);
   sinkpad = gst_element_get_pad (element, "audio_%d");
   fail_if (sinkpad == NULL, "Could not get sink pad from %s",
@@ -117,6 +118,7 @@
   sinkpad = gst_pad_new_from_static_template (template, "sink");
   fail_if (sinkpad == NULL, "Could not create a sinkpad");
+  gst_pad_set_active (sinkpad, TRUE);
   srcpad = gst_element_get_pad (element, "src");
   fail_if (srcpad == NULL, "Could not get source pad from %s",
@@ -213,7 +215,8 @@
   ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
   fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
   num_buffers = g_list_length (buffers);
-  fail_unless (num_buffers >= 5);
+  fail_unless (num_buffers >= 5,
+      "expected at least 5 buffers, but got only %d", num_buffers);
   for (i = 0; i < num_buffers; ++i) {
     outbuffer = GST_BUFFER (buffers->data);
@@ -331,7 +334,7 @@
   gst_caps_unref (caps);
-  fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
+  fail_unless_equals_int (gst_pad_push (mysrcpad, inbuffer), GST_FLOW_OK);