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

Timestamp:

Nov 9, 2017 10:48:17 PM (6 years ago)

Author:

ming

Message:

Fixed #2057: Optimization: Improve conference mix loop performance

File:

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

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

@@ -1942 +1942 @@
             struct conf_port *listener;
             pj_int32_t *mix_buf;
-            unsigned k;
 
             listener = conf->ports[conf_port->listener_slots[cj]];
@@ -1957 +1956 @@
                  * any overflowed level in the mixed signal.
                  */
-                for (k=0; k < conf->samples_per_frame; ++k) {
+                unsigned k, samples_per_frame = conf->samples_per_frame;
+                pj_int32_t mix_buf_min = 0;
+                pj_int32_t mix_buf_max = 0;
+
+                for (k = 0; k < samples_per_frame; ++k) {
                     mix_buf[k] += p_in[k];
-                    /* Check if normalization adjustment needed. */
-                    if (IS_OVERFLOW(mix_buf[k])) {
-                        /* NORMAL_LEVEL * MAX_LEVEL / mix_buf[k]; */
-                        int tmp_adj = (MAX_LEVEL<<7) / mix_buf[k];
-                        if (tmp_adj<0) tmp_adj = -tmp_adj;
-
-                        if (tmp_adj<listener->mix_adj)
-                            listener->mix_adj = tmp_adj;
-
-                    } /* if any overflow in the mixed signals */
-                } /* loop mixing signals */
+                    if (mix_buf[k] < mix_buf_min)
+                        mix_buf_min = mix_buf[k];
+                    if (mix_buf[k] > mix_buf_max)
+                        mix_buf_max = mix_buf[k];
+                }
+
+                /* Check if normalization adjustment needed. */
+                if (mix_buf_min < MIN_LEVEL || mix_buf_max > MAX_LEVEL) {
+                    if (-mix_buf_min > mix_buf_max)
+                        mix_buf_max = -mix_buf_min;
+
+                    /* NORMAL_LEVEL * MAX_LEVEL / mix_buf_max; */
+                    int tmp_adj = (MAX_LEVEL<<7) / mix_buf_max;
+                    if (tmp_adj < listener->mix_adj)
+                        listener->mix_adj = tmp_adj;
+                }
             } else {
                 /* Only 1 transmitter:
@@ -1975 +1983 @@
                  * no mixing and level adjustment needed
                  */
-                for (k=0; k<conf->samples_per_frame; ++k) {
+                unsigned k, samples_per_frame = conf->samples_per_frame;
+
+                for (k = 0; k < samples_per_frame; ++k) {
                     mix_buf[k] = p_in[k];
                 }