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

Timestamp:

Dec 22, 2007 7:43:45 AM (16 years ago)

Author:

bennylp

Message:

Fixed bug caused by ticket #427: frame type not properly initialized to PJMEDIA_FRAME_TYPE_AUDIO, causing audio frames to be dropped in the conference bridge (thanks P.J. Cast)

File:

• pjproject/trunk/pjmedia/src/pjmedia/conference.c (modified) (1 diff)

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

@@ -1281 +1281 @@
     } else {
 
-        /* Initialize frame type to None */
-        *type = PJMEDIA_FRAME_TYPE_NONE;
+        /* Initialize frame type */
+        if (cport->rx_buf_count == 0) {
+            *type = PJMEDIA_FRAME_TYPE_NONE;
+        } else {
+            /* we got some samples in the buffer */
+            *type = PJMEDIA_FRAME_TYPE_AUDIO;
+        }
 
         /*