Changeset 5696

Timestamp:

Nov 16, 2017 1:25:04 PM (7 years ago)

Author:

riza

Message:

Re #2059 (misc): Set conference's port rx_level to 0 when get frames from the
port is skipped. Thanks to Kal Conley for the original patch.

File:

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

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

@@ -1856 +1856 @@
             status = pjmedia_delay_buf_get(conf_port->delay_buf,
                                   (pj_int16_t*)frame->buf);
-            if (status != PJ_SUCCESS)
+            if (status != PJ_SUCCESS) {
+                conf_port->rx_level = 0;
                 continue;
+            }           
 
         } else {
@@ -1877 +1879 @@
                 conf_port->rx_setting = PJMEDIA_PORT_DISABLE;
                  */
+                conf_port->rx_level = 0;
                 continue;
             }
 
             /* Check that the port is not removed when we call get_frame() */
-            if (conf->ports[i] == NULL)
+            if (conf->ports[i] == NULL) {
+                conf_port->rx_level = 0;
                 continue;
+            }
+                
 
             /* Ignore if we didn't get any frame */
-            if (frame_type != PJMEDIA_FRAME_TYPE_AUDIO)
+            if (frame_type != PJMEDIA_FRAME_TYPE_AUDIO) {
+                conf_port->rx_level = 0;
                 continue;
+            }           
         }