Moves channel-dependent audio input processing to separate encoder task queue

webrtc/voice_engine/voe_base_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 44 matching lines @@
 
   int GetVersion(char version[1024]) override;
 
   int LastError() override;
 
   AudioTransport* audio_transport() override { return this; }
 
   int AssociateSendChannel(int channel, int accociate_send_channel) override;
 
   // AudioTransport
-  int32_t RecordedDataIsAvailable(const void* audioSamples,
-                                  const size_t nSamples,
-                                  const size_t nBytesPerSample,
-                                  const size_t nChannels,
-                                  const uint32_t samplesPerSec,
-                                  const uint32_t totalDelayMS,
-                                  const int32_t clockDrift,
-                                  const uint32_t currentMicLevel,
-                                  const bool keyPressed,
-                                  uint32_t& newMicLevel) override;
+  int32_t RecordedDataIsAvailable(const void* audio_data,
+                                  const size_t number_of_frames,
+                                  const size_t bytes_per_sample,
+                                  const size_t number_of_channels,
+                                  const uint32_t sample_rate,
+                                  const uint32_t audio_delay_milliseconds,
+                                  const int32_t clock_drift,
+                                  const uint32_t volume,
+                                  const bool key_pressed,
+                                  uint32_t& new_mic_volume) override;
   int32_t NeedMorePlayData(const size_t nSamples,
                            const size_t nBytesPerSample,
                            const size_t nChannels,
                            const uint32_t samplesPerSec,
                            void* audioSamples,
                            size_t& nSamplesOut,
                            int64_t* elapsed_time_ms,
                            int64_t* ntp_time_ms) override;
   void PushCaptureData(int voe_channel,
                        const void* audio_data,
@@ skipping 17 matching lines @@
   VoEBaseImpl(voe::SharedData* shared);
   ~VoEBaseImpl() override;
 
  private:
   int32_t StartPlayout();
   int32_t StopPlayout();
   int32_t StartSend();
   int32_t StopSend();
   int32_t TerminateInternal();
 
-  // Helper function to process the recorded data with AudioProcessing Module,
-  // demultiplex the data to specific voe channels, encode and send to the
-  // network. When |number_of_VoE_channels| is 0, it will demultiplex the
-  // data to all the existing VoE channels.
-  // It returns new AGC microphone volume or 0 if no volume changes
-  // should be done.
-  int ProcessRecordedDataWithAPM(
-      const int voe_channels[], size_t number_of_voe_channels,
-      const void* audio_data, uint32_t sample_rate, size_t number_of_channels,
-      size_t number_of_frames, uint32_t audio_delay_milliseconds,
-      int32_t clock_drift, uint32_t volume, bool key_pressed);
-
   void GetPlayoutData(int sample_rate, size_t number_of_channels,
                       size_t number_of_frames, bool feed_data_to_apm,
                       void* audio_data, int64_t* elapsed_time_ms,
                       int64_t* ntp_time_ms);
 
   // Initialize channel by setting Engine Information then initializing
   // channel.
   int InitializeChannel(voe::ChannelOwner* channel_owner);
   VoiceEngineObserver* voiceEngineObserverPtr_;
   rtc::CriticalSection callbackCritSect_;
   rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
 
   AudioFrame audioFrame_;
   voe::SharedData* shared_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H