From b274204feb562f45bf23badf59104c232defb098 Mon Sep 17 00:00:00 2001
From: peah <peah@webrtc.org>
Date: Thu, 18 May 2017 15:09:33 -0700
Subject: [PATCH] AppRTCMobile support to turn off the WebRTC AGC and HPF

This CL adds support for turning off the WebRTC AGC
and HPF in AppRTCMobile.

BUG=webrtc:6183,webrtc:6220

Review-Url: https://codereview.webrtc.org/2871393002
Cr-Commit-Position: refs/heads/master@{#18204}
---
 .../androidapp/res/values/strings.xml         |  4 +
 .../androidapp/res/xml/preferences.xml        |  5 ++
 .../src/org/appspot/apprtc/CallActivity.java  |  5 +-
 .../org/appspot/apprtc/ConnectActivity.java   |  8 ++
 .../appspot/apprtc/PeerConnectionClient.java  | 15 +++-
 .../org/appspot/apprtc/SettingsActivity.java  |  4 +
 .../apprtc/test/PeerConnectionClientTest.java | 76 +++++++++----------
 7 files changed, 75 insertions(+), 42 deletions(-)

diff --git a/webrtc/examples/androidapp/res/values/strings.xml b/webrtc/examples/androidapp/res/values/strings.xml
index c6935a4622..231475f587 100644
--- a/webrtc/examples/androidapp/res/values/strings.xml
+++ b/webrtc/examples/androidapp/res/values/strings.xml
@@ -152,6 +152,10 @@
     <string name="pref_enable_level_control_title">Enable level control.</string>
     <string name="pref_enable_level_control_default">false</string>
 
+    <string name="pref_disable_webrtc_agc_and_hpf_key">disable_webrtc_agc_and_hpf_preference</string>
+    <string name="pref_disable_webrtc_agc_and_hpf_title">Disable WebRTC AGC and HPF.</string>
+    <string name="pref_disable_webrtc_agc_default">false</string>
+
     <string name="pref_speakerphone_key">speakerphone_preference</string>
     <string name="pref_speakerphone_title">Speakerphone.</string>
     <string name="pref_speakerphone_dlg">Speakerphone.</string>
diff --git a/webrtc/examples/androidapp/res/xml/preferences.xml b/webrtc/examples/androidapp/res/xml/preferences.xml
index 675354690a..c9fe750d9e 100644
--- a/webrtc/examples/androidapp/res/xml/preferences.xml
+++ b/webrtc/examples/androidapp/res/xml/preferences.xml
@@ -152,6 +152,11 @@
             android:title="@string/pref_enable_level_control_title"
             android:defaultValue="@string/pref_enable_level_control_default" />
 
+        <CheckBoxPreference
+            android:key="@string/pref_disable_webrtc_agc_and_hpf_key"
+            android:title="@string/pref_disable_webrtc_agc_and_hpf_title"
+            android:defaultValue="@string/pref_disable_webrtc_agc_default" />
+
         <ListPreference
             android:key="@string/pref_speakerphone_key"
             android:title="@string/pref_speakerphone_title"
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
index 3869e0b0fa..de9ecd019f 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
@@ -106,6 +106,8 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven
   public static final String EXTRA_DISABLE_BUILT_IN_AGC = "org.appspot.apprtc.DISABLE_BUILT_IN_AGC";
   public static final String EXTRA_DISABLE_BUILT_IN_NS = "org.appspot.apprtc.DISABLE_BUILT_IN_NS";
   public static final String EXTRA_ENABLE_LEVEL_CONTROL = "org.appspot.apprtc.ENABLE_LEVEL_CONTROL";
+  public static final String EXTRA_DISABLE_WEBRTC_AGC_AND_HPF =
+      "org.appspot.apprtc.DISABLE_WEBRTC_GAIN_CONTROL";
   public static final String EXTRA_DISPLAY_HUD = "org.appspot.apprtc.DISPLAY_HUD";
   public static final String EXTRA_TRACING = "org.appspot.apprtc.TRACING";
   public static final String EXTRA_CMDLINE = "org.appspot.apprtc.CMDLINE";
@@ -323,7 +325,8 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven
             intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_AEC, false),
             intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_AGC, false),
             intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_NS, false),
-            intent.getBooleanExtra(EXTRA_ENABLE_LEVEL_CONTROL, false), dataChannelParameters);
+            intent.getBooleanExtra(EXTRA_ENABLE_LEVEL_CONTROL, false),
+            intent.getBooleanExtra(EXTRA_DISABLE_WEBRTC_AGC_AND_HPF, false), dataChannelParameters);
     commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false);
     runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0);
 
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
index 1f5adaecdd..ac03bfb05f 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
@@ -74,6 +74,7 @@ public class ConnectActivity extends Activity {
   private String keyprefDisableBuiltInAgc;
   private String keyprefDisableBuiltInNs;
   private String keyprefEnableLevelControl;
+  private String keyprefDisableWebRtcAGCAndHPF;
   private String keyprefDisplayHud;
   private String keyprefTracing;
   private String keyprefRoomServerUrl;
@@ -118,6 +119,7 @@ public class ConnectActivity extends Activity {
     keyprefDisableBuiltInAgc = getString(R.string.pref_disable_built_in_agc_key);
     keyprefDisableBuiltInNs = getString(R.string.pref_disable_built_in_ns_key);
     keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key);
+    keyprefDisableWebRtcAGCAndHPF = getString(R.string.pref_disable_webrtc_agc_and_hpf_key);
     keyprefDisplayHud = getString(R.string.pref_displayhud_key);
     keyprefTracing = getString(R.string.pref_tracing_key);
     keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key);
@@ -393,6 +395,11 @@ public class ConnectActivity extends Activity {
         CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, R.string.pref_enable_level_control_key,
         useValuesFromIntent);
 
+    // Check Disable gain control
+    boolean disableWebRtcAGCAndHPF = sharedPrefGetBoolean(
+        R.string.pref_disable_webrtc_agc_and_hpf_key, CallActivity.EXTRA_DISABLE_WEBRTC_AGC_AND_HPF,
+        R.string.pref_disable_webrtc_agc_and_hpf_key, useValuesFromIntent);
+
     // Get video resolution from settings.
     int videoWidth = 0;
     int videoHeight = 0;
@@ -521,6 +528,7 @@ public class ConnectActivity extends Activity {
       intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC);
       intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS);
       intent.putExtra(CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, enableLevelControl);
+      intent.putExtra(CallActivity.EXTRA_DISABLE_WEBRTC_AGC_AND_HPF, disableWebRtcAGCAndHPF);
       intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate);
       intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec);
       intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud);
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
index 4c949de7ca..0c43e0ddae 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
@@ -87,6 +87,8 @@ public class PeerConnectionClient {
   private static final String VIDEO_VP8_INTEL_HW_ENCODER_FIELDTRIAL = "WebRTC-IntelVP8/Enabled/";
   private static final String VIDEO_H264_HIGH_PROFILE_FIELDTRIAL =
       "WebRTC-H264HighProfile/Enabled/";
+  private static final String DISABLE_WEBRTC_AGC_FIELDTRIAL =
+      "WebRTC-Audio-MinimizeResamplingOnMobile/Enabled/";
   private static final String AUDIO_CODEC_PARAM_BITRATE = "maxaveragebitrate";
   private static final String AUDIO_ECHO_CANCELLATION_CONSTRAINT = "googEchoCancellation";
   private static final String AUDIO_AUTO_GAIN_CONTROL_CONSTRAINT = "googAutoGainControl";
@@ -190,6 +192,7 @@ public class PeerConnectionClient {
     public final boolean disableBuiltInAGC;
     public final boolean disableBuiltInNS;
     public final boolean enableLevelControl;
+    public final boolean disableWebRtcAGCAndHPF;
     private final DataChannelParameters dataChannelParameters;
 
     public PeerConnectionParameters(boolean videoCallEnabled, boolean loopback, boolean tracing,
@@ -197,11 +200,11 @@ public class PeerConnectionClient {
         boolean videoCodecHwAcceleration, boolean videoFlexfecEnabled, int audioStartBitrate,
         String audioCodec, boolean noAudioProcessing, boolean aecDump, boolean useOpenSLES,
         boolean disableBuiltInAEC, boolean disableBuiltInAGC, boolean disableBuiltInNS,
-        boolean enableLevelControl) {
+        boolean enableLevelControl, boolean disableWebRtcAGCAndHPF) {
       this(videoCallEnabled, loopback, tracing, videoWidth, videoHeight, videoFps, videoMaxBitrate,
           videoCodec, videoCodecHwAcceleration, videoFlexfecEnabled, audioStartBitrate, audioCodec,
           noAudioProcessing, aecDump, useOpenSLES, disableBuiltInAEC, disableBuiltInAGC,
-          disableBuiltInNS, enableLevelControl, null);
+          disableBuiltInNS, enableLevelControl, disableWebRtcAGCAndHPF, null);
     }
 
     public PeerConnectionParameters(boolean videoCallEnabled, boolean loopback, boolean tracing,
@@ -209,7 +212,8 @@ public class PeerConnectionClient {
         boolean videoCodecHwAcceleration, boolean videoFlexfecEnabled, int audioStartBitrate,
         String audioCodec, boolean noAudioProcessing, boolean aecDump, boolean useOpenSLES,
         boolean disableBuiltInAEC, boolean disableBuiltInAGC, boolean disableBuiltInNS,
-        boolean enableLevelControl, DataChannelParameters dataChannelParameters) {
+        boolean enableLevelControl, boolean disableWebRtcAGCAndHPF,
+        DataChannelParameters dataChannelParameters) {
       this.videoCallEnabled = videoCallEnabled;
       this.loopback = loopback;
       this.tracing = tracing;
@@ -229,6 +233,7 @@ public class PeerConnectionClient {
       this.disableBuiltInAGC = disableBuiltInAGC;
       this.disableBuiltInNS = disableBuiltInNS;
       this.enableLevelControl = enableLevelControl;
+      this.disableWebRtcAGCAndHPF = disableWebRtcAGCAndHPF;
       this.dataChannelParameters = dataChannelParameters;
     }
   }
@@ -389,6 +394,10 @@ public class PeerConnectionClient {
       Log.d(TAG, "Enable FlexFEC field trial.");
     }
     fieldTrials += VIDEO_VP8_INTEL_HW_ENCODER_FIELDTRIAL;
+    if (peerConnectionParameters.disableWebRtcAGCAndHPF) {
+      fieldTrials += DISABLE_WEBRTC_AGC_FIELDTRIAL;
+      Log.d(TAG, "Disable WebRTC AGC field trial.");
+    }
 
     // Check preferred video codec.
     preferredVideoCodec = VIDEO_CODEC_VP8;
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
index 96d94e9b52..43b8a0a662 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
@@ -47,6 +47,7 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
   private String keyprefDisableBuiltInAGC;
   private String keyprefDisableBuiltInNS;
   private String keyprefEnableLevelControl;
+  private String keyprefDisableWebRtcAGCAndHPF;
   private String keyprefSpeakerphone;
 
   private String keyPrefRoomServerUrl;
@@ -87,6 +88,7 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
     keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key);
     keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key);
     keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key);
+    keyprefDisableWebRtcAGCAndHPF = getString(R.string.pref_disable_webrtc_agc_and_hpf_key);
     keyprefSpeakerphone = getString(R.string.pref_speakerphone_key);
 
     keyprefEnableDataChannel = getString(R.string.pref_enable_datachannel_key);
@@ -141,6 +143,7 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
     updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC);
     updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS);
     updateSummaryB(sharedPreferences, keyprefEnableLevelControl);
+    updateSummaryB(sharedPreferences, keyprefDisableWebRtcAGCAndHPF);
     updateSummaryList(sharedPreferences, keyprefSpeakerphone);
 
     updateSummaryB(sharedPreferences, keyprefEnableDataChannel);
@@ -234,6 +237,7 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
         || key.equals(keyprefDisableBuiltInAGC)
         || key.equals(keyprefDisableBuiltInNS)
         || key.equals(keyprefEnableLevelControl)
+        || key.equals(keyprefDisableWebRtcAGCAndHPF)
         || key.equals(keyPrefDisplayHud)
         || key.equals(keyprefEnableDataChannel)
         || key.equals(keyprefOrdered)
diff --git a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java b/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java
index 33956f77f2..e93ce74928 100644
--- a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java
+++ b/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java
@@ -263,25 +263,25 @@ public class PeerConnectionClientTest implements PeerConnectionEvents {
   }
 
   private PeerConnectionParameters createParametersForAudioCall() {
-    PeerConnectionParameters peerConnectionParameters =
-        new PeerConnectionParameters(false, /* videoCallEnabled */
-            true, /* loopback */
-            false, /* tracing */
-            // Video codec parameters.
-            0, /* videoWidth */
-            0, /* videoHeight */
-            0, /* videoFps */
-            0, /* videoStartBitrate */
-            "", /* videoCodec */
-            true, /* videoCodecHwAcceleration */
-            false, /* videoFlexfecEnabled */
-            // Audio codec parameters.
-            0, /* audioStartBitrate */
-            "OPUS", /* audioCodec */
-            false, /* noAudioProcessing */
-            false, /* aecDump */
-            false /* useOpenSLES */, false /* disableBuiltInAEC */, false /* disableBuiltInAGC */,
-            false /* disableBuiltInNS */, false /* enableLevelControl */);
+    PeerConnectionParameters peerConnectionParameters = new PeerConnectionParameters(
+        false, /* videoCallEnabled */
+        true, /* loopback */
+        false, /* tracing */
+        // Video codec parameters.
+        0, /* videoWidth */
+        0, /* videoHeight */
+        0, /* videoFps */
+        0, /* videoStartBitrate */
+        "", /* videoCodec */
+        true, /* videoCodecHwAcceleration */
+        false, /* videoFlexfecEnabled */
+        // Audio codec parameters.
+        0, /* audioStartBitrate */
+        "OPUS", /* audioCodec */
+        false, /* noAudioProcessing */
+        false, /* aecDump */
+        false /* useOpenSLES */, false /* disableBuiltInAEC */, false /* disableBuiltInAGC */,
+        false /* disableBuiltInNS */, false /* enableLevelControl */, false /* disableWebRtcAGC */);
 
     return peerConnectionParameters;
   }
@@ -301,25 +301,25 @@ public class PeerConnectionClientTest implements PeerConnectionEvents {
   }
 
   private PeerConnectionParameters createParametersForVideoCall(String videoCodec) {
-    PeerConnectionParameters peerConnectionParameters =
-        new PeerConnectionParameters(true, /* videoCallEnabled */
-            true, /* loopback */
-            false, /* tracing */
-            // Video codec parameters.
-            0, /* videoWidth */
-            0, /* videoHeight */
-            0, /* videoFps */
-            0, /* videoStartBitrate */
-            videoCodec, /* videoCodec */
-            true, /* videoCodecHwAcceleration */
-            false, /* videoFlexfecEnabled */
-            // Audio codec parameters.
-            0, /* audioStartBitrate */
-            "OPUS", /* audioCodec */
-            false, /* noAudioProcessing */
-            false, /* aecDump */
-            false /* useOpenSLES */, false /* disableBuiltInAEC */, false /* disableBuiltInAGC */,
-            false /* disableBuiltInNS */, false /* enableLevelControl */);
+    PeerConnectionParameters peerConnectionParameters = new PeerConnectionParameters(
+        true, /* videoCallEnabled */
+        true, /* loopback */
+        false, /* tracing */
+        // Video codec parameters.
+        0, /* videoWidth */
+        0, /* videoHeight */
+        0, /* videoFps */
+        0, /* videoStartBitrate */
+        videoCodec, /* videoCodec */
+        true, /* videoCodecHwAcceleration */
+        false, /* videoFlexfecEnabled */
+        // Audio codec parameters.
+        0, /* audioStartBitrate */
+        "OPUS", /* audioCodec */
+        false, /* noAudioProcessing */
+        false, /* aecDump */
+        false /* useOpenSLES */, false /* disableBuiltInAEC */, false /* disableBuiltInAGC */,
+        false /* disableBuiltInNS */, false /* enableLevelControl */, false /* disableWebRtcAGC */);
 
     return peerConnectionParameters;
   }