diff options
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-17 22:19:21 +0000 |
|---|---|---|
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-17 22:19:21 +0000 |
| commit | 9ae7d44896eeb88cb5dd4a7baf805607436ce7e0 (patch) | |
| tree | cbd6aa98943786b0c7c9d1ec831dda02a2424dc5 /modules | |
| parent | f147639fcf3f45fdf764480834a483eb88b1cf2a (diff) | |
| download | webrtc-9ae7d44896eeb88cb5dd4a7baf805607436ce7e0.tar.gz | |
Use _numMixedParticipants instead of audioFrameList->size() to determine if there're more than one participants.
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/webrtc@6723 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 26ef3e88..bc97ec20 100644 --- a/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -955,7 +955,7 @@ int32_t AudioConferenceMixerImpl::MixFromList( return 0; } - if (audioFrameList->size() == 1) { + if (_numMixedParticipants == 1) { mixedAudio.timestamp_ = audioFrameList->front()->timestamp_; mixedAudio.elapsed_time_ms_ = audioFrameList->front()->elapsed_time_ms_; } else { |