Improve vad

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

Author: daijh

webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

@@ -128,8 +128,8 @@ AudioConferenceMixerImpl::AudioConferenceMixerImpl(int id)
       _vadEnabled(false),
       _vadReceiver(NULL),
       _amountOf10MsBetweenVadCallbacks(0),
-      _amountOf10MsUntilNextVadCallback(0),
-      _vadStatisticsAmount(0) {}
+      _amountOf10MsAll(0),
+      _amountOf10MsRemainder(0) {}
 
 bool AudioConferenceMixerImpl::Init() {
     Config config;
@@ -278,13 +278,17 @@ void AudioConferenceMixerImpl::Process() {
         }
     }
 
+    bool fireVadCallback = false;
     {
         rtc::CritScope cs(&_crit);
 
         // woogeen vad
-        _vadStatisticsAmount = 0;
-        if(_vadEnabled && _amountOf10MsUntilNextVadCallback-- == 0) {
-            _amountOf10MsUntilNextVadCallback = _amountOf10MsBetweenVadCallbacks;
+        if(_vadEnabled) {
+            if (_amountOf10MsRemainder == 0) {
+                _amountOf10MsAll = _amountOf10MsBetweenVadCallbacks;
+                _amountOf10MsRemainder = _amountOf10MsBetweenVadCallbacks;
+                _vadParticipantEnergyList.clear();
+            }
 
             if (mixList.size() + additionalFramesList.size() <= kMaximumVadParticipants) {
                 AudioFrameList vadParticipantList;
@@ -297,7 +301,7 @@ void AudioConferenceMixerImpl::Process() {
 
                 UpdateVadStatistics(&vadParticipantList);
             } else {
-                WEBRTC_TRACE(kTraceWarning, kTraceAudioMixerServer, _id,
+                WEBRTC_TRACE(kTraceError, kTraceAudioMixerServer, _id,
                         "vad participants exceeded MaximumAmount(%d)", kMaximumVadParticipants);
             }
         }
@@ -363,6 +367,20 @@ void AudioConferenceMixerImpl::Process() {
             mixedAudio->timestamp_ = _timeStamp;
             _timeStamp += static_cast<uint32_t>(_sampleSize);
         }
+
+        // woogeen vad
+        if(_vadEnabled && --_amountOf10MsRemainder == 0) {
+            _vadStatistics.resize(_vadParticipantEnergyList.size());
+
+            size_t i = 0;
+            for (auto& item : _vadParticipantEnergyList) {
+                _vadStatistics[i].id        = item.first;
+                _vadStatistics[i].energy    = item.second / _amountOf10MsAll;
+
+                i++;
+            }
+            fireVadCallback = true;
+        }
     }
 
     {
@@ -375,10 +393,10 @@ void AudioConferenceMixerImpl::Process() {
                 mixList.size());
         }
 
-        if((_vadReceiver != NULL) && _vadStatisticsAmount > 0) {
+        if(_vadReceiver != NULL && fireVadCallback) {
             _vadReceiver->VadParticipants(
-                    _vadStatistics,
-                    _vadStatisticsAmount);
+                    _vadStatistics.data(),
+                    _vadStatistics.size());
         }
     }
 
@@ -1021,6 +1039,9 @@ int32_t AudioConferenceMixerImpl::RegisterMixerVadCallback(
     {
         rtc::CritScope cs(&_crit);
         _amountOf10MsBetweenVadCallbacks = amountOf10MsBetweenCallbacks;
+        _amountOf10MsAll = 0;
+        _amountOf10MsRemainder = 0;
+
         _vadEnabled = true;
     }
     return 0;
@@ -1034,6 +1055,8 @@ int32_t AudioConferenceMixerImpl::UnRegisterMixerVadCallback() {
 
         _vadEnabled = false;
         _amountOf10MsBetweenVadCallbacks = 0;
+        _amountOf10MsAll = 0;
+        _amountOf10MsRemainder = 0;
     }
     {
         rtc::CritScope cs(&_cbCrit);
@@ -1043,14 +1066,23 @@ int32_t AudioConferenceMixerImpl::UnRegisterMixerVadCallback() {
 }
 
 void AudioConferenceMixerImpl::UpdateVadStatistics(AudioFrameList* mixList) {
-    _vadStatisticsAmount = 0;
+    WEBRTC_TRACE(kTraceStream, kTraceAudioMixerServer, _id,
+            "UpdateVadStatistics: %d",
+            _amountOf10MsRemainder);
+
     for (AudioFrameList::iterator iter = mixList->begin();
          iter != mixList->end();
          ++iter) {
         if((*iter).frame->vad_activity_ == AudioFrame::kVadActive) {
-            _vadStatistics[_vadStatisticsAmount].id = (*iter).frame->id_;
-            _vadStatistics[_vadStatisticsAmount].energy = CalculateEnergy(*(*iter).frame);
-            _vadStatisticsAmount++;
+            if (_vadParticipantEnergyList.find((*iter).frame->id_) == _vadParticipantEnergyList.end()) {
+                _vadParticipantEnergyList[(*iter).frame->id_] = 0;
+            }
+            uint32_t energy = CalculateEnergy(*(*iter).frame);
+            _vadParticipantEnergyList[(*iter).frame->id_] += energy;
+
+            WEBRTC_TRACE(kTraceStream, kTraceAudioMixerServer, _id,
+                    "###VadStatistics id(%d), energy(%12u), allEnergy(%12ld)",
+                    (*iter).frame->id_, energy, _vadParticipantEnergyList[(*iter).frame->id_]);
         }
     }
 }

webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

@@ -193,17 +193,19 @@ class AudioConferenceMixerImpl : public AudioConferenceMixer
     std::unique_ptr<AudioProcessing> _limiter;
 
     // woogeen vad
-    enum {kMaximumVadParticipants = 128};
+    enum {kMaximumVadParticipants = 1024};
 
     void UpdateVadStatistics(AudioFrameList* mixList);
 
     bool _vadEnabled;
     AudioMixerVadReceiver* _vadReceiver;
     uint32_t _amountOf10MsBetweenVadCallbacks;
 
-    uint32_t _amountOf10MsUntilNextVadCallback;
-    size_t _vadStatisticsAmount;
-    ParticipantVadStatistics _vadStatistics[kMaximumVadParticipants];
+    uint32_t _amountOf10MsAll;
+    uint32_t _amountOf10MsRemainder;
+    std::map<int32_t, int64_t> _vadParticipantEnergyList;
+
+    std::vector<ParticipantVadStatistics> _vadStatistics;
 };
 }  // namespace webrtc