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

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 109 matching lines @@
   LevelEstimator* level_estimator() const override;
   NoiseSuppression* noise_suppression() const override;
   VoiceDetection* voice_detection() const override;
 
  protected:
   // Overridden in a mock.
   virtual int InitializeLocked()
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
 
  private:
+  class ApmSubmoduleStates;

[hlundin-webrtc, 2016/09/06 10:41:32]

I'm not fond of forward-declaring private subclasses. Make a proper declaration
here instead, and don't use an std::unique_ptr for the member variable below.

[peah-webrtc, 2016/09/07 06:28:11]

Done.

   struct ApmPublicSubmodules;
   struct ApmPrivateSubmodules;
 
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
   // State for the debug dump.
   struct ApmDebugDumpThreadState {
     ApmDebugDumpThreadState();
     ~ApmDebugDumpThreadState();
     std::unique_ptr<audioproc::Event> event_msg;  // Protobuf message.
     std::string event_str;  // Memory for protobuf serialization.
@@ skipping 13 matching lines @@
     ApmDebugDumpThreadState capture;
   };
 #endif
 
   // Method for modifying the formats struct that are called from both
   // the render and capture threads. The check for whether modifications
   // are needed is done while holding the render lock only, thereby avoiding
   // that the capture thread blocks the render thread.
   // The struct is modified in a single-threaded manner by holding both the
   // render and capture locks.
-  int MaybeInitialize(const ProcessingConfig& config)
+  int MaybeInitialize(const ProcessingConfig& config, bool force_initialization)
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
 
   int MaybeInitializeRender(const ProcessingConfig& processing_config)
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
 
-  int MaybeInitializeCapture(const ProcessingConfig& processing_config)
+  int MaybeInitializeCapture(const ProcessingConfig& processing_config,
+                             bool force_initialization)
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
 
-  // Method for checking for the need of conversion. Accesses the formats
-  // structs in a read manner but the requirement for the render lock to be held
-  // was added as it currently anyway is always called in that manner.
-  bool rev_conversion_needed() const EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-  bool render_check_rev_conversion_needed() const
-      EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
+  // Method for updating the state keeping track of the active submodules.
+  // Returns a bool indicating whether the state had changed.
+  bool UpdateActiveSubmoduleStates() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
 
   // Methods requiring APM running in a single-threaded manner.
   // Are called with both the render and capture locks already
   // acquired.
   void InitializeExperimentalAgc()
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
   void InitializeTransient()
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
   void InitializeBeamformer()
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
@@ skipping 13 matching lines @@
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
   void InitializeEchoControlMobile()
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
   int InitializeLocked(const ProcessingConfig& config)
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
   void InitializeLevelController() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
 
   // Capture-side exclusive methods possibly running APM in a multi-threaded
   // manner that are called with the render lock already acquired.
   int ProcessStreamLocked() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  bool output_copy_needed() const EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  bool is_fwd_processed() const EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  bool fwd_synthesis_needed() const EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  bool fwd_analysis_needed() const EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
   void MaybeUpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
 
   // Render-side exclusive methods possibly running APM in a multi-threaded
   // manner that are called with the render lock already acquired.
   // TODO(ekm): Remove once all clients updated to new interface.
   int AnalyzeReverseStreamLocked(const float* const* src,
                                  const StreamConfig& input_config,
                                  const StreamConfig& output_config)
       EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-  bool is_rev_processed() const EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-  bool rev_synthesis_needed() const EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-  bool rev_analysis_needed() const EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
   int ProcessReverseStreamLocked() EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
 
 // Debug dump methods that are internal and called without locks.
 // TODO(peah): Make thread safe.
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
   // TODO(andrew): make this more graceful. Ideally we would split this stuff
   // out into a separate class with an "enabled" and "disabled" implementation.
   static int WriteMessageToDebugFile(FileWrapper* debug_file,
                                      int64_t* filesize_limit_bytes,
                                      rtc::CriticalSection* crit_debug,
@@ skipping 10 matching lines @@
   rtc::CriticalSection crit_debug_;
 
   // Debug dump state.
   ApmDebugDumpState debug_dump_;
 #endif
 
   // Critical sections.
   rtc::CriticalSection crit_render_ ACQUIRED_BEFORE(crit_capture_);
   rtc::CriticalSection crit_capture_;
 
+  // Class containing information about what submodules are active.
+  std::unique_ptr<ApmSubmoduleStates> submodule_states_;

[hlundin-webrtc, 2016/09/06 10:41:32]

As said above, don't use std::unique_ptr. Let it be a plain member instead,
since you are not using any features of the unique_ptr anyway (it is populated
only once, in the ctor, and is never deleted before the dtor).

[peah-webrtc, 2016/09/07 06:28:11]

Sounds good!

Done.

+
   // Structs containing the pointers to the submodules.
   std::unique_ptr<ApmPublicSubmodules> public_submodules_;
   std::unique_ptr<ApmPrivateSubmodules> private_submodules_
       GUARDED_BY(crit_capture_);
 
   // State that is written to while holding both the render and capture locks
   // but can be read without any lock being held.
   // As this is only accessed internally of APM, and all internal methods in APM
   // either are holding the render or capture locks, this construct is safe as
   // it is not possible to read the variables while writing them.
@@ skipping 68 matching lines @@
     ApmRenderState();
     ~ApmRenderState();
     std::unique_ptr<AudioConverter> render_converter;
     std::unique_ptr<AudioBuffer> render_audio;
   } render_ GUARDED_BY(crit_render_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_