[farsight2/master] Reject vorbis without configuration

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:23:07 PST 2008


---
 gst/fsrtpconference/fs-rtp-specific-nego.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-specific-nego.c b/gst/fsrtpconference/fs-rtp-specific-nego.c
index 34dd8d1..af5a771 100644
--- a/gst/fsrtpconference/fs-rtp-specific-nego.c
+++ b/gst/fsrtpconference/fs-rtp-specific-nego.c
@@ -57,13 +57,15 @@ static FsCodec *
 sdp_is_compat_ilbc (FsCodec *local_codec, FsCodec *remote_codec);
 static FsCodec *
 sdp_is_compat_h263_1998 (FsCodec *local_codec, FsCodec *remote_codec);
+static FsCodec *
+sdp_is_compat_vorbis (FsCodec *local_codec, FsCodec *remote_codec);
 
 static struct SdpCompatCheck sdp_compat_checks[] = {
   {FS_MEDIA_TYPE_AUDIO, "iLBC", sdp_is_compat_ilbc,
    {NULL}},
   {FS_MEDIA_TYPE_VIDEO, "H263-1998", sdp_is_compat_h263_1998,
    {NULL}},
-  {FS_MEDIA_TYPE_AUDIO, "VORBIS", sdp_is_compat_default,
+  {FS_MEDIA_TYPE_AUDIO, "VORBIS", sdp_is_compat_vorbis,
    {"configuration", NULL}},
   {FS_MEDIA_TYPE_VIDEO, "THEORA", sdp_is_compat_default,
    {"configuration", NULL}},
@@ -468,3 +470,13 @@ sdp_is_compat_h263_1998 (FsCodec *local_codec, FsCodec *remote_codec)
 
   return fs_codec_copy (remote_codec);
 }
+
+
+static FsCodec *
+sdp_is_compat_vorbis (FsCodec *local_codec, FsCodec *remote_codec)
+{
+  if (!fs_codec_get_optional_parameter (remote_codec, "configuration", NULL))
+    return NULL;
+
+  return sdp_is_compat_default (local_codec, remote_codec);
+}
-- 
1.5.6.5




More information about the farsight-commits mailing list