Support multiple inputs from one audio mixer participant

Change-Id: Ieccb668215049164b31562dc7466592c0deccbaa
Reviewed-on: https://git-ccr-1.devtools.intel.com/gerrit/95930
Reviewed-by: Dai, Jianhui J <[email protected]>
Reviewed-by: Duan, Xiande <[email protected]>
Tested-by: Duan, Xiande <[email protected]>

Author: daijh

webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h

@@ -74,6 +74,8 @@ class AudioConferenceMixer : public Module
                                         const uint32_t amountOf10MsBetweenCallbacks) = 0;
     virtual int32_t UnRegisterMixerVadCallback() = 0;
 
+    virtual void SetMultipleInputs(bool enable) = 0;
+
 protected:
     AudioConferenceMixer() {}
 };

webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

@@ -19,6 +19,8 @@
 #define _VAD_METHOD_VOICE_DETECTION_
 //#define _VAD_METHOD_JOINT_ENERGY_VOICE_DETECTION_
 
+#define GROUP_ID(id) (((id) >> 16) & 0xffff)
+
 namespace webrtc {
 namespace {
 
@@ -133,7 +135,8 @@ AudioConferenceMixerImpl::AudioConferenceMixerImpl(int id)
       _vadReceiver(NULL),
       _amountOf10MsBetweenVadCallbacks(0),
       _amountOf10MsAll(0),
-      _amountOf10MsRemainder(0) {}
+      _amountOf10MsRemainder(0),
+      _supportMultipleInputs(false) {}
 
 bool AudioConferenceMixerImpl::Init() {
     Config config;
@@ -339,6 +342,7 @@ void AudioConferenceMixerImpl::Process() {
         MixAnonomouslyFromList(generalFrame, rampOutList);
 
         // 2. mix workList and anonomouslyMixerdFrame
+        std::map<uint16_t, bool> groupIds;
         for (size_t i = 0; i <= mixList.size(); ++i) {
             AudioFrameList workList = mixList;
             int id = -1;
@@ -351,7 +355,24 @@ void AudioConferenceMixerImpl::Process() {
                 AudioFrameList::iterator it = workList.begin();
                 advance(it, i);
                 id = (*it).frame->id_;
-                workList.erase(it);
+
+                if (_supportMultipleInputs) {
+                    uint16_t groupId = GROUP_ID(id);
+                    if (groupIds.find(groupId) != groupIds.end()) {
+                        continue;
+                    }
+
+                    groupIds[groupId] = true;
+                    for (it = workList.begin(); it != workList.end(); ) {
+                        if (GROUP_ID((*it).frame->id_) == groupId) {
+                            it = workList.erase(it);
+                        } else {
+                            ++it;
+                        }
+                    }
+                } else {
+                    workList.erase(it);
+                }
 
                 mixedAudio->CopyFrom(*generalFrame);
             }
@@ -1117,10 +1138,19 @@ void AudioConferenceMixerImpl::UpdateVadStatistics(AudioFrameList* mixList) {
             _vadParticipantEnergyList[id] += energy;
 
             WEBRTC_TRACE(kTraceStream, kTraceAudioMixerServer, _id,
-                    "###VadStatistics id(%d), energy(%12u), allEnergy(%12ld)",
+                    "###VadStatistics id(0x%-8x), energy(%12u), allEnergy(%12ld)",
                     id, energy, _vadParticipantEnergyList[id]);
         }
     }
 }
 
+void AudioConferenceMixerImpl::SetMultipleInputs(bool enable)
+{
+    WEBRTC_TRACE(kTraceInfo, kTraceAudioMixerServer, _id,
+            "Support multiple inputs: %d",
+            enable);
+
+    _supportMultipleInputs = enable;
+}
+
 }  // namespace webrtc

webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

@@ -90,6 +90,8 @@ class AudioConferenceMixerImpl : public AudioConferenceMixer
                                         const uint32_t amountOf10MsBetweenCallbacks) override;
     int32_t UnRegisterMixerVadCallback() override;
 
+    void SetMultipleInputs(bool enable) override;
+
 private:
     enum{DEFAULT_AUDIO_FRAME_POOLSIZE = 50};
 
@@ -208,6 +210,8 @@ class AudioConferenceMixerImpl : public AudioConferenceMixer
     std::map<int32_t, std::unique_ptr<AudioProcessing>> _apms;
 
     std::vector<ParticipantVadStatistics> _vadStatistics;
+
+    bool _supportMultipleInputs;
 };
 }  // namespace webrtc