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

Timestamp:

May 14, 2006 6:23:34 PM (18 years ago)

Author:

bennylp

Message:

Fixed more bugs with multiple frame handling

File:

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

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

@@ -1096 +1096 @@
      * transmit NULL frame. 
      */
+    /* note:
+     *  the "cport->sources==0" checking will cause discontinuous
+     *  transmission for RTP stream.
+     */
     if (cport->tx_setting == PJMEDIA_PORT_MUTE || cport->sources==0) {
 
@@ -1125 +1129 @@
     buf = (pj_int16_t*)cport->mix_buf;
 
-    if (cport->tx_adj_level != NORMAL_LEVEL) {
+    if (cport->tx_adj_level != NORMAL_LEVEL && cport->sources) {
 
         unsigned adj_level = cport->tx_adj_level;
@@ -1169 +1173 @@
      * indication of the signal level of the port.
      */
-    if (cport->need_tx_level) {
+    if (cport->need_tx_level && cport->sources) {
         pj_uint32_t level;