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

Timestamp:

Jul 19, 2011 3:42:28 AM (13 years ago)

Author:

nanang

Message:

Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/conference.c (modified) (6 diffs)

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

@@ -27 +27 @@
 #include <pjmedia/sound_port.h>
 #include <pjmedia/stereo.h>
-#include <pjmedia/stream.h>
 #include <pj/array.h>
 #include <pj/assert.h>
@@ -66 +65 @@
 
 #define SIGNATURE           PJMEDIA_CONF_BRIDGE_SIGNATURE
-#define SIGNATURE_PORT      PJMEDIA_PORT_SIGNATURE('C', 'O', 'N', 'P')
+#define SIGNATURE_PORT      PJMEDIA_SIG_PORT_CONF_PASV
 /* Normal level is hardcodec to 128 in all over places */
 #define NORMAL_LEVEL        128
@@ -242 +241 @@
 /* Prototypes */
 static pj_status_t put_frame(pjmedia_port *this_port, 
-                             const pjmedia_frame *frame);
+                             pjmedia_frame *frame);
 static pj_status_t get_frame(pjmedia_port *this_port, 
                              pjmedia_frame *frame);
@@ -286 +285 @@
     /* Save some port's infos, for convenience. */
     if (port) {
+        pjmedia_audio_format_detail *afd;
+
+        afd = pjmedia_format_get_audio_format_detail(&port->info.fmt, 1);
         conf_port->port = port;
-        conf_port->clock_rate = port->info.clock_rate;
-        conf_port->samples_per_frame = port->info.samples_per_frame;
-        conf_port->channel_count = port->info.channel_count;
+        conf_port->clock_rate = afd->clock_rate;
+        conf_port->samples_per_frame = PJMEDIA_AFD_SPF(afd);
+        conf_port->channel_count = afd->channel_count;
     } else {
         conf_port->port = NULL;
@@ -751 +753 @@
      * - monochannel on port or conference bridge.
      */
-    if (strm_port->info.channel_count != conf->channel_count && 
-        (strm_port->info.channel_count != 1 && conf->channel_count != 1)) 
+    if (PJMEDIA_PIA_CCNT(&strm_port->info) != conf->channel_count &&
+        (PJMEDIA_PIA_CCNT(&strm_port->info) != 1 &&
+         conf->channel_count != 1))
     {
         pj_assert(!"Number of channels mismatch");
@@ -2051 +2054 @@
  */
 static pj_status_t put_frame(pjmedia_port *this_port, 
-                             const pjmedia_frame *frame)
+                             pjmedia_frame *frame)
 {
     pjmedia_conf *conf = (pjmedia_conf*) this_port->port_data.pdata;