Changeset 318 for pjproject/trunk/pjmedia/src/pjmedia/conference.c

Timestamp:

Mar 15, 2006 7:32:41 PM (18 years ago)

Author:

bennylp

Message:

Added Null port, and changed conference so that it does not call port get_frame() when there is no listener on the port

File:

• pjproject/trunk/pjmedia/src/pjmedia/conference.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -492 +492 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(conf && pool && strm_port && port_name && p_port, 
-                     PJ_EINVAL);
+    PJ_ASSERT_RETURN(conf && pool && strm_port && port_name, PJ_EINVAL);
 
     pj_mutex_lock(conf->mutex);
@@ -523 +522 @@
 
     /* Done. */
-    *p_port = index;
+    if (p_port) {
+        *p_port = index;
+    }
 
     pj_mutex_unlock(conf->mutex);
@@ -1052 +1053 @@
             continue;
         }
+
+        /* Also skip if this port doesn't have listeners. */
+        if (conf_port->listener_cnt == 0)
+            continue;
 
         /* Get frame from this port. 
@@ -1102 +1107 @@
         }
 
-        /* Also skip if this port doesn't have listeners. */
-        if (conf_port->listener_cnt == 0)
-            continue;
-
         /* Get the signal level. */
         level = pjmedia_calc_avg_signal(output, conf->samples_per_frame);