Made MixerAudioSource a pure interface.

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 44e04fa32d4aa6de25d5297b0cdc74154f1368ca..ec638524ab4b6e7a6a5d4548acdbe7743c0c03e3 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_impl.cc
+++ b/webrtc/modules/audio_mixer/audio_mixer_impl.cc
@@ -14,6 +14,7 @@
 #include <functional>
 #include <utility>
 
+#include "webrtc/base/logging.h"

[the sun, 2016/10/06 09:50:31]

nit: belongs in different CL? I don't see you doing anything with logging

[aleloi, 2016/10/06 12:15:57]

I do in the new methods GetSourceWithStatusForTest and
GetAudioSourceMixabilityStatusForTest.

 #include "webrtc/modules/audio_mixer/audio_frame_manipulator.h"
 #include "webrtc/modules/utility/include/audio_frame_operations.h"
 #include "webrtc/system_wrappers/include/trace.h"
@@ -23,29 +24,26 @@ namespace {
 
 class SourceFrame {
  public:
-  SourceFrame(MixerAudioSource* p, AudioFrame* a, bool m, bool was_mixed_before)
-      : audio_source_(p),
-        audio_frame_(a),
-        muted_(m),
-        was_mixed_before_(was_mixed_before) {
+  SourceFrame(AudioSourceWithMixStatus* audio_source,
+              AudioFrame* audio_frame,
+              bool muted)
+      : audio_source_(audio_source), audio_frame_(audio_frame), muted_(muted) {
     if (!muted_) {
-      energy_ = NewMixerCalculateEnergy(*a);
+      energy_ = AudioMixerCalculateEnergy(*audio_frame);
     }
   }
 
-  SourceFrame(MixerAudioSource* p,
-              AudioFrame* a,
-              bool m,
-              bool was_mixed_before,
+  SourceFrame(AudioSourceWithMixStatus* audio_source,
+              AudioFrame* audio_frame,
+              bool muted,
               uint32_t energy)
-      : audio_source_(p),
-        audio_frame_(a),
-        muted_(m),
-        energy_(energy),
-        was_mixed_before_(was_mixed_before) {}
-
-  // a.shouldMixBefore(b) is used to select mixer participants.
-  bool shouldMixBefore(const SourceFrame& other) const {
+      : audio_source_(audio_source),
+        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_;
     }
@@ -60,11 +58,10 @@ class SourceFrame {
     return energy_ > other.energy_;
   }
 
-  MixerAudioSource* audio_source_;
+  AudioSourceWithMixStatus* audio_source_;

[the sun, 2016/10/06 09:50:31]

Provide default values, since you haven't removed the default ctors/op=

[aleloi, 2016/10/06 12:15:57]

Done.

   AudioFrame* audio_frame_;
   bool muted_;
   uint32_t energy_;
-  bool was_mixed_before_;
 };
 
 // Remixes a frame between stereo and mono.
@@ -80,13 +77,13 @@ void RemixFrame(AudioFrame* frame, size_t number_of_channels) {
 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.was_mixed_before_) {
+    if (!source_frame.audio_source_->WasMixed()) {
       NewMixerRampIn(source_frame.audio_frame_);
     }
 
     const bool is_mixed = source_frame.audio_source_->IsMixed();
     // Ramp out currently unmixed.
-    if (source_frame.was_mixed_before_ && !is_mixed) {
+    if (source_frame.audio_source_->WasMixed() && !is_mixed) {
       NewMixerRampOut(source_frame.audio_frame_);
     }
   }
@@ -153,7 +150,7 @@ AudioMixerImpl::AudioMixerImpl(int id, std::unique_ptr<AudioProcessing> limiter)
 
 AudioMixerImpl::~AudioMixerImpl() {}
 
-std::unique_ptr<AudioMixer> AudioMixerImpl::Create(int id) {
+std::unique_ptr<AudioMixerImpl> AudioMixerImpl::Create(int id) {
   Config config;
   config.Set<ExperimentalAgc>(new ExperimentalAgc(false));
   std::unique_ptr<AudioProcessing> limiter(AudioProcessing::Create(config));
@@ -179,7 +176,7 @@ std::unique_ptr<AudioMixer> AudioMixerImpl::Create(int id) {
   if (limiter->gain_control()->Enable(true) != limiter->kNoError)
     return nullptr;
 
-  return std::unique_ptr<AudioMixer>(
+  return std::unique_ptr<AudioMixerImpl>(
       new AudioMixerImpl(id, std::move(limiter)));
 }
 
@@ -344,7 +341,7 @@ bool AudioMixerImpl::AnonymousMixabilityStatus(
   return IsAudioSourceInList(audio_source, additional_audio_source_list_);
 }
 
-AudioFrameList AudioMixerImpl::GetNonAnonymousAudio() const {
+AudioFrameList AudioMixerImpl::GetNonAnonymousAudio() {
   RTC_DCHECK_RUN_ON(&thread_checker_);
   WEBRTC_TRACE(kTraceStream, kTraceAudioMixerServer, id_,
                "GetNonAnonymousAudio()");
@@ -353,33 +350,33 @@ AudioFrameList AudioMixerImpl::GetNonAnonymousAudio() const {
   std::vector<SourceFrame> ramp_list;
 
   // Get audio source audio and put it in the struct vector.
-  for (auto* const audio_source : audio_source_list_) {
-    auto audio_frame_with_info = audio_source->GetAudioFrameWithMuted(
-        id_, static_cast<int>(OutputFrequency()));
+  for (auto& source_and_status : audio_source_list_) {
+    auto audio_frame_with_info =
+        source_and_status.audio_source()->GetAudioFrameWithMuted(
+            id_, static_cast<int>(OutputFrequency()));
 
     const auto audio_frame_info = audio_frame_with_info.audio_frame_info;
     AudioFrame* audio_source_audio_frame = audio_frame_with_info.audio_frame;
 
     if (audio_frame_info == MixerAudioSource::AudioFrameInfo::kError) {
       WEBRTC_TRACE(kTraceWarning, kTraceAudioMixerServer, id_,
-                   "failed to GetAudioFrameWithMuted() from participant");
+                   "failed to GetAudioFrameWithMuted() from source");
       continue;
     }
     audio_source_mixing_data_list.emplace_back(
-        audio_source, audio_source_audio_frame,
-        audio_frame_info == MixerAudioSource::AudioFrameInfo::kMuted,
-        audio_source->WasMixed());
+        &source_and_status, audio_source_audio_frame,
+        audio_frame_info == MixerAudioSource::AudioFrameInfo::kMuted);
   }
 
   // Sort frames by sorting function.
   std::sort(audio_source_mixing_data_list.begin(),
             audio_source_mixing_data_list.end(),
-            std::mem_fn(&SourceFrame::shouldMixBefore));
+            std::mem_fn(&SourceFrame::ShouldMixBefore));
 
   int max_audio_frame_counter = kMaximumAmountOfMixedAudioSources;
 
   // Go through list in order and put unmuted frames in result list.
-  for (const SourceFrame& p : audio_source_mixing_data_list) {
+  for (const auto& p : audio_source_mixing_data_list) {
     // Filter muted.
     if (p.muted_) {
       p.audio_source_->SetIsMixed(false);
@@ -391,8 +388,7 @@ AudioFrameList AudioMixerImpl::GetNonAnonymousAudio() const {
     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,
-                             p.was_mixed_before_, -1);
+      ramp_list.emplace_back(p.audio_source_, p.audio_frame_, false, -1);
       is_mixed = true;
     }
     p.audio_source_->SetIsMixed(is_mixed);
@@ -401,24 +397,16 @@ AudioFrameList AudioMixerImpl::GetNonAnonymousAudio() const {
   return result;
 }
 
-AudioFrameList AudioMixerImpl::GetAnonymousAudio() const {
+AudioFrameList AudioMixerImpl::GetAnonymousAudio() {
   RTC_DCHECK_RUN_ON(&thread_checker_);
   WEBRTC_TRACE(kTraceStream, kTraceAudioMixerServer, id_,
                "GetAnonymousAudio()");
-  // The GetAudioFrameWithMuted() callback may result in the audio source being
-  // removed from additionalAudioFramesList_. If that happens it will
-  // invalidate any iterators. Create a copy of the audio sources list such
-  // that the list of participants can be traversed safely.
   std::vector<SourceFrame> ramp_list;
-  MixerAudioSourceList additional_audio_sources_list;
   AudioFrameList result;
-  additional_audio_sources_list.insert(additional_audio_sources_list.begin(),
-                                       additional_audio_source_list_.begin(),
-                                       additional_audio_source_list_.end());
-
-  for (const auto& audio_source : additional_audio_sources_list) {
+  for (auto& source_and_status : additional_audio_source_list_) {
     const auto audio_frame_with_info =
-        audio_source->GetAudioFrameWithMuted(id_, OutputFrequency());
+        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;
     if (ret == MixerAudioSource::AudioFrameInfo::kError) {
@@ -428,9 +416,8 @@ AudioFrameList AudioMixerImpl::GetAnonymousAudio() const {
     }
     if (ret != MixerAudioSource::AudioFrameInfo::kMuted) {
       result.push_back(audio_frame);
-      ramp_list.emplace_back(audio_source, audio_frame, false,
-                             audio_source->IsMixed(), 0);
-      audio_source->SetIsMixed(true);
+      ramp_list.emplace_back(&source_and_status, audio_frame, false, 0);
+      source_and_status.SetIsMixed(true);
     }
   }
   Ramp(ramp_list);
@@ -442,8 +429,12 @@ bool AudioMixerImpl::IsAudioSourceInList(
     const MixerAudioSourceList& audio_source_list) const {
   WEBRTC_TRACE(kTraceStream, kTraceAudioMixerServer, id_,
                "IsAudioSourceInList(audio_source,audio_source_list)");
-  return std::find(audio_source_list.begin(), audio_source_list.end(),
-                   &audio_source) != audio_source_list.end();
+  for (const auto& source_and_mix : audio_source_list) {
+    if (source_and_mix.audio_source() == &audio_source) {
+      return true;
+    }
+  }
+  return false;
 }
 
 bool AudioMixerImpl::AddAudioSourceToList(
@@ -451,9 +442,7 @@ bool AudioMixerImpl::AddAudioSourceToList(
     MixerAudioSourceList* audio_source_list) const {
   WEBRTC_TRACE(kTraceStream, kTraceAudioMixerServer, id_,
                "AddAudioSourceToList(audio_source, audio_source_list)");
-  audio_source_list->push_back(audio_source);
-  // Make sure that the mixed status is correct for new MixerAudioSource.
-  audio_source->ResetMixedStatus();
+  audio_source_list->emplace_back(audio_source);
   return true;
 }
 
@@ -462,12 +451,13 @@ bool AudioMixerImpl::RemoveAudioSourceFromList(
     MixerAudioSourceList* audio_source_list) const {
   WEBRTC_TRACE(kTraceStream, kTraceAudioMixerServer, id_,
                "RemoveAudioSourceFromList(audio_source, audio_source_list)");
-  const auto iter = std::find(audio_source_list->begin(),
-                              audio_source_list->end(), audio_source);
+  const auto iter =
+      std::find_if(audio_source_list->begin(), audio_source_list->end(),

[the sun, 2016/10/06 09:50:31]

Looks repeated from IsAudioSourceInList(), although this time with a lambda. Can
you make one function which returns an iterator and use that in both call sites?

[aleloi, 2016/10/06 12:15:57]

Turns out I still end up with two identical versions: one returning ::iterator
and one returning vector<...>::const_iterator. The problem is in vector::erase,
which in C++11 should work with both, but needs ::iterator before C++11. Our stl
version seems not to be fully converted yet and has the old signature of erase.

+                   [audio_source](const AudioSourceWithMixStatus& p) {
+                     return p.audio_source() == audio_source;
+                   });
   if (iter != audio_source_list->end()) {
     audio_source_list->erase(iter);
-    // AudioSource is no longer mixed, reset to default.
-    audio_source->ResetMixedStatus();
     return true;
   } else {
     return false;
@@ -519,4 +509,36 @@ int AudioMixerImpl::GetOutputAudioLevelFullRange() {
                "GetAudioOutputLevelFullRange() => level=%d", level);
   return level;
 }
+
+AudioSourceWithMixStatus* AudioMixerImpl::GetSourceWithStatusForTest(
+    MixerAudioSource* audio_source) {
+  RTC_DCHECK_RUN_ON(&thread_checker_);
+  rtc::CritScope lock(&crit_);
+  for (auto& source_and_mix : audio_source_list_) {
+    if (source_and_mix.audio_source() == audio_source) {
+      return &source_and_mix;
+    }
+  }
+  for (auto& source_and_mix : additional_audio_source_list_) {
+    if (source_and_mix.audio_source() == audio_source) {
+      return &source_and_mix;
+    }
+  }
+
+  LOG_T_F(LS_ERROR) << "Audio source unknown";
+  return nullptr;
+}
+
+bool AudioMixerImpl::GetAudioSourceMixabilityStatusForTest(
+    MixerAudioSource* audio_source) {
+  RTC_DCHECK_RUN_ON(&thread_checker_);
+  rtc::CritScope lock(&crit_);
+  const auto* const ptr = GetSourceWithStatusForTest(audio_source);
+  if (ptr) {
+    return ptr->IsMixed();
+  } else {
+    LOG_T_F(LS_ERROR) << "Audio source unknown";
+    return false;
+  }
+}
 }  // namespace webrtc