Changed ramping functionality of the AudioMixer.

webrtc/modules/audio_mixer/audio_mixer_impl.cc

Index: webrtc/modules/audio_mixer/audio_mixer_impl.cc
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.cc b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
index 50da38563d4a0e35efb925b94867812d0461fdec..f8f7586f55d26ea2ecbf66d291162408e7954031 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_impl.cc
+++ b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
@@ -24,59 +24,60 @@ namespace {
 
 class SourceFrame {

[hlundin-webrtc, 2016/10/07 15:03:10]

I'm still inclined to say that this should be a struct.

[aleloi, 2016/10/10 10:58:17]

I'm quite sure that also was the conclusion of our offline discussion. Move the
comparison function out and make SourceFrame a struct. I've changed.

  public:
-  SourceFrame(AudioSourceWithMixStatus* audio_source,
+  SourceFrame(AudioMixerImpl::SourceStatus* source_status,

[hlundin-webrtc, 2016/10/07 15:03:10]

This passing of non-const pointer makes me cringe a bit. But I think it is for
another CL. Let's discuss offline.

[aleloi, 2016/10/10 10:58:17]

Acknowledged.

               AudioFrame* audio_frame,
               bool muted)
-      : audio_source_(audio_source), audio_frame_(audio_frame), muted_(muted) {
+      : source_status_(source_status),
+        audio_frame_(audio_frame),
+        muted_(muted) {
+    RTC_DCHECK(source_status);
+    RTC_DCHECK(audio_frame);
     if (!muted_) {
       energy_ = AudioMixerCalculateEnergy(*audio_frame);
     }
   }
 
-  SourceFrame(AudioSourceWithMixStatus* audio_source,
+  SourceFrame(AudioMixerImpl::SourceStatus* source_status,
               AudioFrame* audio_frame,
               bool muted,
               uint32_t energy)
-      : audio_source_(audio_source),
+      : source_status_(source_status),
         audio_frame_(audio_frame),
         muted_(muted),
-        energy_(energy) {}
-
-  // a.ShouldMixBefore(b) is used to select mixer sources.
-  bool ShouldMixBefore(const SourceFrame& other) const {
-    if (muted_ != other.muted_) {
-      return other.muted_;
-    }
-
-    const auto our_activity = audio_frame_->vad_activity_;
-    const auto other_activity = other.audio_frame_->vad_activity_;
-
-    if (our_activity != other_activity) {
-      return our_activity == AudioFrame::kVadActive;
-    }
-
-    return energy_ > other.energy_;
+        energy_(energy) {
+    RTC_DCHECK(source_status);
+    RTC_DCHECK(audio_frame);
   }
 
-  AudioSourceWithMixStatus* audio_source_ = nullptr;
+  AudioMixerImpl::SourceStatus* source_status_ = nullptr;
   AudioFrame* audio_frame_ = nullptr;
   bool muted_ = true;
   uint32_t energy_ = 0;
 };
 
+// ShouldMixBefore(a, b) is used to select mixer sources.
+bool ShouldMixBefore(const SourceFrame& a, const SourceFrame& b) {
+  if (a.muted_ != b.muted_) {
+    return b.muted_;
+  }
+
+  const auto a_activity = a.audio_frame_->vad_activity_;
+  const auto b_activity = b.audio_frame_->vad_activity_;
 
-void Ramp(const std::vector<SourceFrame>& mixed_sources_and_frames) {
-  for (const auto& source_frame : mixed_sources_and_frames) {
-    // Ramp in previously unmixed.
-    if (!source_frame.audio_source_->WasMixed()) {
-      NewMixerRampIn(source_frame.audio_frame_);
-    }
+  if (a_activity != b_activity) {
+    return a_activity == AudioFrame::kVadActive;
+  }
 
-    const bool is_mixed = source_frame.audio_source_->IsMixed();
-    // Ramp out currently unmixed.
-    if (source_frame.audio_source_->WasMixed() && !is_mixed) {
-      NewMixerRampOut(source_frame.audio_frame_);
-    }
+  return a.energy_ > b.energy_;
+}
+
+void RampAndUpdateGain(
+    const std::vector<SourceFrame>& mixed_sources_and_frames) {
+  for (const auto& source_frame : mixed_sources_and_frames) {
+    float target_gain_ = source_frame.source_status_->is_mixed_ ? 1 : 0;

[hlundin-webrtc, 2016/10/07 15:03:10]

target_gain without underscore.

[aleloi, 2016/10/10 10:58:17]

Oops!

+    Ramp(source_frame.audio_frame_, source_frame.source_status_->gain_,
+         target_gain_);
+    source_frame.source_status_->gain_ = target_gain_;
   }
 }
 
@@ -121,21 +122,21 @@ int32_t MixFromList(AudioFrame* mixed_audio,
   return 0;
 }
 
-MixerAudioSourceList::const_iterator FindSourceInList(
+AudioMixerImpl::MixerAudioSourceList::const_iterator FindSourceInList(
     AudioMixerImpl::Source const* audio_source,
-    MixerAudioSourceList const* audio_source_list) {
+    AudioMixerImpl::MixerAudioSourceList const* audio_source_list) {
   return std::find_if(audio_source_list->begin(), audio_source_list->end(),
-                      [audio_source](const AudioSourceWithMixStatus& p) {
-                        return p.audio_source() == audio_source;
+                      [audio_source](const AudioMixerImpl::SourceStatus& p) {
+                        return p.audio_source_ == audio_source;
                       });
 }
 
-MixerAudioSourceList::iterator FindSourceInList(
+AudioMixerImpl::MixerAudioSourceList::iterator FindSourceInList(
     AudioMixerImpl::Source const* audio_source,
-    MixerAudioSourceList* audio_source_list) {
+    AudioMixerImpl::MixerAudioSourceList* audio_source_list) {
   return std::find_if(audio_source_list->begin(), audio_source_list->end(),
-                      [audio_source](const AudioSourceWithMixStatus& p) {
-                        return p.audio_source() == audio_source;
+                      [audio_source](const AudioMixerImpl::SourceStatus& p) {
+                        return p.audio_source_ == audio_source;
                       });
 }
 
@@ -362,7 +363,7 @@ AudioFrameList AudioMixerImpl::GetNonAnonymousAudio() {
   // Get audio source audio and put it in the struct vector.
   for (auto& source_and_status : audio_source_list_) {
     auto audio_frame_with_info =
-        source_and_status.audio_source()->GetAudioFrameWithMuted(
+        source_and_status.audio_source_->GetAudioFrameWithMuted(
             id_, static_cast<int>(OutputFrequency()));
 
     const auto audio_frame_info = audio_frame_with_info.audio_frame_info;
@@ -380,8 +381,7 @@ AudioFrameList AudioMixerImpl::GetNonAnonymousAudio() {
 
   // Sort frames by sorting function.
   std::sort(audio_source_mixing_data_list.begin(),
-            audio_source_mixing_data_list.end(),
-            std::mem_fn(&SourceFrame::ShouldMixBefore));
+            audio_source_mixing_data_list.end(), ShouldMixBefore);
 
   int max_audio_frame_counter = kMaximumAmountOfMixedAudioSources;
 
@@ -389,7 +389,7 @@ AudioFrameList AudioMixerImpl::GetNonAnonymousAudio() {
   for (const auto& p : audio_source_mixing_data_list) {
     // Filter muted.
     if (p.muted_) {
-      p.audio_source_->SetIsMixed(false);
+      p.source_status_->is_mixed_ = false;
       continue;
     }
 
@@ -398,12 +398,12 @@ AudioFrameList AudioMixerImpl::GetNonAnonymousAudio() {
     if (max_audio_frame_counter > 0) {
       --max_audio_frame_counter;
       result.push_back(p.audio_frame_);
-      ramp_list.emplace_back(p.audio_source_, p.audio_frame_, false, -1);
+      ramp_list.emplace_back(p.source_status_, p.audio_frame_, false, -1);
       is_mixed = true;
     }
-    p.audio_source_->SetIsMixed(is_mixed);
+    p.source_status_->is_mixed_ = is_mixed;
   }
-  Ramp(ramp_list);
+  RampAndUpdateGain(ramp_list);
   return result;
 }
 
@@ -415,7 +415,7 @@ AudioFrameList AudioMixerImpl::GetAnonymousAudio() {
   AudioFrameList result;
   for (auto& source_and_status : additional_audio_source_list_) {
     const auto audio_frame_with_info =
-        source_and_status.audio_source()->GetAudioFrameWithMuted(
+        source_and_status.audio_source_->GetAudioFrameWithMuted(
             id_, OutputFrequency());
     const auto ret = audio_frame_with_info.audio_frame_info;
     AudioFrame* audio_frame = audio_frame_with_info.audio_frame;
@@ -427,10 +427,10 @@ AudioFrameList AudioMixerImpl::GetAnonymousAudio() {
     if (ret != Source::AudioFrameInfo::kMuted) {
       result.push_back(audio_frame);
       ramp_list.emplace_back(&source_and_status, audio_frame, false, 0);
-      source_and_status.SetIsMixed(true);
+      source_and_status.is_mixed_ = true;
     }
   }
-  Ramp(ramp_list);
+  RampAndUpdateGain(ramp_list);
   return result;
 }
 
@@ -439,7 +439,7 @@ bool AudioMixerImpl::AddAudioSourceToList(
     MixerAudioSourceList* audio_source_list) const {
   WEBRTC_TRACE(kTraceStream, kTraceAudioMixerServer, id_,
                "AddAudioSourceToList(audio_source, audio_source_list)");
-  audio_source_list->emplace_back(audio_source);
+  audio_source_list->emplace_back(audio_source, false, 0);
   return true;
 }
 
@@ -511,13 +511,13 @@ bool AudioMixerImpl::GetAudioSourceMixabilityStatusForTest(
   const auto non_anonymous_iter =
       FindSourceInList(audio_source, &audio_source_list_);
   if (non_anonymous_iter != audio_source_list_.end()) {
-    return non_anonymous_iter->IsMixed();
+    return non_anonymous_iter->is_mixed_;
   }
 
   const auto anonymous_iter =
       FindSourceInList(audio_source, &additional_audio_source_list_);
   if (anonymous_iter != audio_source_list_.end()) {
-    return anonymous_iter->IsMixed();
+    return anonymous_iter->is_mixed_;
   }
 
   LOG(LS_ERROR) << "Audio source unknown";