diff --git a/src/org/jitsi/impl/neomedia/device/AudioSystem.java b/src/org/jitsi/impl/neomedia/device/AudioSystem.java
index 962a1cd2a5967077cc55ec376acbe2d83eb9aff8..5f7343c4c0a9ea93bcd5a5b1b14f5ecbb8b9c4d5 100644
--- a/src/org/jitsi/impl/neomedia/device/AudioSystem.java
+++ b/src/org/jitsi/impl/neomedia/device/AudioSystem.java
@@ -28,6 +28,7 @@
*
* @author Lyubomir Marinov
* @author Vincent Lucas
+ * @author Timothy Price
*/
public abstract class AudioSystem
extends DeviceSystem
@@ -45,6 +46,16 @@ public enum DataFlow
PLAYBACK
}
+ /**
+ * The constant/flag (to be) returned by {@link #getFeatures()} in order to
+ * indicate that the respective <tt>AudioSystem</tt> supports toggling its
+ * automatic gain control (AGC) functionality between on and off. The UI
+ * will look for the presence of the flag in order to determine whether a
+ * check box is to be shown to the user to enable toggling the automatic
+ * gain control (AGC) functionality.
+ */
+ public static final int FEATURE_AGC = 1 << 4;
+
/**
* The constant/flag (to be) returned by {@link #getFeatures()} in order to
* indicate that the respective <tt>AudioSystem</tt> supports toggling its
@@ -52,7 +63,7 @@ public enum DataFlow
* presence of the flag in order to determine whether a check box is to be
* shown to the user to enable toggling the denoise functionality.
*/
- public static final int FEATURE_DENOISE = 2;
+ public static final int FEATURE_DENOISE = 1 << 1;
/**
* The constant/flag (to be) returned by {@link #getFeatures()} in order to
@@ -62,7 +73,7 @@ public enum DataFlow
* be shown to the user to enable toggling the echo cancellation
* functionality.
*/
- public static final int FEATURE_ECHO_CANCELLATION = 4;
+ public static final int FEATURE_ECHO_CANCELLATION = 1 << 2;
/**
* The constant/flag (to be) returned by {@link #getFeatures()} in order to
@@ -72,7 +83,7 @@ public enum DataFlow
* boxes are to be shown to the user to allow the configuration of the
* preferred playback and notification audio devices.
*/
- public static final int FEATURE_NOTIFY_AND_PLAYBACK_DEVICES = 8;
+ public static final int FEATURE_NOTIFY_AND_PLAYBACK_DEVICES = 1 << 3;
public static final String LOCATOR_PROTOCOL_AUDIORECORD = "audiorecord";
@@ -101,6 +112,13 @@ public enum DataFlow
*/
private static Logger logger = Logger.getLogger(AudioSystem.class);
+ /**
+ * The (base) name of the <tt>ConfigurationService</tt> property which
+ * indicates whether automatic gain control (AGC) is to be performed for the
+ * captured audio.
+ */
+ private static final String PNAME_AGC = "automaticgaincontrol";
+
/**
* The (base) name of the <tt>ConfigurationService</tt> property which
* indicates whether noise suppression is to be performed for the captured
@@ -476,6 +494,23 @@ public CaptureDeviceInfo2 getSelectedDevice(DataFlow dataFlow)
devices[dataFlow.ordinal()].getSelectedDevice(getDevices(dataFlow));
}
+ /**
+ * Gets the indicator which determines whether automatic gain control (AGC)
+ * is to be performed for captured audio.
+ *
+ * @return <tt>true</tt> if automatic gain control (AGC) is to be performed
+ * for captured audio; otherwise, <tt>false</tt>
+ */
+ public boolean isAutomaticGainControl()
+ {
+ ConfigurationService cfg = LibJitsi.getConfigurationService();
+ boolean value = ((getFeatures() & FEATURE_AGC) == FEATURE_AGC);
+
+ if (cfg != null)
+ value = cfg.getBoolean(getPropertyName(PNAME_AGC), value);
+ return value;
+ }
+
/**
* Gets the indicator which determines whether noise suppression is to be
* performed for captured audio.
@@ -616,6 +651,21 @@ void propertyChange(String property, Object oldValue, Object newValue)
firePropertyChange(property, oldValue, newValue);
}
+ /**
+ * Sets the indicator which determines whether automatic gain control (AGC)
+ * is to be performed for captured audio.
+ *
+ * @param automaticGainControl <tt>true</tt> if automatic gain control (AGC)
+ * is to be performed for captured audio; otherwise, <tt>false</tt>
+ */
+ public void setAutomaticGainControl(boolean automaticGainControl)
+ {
+ ConfigurationService cfg = LibJitsi.getConfigurationService();
+
+ if (cfg != null)
+ cfg.setProperty(getPropertyName(PNAME_AGC), automaticGainControl);
+ }
+
/**
* Sets the list of a kind of devices: capture, notify or playback.
*
diff --git a/src/org/jitsi/impl/neomedia/device/WASAPISystem.java b/src/org/jitsi/impl/neomedia/device/WASAPISystem.java
index 8432676f8a58caaa89bb08948ab50d976bf7fd5c..b9d626181347dabc41e326d4a7bd577925d80907 100644
--- a/src/org/jitsi/impl/neomedia/device/WASAPISystem.java
+++ b/src/org/jitsi/impl/neomedia/device/WASAPISystem.java
@@ -272,7 +272,8 @@ public static void WAVEFORMATEX_fill(
{
super(
LOCATOR_PROTOCOL,
- FEATURE_DENOISE
+ FEATURE_AGC
+ | FEATURE_DENOISE
| FEATURE_ECHO_CANCELLATION
| FEATURE_NOTIFY_AND_PLAYBACK_DEVICES
| FEATURE_REINITIALIZE);
diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/VoiceCaptureDSP.java b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/VoiceCaptureDSP.java
index 16215407172ad28a66a68298c51b772f89e91cab..0a5002d9b0af45265eb9f6dd88bc9254c0101377 100644
--- a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/VoiceCaptureDSP.java
+++ b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/VoiceCaptureDSP.java
@@ -16,6 +16,7 @@
* <tt>DataSource</tt> and <tt>Renderer</tt> implementations.
*
* @author Lyubomir Marinov
+ * @author Timothy Price
*/
public class VoiceCaptureDSP
{
@@ -159,6 +160,22 @@ public class VoiceCaptureDSP
*/
public static final long MFPKEY_WMAAECMA_FEATURE_MODE;
+ /**
+ * Specifies whether the Voice Capture DSP applies microphone gain bounding.
+ * Microphone gain bounding ensures that the microphone has the correct
+ * level of gain. If gain is too high, the captured signal might be
+ * saturated and will be clipped. Clipping is a non-linear effect, which
+ * will cause the acoustic echo cancellation (AEC) algorithm to fail. If the
+ * gain is too low, the signal-to-noise ratio is low, which can also cause
+ * the AEC algorithm to fail or not perform well. The default value of this
+ * <tt>boolean</tt> property is <tt>true</tt>. Microphone gain bounding is
+ * applied only when the DSP operates in source mode. In filter mode, the
+ * application must ensure that the microphone has the correct gain level.
+ * In order to disable automatic gain control (AGC), microphone gain
+ * bounding must also be disabled.
+ */
+ public static final long MFPKEY_WMAAECMA_MIC_GAIN_BOUNDER;
+
/**
* Specifies the processing mode for the Voice Capture DSP.
*
@@ -261,6 +278,8 @@ public class VoiceCaptureDSP
MFPKEY_WMAAECMA_FEATR_NS = maybePSPropertyKeyFromString(fmtid + "8");
MFPKEY_WMAAECMA_FEATURE_MODE
= maybePSPropertyKeyFromString(fmtid + "5");
+ MFPKEY_WMAAECMA_MIC_GAIN_BOUNDER
+ = maybePSPropertyKeyFromString(fmtid + "21");
}
public static native int DMO_MEDIA_TYPE_fill(
diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPIStream.java b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPIStream.java
index fe79f93b14fb583f1d895de885d923a615523f87..15566b93635efdd0fc2e792b08b84d1f357bda03 100644
--- a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPIStream.java
+++ b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPIStream.java
@@ -760,14 +760,29 @@ private void configureAEC(long iPropertyStore)
MFPKEY_WMAAECMA_FEATR_AES,
audioSystem.isEchoCancel() ? 2 : 0);
}
- // Perform automatic gain control (AGC).
+
+ // Possibly perform automatic gain control (AGC).
+ boolean isAGC = audioSystem.isAutomaticGainControl();
+
if (MFPKEY_WMAAECMA_FEATR_AGC != 0)
{
IPropertyStore_SetValue(
iPropertyStore,
MFPKEY_WMAAECMA_FEATR_AGC,
- true);
+ isAGC);
}
+ /*
+ * In order to disable automatic gain control (AGC), microphone
+ * gain bounding must also be disabled.
+ */
+ if (MFPKEY_WMAAECMA_MIC_GAIN_BOUNDER != 0)
+ {
+ IPropertyStore_SetValue(
+ iPropertyStore,
+ MFPKEY_WMAAECMA_MIC_GAIN_BOUNDER,
+ isAGC);
+ }
+
// Perform noise suppression (NS).
if (MFPKEY_WMAAECMA_FEATR_NS != 0)
{