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

Timestamp:

Dec 9, 2007 5:34:09 AM (16 years ago)

Author:

bennylp

Message:

Ticket #427: conference bridge does not handle NONE frame (thanks Daniel Braun)

File:

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

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

@@ -1270 +1270 @@
     } else {
 
+        /* Initialize frame type to None */
+        *type = PJMEDIA_FRAME_TYPE_NONE;
+
         /*
          * If we don't have enough samples in rx_buf, read from the port 
@@ -1297 +1300 @@
                 pjmedia_zero_samples( cport->rx_buf + cport->rx_buf_count,
                                       cport->samples_per_frame);
+            } else {
+                /* We've got at least one frame */
+                *type = PJMEDIA_FRAME_TYPE_AUDIO;
             }
 
@@ -1719 +1725 @@
             if (conf->ports[i] == NULL)
                 continue;
+
+            /* Ignore if we didn't get any frame */
+            if (frame_type != PJMEDIA_FRAME_TYPE_AUDIO)
+                continue;
         }