tests/check/pipelines/simple-launch-lines.c: Improve the tests a little more.

Original commit message from CVS:
* tests/check/pipelines/simple-launch-lines.c:
Improve the tests a little more.

2 files changed, 51 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 08d1b5ed..01d9a3a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-24  Stefan Kost  <ensonic@users.sf.net>
+
+	* tests/check/pipelines/simple-launch-lines.c:
+	   Improve the tests a little more.
+
 2007-10-23  Zaheer Abbas Merali <zaheerabbas at merali dot org>
 
 	patch by: Yun Zheng Hu
diff --git a/tests/check/pipelines/simple-launch-lines.c b/tests/check/pipelines/simple-launch-lines.c
index ed2c618a..bbf2bb9f 100644
--- a/tests/check/pipelines/simple-launch-lines.c
+++ b/tests/check/pipelines/simple-launch-lines.c
@@ -109,104 +109,113 @@ GST_START_TEST (test_rtppayloaders)
   gchar *s;
 
   /* we use is-live here to avoid preroll */
-#define FAKESRC "fakesrc is-live=true num-buffers=5"
-#define FAKESINK "fakesink"
+#define PIPELINE_STRING(bufcount, bufsize, pl, dpl) "fakesrc is-live=true num-buffers=" bufcount " filltype=2 sizetype=2 sizemax=" bufsize " ! " pl " ! " dpl " ! fakesink"
+#define DEFAULT_BUFCOUNT "5"
+#define DEFAULT_BUFSIZE "16"
 
-  /* FIXME: why do we need to use capsfilter for some payloaders? */
-
-  /*s = FAKESRC " ! ! rtpac3depay ! " FAKESINK */
-
-  s = FAKESRC
-      " ! audio/x-iLBC,mode=20 ! rtpilbcpay ! rtpilbcdepay ! audio/x-iLBC,mode=20 ! "
-      FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtpilbcpay",
+      "rtpilbcdepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtpgsmpay ! rtpgsmdepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtpgsmpay",
+      "rtpgsmdepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC
-      " ! audio/AMR,channels=1,rate=8000 ! rtpamrpay ! rtpamrdepay ! audio/AMR,channels=1,rate=8000 ! "
-      FAKESINK;
+  /* This one needs a bit different buffer size than others or it doesn't work. */
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, "52", "rtpamrpay", "rtpamrdepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtppcmapay ! rtppcmadepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtppcmapay",
+      "rtppcmadepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtppcmupay ! rtppcmudepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtppcmupay",
+      "rtppcmudepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtpmpapay ! rtpmpadepay ! " FAKESINK;
-  run_pipeline (setup_pipeline (s), s,
-      GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
-      GST_MESSAGE_UNKNOWN);
-
-  /*s = FAKESRC " ! ! rtpmpvdepay ! " FAKESINK; */
-
-  s = FAKESRC " ! rtph263ppay ! rtph263pdepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtpmpapay",
+      "rtpmpadepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtph263pay ! rtph263depay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtph263ppay",
+      "rtph263pdepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtph264pay ! rtph264depay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtph263pay",
+      "rtph263depay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtpL16pay ! rtpL16depay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtph264pay",
+      "rtph264depay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  /*s = FAKESRC " ! asteriskh263 ! " FAKESINK; */
-
-  s = FAKESRC " ! rtpmp2tpay ! rtpmp2tdepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtpL16pay",
+      "rtpL16depay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtpmp4vpay ! rtpmp4vdepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtpmp2tpay",
+      "rtpmp2tdepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  /*s = FAKESRC " ! ! rtpmp4adepay ! " FAKESINK; */
-
-  s = FAKESRC " ! rtpmp4gpay ! rtpmp4gdepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtpmp4vpay",
+      "rtpmp4vdepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtpspeexpay ! rtpspeexdepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtpmp4gpay",
+      "rtpmp4gdepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  /*s = FAKESRC " ! ! rtpsv3vdepay ! " FAKESINK; */
+  /* Cannot be tested with fakesrc becouse speex payloader requires a valid header?! */
+  /*
+     s = PIPELINE_STRING(DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtpspeexpay", "rtpspeexdepay");
+     run_pipeline (setup_pipeline (s), s,
+     GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
+     GST_MESSAGE_UNKNOWN);
+   */
 
-  s = FAKESRC " ! rtptheorapay ! rtptheoradepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtptheorapay",
+      "rtptheoradepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
 
-  s = FAKESRC " ! rtpvorbispay ! rtpvorbisdepay ! " FAKESINK;
+  s = PIPELINE_STRING (DEFAULT_BUFCOUNT, DEFAULT_BUFSIZE, "rtpvorbispay",
+      "rtpvorbisdepay");
   run_pipeline (setup_pipeline (s), s,
       GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
       GST_MESSAGE_UNKNOWN);
+
+  /*s = FAKESRC " ! ! rtpac3depay ! " FAKESINK */
+  /*s = FAKESRC " ! ! asteriskh263 ! " FAKESINK; */
+  /*s = FAKESRC " ! ! rtpmpvdepay ! " FAKESINK; */
+  /*s = FAKESRC " ! ! rtpmp4adepay ! " FAKESINK; */
+  /*s = FAKESRC " ! ! rtpsv3vdepay ! " FAKESINK; */
 }
 
 GST_END_TEST