summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2006-04-28 15:37:12 +0000
committerBenny Prijono <bennylp@teluu.com>2006-04-28 15:37:12 +0000
commit5925cd6e6bcf069c532a951ec04abda2fd3df9ef (patch)
tree30166e379a57537e98d7b662b2530279e2673bd3
parentff85a7a01908bc1daa24b9f02a09bf2ef8885587 (diff)
Increase the maximum number of formats in SDP media line (from 16 to 32)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@419 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjlib/src/pj/config.c2
-rw-r--r--pjmedia/include/pjmedia/sdp.h2
-rw-r--r--pjmedia/src/pjmedia/endpoint.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/pjlib/src/pj/config.c b/pjlib/src/pj/config.c
index a6015767..4e77c4b3 100644
--- a/pjlib/src/pj/config.c
+++ b/pjlib/src/pj/config.c
@@ -21,7 +21,7 @@
#include <pj/ioqueue.h>
static const char *id = "config.c";
-const char *PJ_VERSION = "0.5.4.11";
+const char *PJ_VERSION = "0.5.4.12";
PJ_DEF(void) pj_dump_config(void)
{
diff --git a/pjmedia/include/pjmedia/sdp.h b/pjmedia/include/pjmedia/sdp.h
index d144885a..e4d9ddf5 100644
--- a/pjmedia/include/pjmedia/sdp.h
+++ b/pjmedia/include/pjmedia/sdp.h
@@ -44,7 +44,7 @@ PJ_BEGIN_DECL
* The PJMEDIA_MAX_SDP_FMT macro defines maximum format in a media line.
*/
#ifndef PJMEDIA_MAX_SDP_FMT
-# define PJMEDIA_MAX_SDP_FMT 16
+# define PJMEDIA_MAX_SDP_FMT 32
#endif
/**
diff --git a/pjmedia/src/pjmedia/endpoint.c b/pjmedia/src/pjmedia/endpoint.c
index 0c14ac65..4bfdccd8 100644
--- a/pjmedia/src/pjmedia/endpoint.c
+++ b/pjmedia/src/pjmedia/endpoint.c
@@ -283,8 +283,12 @@ PJ_DEF(pj_status_t) pjmedia_endpt_create_sdp( pjmedia_endpt *endpt,
pjmedia_sdp_media *m;
pjmedia_sdp_attr *attr;
+ /* Sanity check arguments */
PJ_ASSERT_RETURN(endpt && pool && p_sdp && stream_cnt, PJ_EINVAL);
+ /* Check that there are not too many codecs */
+ PJ_ASSERT_RETURN(endpt->codec_mgr.codec_cnt <= PJMEDIA_MAX_SDP_FMT,
+ PJ_ETOOMANY);
/* Create and initialize basic SDP session */
sdp = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_session));