Changeset 318

Timestamp:

Mar 15, 2006 7:32:41 PM (19 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

Location:

pjproject/trunk

Files:

• pjmedia/build/pjmedia.dsp (modified) (2 diffs)
• pjmedia/include/pjmedia.h (modified) (1 diff)
• pjmedia/include/pjmedia/null_port.h (added)
• pjmedia/src/pjmedia/conference.c (modified) (4 diffs)
• pjmedia/src/pjmedia/null_port.c (added)
• pjsip/include/pjsua-lib/pjsua.h (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -121 +121 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\null_port.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\nullsound.c
 # PROP Exclude_From_Build 1
@@ -207 +211 @@
 
 SOURCE=..\include\pjmedia\jbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\null_port.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -33 +33 @@
 #include <pjmedia/g711.h>
 #include <pjmedia/jbuf.h>
+#include <pjmedia/null_port.h>
 #include <pjmedia/port.h>
 #include <pjmedia/rtcp.h>

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);

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -65 +65 @@
  * streams.
  */
-#define PJSUA_CONF_MORE_PORTS       2
+#define PJSUA_CONF_MORE_PORTS       3
 
 
@@ -186 +186 @@
     char            *wav_file;      /**< WAV file name to play.         */
     unsigned         wav_slot;      /**< WAV player slot in bridge      */
+    pjmedia_port    *file_port;     /**< WAV player port.               */
+    pjmedia_port    *null_port;     /**< NULL port.                     */
     pj_bool_t        auto_play;     /**< Auto play file for calls?      */
     pj_bool_t        auto_loop;     /**< Auto loop RTP stream?          */

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

@@ -754 +754 @@
     }
 
+    /* Add NULL port to the bridge. */
+    status = pjmedia_null_port_create( pjsua.pool, pjsua.clock_rate, 
+                                       pjsua.clock_rate * 20 / 1000, 16,
+                                       &pjsua.null_port);
+    pjmedia_conf_add_port( pjsua.mconf, pjsua.pool, pjsua.null_port, 
+                           &pjsua.null_port->info.name, NULL );
+
     /* Create WAV file player if required: */
 
     if (pjsua.wav_file) {
-        pjmedia_port *port;
         pj_str_t port_name;
 
         /* Create the file player port. */
         status = pjmedia_file_player_port_create( pjsua.pool, pjsua.wav_file,
-                                                  0, -1, NULL, &port);
+                                                  0, -1, NULL, 
+                                                  &pjsua.file_port);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, 
@@ -771 +778 @@
 
         /* Add port to conference bridge: */
-        status = pjmedia_conf_add_port(pjsua.mconf, pjsua.pool, port, 
+        status = pjmedia_conf_add_port(pjsua.mconf, pjsua.pool, 
+                                       pjsua.file_port, 
                                        pj_cstr(&port_name, pjsua.wav_file),
                                        &pjsua.wav_slot);
@@ -1050 +1058 @@
         pjmedia_conf_destroy(pjsua.mconf);
 
+    /* Destroy file port */
+    pjmedia_port_destroy(pjsua.file_port);
+
+    /* Destroy null port. */
+    pjmedia_port_destroy(pjsua.null_port);
+
+
     /* Destroy sound framework: 
      * (this should be done in pjmedia_shutdown())