Changeset 2748 for pjproject/trunk

Timestamp:

Jun 4, 2009 7:36:52 PM (15 years ago)

Author:

nanang

Message:

Ticket #879:

• Fixed bug in conf bridge create_on_port() (bug of r2747).
• Updated sound port to instantiate sync port only when audio format is PCM.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• conference.c (modified) (1 diff)
• sound_port.c (modified) (2 diffs)

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

@@ -459 +459 @@
 
 
-    status = create_conf_port(conf, pool, &name, NULL, &conf_port);
+    status = create_conf_port(pool, conf, NULL, &name, &conf_port);
     if (status != PJ_SUCCESS)
         return status;

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -565 +565 @@
     pjmedia_port_info *pinfo;
     pjmedia_aud_param *param;
-    pjmedia_sync_param sync_param;
     pj_status_t status;
 
@@ -610 +609 @@
     }
 
-    /* Create sync port */
-    pj_bzero(&sync_param, sizeof(sync_param));
-    sync_param.options = PJMEDIA_SYNC_DONT_DESTROY_DN;
-    status = pjmedia_sync_port_create(snd_port->pool, 
-                                      (snd_port->echo_port?
-                                       snd_port->echo_port:snd_port->port),
-                                      &sync_param, &snd_port->sync_port);
-    if (status != PJ_SUCCESS)
-        return status;
-
-    /* Update down port of sound port */
-    snd_port->dn_port = snd_port->sync_port;
+    /* Create sync port. Only do this if the format is PCM! */
+    if (param->ext_fmt.id == PJMEDIA_FORMAT_PCM) {
+        pjmedia_sync_param sync_param;
+        
+        pj_bzero(&sync_param, sizeof(sync_param));
+        sync_param.options = PJMEDIA_SYNC_DONT_DESTROY_DN;
+        status = pjmedia_sync_port_create(snd_port->pool, 
+                                          (snd_port->echo_port?
+                                           snd_port->echo_port:snd_port->port),
+                                          &sync_param, &snd_port->sync_port);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        /* Update down port of sound port */
+        snd_port->dn_port = snd_port->sync_port;
+    }
 
     return PJ_SUCCESS;