fix multiple audio inputs issue

daijh · Duan, Xiande · commit fe29421cb031 · 2018-09-18T00:57:54.000-07:00
Change-Id: I0c975533b600cd0866d3b7171674c923aaad6f4f Reviewed-on: https://git-ccr-1.devtools.intel.com/gerrit/99532 Tested-by: webrtctest <webrtctest@intel.com> Reviewed-by: Duan, Xiande <xiande.duan@intel.com>
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
@@ -285,6 +285,7 @@ void AudioConferenceMixerImpl::Process() {
         }
     }
 
+    uint32_t mixedFrameCount = 0;
     bool fireVadCallback = false;
     {
         rtc::CritScope cs(&_crit);
@@ -351,7 +352,6 @@ void AudioConferenceMixerImpl::Process() {
             if (i == mixList.size()) {
                 mixedAudio = generalFrame;
             } else {
-                mixedAudio = uniqueFrames[i];
                 AudioFrameList::iterator it = workList.begin();
                 advance(it, i);
                 id = (*it).frame->id_;
@@ -374,6 +374,7 @@ void AudioConferenceMixerImpl::Process() {
                     workList.erase(it);
                 }
 
+                mixedAudio = uniqueFrames[mixedFrameCount++];
                 mixedAudio->CopyFrom(*generalFrame);
             }
 
@@ -415,7 +416,7 @@ void AudioConferenceMixerImpl::Process() {
                 _id,
                 *generalFrame,
                 const_cast<const AudioFrame**>(uniqueFrames),
-                mixList.size());
+                mixedFrameCount);
         }
 
         if(_vadReceiver != NULL && fireVadCallback) {

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ void AudioConferenceMixerImpl::Process() {`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`
	`288`	`+ uint32_t mixedFrameCount = 0;`
`288`	`289`	`bool fireVadCallback = false;`
`289`	`290`	`{`
`290`	`291`	`rtc::CritScope cs(&_crit);`
`@@ -351,7 +352,6 @@ void AudioConferenceMixerImpl::Process() {`
`351`	`352`	`if (i == mixList.size()) {`
`352`	`353`	`mixedAudio = generalFrame;`
`353`	`354`	`} else {`
`354`		`- mixedAudio = uniqueFrames[i];`
`355`	`355`	`AudioFrameList::iterator it = workList.begin();`
`356`	`356`	`advance(it, i);`
`357`	`357`	`id = (*it).frame->id_;`
`@@ -374,6 +374,7 @@ void AudioConferenceMixerImpl::Process() {`
`374`	`374`	`workList.erase(it);`
`375`	`375`	`}`
`376`	`376`
	`377`	`+ mixedAudio = uniqueFrames[mixedFrameCount++];`
`377`	`378`	`mixedAudio->CopyFrom(*generalFrame);`
`378`	`379`	`}`
`379`	`380`
`@@ -415,7 +416,7 @@ void AudioConferenceMixerImpl::Process() {`
`415`	`416`	`_id,`
`416`	`417`	`*generalFrame,`
`417`	`418`	`const_cast<const AudioFrame**>(uniqueFrames),`
`418`		`- mixList.size());`
	`419`	`+ mixedFrameCount);`
`419`	`420`	`}`
`420`	`421`
`421`	`422`	`if(_vadReceiver != NULL && fireVadCallback) {`