Changeset 215 for pjproject/trunk/pjmedia/src/pjmedia/session.c

Timestamp:

Feb 22, 2006 12:06:39 PM (18 years ago)

Author:

bennylp

Message:

RFC 2833 support!

File:

• pjproject/trunk/pjmedia/src/pjmedia/session.c (modified) (11 diffs)

pjproject/trunk/pjmedia/src/pjmedia/session.c

@@ -34 +34 @@
     pjmedia_stream_info     stream_info[PJMEDIA_MAX_SDP_MEDIA];
     pjmedia_stream         *stream[PJMEDIA_MAX_SDP_MEDIA];
+    void                   *user_data;
 };
 
@@ -48 +49 @@
 static const pj_str_t ID_SDP_NAME = { "pjmedia", 7 };
 static const pj_str_t ID_RTPMAP = { "rtpmap", 6 };
+static const pj_str_t ID_TELEPHONE_EVENT = { "telephone-event", 15 };
 
 static const pj_str_t STR_INACTIVE = { "inactive", 8 };
@@ -67 +69 @@
     const pjmedia_sdp_attr *attr;
     pjmedia_sdp_rtpmap *rtpmap;
+    unsigned i;
     pj_status_t status;
 
@@ -152 +155 @@
      * type without rtpmap.
      */
-    attr = pjmedia_sdp_media_find_attr(local_m, &ID_RTPMAP, NULL);
+    attr = pjmedia_sdp_media_find_attr(local_m, &ID_RTPMAP, 
+                                       &local_m->desc.fmt[0]);
     if (attr == NULL)
         return PJMEDIA_EMISSINGRTPMAP;
@@ -166 +170 @@
     pj_strdup(pool, &si->fmt.encoding_name, &rtpmap->enc_name);
     si->fmt.sample_rate = rtpmap->clock_rate;
+
+    /* Get local DTMF payload type */
+    si->tx_event_pt = -1;
+    for (i=0; i<local_m->attr_count; ++i) {
+        pjmedia_sdp_rtpmap r;
+
+        attr = local_m->attr[i];
+        if (pj_strcmp(&attr->name, &ID_RTPMAP) != 0)
+            continue;
+        if (pjmedia_sdp_attr_get_rtpmap(attr, &r) != PJ_SUCCESS)
+            continue;
+        if (pj_strcmp(&r.enc_name, &ID_TELEPHONE_EVENT) == 0) {
+            si->tx_event_pt = pj_strtoul(&r.pt);
+            break;
+        }
+    }
+
+    /* Get remote DTMF payload type */
+    si->rx_event_pt = -1;
+    for (i=0; i<rem_m->attr_count; ++i) {
+        pjmedia_sdp_rtpmap r;
+
+        attr = rem_m->attr[i];
+        if (pj_strcmp(&attr->name, &ID_RTPMAP) != 0)
+            continue;
+        if (pjmedia_sdp_attr_get_rtpmap(attr, &r) != PJ_SUCCESS)
+            continue;
+        if (pj_strcmp(&r.enc_name, &ID_TELEPHONE_EVENT) == 0) {
+            si->rx_event_pt = pj_strtoul(&r.pt);
+            break;
+        }
+    }
+
 
     /* Leave SSRC to zero. */
@@ -183 +220 @@
                                             const pjmedia_sdp_session *local_sdp,
                                             const pjmedia_sdp_session *rem_sdp,
+                                            void *user_data,
                                             pjmedia_session **p_session )
 {
@@ -204 +242 @@
     session->endpt = endpt;
     session->stream_cnt = stream_cnt;
+    session->user_data = user_data;
     
     /* Stream count is the lower number of stream_cnt or SDP m= lines count */
@@ -240 +279 @@
         status = pjmedia_stream_create(endpt, session->pool,
                                        &session->stream_info[i],
+                                       session,
                                        &session->stream[i]);
         if (status == PJ_SUCCESS)
@@ -386 +426 @@
 
 
+/*
+ * Get the port interface.
+ */
 PJ_DEF(pj_status_t) pjmedia_session_get_port(  pjmedia_session *session,
                                                unsigned index,
@@ -393 +436 @@
 }
 
-/**
+/*
  * Get statistics
  */
@@ -407 +450 @@
 
 
+/*
+ * Dial DTMF digit to the stream, using RFC 2833 mechanism.
+ */
+PJ_DEF(pj_status_t) pjmedia_session_dial_dtmf( pjmedia_session *session,
+                                               unsigned index,
+                                               const pj_str_t *ascii_digits )
+{
+    PJ_ASSERT_RETURN(session && ascii_digits, PJ_EINVAL);
+    return pjmedia_stream_dial_dtmf(session->stream[index], ascii_digits);
+}
+
+/*
+ * Check if the specified stream has received DTMF digits.
+ */
+PJ_DEF(pj_status_t) pjmedia_session_check_dtmf( pjmedia_session *session,
+                                                unsigned index )
+{
+    PJ_ASSERT_RETURN(session, PJ_EINVAL);
+    return pjmedia_stream_check_dtmf(session->stream[index]);
+}
+
+
+/*
+ * Retrieve DTMF digits from the specified stream.
+ */
+PJ_DEF(pj_status_t) pjmedia_session_get_dtmf( pjmedia_session *session,
+                                              unsigned index,
+                                              char *ascii_digits,
+                                              unsigned *size )
+{
+    PJ_ASSERT_RETURN(session && ascii_digits && size, PJ_EINVAL);
+    return pjmedia_stream_get_dtmf(session->stream[index], ascii_digits,
+                                   size);
+}