generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use _numMixedParticipants instead of audioFrameList->size() to determine if there're more than one participants.

Browse Source 
There are two audioFrameLists. The previous check wouldn't work correctly if each list had a single member.

TEST=chrome https://apprtc.appspot.com/?debug=loopback&video=false and verify e2e delay stats
BUG=
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/15019004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6723 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2014-07-17 22:19:21 +00:00
parent aa93611375
commit 4f5da030f1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
View File

@ -955,7 +955,7 @@ int32_t AudioConferenceMixerImpl::MixFromList(
return 0; return 0;
} }
if (audioFrameList->size() == 1) { if (_numMixedParticipants == 1) {
mixedAudio.timestamp_ = audioFrameList->front()->timestamp_; mixedAudio.timestamp_ = audioFrameList->front()->timestamp_;
mixedAudio.elapsed_time_ms_ = audioFrameList->front()->elapsed_time_ms_; mixedAudio.elapsed_time_ms_ = audioFrameList->front()->elapsed_time_ms_;
} else { } else {