Cleaned up and revised the handling of resampling and bandsplitting in APM and

webrtc/modules/audio_processing/echo_control_mobile_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 25 matching lines @@
 
   // EchoControlMobile implementation.
   bool is_enabled() const override;
   RoutingMode routing_mode() const override;
   bool is_comfort_noise_enabled() const override;
 
   void Initialize(int sample_rate_hz,
                   size_t num_reverse_channels,
                   size_t num_output_channels);
 
-  // Checks whether the module is enabled. Must only be
-  // called from the render side of APM as otherwise
-  // deadlocks may occur.
-  bool is_enabled_render_side_query() const;
-
   // Reads render side data that has been queued on the render call.
   void ReadQueuedRenderData();
 
  private:
   class Canceller;
   struct StreamProperties;
 
   // EchoControlMobile implementation.
   int Enable(bool enable) override;
   int set_routing_mode(RoutingMode mode) override;
@@ skipping 28 matching lines @@
       render_signal_queue_;
 
   std::vector<std::unique_ptr<Canceller>> cancellers_;
   std::unique_ptr<StreamProperties> stream_properties_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoControlMobileImpl);
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_