commit 7ffefe41a0e857f94e869a174df286297c223d54
author henrik.lundin <henrik.lundin@webrtc.org> Wed May 18 09:34:17 2016
committer Commit bot <commit-bot@chromium.org> Wed May 18 09:34:24 2016
tree 4a4909079a26ba8b5c44a43f1efd1ad13ad02fc0
parent 084d5f10cc8ecddbceaf37a5d54f8e2581b3c301

Add muted parameter to audio_frame_manipulator methods

BUG=webrtc:5609
NOTRY=True

Review-Url: https://codereview.webrtc.org/1983023002
Cr-Original-Commit-Position: refs/heads/master@{#12788}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 5a216d0489b2374a778c90e657fb71a6def5d1a1

modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

diff --git a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
index 552d9c4..b7bf1ba 100644
--- a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
+++ b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
@@ -577,7 +577,7 @@
         }
 
         if(audioFrame->vad_activity_ == AudioFrame::kVadActive) {
-            if(!wasMixed) {
+            if(!wasMixed && !muted) {
                 RampIn(*audioFrame);
             }
 
@@ -585,13 +585,15 @@
                 // There are already more active participants than should be
                 // mixed. Only keep the ones with the highest energy.
                 AudioFrameList::iterator replaceItem;
-                uint32_t lowestEnergy = CalculateEnergy(*audioFrame);
+                uint32_t lowestEnergy =
+                    muted ? 0 : CalculateEnergy(*audioFrame);
 
                 bool found_replace_item = false;
                 for (AudioFrameList::iterator iter = activeList.begin();
                      iter != activeList.end();
                      ++iter) {
-                    const uint32_t energy = CalculateEnergy(*iter->frame);
+                    const uint32_t energy =
+                        muted ? 0 : CalculateEnergy(*iter->frame);
                     if(energy < lowestEnergy) {
                         replaceItem = iter;
                         lowestEnergy = energy;
@@ -599,6 +601,7 @@
                     }
                 }
                 if(found_replace_item) {
+                    RTC_DCHECK(!muted);  // Cannot replace with a muted frame.
                     FrameAndMuteInfo replaceFrame = *replaceItem;
 
                     bool replaceWasMixed = false;
@@ -620,7 +623,9 @@
                            kMaximumAmountOfMixedParticipants);
 
                     if (replaceWasMixed) {
-                      RampOut(*replaceFrame.frame);
+                      if (!replaceFrame.muted) {
+                        RampOut(*replaceFrame.frame);
+                      }
                       rampOutList->push_back(replaceFrame);
                       assert(rampOutList->size() <=
                              kMaximumAmountOfMixedParticipants);
@@ -629,7 +634,9 @@
                     }
                 } else {
                     if(wasMixed) {
-                        RampOut(*audioFrame);
+                        if (!muted) {
+                            RampOut(*audioFrame);
+                        }
                         rampOutList->push_back(FrameAndMuteInfo(audioFrame,
                                                                 muted));
                         assert(rampOutList->size() <=
@@ -650,7 +657,9 @@
                     new ParticipantFrameStruct(*participant, audioFrame, muted);
                 passiveWasMixedList.push_back(part_struct);
             } else if(mustAddToPassiveList) {
-                RampIn(*audioFrame);
+                if (!muted) {
+                    RampIn(*audioFrame);
+                }
                 ParticipantFrameStruct* part_struct =
                     new ParticipantFrameStruct(*participant, audioFrame, muted);
                 passiveWasNotMixedList.push_back(part_struct);