Done media integration in pjsua. Needs to do actual voice testing

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@163 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 34 insertions, 0 deletions

diff --git a/pjmedia/include/pjmedia/sdp_neg.h b/pjmedia/include/pjmedia/sdp_neg.h
index d67aa49d..e4f5511b 100644
--- a/pjmedia/include/pjmedia/sdp_neg.h
+++ b/pjmedia/include/pjmedia/sdp_neg.h
@@ -97,6 +97,17 @@ enum pjmedia_sdp_neg_state
     PJMEDIA_SDP_NEG_STATE_DONE,
 };
 
+
+/**
+ * Get the state string description of the specified state.
+ *
+ * @param state		Negotiator state.
+ *
+ * @return		String description of the state.
+ */
+PJ_DECL(const char*) pjmedia_sdp_neg_state_str(pjmedia_sdp_neg_state state);
+
+
 /**
  * Create the SDP negotiator with local offer. The SDP negotiator then
  * will move to PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER state, where it waits
diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c
index 92f01251..071f9e7d 100644
--- a/pjmedia/src/pjmedia/sdp.c
+++ b/pjmedia/src/pjmedia/sdp.c
@@ -402,6 +402,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_rtpmap_to_attr(pj_pool_t *pool,
     p = tempbuf;
     endbuf = tempbuf+sizeof(tempbuf);
 
+    /* Add colon */
+    *p++ = ':';
+
     /* Add payload type. */
     pj_memcpy(p, rtpmap->pt.ptr, rtpmap->pt.slen);
     p += rtpmap->pt.slen;
diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c
index 37cf5f9c..737aa06a 100644
--- a/pjmedia/src/pjmedia/sdp_neg.c
+++ b/pjmedia/src/pjmedia/sdp_neg.c
@@ -40,6 +40,26 @@ struct pjmedia_sdp_neg
 			*neg_remote_sdp;    /**< Temporary remote SDP.	     */
 };
 
+static const char *state_str[] = 
+{
+    "STATE_NULL",
+    "STATE_LOCAL_OFFER",
+    "STATE_REMOTE_OFFER",
+    "STATE_WAIT_NEGO",
+    "STATE_DONE",
+};
+
+/*
+ * Get string representation of negotiator state.
+ */
+PJ_DEF(const char*) pjmedia_sdp_neg_state_str(pjmedia_sdp_neg_state state)
+{
+    if (state >=0 && state < PJ_ARRAY_SIZE(state_str))
+	return state_str[state];
+
+    return "<?UNKNOWN?>";
+}
+
 
 /*
  * Create with local offer.