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

Timestamp:

Jun 4, 2009 6:48:49 PM (15 years ago)

Author:

nanang

Message:

Ticket #879:

• Added pjmedia synchronizer port.
• Updated affected components, i.e: sound port, AEC, conference bridge.

File:

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

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

@@ -237 +237 @@
     unsigned              samples_per_frame;    /**< Samples per frame.     */
     unsigned              bits_per_sample;      /**< Bits per sample.       */
+    pj_int16_t           *master_port_buf;
 };
 
@@ -458 +459 @@
 
 
-    status = create_pasv_port(conf, pool, &name, NULL, &conf_port);
+    status = create_conf_port(conf, pool, &name, NULL, &conf_port);
     if (status != PJ_SUCCESS)
         return status;
@@ -557 +558 @@
     conf->master_port = PJ_POOL_ZALLOC_T(pool, pjmedia_port);
     PJ_ASSERT_RETURN(conf->master_port, PJ_ENOMEM);
+
+    conf->master_port_buf = (pj_int16_t*)
+                            pj_pool_zalloc(pool, conf->samples_per_frame<<1);
+    PJ_ASSERT_RETURN(conf->master_port_buf, PJ_ENOMEM);
     
     pjmedia_port_info_init(&conf->master_port->info, &name, SIGNATURE,
@@ -1052 +1057 @@
 
         /* if source port is passive port and has no listener, reset delaybuf */
-        if (src_port->delay_buf && src_port->listener_cnt == 0)
-            pjmedia_delay_buf_reset(src_port->delay_buf);
+        if (src_port->listener_cnt == 0) {
+            if (src_port->delay_buf)
+                pjmedia_delay_buf_reset(src_port->delay_buf);
+            if (src_port->port == NULL)
+                pjmedia_zero_samples(conf->master_port_buf, 
+                                     conf->samples_per_frame);
+        }
     }
 
@@ -1842 +1852 @@
 
         /* Get frame from this port.
+         * For port 0 (master port), get the frame from master_port_buf.
          * For passive ports, get the frame from the delay_buf.
          * For other ports, get the frame from the port. 
          */
-        if (conf_port->delay_buf != NULL) {
+        if (conf_port->port == NULL) {
+
+            pjmedia_copy_samples((pj_int16_t*)frame->buf, conf->master_port_buf,
+                                 conf->samples_per_frame);
+
+        } else if (conf_port->delay_buf != NULL) {
+
             pj_status_t status;
         
@@ -2055 +2072 @@
     pjmedia_conf *conf = (pjmedia_conf*) this_port->port_data.pdata;
     struct conf_port *port = conf->ports[this_port->port_data.ldata];
-    pj_status_t status;
 
     /* Check for correct size. */
@@ -2062 +2078 @@
                       PJMEDIA_ENCSAMPLESPFRAME);
 
-    /* Check existance of delay_buf instance */
-    PJ_ASSERT_RETURN( port->delay_buf, PJ_EBUG );
-
     /* Skip if this port is muted/disabled. */
     if (port->rx_setting != PJMEDIA_PORT_ENABLE) {
@@ -2075 +2088 @@
     }
 
-    status = pjmedia_delay_buf_put(port->delay_buf, (pj_int16_t*)frame->buf);
-
-    return status;
+    pjmedia_copy_samples(conf->master_port_buf, (pj_int16_t*)frame->buf,
+                         conf->samples_per_frame);
+
+    return PJ_SUCCESS;
 }