Changeset 5702

Timestamp:

Nov 27, 2017 3:29:07 AM (7 years ago)

Author:

ming

Message:

Fixed #2068: Add compile time option to enable/disable simple AGC in conference

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/config.h (modified) (1 diff)
• src/pjmedia/conference.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -73 +73 @@
 #ifndef PJMEDIA_CONF_SWITCH_BOARD_BUF_SIZE
 #   define PJMEDIA_CONF_SWITCH_BOARD_BUF_SIZE    PJMEDIA_MAX_MTU
+#endif
+
+/**
+ * Specify whether the conference bridge uses AGC, an automatic adjustment to
+ * avoid dramatic change in the signal level which can cause noise.
+ *
+ * Default: 1 (enabled)
+ */
+#ifndef PJMEDIA_CONF_USE_AGC
+#   define PJMEDIA_CONF_USE_AGC             1
 #endif
 

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

@@ -76 +76 @@
  * in the port does not cause misaligned signal (which causes noise).
  */
-#define ATTACK_A    (conf->clock_rate / conf->samples_per_frame)
-#define ATTACK_B    1
-#define DECAY_A     0
-#define DECAY_B     1
-
-#define SIMPLE_AGC(last, target) \
+#if defined(PJMEDIA_CONF_USE_AGC) && PJMEDIA_CONF_USE_AGC != 0
+#   define ATTACK_A     ((conf->clock_rate / conf->samples_per_frame) >> 4)
+#   define ATTACK_B     1
+#   define DECAY_A      0
+#   define DECAY_B      1
+
+#   define SIMPLE_AGC(last, target) \
     if (target >= last) \
         target = (ATTACK_A*(last+1)+ATTACK_B*target)/(ATTACK_A+ATTACK_B); \
     else \
         target = (DECAY_A*last+DECAY_B*target)/(DECAY_A+DECAY_B)
+#else
+#   define SIMPLE_AGC(last, target)
+#endif
 
 #define MAX_LEVEL   (32767)