Changeset 438 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

May 13, 2006 10:46:23 PM (18 years ago)

Author:

bennylp

Message:

Another major modifications in PJMEDIA:

• handle multiple frames in one packet
• split stream creation into two steps to allow customization
• PLC framework and implementation with G.711 and speex
• stream returns NO_FRAME correctly.
• added ptime argument in pjsua

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (8 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -27 +27 @@
  */
 
-#define THIS_FILE   "pjsua_inv.c"
+#define THIS_FILE   "pjsua_call.c"
 
 
@@ -154 +154 @@
         call->session = NULL;
 
-    }
-
-    PJ_LOG(3,(THIS_FILE, "Media session for call %d is destroyed", 
-                         call_index));
+        PJ_LOG(3,(THIS_FILE, "Media session for call %d is destroyed", 
+                             call_index));
+
+    }
 
     return PJ_SUCCESS;
@@ -524 +524 @@
             pj_gettimeofday(&call->dis_time);
             break;
+        default:
+            /* Nothing to do. Just to keep gcc from complaining about
+             * unused enums.
+             */ 
+            break;
     }
 
@@ -557 +562 @@
             st_code = e->body.tsx_state.tsx->status_code;
             ev_state = PJSIP_EVSUB_STATE_TERMINATED;
+            break;
+
+        default:
+            /* Nothing to do. Just to keep gcc from complaining about
+             * unused enums.
+             */
             break;
         }
@@ -916 +927 @@
 }
 
+#if 0
 /* Disconnect call */
 static void call_disconnect(pjsip_inv_session *inv,
@@ -931 +943 @@
     }
 }
+#endif
 
 /*
@@ -941 +954 @@
 {
     pjsua_call *call;
+    pjmedia_session_info sess_info;
     const pjmedia_sdp_session *local_sdp;
     const pjmedia_sdp_session *remote_sdp;
@@ -991 +1005 @@
     }
 
-    /* Create new media session. 
-     * The media session is active immediately.
-     */
     if (pjsua.null_audio)
         return;
-    
-    status = pjmedia_session_create( pjsua.med_endpt, 1, 
-                                     &call->skinfo,
-                                     local_sdp, remote_sdp, 
-                                     call,
-                                     &call->session );
+
+    /* Create media session info based on SDP parameters. 
+     * We only support one stream per session at the moment
+     */    
+    status = pjmedia_session_info_from_sdp( call->inv->dlg->pool, 
+                                            pjsua.med_endpt, 1,
+                                            &sess_info, &call->skinfo,
+                                            local_sdp, remote_sdp);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create media session", 
+                     status);
+        //call_disconnect(inv, PJSIP_SC_UNSUPPORTED_MEDIA_TYPE);
+        return;
+    }
+
+    /* Override ptime, if this option is specified. */
+    if (pjsua.ptime) {
+        sess_info.stream_info[0].param->setting.frm_per_pkt = (pj_uint8_t)
+            (pjsua.ptime / sess_info.stream_info[0].param->info.frm_ptime);
+        if (sess_info.stream_info[0].param->setting.frm_per_pkt==0)
+            sess_info.stream_info[0].param->setting.frm_per_pkt = 1;
+    }
+
+    /* Optionally, application may modify other stream settings here
+     * (such as jitter buffer parameters, codec ptime, etc.)
+     */
+
+    /* Create session based on session info. */
+    status = pjmedia_session_create( pjsua.med_endpt, &sess_info,
+                                     call, &call->session );
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create media session",