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

webrtc/voice_engine/transmit_mixer.cc

 /*
  *  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 364 matching lines @@
                                         _audioFrame.sample_rate_hz_,
                                         _audioFrame.num_channels_ == 2);
       }
     }
 
     // --- Measure audio level of speech after all processing.
     _audioLevel.ComputeLevel(_audioFrame);
     return 0;
 }
 
-int32_t
-TransmitMixer::DemuxAndMix()
-{
-    WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
-                 "TransmitMixer::DemuxAndMix()");
-
-    for (ChannelManager::Iterator it(_channelManagerPtr); it.IsValid();
-         it.Increment())
-    {
-        Channel* channelPtr = it.GetChannel();
-        if (channelPtr->Sending())
-        {
-            // Demultiplex makes a copy of its input.
-            channelPtr->Demultiplex(_audioFrame);
-            channelPtr->PrepareEncodeAndSend(_audioFrame.sample_rate_hz_);
-        }
-    }
-    return 0;
-}
-
-void TransmitMixer::DemuxAndMix(const int voe_channels[],
-                                size_t number_of_voe_channels) {
-  for (size_t i = 0; i < number_of_voe_channels; ++i) {
-    voe::ChannelOwner ch = _channelManagerPtr->GetChannel(voe_channels[i]);
-    voe::Channel* channel_ptr = ch.channel();
-    if (channel_ptr) {
-      if (channel_ptr->Sending()) {
-        // Demultiplex makes a copy of its input.
-        channel_ptr->Demultiplex(_audioFrame);
-        channel_ptr->PrepareEncodeAndSend(_audioFrame.sample_rate_hz_);
-      }
+void TransmitMixer::ProcessAudio() {
+  RTC_DCHECK_GT(_audioFrame.samples_per_channel_, 0);
+  for (ChannelManager::Iterator it(_channelManagerPtr); it.IsValid();
+       it.Increment()) {
+    Channel* const channel = it.GetChannel();
+    if (channel->Sending()) {
+      channel->ProcessAndEncodeAudio(_audioFrame);
     }
   }
 }
 
-int32_t
-TransmitMixer::EncodeAndSend()
-{
-    WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId, -1),
-                 "TransmitMixer::EncodeAndSend()");
-
-    for (ChannelManager::Iterator it(_channelManagerPtr); it.IsValid();
-         it.Increment())
-    {
-        Channel* channelPtr = it.GetChannel();
-        if (channelPtr->Sending())
-        {
-            channelPtr->EncodeAndSend();
-        }
-    }
-    return 0;
-}
-
-void TransmitMixer::EncodeAndSend(const int voe_channels[],
-                                  size_t number_of_voe_channels) {
+// TODO(henrika): investigate the possibility of removing this method.
+void TransmitMixer::ProcessAudio(const int voe_channels[],
+                                 size_t number_of_voe_channels) {
+  RTC_DCHECK_GT(_audioFrame.samples_per_channel_, 0);
   for (size_t i = 0; i < number_of_voe_channels; ++i) {
     voe::ChannelOwner ch = _channelManagerPtr->GetChannel(voe_channels[i]);
-    voe::Channel* channel_ptr = ch.channel();
-    if (channel_ptr && channel_ptr->Sending())
-      channel_ptr->EncodeAndSend();
+    voe::Channel* channel = ch.channel();
+    if (channel) {
+      if (channel->Sending()) {
+        channel->ProcessAndEncodeAudio(_audioFrame);
+      }
+    }
   }
 }
 
 uint32_t TransmitMixer::CaptureLevel() const
 {
     return _captureLevel;
 }
 
 int32_t
 TransmitMixer::StopSend()
@@ skipping 773 matching lines @@
 void TransmitMixer::EnableStereoChannelSwapping(bool enable) {
   swap_stereo_channels_ = enable;
 }
 
 bool TransmitMixer::IsStereoChannelSwappingEnabled() {
   return swap_stereo_channels_;
 }
 
 }  // namespace voe
 }  // namespace webrtc