Changeset 2456 for pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/ua.cpp

Timestamp:

Feb 16, 2009 4:29:05 PM (16 years ago)

Author:

nanang

Message:

Changed term 'fourcc' to 'format' and few minor fixes/updates.

File:

• pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/ua.cpp (modified) (11 diffs)

pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/ua.cpp

@@ -93 +93 @@
 
 static pj_pool_t *app_pool;
-static pjmedia_snd_port *snd_port;
+static pjmedia_snd_port *g_snd_port;
 
 
@@ -134 +134 @@
         if (call_id == g_call_id)
             g_call_id = PJSUA_INVALID_ID;
-        if (snd_port) {
-            pjmedia_snd_port_destroy(snd_port);
-            snd_port = NULL;
-        }
     } else if (ci.state != PJSIP_INV_STATE_INCOMING) {
         if (g_call_id == PJSUA_INVALID_ID)
@@ -270 +266 @@
     unsigned samples_per_frame;
     pj_status_t status;
+    
+    PJ_UNUSED_ARG(call_id);
+    PJ_UNUSED_ARG(p_port);
     
     status = pjmedia_session_get_info(sess, &sess_info);
@@ -289 +288 @@
     setting.vad = strm_info->param->setting.vad;
     setting.plc = strm_info->param->setting.plc;
-    if (setting.format.u32 == PJMEDIA_FOURCC_ILBC) {
+    if (setting.format.u32 == PJMEDIA_FORMAT_ILBC) {
         unsigned i;
         pjmedia_codec_fmtp *fmtp = &strm_info->param->setting.dec_fmtp;
@@ -315 +314 @@
     /* Reset conference attributes. */
     conf->info.samples_per_frame = samples_per_frame;
-    conf->info.clock_rate = 8000;
-    conf->info.channel_count = 1;
+    conf->info.clock_rate = strm_info->param->info.clock_rate;
+    conf->info.channel_count = strm_info->param->info.channel_cnt;
     conf->info.bits_per_sample = 16;
+    conf->info.format = strm_info->param->info.format;
 
     /* Reopen sound device. */
@@ -324 +324 @@
                                       0,
                                       0,
-                                      8000,
-                                      1,
+                                      strm_info->param->info.clock_rate,
+                                      strm_info->param->info.channel_cnt,
                                       samples_per_frame,
                                       16,
                                       &setting,
-                                      &snd_port);
+                                      &g_snd_port);
     if (status != PJ_SUCCESS) {
         PJ_LOG(1,(THIS_FILE, "on_stream_created() failed to reopen sound "
@@ -336 +336 @@
     }
     
-    status = pjmedia_snd_port_connect(snd_port, conf);
+    status = pjmedia_snd_port_connect(g_snd_port, conf);
     if (status != PJ_SUCCESS) {
         PJ_LOG(1,(THIS_FILE, "on_stream_created() failed to connect sound "
                              "device to conference, status=%d", status));
         return;
+    }
+}
+
+static void on_stream_destroyed(pjsua_call_id call_id,
+                                pjmedia_session *sess, 
+                                unsigned stream_idx)
+{
+    PJ_UNUSED_ARG(call_id);
+    PJ_UNUSED_ARG(sess);
+    PJ_UNUSED_ARG(stream_idx);
+
+    if (g_snd_port) {
+        pjmedia_snd_port_destroy(g_snd_port);
+        g_snd_port = NULL;
     }
 }
@@ -407 +421 @@
     cfg.cb.on_nat_detect = &on_nat_detect;
     cfg.cb.on_stream_created = &on_stream_created;
+    cfg.cb.on_stream_destroyed = &on_stream_destroyed;
     
     if (SIP_PROXY) {
@@ -429 +444 @@
     log_cfg.console_level = LOG_LEVEL;
     log_cfg.cb = &log_writer;
-    //log_cfg.log_filename = pj_str("C:\\data\\symbian_ua.log");
+    log_cfg.log_filename = pj_str("C:\\data\\symbian_ua.log");
 
     pjsua_media_config_default(&med_cfg);
@@ -621 +636 @@
 #   if PJMEDIA_SOUND_IMPLEMENTATION == PJMEDIA_SOUND_SYMB_APS_SOUND
     case 't':
-        if (snd_port) {
+        if (g_snd_port) {
             static pj_bool_t act_loudspk = PJ_TRUE;
             pjmedia_snd_stream *strm;
             
-            strm = pjmedia_snd_port_get_snd_stream(snd_port);
+            strm = pjmedia_snd_port_get_snd_stream(g_snd_port);
             pjmedia_snd_aps_activate_loudspeaker(strm, act_loudspk);
             act_loudspk = !act_loudspk;
@@ -998 +1013 @@
 #endif
         
-    if (snd_port) {
-        pjmedia_snd_port_destroy(snd_port);
-        snd_port = NULL;
+    if (g_snd_port) {
+        pjmedia_snd_port_destroy(g_snd_port);
+        g_snd_port = NULL;
     }