Make Beamforming dynamically settable for Android platform builds

webrtc/modules/audio_processing/audio_processing_impl.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 249 matching lines @@
                        {kSampleRate16kHz, 1, false},
                        {kSampleRate16kHz, 1, false}}}),
           rev_proc_format(kSampleRate16kHz, 1) {}
     ProcessingConfig api_format;
     StreamConfig rev_proc_format;
   } formats_;
 
   // APM constants.
   const struct ApmConstants {
     ApmConstants(int agc_startup_min_volume,
-                 const std::vector<Point> array_geometry,
-                 SphericalPointf target_direction,
                  bool use_new_agc,
-                 bool intelligibility_enabled,
-                 bool beamformer_enabled)
+                 bool intelligibility_enabled)
         :  // Format of processing streams at input/output call sites.
           agc_startup_min_volume(agc_startup_min_volume),
-          array_geometry(array_geometry),
-          target_direction(target_direction),
           use_new_agc(use_new_agc),
-          intelligibility_enabled(intelligibility_enabled),
-          beamformer_enabled(beamformer_enabled) {}
+          intelligibility_enabled(intelligibility_enabled) {}
     int agc_startup_min_volume;
-    std::vector<Point> array_geometry;
-    SphericalPointf target_direction;
     bool use_new_agc;
     bool intelligibility_enabled;
-    bool beamformer_enabled;
   } constants_;
 
   struct ApmCaptureState {
-    ApmCaptureState(bool transient_suppressor_enabled)
+    ApmCaptureState(bool transient_suppressor_enabled,
+                    bool beamformer_enabled,
+                    const std::vector<Point> array_geometry,

[hlundin-webrtc, 2016/01/08 12:38:39]

Can't this be a const reference? Otherwise the const qualifier is a but
unnecessary.

[aluebs-webrtc, 2016/01/08 17:59:17]

Great point! Copying and pasting is a hard task... :)

+                    SphericalPointf target_direction)
         : aec_system_delay_jumps(-1),
           delay_offset_ms(0),
           was_stream_delay_set(false),
           last_stream_delay_ms(0),
           last_aec_system_delay_ms(0),
           stream_delay_jumps(-1),
           output_will_be_muted(false),
           key_pressed(false),
           transient_suppressor_enabled(transient_suppressor_enabled),
+          beamformer_enabled(beamformer_enabled),
+          array_geometry(array_geometry),
+          target_direction(target_direction),
           fwd_proc_format(kSampleRate16kHz),
           split_rate(kSampleRate16kHz) {}
     int aec_system_delay_jumps;
     int delay_offset_ms;
     bool was_stream_delay_set;
     int last_stream_delay_ms;
     int last_aec_system_delay_ms;
     int stream_delay_jumps;
     bool output_will_be_muted;
     bool key_pressed;
     bool transient_suppressor_enabled;
+    bool beamformer_enabled;
+    std::vector<Point> array_geometry;
+    SphericalPointf target_direction;
     rtc::scoped_ptr<AudioBuffer> capture_audio;
     // Only the rate and samples fields of fwd_proc_format_ are used because the
     // forward processing number of channels is mutable and is tracked by the
     // capture_audio_.
     StreamConfig fwd_proc_format;
     int split_rate;
   } capture_ GUARDED_BY(crit_capture_);
 
   struct ApmCaptureNonLockedState {
     ApmCaptureNonLockedState()
@@ skipping 10 matching lines @@
 
   struct ApmRenderState {
     rtc::scoped_ptr<AudioConverter> render_converter;
     rtc::scoped_ptr<AudioBuffer> render_audio;
   } render_ GUARDED_BY(crit_render_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_