rtpcodecnego: Filter by input and output caps

1 files changed, 58 insertions, 1 deletions

diff --git a/tests/check/rtp/codecs.c b/tests/check/rtp/codecs.c
index b9bfffe7..43346fe6 100644
--- a/tests/check/rtp/codecs.c
+++ b/tests/check/rtp/codecs.c
@@ -1510,6 +1510,8 @@ GST_START_TEST (test_rtpcodecs_nego_ilbc)
   FsCodec *prefcodec = NULL;
   FsCodec *outprefcodec = NULL;
   FsParticipant *participant;
+  GError *error = NULL;
+  GstCaps *caps;
 
   setup_codec_tests (&dat, &participant, FS_MEDIA_TYPE_AUDIO);
 
@@ -1525,6 +1527,11 @@ GST_START_TEST (test_rtpcodecs_nego_ilbc)
   fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
       "identity ! rtpilbcpay");
 
+  caps = gst_caps_from_string ("audio/x-iLBC; audio/x-raw");
+  fail_unless (fs_session_set_allowed_caps (dat->session, caps, caps, &error));
+  g_assert_no_error (error);
+  gst_caps_unref (caps);
+
   codec = fs_codec_new (100, "ILBC", FS_MEDIA_TYPE_AUDIO, 8000);
   outcodec = fs_codec_new (100, "ILBC", FS_MEDIA_TYPE_AUDIO, 8000);
   test_one_codec (dat->session, participant, prefcodec, outprefcodec,
@@ -1610,6 +1617,8 @@ GST_START_TEST (test_rtpcodecs_nego_g729)
   FsCodec *prefcodec = NULL;
   FsCodec *outprefcodec = NULL;
   FsParticipant *participant;
+  GError *error = NULL;
+  GstCaps *caps;
 
   setup_codec_tests (&dat, &participant, FS_MEDIA_TYPE_AUDIO);
 
@@ -1623,6 +1632,11 @@ GST_START_TEST (test_rtpcodecs_nego_g729)
   fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
       "identity ! rtpg729pay");
 
+  caps = gst_caps_from_string ("audio/G729; audio/x-raw");
+  fail_unless (fs_session_set_allowed_caps (dat->session, caps, caps, &error));
+  g_assert_no_error (error);
+  gst_caps_unref (caps);
+
   codec = fs_codec_new (18, "G729", FS_MEDIA_TYPE_AUDIO, 8000);
   outcodec = fs_codec_new (18, "G729", FS_MEDIA_TYPE_AUDIO, 8000);
   test_one_codec (dat->session, participant, prefcodec, outprefcodec,
@@ -1711,6 +1725,8 @@ GST_START_TEST (test_rtpcodecs_nego_h261)
   FsCodec *prefcodec = NULL;
   FsCodec *outprefcodec = NULL;
   FsParticipant *participant;
+  GError *error = NULL;
+  GstCaps *caps;
 
   setup_codec_tests (&dat, &participant, FS_MEDIA_TYPE_VIDEO);
 
@@ -1722,6 +1738,13 @@ GST_START_TEST (test_rtpcodecs_nego_h261)
   fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
       "identity");
 
+  caps = gst_caps_from_string ("application/x-rtp, media=(string)video,"
+      " clock-rate=90000, encoding-name=H261; video/x-raw");
+  fail_unless (fs_session_set_allowed_caps (dat->session, caps, caps, &error));
+  g_assert_no_error (error);
+  gst_caps_unref (caps);
+
+
   codec = fs_codec_new (31, "H261", FS_MEDIA_TYPE_VIDEO, 90000);
   outcodec = fs_codec_new (31, "H261", FS_MEDIA_TYPE_VIDEO, 90000);
   test_one_codec (dat->session, participant, prefcodec, outprefcodec,
@@ -1789,6 +1812,8 @@ GST_START_TEST (test_rtpcodecs_nego_h263_1998)
   FsCodec *prefcodec = NULL;
   FsCodec *outprefcodec = NULL;
   FsParticipant *participant;
+  GError *error = NULL;
+  GstCaps *caps;
 
   setup_codec_tests (&dat, &participant, FS_MEDIA_TYPE_VIDEO);
 
@@ -1800,6 +1825,12 @@ GST_START_TEST (test_rtpcodecs_nego_h263_1998)
   fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
       "identity");
 
+  caps = gst_caps_from_string ("application/x-rtp, media=(string)video,"
+      " clock-rate=90000, encoding-name=H263-1998; video/x-raw");
+  fail_unless (fs_session_set_allowed_caps (dat->session, caps, caps, &error));
+  g_assert_no_error (error);
+  gst_caps_unref (caps);
+
   codec = fs_codec_new (96, "H263-1998", FS_MEDIA_TYPE_VIDEO, 90000);
   outcodec = fs_codec_new (96, "H263-1998", FS_MEDIA_TYPE_VIDEO, 90000);
   test_one_codec (dat->session, participant, prefcodec, outprefcodec,
@@ -1951,6 +1982,8 @@ GST_START_TEST (test_rtpcodecs_nego_h263_2000)
   FsCodec *prefcodec = NULL;
   FsCodec *outprefcodec = NULL;
   FsParticipant *participant;
+  GError *error = NULL;
+  GstCaps *caps;
 
   setup_codec_tests (&dat, &participant, FS_MEDIA_TYPE_VIDEO);
 
@@ -1962,6 +1995,14 @@ GST_START_TEST (test_rtpcodecs_nego_h263_2000)
   fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
       "identity");
 
+
+  caps = gst_caps_from_string ("application/x-rtp, media=(string)video,"
+      " clock-rate=90000, encoding-name=H263-2000; video/x-raw");
+  fail_unless (fs_session_set_allowed_caps (dat->session, caps, caps, &error));
+  g_assert_no_error (error);
+  gst_caps_unref (caps);
+
+
   codec = fs_codec_new (96, "H263-2000", FS_MEDIA_TYPE_VIDEO, 90000);
   outcodec = fs_codec_new (96, "H263-2000", FS_MEDIA_TYPE_VIDEO, 90000);
   test_one_codec (dat->session, participant, prefcodec, outprefcodec,
@@ -2037,6 +2078,8 @@ GST_START_TEST (test_rtpcodecs_nego_h264)
   FsCodec *outprefcodec = NULL;
   FsCodec *tmp_prefcodec, *tmp_outprefcodec;
   FsParticipant *participant;
+  GError *error = NULL;
+  GstCaps *caps;
 
   setup_codec_tests (&dat, &participant, FS_MEDIA_TYPE_VIDEO);
 
@@ -2048,6 +2091,12 @@ GST_START_TEST (test_rtpcodecs_nego_h264)
   fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
       "identity");
 
+  caps = gst_caps_from_string ("application/x-rtp, media=(string)video,"
+      " clock-rate=90000, encoding-name=H264; video/x-raw");
+  fail_unless (fs_session_set_allowed_caps (dat->session, caps, caps, &error));
+  g_assert_no_error (error);
+  gst_caps_unref (caps);
+
   codec = fs_codec_new (96, "H264", FS_MEDIA_TYPE_VIDEO, 90000);
   outcodec = fs_codec_new (96, "H264", FS_MEDIA_TYPE_VIDEO, 90000);
   test_one_codec (dat->session, participant, prefcodec, outprefcodec,
@@ -2169,8 +2218,10 @@ GST_START_TEST (test_rtpcodecs_nego_feedback)
   FsCodec *prefcodec = NULL;
   FsCodec *outprefcodec = NULL;
   FsParticipant *participant;
-  setup_codec_tests (&dat, &participant, FS_MEDIA_TYPE_VIDEO);
+  GError *error = NULL;
+  GstCaps *caps;
 
+  setup_codec_tests (&dat, &participant, FS_MEDIA_TYPE_VIDEO);
 
   outprefcodec = fs_codec_new (FS_CODEC_ID_ANY, "H264",
       FS_MEDIA_TYPE_VIDEO, 90000);
@@ -2180,6 +2231,12 @@ GST_START_TEST (test_rtpcodecs_nego_feedback)
   fs_codec_add_optional_parameter (prefcodec, "farstream-send-profile",
       "identity");
 
+  caps = gst_caps_from_string ("application/x-rtp, media=(string)video,"
+      " clock-rate=90000, encoding-name=H264; video/x-raw");
+  fail_unless (fs_session_set_allowed_caps (dat->session, caps, caps, &error));
+  g_assert_no_error (error);
+  gst_caps_unref (caps);
+
   codec = fs_codec_new (96, "H264", FS_MEDIA_TYPE_VIDEO, 90000);
   outcodec = fs_codec_new (96, "H264", FS_MEDIA_TYPE_VIDEO, 90000);
   test_one_codec (dat->session, participant, prefcodec, outprefcodec,