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

Timestamp:

Feb 25, 2006 2:04:42 AM (18 years ago)

Author:

bennylp

Message:

Synched with documentation

File:

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

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

@@ -18 +18 @@
  */
 #include <pjmedia/conference.h>
-#include <pjmedia/vad.h>
+#include <pjmedia/silencedet.h>
 #include <pjmedia/stream.h>
 #include <pjmedia/sound.h>
@@ -56 +56 @@
     int                  listener_cnt;  /**< Number of listeners.           */
     pj_bool_t           *listeners;     /**< Array of listeners.            */
-    pjmedia_vad         *vad;           /**< VAD for this port.             */
+    pjmedia_silence_det *vad;           /**< VAD for this port.             */
 
     /* Tx buffer contains the frame to be "transmitted" to this port
@@ -140 +140 @@
 
     /* Create and init vad. */
-    status = pjmedia_vad_create( pool, &conf_port->vad);
+    status = pjmedia_silence_det_create( pool, &conf_port->vad);
     if (status != PJ_SUCCESS)
         return status;
 
-    pjmedia_vad_set_adaptive(conf_port->vad, conf->samples_per_frame);
+    pjmedia_silence_det_set_adaptive(conf_port->vad, conf->samples_per_frame);
 
 
@@ -739 +739 @@
 
         /* Do we have signal? */
-        silence = pjmedia_vad_detect_silence(conf_port->vad,
-                                             output, 
-                                             conf->samples_per_frame,
-                                             &level);
+        silence = pjmedia_silence_det_detect_silence(conf_port->vad,
+                                                     output, 
+                                                     conf->samples_per_frame,
+                                                     &level);
 
         /* Skip if we don't have signal. */
@@ -790 +790 @@
             frame.buf = NULL;
             frame.size = 0;
-            
+
             if (conf_port->port)
                 pjmedia_port_put_frame(conf_port->port, &frame);