Changeset 3512 for pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Apr 8, 2011 4:26:18 AM (14 years ago)

Author:

nanang

Message:

Re #1201:

• fix bug responding 488 after receiving re-INVITE for doublehold
• updated pjsua_media.c to skip instantiating video devs when call hold by local.

File:

• pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1267 +1267 @@
     for (i=0; i<sdp->media_count && count<PJSUA_MAX_CALL_MEDIA; ++i) {
         const pjmedia_sdp_media *m = sdp->media[i];
+        const pjmedia_sdp_conn *c;
 
         /* Skip different media */
@@ -1273 +1274 @@
             continue;
         }
+
+        c = m->conn? m->conn : sdp->conn;
 
         /* Supported transports */
@@ -1306 +1309 @@
 
         /* Is media inactive? */
-        if (pjmedia_sdp_media_find_attr2(m, "inactive", NULL))
-            score[i] -= 10;
+        if (pjmedia_sdp_media_find_attr2(m, "inactive", NULL) ||
+            pj_strcmp2(&c->addr, "0.0.0.0") == 0)
+        {
+            //score[i] -= 10;
+            score[i] -= 1;
+        }
 
         ++count;
@@ -2301 +2308 @@
 
         /* Setup encoding direction */
-        if (si->dir & PJMEDIA_DIR_ENCODING) {
+        if (si->dir & PJMEDIA_DIR_ENCODING && !call->local_hold) {
             pjmedia_vid_port_param vport_param;